Adiciona validação e captura de valores inválidos em data_availability_status #1252
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # Generated by Django 5.2.7 on 2026-01-05 19:42 | ||
|
|
||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ("article", "0044_alter_article_accepted_dateiso_and_more"), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.AddField( | ||
| model_name="article", | ||
| name="invalid_data_availability_status", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Armazena valores inválidos recebidos do XML", | ||
| max_length=255, | ||
| null=True, | ||
| verbose_name="Invalid data availability status from XML", | ||
| ), | ||
| ), | ||
| migrations.AlterField( | ||
| model_name="article", | ||
| name="data_availability_status", | ||
| field=models.CharField( | ||
| blank=True, | ||
| choices=[ | ||
| ( | ||
| "data-available", | ||
| "Os dados de pesquisa estão disponíveis em repositório.", | ||
| ), | ||
| ( | ||
| "data-available-upon-request", | ||
| "Os dados de pesquisa só estão disponíveis mediante solicitação.", | ||
| ), | ||
| ( | ||
| "data-in-article", | ||
| "Os dados de pesquisa estão disponíveis no corpo do documento.", | ||
| ), | ||
| ( | ||
| "data-not-available", | ||
| "Os dados de pesquisa não estão disponíveis.", | ||
| ), | ||
| ( | ||
| "uninformed", | ||
| "Uso de dados não informado; nenhum dado de pesquisa gerado ou utilizado.", | ||
| ), | ||
| ("absent", "Informação ausente no XML"), | ||
| ("not-processed", "XML não processado"), | ||
| ("invalid", "Valor inválido recebido do XML"), | ||
| ], | ||
| default="not-processed", | ||
| max_length=30, | ||
| null=True, | ||
| verbose_name="Data Availability Status", | ||
| ), | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -299,32 +299,32 @@ def add_peer_review_dates(xmltree, article, errors): | |||||||
| """ | ||||||||
| try: | ||||||||
| dates = ArticleDates(xmltree=xmltree) | ||||||||
|
|
||||||||
| # Obter estatísticas completas de peer review | ||||||||
| peer_review_stats = dates.get_peer_reviewed_stats(serialize_dates=True) | ||||||||
|
|
||||||||
| # Armazenar estatísticas completas em JSON | ||||||||
| article.peer_review_stats = peer_review_stats | ||||||||
|
|
||||||||
| # Extrair datas individuais em formato ISO | ||||||||
| article.preprint_dateiso = peer_review_stats.get("preprint_date") | ||||||||
| article.received_dateiso = peer_review_stats.get("received_date") | ||||||||
| article.accepted_dateiso = peer_review_stats.get("accepted_date") | ||||||||
|
|
||||||||
| # Extrair intervalos em dias | ||||||||
| article.days_preprint_to_received = peer_review_stats.get("days_from_preprint_to_received") | ||||||||
| article.days_received_to_accepted = peer_review_stats.get("days_from_received_to_accepted") | ||||||||
| article.days_accepted_to_published = peer_review_stats.get("days_from_accepted_to_published") | ||||||||
| article.days_preprint_to_published = peer_review_stats.get("days_from_preprint_to_published") | ||||||||
| article.days_receive_to_published = peer_review_stats.get("days_from_received_to_published") | ||||||||
|
|
||||||||
| # Extrair flags de estimativa | ||||||||
| article.days_preprint_to_received_estimated = peer_review_stats.get("estimated_days_from_preprint_to_received") | ||||||||
| article.days_received_to_accepted_estimated = peer_review_stats.get("estimated_days_from_received_to_accepted") | ||||||||
| article.days_accepted_to_published_estimated = peer_review_stats.get("estimated_days_from_accepted_to_published") | ||||||||
| article.days_preprint_to_published_estimated = peer_review_stats.get("estimated_days_from_preprint_to_published") | ||||||||
| article.days_receive_to_published_estimated = peer_review_stats.get("estimated_days_from_received_to_published") | ||||||||
|
|
||||||||
| except Exception as e: | ||||||||
| add_error(errors, "add_peer_review_dates", e) | ||||||||
|
|
||||||||
|
|
@@ -333,9 +333,16 @@ def add_data_availability_status(xmltree, errors, article, user): | |||||||
| """ | ||||||||
| Extrai a declaração de disponibilidade de dados do XML. | ||||||||
|
|
||||||||
| Lógica de validação: | ||||||||
| - Valor inválido: preserva em invalid_data_availability_status e marca como "invalid" | ||||||||
| - Valor válido explícito: limpa invalid_data_availability_status | ||||||||
| - Valor ausente: mantém invalid_data_availability_status inalterado (preserva histórico) | ||||||||
|
|
||||||||
| Args: | ||||||||
| xmltree: Árvore XML do artigo | ||||||||
| errors: Lista para coletar erros | ||||||||
| article: Instância do modelo Article | ||||||||
| user: Usuário responsável pela operação | ||||||||
| """ | ||||||||
| try: | ||||||||
| status = None | ||||||||
|
|
@@ -351,10 +358,23 @@ def add_data_availability_status(xmltree, errors, article, user): | |||||||
| continue | ||||||||
| items.append({"language": lang, "text": text}) | ||||||||
|
|
||||||||
| # Valida o status extraído do XML | ||||||||
| if status is None: | ||||||||
| # Valor ausente no XML (orientação mais recente do SPS) | ||||||||
| article.data_availability_status = choices.DATA_AVAILABILITY_STATUS_ABSENT | ||||||||
| article.invalid_data_availability_status = None | ||||||||
| elif status not in choices.DATA_AVAILABILITY_STATUS_VALID_VALUES: | ||||||||
| # Valor inválido encontrado no XML | ||||||||
| article.invalid_data_availability_status = status | ||||||||
| article.data_availability_status = choices.DATA_AVAILABILITY_STATUS_INVALID | ||||||||
| else: | ||||||||
| # Valor válido explícito presente | ||||||||
| article.invalid_data_availability_status = None | ||||||||
|
There was a problem hiding this comment. The validation logic has a subtle issue: when the status from XML is None (absent), it correctly sets the status to DATA_AVAILABILITY_STATUS_ABSENT, but it also sets invalid_data_availability_status to None. However, when a valid status is provided from the XML, invalid_data_availability_status is also set to None. This means that if an article previously had an invalid status and is then updated with a valid status or no status, the original invalid value will be lost. Consider whether the invalid_data_availability_status field should only be cleared when explicitly appropriate, or if historical tracking of invalid values is needed.
Suggested change
|
||||||||
| article.data_availability_status = status | ||||||||
|
|
||||||||
| # SAVE OBRIGATÓRIO ANTES DE ADICIONAR OS ITENS M2M | ||||||||
| article.save() | ||||||||
|
|
||||||||
| for item in items: | ||||||||
| DataAvailabilityStatement.create_or_update( | ||||||||
| user=user, | ||||||||
|
|
@@ -1007,32 +1027,32 @@ def add_related_articles(xmltree, article, user, errors): | |||||||
| """ | ||||||||
| try: | ||||||||
| related_articles = RelatedArticles(xmltree) | ||||||||
|
|
||||||||
| for related_article_data in related_articles.related_articles(): | ||||||||
| try: | ||||||||
| # Extrair dados do artigo relacionado | ||||||||
| href = related_article_data.get("href") | ||||||||
| if not href: | ||||||||
| continue | ||||||||
|
|
||||||||
| ext_link_type = related_article_data.get("ext-link-type") | ||||||||
| related_type = related_article_data.get("related-article-type") | ||||||||
|
|
||||||||
| # Adicionar relacionamento ao artigo | ||||||||
| article.add_related_article( | ||||||||
| user=user, | ||||||||
| href=href, | ||||||||
| ext_link_type=ext_link_type, | ||||||||
| related_type=related_type | ||||||||
| ) | ||||||||
|
|
||||||||
| except Exception as e: | ||||||||
| add_error( | ||||||||
| errors, | ||||||||
| "add_related_articles.process_item", | ||||||||
| e, | ||||||||
| related_article_data=related_article_data | ||||||||
| ) | ||||||||
|
|
||||||||
| except Exception as e: | ||||||||
| add_error(errors, "add_related_articles", e) | ||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Rossi-Luciano acho que é melhor adicionar
article.invalid_data_availability_status = None