Merge pull request #921 from robertatakenaka/rc_fix_article_payload_authors

[alimentação direta] Resolve questões que impediam publicação dos artigos

Author: robertatakenaka

journal/migrations/0014_alter_journal_title_alter_officialjournal_title.py

@@ -108,33 +108,28 @@ def finished(self):
 
     @classmethod
     def create(cls, user, proc, name):
-        name = name[:64]
-        cls.exclude_events(user, proc, name)
         obj = cls()
         obj.proc = proc
         obj.name = name
         obj.creator = user
         obj.save()
         return obj
-        # try:
-        #     return cls.objects.get(proc=proc, name=name)
-        # except cls.MultipleObjectsReturned:
-        #     return cls.objects.filter(proc=proc, name=name).order_by("-created").first()
-        # except cls.DoesNotExist:
-        #     obj = cls()
-        #     obj.proc = proc
-        #     obj.name = name
-        #     obj.creator = user
-        #     obj.save()
-        #     return obj
 
     @classmethod
     def exclude_events(cls, user, proc, name):
         # apaga todas as ocorrências que foram armazenadas no arquivo
         try:
-            cls.objects.filter(proc=proc, name=name).delete()
+            event = cls.objects.get(proc=proc, name=name)
+        except cls.MultipleObjectsReturned:
+            event = cls.objects.filter(proc=proc, name=name).order_by("-created").first()
+        except cls.DoesNotExist:
+            return
+        
+        try:
+            cls.objects.filter(proc=proc, created__gte=event.created).delete()
+            logging.info(f"Deleted events for proc {proc} and name {name} starting from {event.created}")
         except Exception as e:
-            pass
+            logging.info(f"Error deleting events for proc {proc} and name {name}: {e}")
 
     @classmethod
     def start(
@@ -143,6 +138,9 @@ def start(
         proc,
         name=None,
     ):
+        logging.info(f"Starting operation {name} for proc {proc} by user {user}")
+        name = name[:64]
+        cls.exclude_events(user, proc, name)
         return cls.create(user, proc, name)
 
     def finish(

proc/models.py

@@ -202,7 +202,7 @@ def migrate_journal(
     """
     try:
         event = None
-        detail = None
+        detail = {}
         detail = {
             "journal_proc": str(journal_proc),
             "force_update": force_update,
@@ -270,7 +270,7 @@ def migrate_issue(user, issue_proc, force_update):
     """
     try:
         event = None
-        detail = None
+        detail = {}
         detail = {
             "issue_proc": str(issue_proc),
             "force_update": force_update,

proc/source_classic_website.py

@@ -51,7 +51,7 @@ def __init__(
         self.password = password
         self.token = token
         self.enabled = enabled
-        if not token and enabled:
+        if not token:
             self.get_token()
 
     @property
@@ -72,8 +72,6 @@ def post_data(self, payload, kwargs=None):
         # logging.info(f"payload={payload}")
         response = None
         try:
-            if not self.enabled:
-                raise ValueError(_("Website enabled is False ({})").format(self.post_data_url))
             if not self.token:
                 self.get_token()
             response = self._post_data(payload, self.token, kwargs)
@@ -118,6 +116,8 @@ def get_token(self):
         )
         # logging.info(resp)
         self.token = resp.get("token")
+        if not self.token:
+            raise Exception(f"Failed to get token from {self.get_token_url} with username {self.username}: {resp}")
         return self.token
 
     def _post_data(self, payload, token, kwargs=None):

publication/api/publication.py

@@ -561,7 +561,7 @@ def process_system_decision(self, task_publish_article):
                 user = self.updated_by or self.creator
                 # é desejável que o artigo seja publicado diretamente
                 # prepare_to_publish verficará se há impedimentos
-                detail = None
+                detail = {}
                 event = None
                 event = self.start(user, "process_system_decision")
 
@@ -956,9 +956,8 @@ def update_status_and_add_comments(self, user, result, new_status=None):
             save = True
 
         if comments:
-            if not self.qa_comment:
-                self.qa_comment = ""
-            self.qa_comment += "\n".join(comments)
+            self.qa_comment = self.qa_comment or ""
+            self.qa_comment += "\n".join(str(c) for c in comments)
             save = True
 
         if save:
@@ -1001,7 +1000,7 @@ def xml_file_changed_pid_v2(self, user, xml_with_pre):
 
     def add_pid_v2(self, user, xml_with_pre):
         try:
-            detail = None
+            detail = {}
             pid_v2_gen = None
             event = self.start(user, "add_pid_v2")
             pid_v2_gen = PidV2Generator(xml_with_pre)

upload/models.py

@@ -221,11 +221,14 @@ def publish_article_on_website(
             username=website.api_username,
             password=website.api_password,
             timeout=15,
+            enabled=website.enabled,
         )
         api.get_token()
         api_data = api.data
     except WebSiteConfiguration.DoesNotExist as exc:
         return
+    except Exception as exc:
+        return
 
     journal_proc = issue_proc.journal_proc