(PC-11034) Fix query to filter already processed application ids

pass-culture · Oct 14, 2021 · 84496f8 · 84496f8
1 parent 8ec84ae
commit 84496f8
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 1 deletion.
diff --git a/src/pcapi/repository/beneficiary_import_queries.py b/src/pcapi/repository/beneficiary_import_queries.py
@@ -31,7 +31,11 @@ def get_existing_applications_id(procedure_id: int) -> set[int]:
     return {
         beneficiary_import.applicationId
         for beneficiary_import in BeneficiaryImport.query.join(BeneficiaryImportStatus)
-        .filter(BeneficiaryImportStatus.status.in_([ImportStatus.CREATED, ImportStatus.REJECTED]))
+        .filter(
+            BeneficiaryImportStatus.status.in_(
+                [ImportStatus.CREATED, ImportStatus.REJECTED, ImportStatus.DUPLICATE, ImportStatus.ERROR]
+            )
+        )
         .options(load_only(BeneficiaryImport.applicationId))
         .filter(BeneficiaryImport.sourceId == procedure_id)
         .all()

diff --git a/tests/repository/beneficiary_import_queries_test.py b/tests/repository/beneficiary_import_queries_test.py
@@ -9,6 +9,7 @@
 from pcapi.models import BeneficiaryImportSources
 from pcapi.models import ImportStatus
 from pcapi.repository.beneficiary_import_queries import find_applications_ids_to_retry
+from pcapi.repository.beneficiary_import_queries import get_existing_applications_id
 from pcapi.repository.beneficiary_import_queries import is_already_imported
 from pcapi.repository.beneficiary_import_queries import save_beneficiary_import_with_status
 
@@ -196,3 +197,55 @@ def test_returns_an_empty_list_if_no_retry_imports_exist(self, app):
 
         # then
         assert not ids
+
+
+@pytest.mark.usefixtures("db_session")
+class GetExistingApplicationIdTest:
+    def test_existing_application_id(self):
+        procedure_id = 123
+
+        draft = users_factories.BeneficiaryImportStatusFactory(
+            beneficiaryImport__sourceId=procedure_id,
+            status=ImportStatus.DRAFT,
+        )
+
+        ongoing = users_factories.BeneficiaryImportStatusFactory(
+            beneficiaryImport__sourceId=procedure_id,
+            status=ImportStatus.ONGOING,
+        )
+        duplicate = users_factories.BeneficiaryImportStatusFactory(
+            beneficiaryImport__sourceId=procedure_id,
+            status=ImportStatus.DUPLICATE,
+        )
+        error = users_factories.BeneficiaryImportStatusFactory(
+            beneficiaryImport__sourceId=procedure_id,
+            status=ImportStatus.ERROR,
+        )
+        created = users_factories.BeneficiaryImportStatusFactory(
+            beneficiaryImport__sourceId=procedure_id,
+            status=ImportStatus.CREATED,
+        )
+
+        rejected = users_factories.BeneficiaryImportStatusFactory(
+            beneficiaryImport__sourceId=procedure_id,
+            status=ImportStatus.REJECTED,
+        )
+        retry = users_factories.BeneficiaryImportStatusFactory(
+            beneficiaryImport__sourceId=procedure_id,
+            status=ImportStatus.RETRY,
+        )
+        without_continuation = users_factories.BeneficiaryImportStatusFactory(
+            beneficiaryImport__sourceId=procedure_id,
+            status=ImportStatus.WITHOUT_CONTINUATION,
+        )
+
+        application_ids = get_existing_applications_id(procedure_id)
+        assert draft.beneficiaryImport.applicationId not in application_ids
+        assert ongoing.beneficiaryImport.applicationId not in application_ids
+        assert without_continuation.beneficiaryImport.applicationId not in application_ids
+        assert retry.beneficiaryImport.applicationId not in application_ids
+
+        assert rejected.beneficiaryImport.applicationId in application_ids
+        assert error.beneficiaryImport.applicationId in application_ids
+        assert created.beneficiaryImport.applicationId in application_ids
+        assert duplicate.beneficiaryImport.applicationId in application_ids