diff --git a/arkindex/documents/tasks.py b/arkindex/documents/tasks.py index 956f250eab3cb7c73dad87b4fecf405c17b8578f..1c42b0d360adf1e7e7f2c97f61f911629cfbedea 100644 --- a/arkindex/documents/tasks.py +++ b/arkindex/documents/tasks.py @@ -21,7 +21,7 @@ from arkindex.documents.models import ( Transcription, TranscriptionEntity, ) -from arkindex.ponos.models import Task +from arkindex.ponos.models import Artifact, Task from arkindex.process.models import Process, ProcessDatasetSet, ProcessElement, WorkerActivity, WorkerRun from arkindex.training.models import DatasetElement, DatasetSet from arkindex.users.models import User @@ -71,6 +71,8 @@ def corpus_delete(corpus_id: str) -> None: Selection.objects.filter(element__corpus_id=corpus_id), corpus.memberships.all(), corpus.exports.all(), + # Delete task artifacts + Artifact.objects.filter(task__process__corpus_id=corpus_id), # ProcessDatasetSet M2M ProcessDatasetSet.objects.filter(set__dataset__corpus_id=corpus_id), ProcessDatasetSet.objects.filter(process__corpus_id=corpus_id), diff --git a/arkindex/sql_validation/corpus_delete.sql b/arkindex/sql_validation/corpus_delete.sql index eb4184273585fe0f3a85e1e0fb1f875bfe56ff59..51eae442a74c5aba4fc8c8f7c0e9238bbe0dda90 100644 --- a/arkindex/sql_validation/corpus_delete.sql +++ b/arkindex/sql_validation/corpus_delete.sql @@ -157,6 +157,15 @@ DELETE FROM "documents_corpusexport" WHERE "documents_corpusexport"."corpus_id" = '{corpus_id}'::uuid; +DELETE +FROM "ponos_artifact" +WHERE "ponos_artifact"."id" IN + (SELECT U0."id" + FROM "ponos_artifact" U0 + INNER JOIN "ponos_task" U1 ON (U0."task_id" = U1."id") + INNER JOIN "process_process" U2 ON (U1."process_id" = U2."id") + WHERE U2."corpus_id" = '{corpus_id}'::uuid); + DELETE FROM "process_processdatasetset" WHERE "process_processdatasetset"."id" IN diff --git a/arkindex/sql_validation/corpus_delete_top_level_type.sql b/arkindex/sql_validation/corpus_delete_top_level_type.sql index 6ee77ab04200a9b63218e08046aeaefde2f14192..0a552ec5f429f0caa12f106c13e223d7afbe11ab 100644 --- a/arkindex/sql_validation/corpus_delete_top_level_type.sql +++ b/arkindex/sql_validation/corpus_delete_top_level_type.sql @@ -161,6 +161,15 @@ DELETE FROM "documents_corpusexport" WHERE "documents_corpusexport"."corpus_id" = '{corpus_id}'::uuid; +DELETE +FROM "ponos_artifact" +WHERE "ponos_artifact"."id" IN + (SELECT U0."id" + FROM "ponos_artifact" U0 + INNER JOIN "ponos_task" U1 ON (U0."task_id" = U1."id") + INNER JOIN "process_process" U2 ON (U1."process_id" = U2."id") + WHERE U2."corpus_id" = '{corpus_id}'::uuid); + DELETE FROM "process_processdatasetset" WHERE "process_processdatasetset"."id" IN