Merge pull request #973 from robertatakenaka/fix_bugs_migration

Corrige problemas de banco de dados ao executar migração de artigos

Author: robertatakenaka

VERSION

@@ -1 +1 @@
-v2.12.0rc12
+v2.12.0rc13

article/models.py

@@ -336,9 +336,17 @@ def get_first(cls, pid_v2=None, sps_pkg_name=None, pid_v3=None, delete=False):
             if obj is None:
                 raise cls.DoesNotExist            
         if delete:
-            qs.exclude(pk=obj.pk).delete()
+            cls.delete_queryset(qs.exclude(pk=obj.pk))
         return obj
 
+    @classmethod
+    def delete_queryset(cls, qs):
+        ArticleDOIWithLang.objects.filter(article__in=qs).delete()
+        ArticleTitle.objects.filter(parent__in=qs).delete()
+        ArticleCollection.objects.filter(article__in=qs).delete()
+        ArticleWebPage.objects.filter(article__in=qs).delete()
+        return qs.delete()
+
     # ── create_or_update ──
 
     @classmethod
@@ -914,7 +922,7 @@ def exclude_invalid_records(cls, user, issue, sps_pkg_id_list, timeout=None):
                     sps_pkg_to_delete.add(sps_pkg_id)
                     sps_pkg_names.append(sps_pkg_name)
             response["sps_pkg_with_invalid_pid_v2"] = sps_pkg_names
-            qtd_deleted, _ = qs.delete()
+            qtd_deleted, _ = cls.delete_queryset(qs)
             total_deletado += qtd_deleted
 
         # 1. Remoção por falta de pp_xml
@@ -933,7 +941,7 @@ def exclude_invalid_records(cls, user, issue, sps_pkg_id_list, timeout=None):
                     sps_pkg_names.append(item.sps_pkg.sps_pkg_name)
         if article_ids:
             response["ppxml_invalid"] = sps_pkg_names
-            qtd_deleted, _ = qs.filter(id__in=article_ids).delete()
+            qtd_deleted, _ = cls.delete_queryset(qs.filter(id__in=article_ids))
             total_deletado += qtd_deleted
 
         # 2. Remoção por duplicidade
@@ -945,7 +953,7 @@ def exclude_invalid_records(cls, user, issue, sps_pkg_id_list, timeout=None):
             for value in list(multiple_values or []):
 
                 # Filtra os registros que possuem este valor específico duplicado
-                duplicados = qs.filter(**{field_name: value}).order_by("-update")
+                duplicados = qs.filter(**{field_name: value}).order_by("-updated")
 
                 if not duplicados.exists():
                     continue
@@ -982,23 +990,23 @@ def exclude_invalid_records(cls, user, issue, sps_pkg_id_list, timeout=None):
                     response[f"repeated_{field_name}"].append((value, sps_pkg_names))
 
                     # Executa a deleção e soma ao totalizador
-                    qtd_deletada, _ = remover_qs.delete()
+                    qtd_deletada, _ = cls.delete_queryset(remover_qs)
                     total_deletado += qtd_deletada
 
         # Se você precisar retornar o total_deletado junto com o dicionário, 
         # pode adicioná-lo ao dicionário ou retornar uma tupla. 
         # Como o seu esqueleto final pedia apenas o retorno do dicionário, mantive assim:
         if ppxml_to_delete:
-            PidProviderXML.objects.filter(id__in=ppxml_to_delete).delete()
+            PidProviderXML.delete_queryset(PidProviderXML.objects.filter(id__in=ppxml_to_delete))
         if sps_pkg_to_delete:
-            SPSPkg.objects.filter(id__in=sps_pkg_to_delete).delete()
+            SPSPkg.delete_queryset(SPSPkg.objects.filter(id__in=sps_pkg_to_delete))
 
         response["deleted_ppxml_ids"] = list(ppxml_to_delete)
         response["deleted_sps_pkg_ids"] = list(sps_pkg_to_delete)
 
         qs = cls.objects.filter(Q(sps_pkg__isnull=True) | Q(pp_xml__isnull=True), issue=issue)
         response["deleted_article_ids"] = list(qs.values_list("id", flat=True))
-        qtd_deleted, _ = qs.delete()
+        qtd_deleted, _ = cls.delete_queryset(qs)
         total_deletado += qtd_deleted
 
         response["total_deleted_items"] = total_deletado

package/models.py

@@ -408,6 +408,11 @@ def supplementary_materials(self):
     def get(cls, pid_v3):
         return cls.objects.get(pid_v3=pid_v3)
 
+    @classmethod
+    def delete_queryset(cls, qs):
+        SPSPkgComponent.objects.filter(sps_pkg__in=qs).delete()
+        qs.delete()
+
     def set_registered_in_core(self, value):
         PidRequester.set_registered_in_core(self.pid_v3, value)
 
@@ -428,7 +433,7 @@ def _get_or_create(cls, user, pid_v3, sps_pkg_name, registered_in_core, pid_v2):
         except cls.MultipleObjectsReturned:
             items = cls.objects.filter(sps_pkg_name=sps_pkg_name).order_by("-updated")
             obj = items.first()
-            items.exclude(id=obj.id).delete()
+            cls.delete_queryset(items.exclude(id=obj.id))
         except cls.DoesNotExist:
             obj = cls()
             obj.creator = user

pid_provider/models.py

@@ -565,6 +565,11 @@ def get_queryset(
             params["proc_status__in"] = proc_status_list
         return cls.objects.filter(q, **params)
 
+    @classmethod
+    def delete_queryset(cls, qs):
+        OtherPid.objects.filter(pid_provider_xml__in=qs).delete()
+        qs.delete()
+
     @classmethod
     @profile_classmethod
     def public_items(cls, from_date):

proc/models.py

@@ -2037,6 +2037,11 @@ def mark_for_reprocessing(
             public_ws_status=tracker_choices.PROGRESS_STATUS_REPROC,
         )
 
+    @classmethod
+    def delete_queryset(cls, qs):
+        ArticleProcResult.objects.filter(proc__in=qs).delete()
+        qs.delete()
+
     # ── status propagation ──
 
     def propagate_reproc_or_todo_status(self):
@@ -2554,7 +2559,7 @@ def exclude_invalid_items(cls, user, issue):
             issue_proc__issue=issue,
         )
         items = qs.values("pid", "sps_pkg__sps_pkg_name")
-        qs.delete()
+        cls.delete_queryset(qs)
         return {"sps_pkg_id_list": list(sps_pkg_id_list), "deleted": list(items)}
 
     def update_sps_pkg_status(self):