From 762c55712974f27fdc725f2527199734eeb1445b Mon Sep 17 00:00:00 2001 From: Ali Zaidi Date: Thu, 22 Jul 2021 15:45:08 +0100 Subject: [PATCH 1/4] Add missing flags in the list. --- api/flags/enums.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/flags/enums.py b/api/flags/enums.py index 6f2025382c..d5c0a2d728 100644 --- a/api/flags/enums.py +++ b/api/flags/enums.py @@ -106,4 +106,7 @@ class SystemFlags: ENFORCEMENT_THIRD_PARTY_MATCH, ENFORCEMENT_SITE_MATCH, ENFORCEMENT_ORGANISATION_MATCH, + SANCTION_UN_SC_MATCH, + SANCTION_OFSI_MATCH, + SANCTION_UK_MATCH, ] From d3ac4dac4eb2bfcbca94b047f597546d5d0ffe34 Mon Sep 17 00:00:00 2001 From: Ali Zaidi Date: Thu, 22 Jul 2021 15:45:42 +0100 Subject: [PATCH 2/4] Delete unused flags to sync the DB with the CSV. --- api/staticdata/management/commands/seedflags.py | 1 + 1 file changed, 1 insertion(+) diff --git a/api/staticdata/management/commands/seedflags.py b/api/staticdata/management/commands/seedflags.py index b0b2af840d..339c0a5866 100644 --- a/api/staticdata/management/commands/seedflags.py +++ b/api/staticdata/management/commands/seedflags.py @@ -18,4 +18,5 @@ class Command(SeedCommand): @transaction.atomic def operation(self, *args, **options): csv = self.read_csv(FLAGS_FILE) + self.delete_unused_objects(Flag, csv) self.update_or_create(Flag, csv) From ce8708f9e005a04a8ab12394a865d3257c1a8cb4 Mon Sep 17 00:00:00 2001 From: Ali Zaidi Date: Tue, 27 Jul 2021 11:50:23 +0100 Subject: [PATCH 3/4] Fix required_by date. --- api/applications/tests/test_edit_application.py | 2 +- test_helpers/clients.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/applications/tests/test_edit_application.py b/api/applications/tests/test_edit_application.py index 44e477e3ff..df37aff655 100644 --- a/api/applications/tests/test_edit_application.py +++ b/api/applications/tests/test_edit_application.py @@ -475,7 +475,7 @@ def test_edit_exhibition_first_exhibition_date_draft_success(self): data = { "title": self.application.title, "required_by_date": self.application.required_by_date, - "first_exhibition_date": "2022-05-03", + "first_exhibition_date": "2030-08-03", } response = self.client.post(self.exhibition_url, data=data, **self.exporter_headers) diff --git a/test_helpers/clients.py b/test_helpers/clients.py index d7ee351904..2b4313d6c8 100644 --- a/test_helpers/clients.py +++ b/test_helpers/clients.py @@ -742,8 +742,8 @@ def create_mod_clearance_application( if case_type == CaseTypeEnum.EXHIBITION: application.title = "title" - application.required_by_date = "2021-07-20" - application.first_exhibition_date = "2022-08-19" + application.required_by_date = "2030-07-20" + application.first_exhibition_date = "2030-07-20" application.save() # must be refreshed to return data in same format as database call application.refresh_from_db() From 86738c9578e8b8d028d2fd62662b10400a575d8d Mon Sep 17 00:00:00 2001 From: Ali Zaidi Date: Tue, 27 Jul 2021 13:04:23 +0100 Subject: [PATCH 4/4] Add missing flags. --- api/flags/enums.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/api/flags/enums.py b/api/flags/enums.py index d5c0a2d728..0fecff87bc 100644 --- a/api/flags/enums.py +++ b/api/flags/enums.py @@ -79,7 +79,30 @@ class SystemFlags: WMD_END_USE_ID = "00000000-0000-0000-0000-000000000006" FIREARMS_ID = "00000000-0000-0000-0000-000000000007" MARITIME_ANTI_PIRACY_ID = "00000000-0000-0000-0000-000000000008" + CRYPTOGRAPHIC_ID = "00000000-0000-0000-0000-000000000009" + MEDIA_ID = "00000000-0000-0000-0000-000000000010" + CONTINENTAL_ID = "00000000-0000-0000-0000-000000000011" + DEALER_ID = "00000000-0000-0000-0000-000000000012" + REFUSAL_FLAG_ID_2 = "00000000-0000-0000-0000-000000000013" ENFORCEMENT_CHECK_REQUIRED = "00000000-0000-0000-0000-000000000014" + NUCLEAR_ID = "00000000-0000-0000-0000-000000000015" + NAVY_ID = "00000000-0000-0000-0000-000000000016" + ARMY_ID = "00000000-0000-0000-0000-000000000017" + AIRFORCE_ID = "00000000-0000-0000-0000-000000000018" + POLICE_ID = "00000000-0000-0000-0000-000000000019" + MINISTRY_OF_INTERIOR_ID = "00000000-0000-0000-0000-000000000020" + OTHER_SECURITY_FORCES_ID = "00000000-0000-0000-0000-000000000021" + COMPANIES_REQUESTING_NUCL_ID = "00000000-0000-0000-0000-000000000022" + MARITIME_ANTI_PIRACY_ID_2 = "00000000-0000-0000-0000-000000000023" + AIRCRAFT_MANUFACTURERS_ID = "00000000-0000-0000-0000-000000000024" + REGISTERED_FIREARM_DEALER_ID = "00000000-0000-0000-0000-000000000025" + OIL_AND_GAS_ID = "00000000-0000-0000-0000-000000000026" + PHARMACEUTICAL_OR_MEDICAL_ID = "00000000-0000-0000-0000-000000000027" + MEDIA_OR_CONTRACT_ID = "00000000-0000-0000-0000-000000000028" + PRIVATE_MILITARY_ID = "00000000-0000-0000-0000-000000000029" + EDUCATION_ID = "00000000-0000-0000-0000-000000000030" + EXPORTERS_OWN_USE_ID = "00000000-0000-0000-0000-000000000031" + OTHER_CONTRACT_ID = "00000000-0000-0000-0000-000000000032" ENFORCEMENT_END_USER_MATCH = "00000000-0000-0000-0000-000000000033" ENFORCEMENT_CONSIGNEE_MATCH = "00000000-0000-0000-0000-000000000034" ENFORCEMENT_ULTIMATE_END_USER_MATCH = "00000000-0000-0000-0000-000000000035" @@ -99,7 +122,30 @@ class SystemFlags: WMD_END_USE_ID, FIREARMS_ID, MARITIME_ANTI_PIRACY_ID, + CRYPTOGRAPHIC_ID, + MEDIA_ID, + CONTINENTAL_ID, + DEALER_ID, + REFUSAL_FLAG_ID_2, ENFORCEMENT_CHECK_REQUIRED, + NUCLEAR_ID, + NAVY_ID, + ARMY_ID, + AIRFORCE_ID, + POLICE_ID, + MINISTRY_OF_INTERIOR_ID, + OTHER_SECURITY_FORCES_ID, + COMPANIES_REQUESTING_NUCL_ID, + MARITIME_ANTI_PIRACY_ID_2, + AIRCRAFT_MANUFACTURERS_ID, + REGISTERED_FIREARM_DEALER_ID, + OIL_AND_GAS_ID, + PHARMACEUTICAL_OR_MEDICAL_ID, + MEDIA_OR_CONTRACT_ID, + PRIVATE_MILITARY_ID, + EDUCATION_ID, + EXPORTERS_OWN_USE_ID, + OTHER_CONTRACT_ID, ENFORCEMENT_END_USER_MATCH, ENFORCEMENT_CONSIGNEE_MATCH, ENFORCEMENT_ULTIMATE_END_USER_MATCH,