Merge branch 'destroy-results-metadata' into 'master'

Destroy metadata in DestroyWorkerResults

Closes #797

See merge request !1420

arkindex/documents/tasks.py

@@ -102,6 +102,7 @@ def worker_results_delete(corpus_id: str, version_id: str, parent_id: str) -> No
             | Q(entity__corpus_id=corpus_id)
         )
     )
+    metadata = MetaData.objects.filter(worker_version_id=version_id, element__corpus_id=corpus_id)
 
     if parent_id:
         elements = elements.filter(Q(id=parent_id) | Q(paths__path__overlap=[parent_id]))
@@ -110,12 +111,14 @@ def worker_results_delete(corpus_id: str, version_id: str, parent_id: str) -> No
         transcription_entities_filter = Q(transcription__element_id=parent_id) | Q(transcription__element__paths__path__overlap=[parent_id])
         transcription_entities = transcription_entities.filter(transcription_entities_filter)
         worker_transcription_entities = worker_transcription_entities.filter(transcription_entities_filter)
+        metadata = metadata.filter(Q(element_id=parent_id) | Q(element__paths__path__overlap=[parent_id]))
 
     elements.trash()
     classifications.delete()
     transcription_entities.delete()
     worker_transcription_entities.delete()
     transcriptions._raw_delete(using='default')
+    metadata.delete()
 
 
 @job('high', timeout=settings.RQ_TIMEOUTS['move_element'])

arkindex/documents/tests/tasks/test_worker_results_delete.py

@@ -8,7 +8,6 @@ class TestDeleteWorkerResults(FixtureTestCase):
 
     @classmethod
     def setUpTestData(cls):
-        super().setUpTestData()
         super().setUpTestData()
         cls.text = MLClass.objects.create(name='text', corpus=cls.corpus)
         cls.version_1 = WorkerVersion.objects.get(worker__slug='reco')

arkindex/sql_validation/worker_results_delete_in_corpus.sql

@@ -256,5 +256,14 @@ WHERE "documents_transcription"."id" IN
         (SELECT U0."id"
          FROM "documents_transcription" U0
          INNER JOIN "documents_element" U1 ON (U0."element_id" = U1."id")
+         WHERE (U1."corpus_id" = '{corpus_id}'::uuid
+                AND U0."worker_version_id" = '{version_id}'::uuid));
+
+DELETE
+FROM "documents_metadata"
+WHERE "documents_metadata"."id" IN
+        (SELECT U0."id"
+         FROM "documents_metadata" U0
+         INNER JOIN "documents_element" U1 ON (U0."element_id" = U1."id")
          WHERE (U1."corpus_id" = '{corpus_id}'::uuid
                 AND U0."worker_version_id" = '{version_id}'::uuid))

arkindex/sql_validation/worker_results_delete_under_parent.sql

@@ -174,6 +174,18 @@ WHERE "documents_transcription"."id" IN
          FROM "documents_transcription" U0
          INNER JOIN "documents_element" U1 ON (U0."element_id" = U1."id")
          LEFT OUTER JOIN "documents_elementpath" U4 ON (U1."id" = U4."element_id")
+         WHERE (U1."corpus_id" = '{corpus_id}'::uuid
+                AND U0."worker_version_id" = '{version_id}'::uuid
+                AND (U0."element_id" = '{parent_id}'::uuid
+                     OR U4."path" && ARRAY['{parent_id}'::uuid]::uuid[])));
+
+DELETE
+FROM "documents_metadata"
+WHERE "documents_metadata"."id" IN
+        (SELECT U0."id"
+         FROM "documents_metadata" U0
+         INNER JOIN "documents_element" U1 ON (U0."element_id" = U1."id")
+         LEFT OUTER JOIN "documents_elementpath" U4 ON (U1."id" = U4."element_id")
          WHERE (U1."corpus_id" = '{corpus_id}'::uuid
                 AND U0."worker_version_id" = '{version_id}'::uuid
                 AND (U0."element_id" = '{parent_id}'::uuid

arkindex/sql_validation/worker_results_delete_under_parent_included.sql

@@ -329,6 +329,18 @@ WHERE "documents_transcription"."id" IN
          FROM "documents_transcription" U0
          INNER JOIN "documents_element" U1 ON (U0."element_id" = U1."id")
          LEFT OUTER JOIN "documents_elementpath" U4 ON (U1."id" = U4."element_id")
+         WHERE (U1."corpus_id" = '{corpus_id}'::uuid
+                AND U0."worker_version_id" = '{version_id}'::uuid
+                AND (U0."element_id" = '{parent_id}'::uuid
+                     OR U4."path" && ARRAY['{parent_id}'::uuid]::uuid[])));
+
+DELETE
+FROM "documents_metadata"
+WHERE "documents_metadata"."id" IN
+        (SELECT U0."id"
+         FROM "documents_metadata" U0
+         INNER JOIN "documents_element" U1 ON (U0."element_id" = U1."id")
+         LEFT OUTER JOIN "documents_elementpath" U4 ON (U1."id" = U4."element_id")
          WHERE (U1."corpus_id" = '{corpus_id}'::uuid
                 AND U0."worker_version_id" = '{version_id}'::uuid
                 AND (U0."element_id" = '{parent_id}'::uuid