UAT release

conf/exporter.py

@@ -131,3 +131,4 @@
 
 CSP_REPORT_URI = env.tuple("EXPORTER_CSP_REPORT_URI", default=("",))
 E2E_WAIT_MULTIPLIER = env.int("E2E_WAIT_MULTIPLIER", default=1)
+FEATURE_FLAG_F680_ALLOWED_ORGANISATIONS = env.list("FEATURE_FLAG_F680_ALLOWED_ORGANISATIONS", default=[])

exporter/apply_for_a_licence/forms/triage_questions.py

@@ -1,3 +1,4 @@
+import rules
 from django.urls import reverse
 from django.conf import settings
 
@@ -24,7 +25,7 @@
 from django.template.loader import render_to_string
 
 
-def opening_question():
+def opening_question(request):
     options = [
         Option(
             key="export_licence",
@@ -42,7 +43,7 @@ def opening_question():
                 "governments and individuals. This includes F680 approval. You should apply for security approval"
                 " before you apply for a licence."
             ),
-            disabled=not settings.FEATURE_FLAG_ALLOW_F680,
+            disabled=not rules.test_rule("can_exporter_use_f680s", request),
         ),
         Option(
             key="transhipment",

exporter/apply_for_a_licence/views.py

@@ -23,7 +23,7 @@
 
 class LicenceType(LoginRequiredMixin, SingleFormView):
     def init(self, request, **kwargs):
-        self.form = opening_question()
+        self.form = opening_question(request)
         self.action = validate_opening_question
 
     def get_success_url(self):

exporter/core/rules.py

@@ -0,0 +1,16 @@
+import rules
+from django.conf import settings
+
+
+@rules.predicate
+def can_exporter_use_f680s(request):
+    return (
+        request.session["organisation"] in settings.FEATURE_FLAG_F680_ALLOWED_ORGANISATIONS
+        or settings.FEATURE_FLAG_ALLOW_F680
+    )
+
+
+rules.add_rule(
+    "can_exporter_use_f680s",
+    can_exporter_use_f680s,
+)

exporter/core/tests/test_rules.py

@@ -0,0 +1,29 @@
+import pytest
+import rules
+
+
+@pytest.mark.parametrize(
+    "user_organisation, allowed_organisations_feature, f680_enabled_feature_flag, expected",
+    (
+        ("12345", ["12345", "98765", "56757"], False, True),
+        ("99999", ["12345", "98765", "56757"], False, False),
+        ("", ["12345", "98765", "56757"], False, False),
+        ("99999", [], False, False),
+        (None, [], False, False),
+        ("99999", [], True, True),
+        ("99999", ["12345", "98765", "56757"], True, True),
+    ),
+)
+def test_can_exporter_use_f680s(
+    rf, client, user_organisation, allowed_organisations_feature, f680_enabled_feature_flag, expected, settings
+):
+    settings.FEATURE_FLAG_F680_ALLOWED_ORGANISATIONS = allowed_organisations_feature
+    settings.FEATURE_FLAG_ALLOW_F680 = f680_enabled_feature_flag
+
+    request = rf.get("/")
+    request.session = client.session
+    session = request.session
+    session["organisation"] = user_organisation
+    session.save()
+
+    assert rules.test_rule("can_exporter_use_f680s", request) is expected

exporter/f680/application_sections/additional_information/tests/test_views.py

@@ -13,6 +13,18 @@ def unset_f680_feature_flag(settings):
     settings.FEATURE_FLAG_ALLOW_F680 = False
 
 
+@pytest.fixture()
+def set_f680_allowed_organisation(settings, organisation_pk):
+    settings.FEATURE_FLAG_F680_ALLOWED_ORGANISATIONS = [organisation_pk]
+    settings.FEATURE_FLAG_ALLOW_F680 = False
+
+
+@pytest.fixture()
+def unset_f680_allowed_organisation(settings, organisation_pk):
+    settings.FEATURE_FLAG_F680_ALLOWED_ORGANISATIONS = ["12345"]
+    settings.FEATURE_FLAG_ALLOW_F680 = False
+
+
 @pytest.fixture(autouse=True)
 def setup(mock_exporter_user_me, settings):
     settings.FEATURE_FLAG_ALLOW_F680 = True
@@ -55,7 +67,21 @@ def mock_f680_application_get(requests_mock, data_f680_case):
 @pytest.fixture
 def mock_f680_application_get_existing_data(requests_mock, data_f680_case):
     data_f680_case["application"] = {
-        "additional_information": {"answers": {"note": "Some note text"}, "questions": {"note": "Add note"}}
+        "sections": {
+            "notes_for_case_officers": {
+                "type": "single",
+                "label": "Notes for case officers",
+                "fields": [
+                    {
+                        "key": "note",
+                        "answer": "Some note text",
+                        "datatype": "string",
+                        "question": "Add note",
+                        "raw_answer": "Some note text",
+                    }
+                ],
+            }
+        }
     }
     application_id = data_f680_case["id"]
     url = client._build_absolute_uri(f"/exporter/f680/application/{application_id}/")
@@ -100,6 +126,17 @@ def test_GET_success(
         assert response.status_code == 200
         assert isinstance(response.context["form"], NotesForCaseOfficerForm)
 
+    def test_GET_success_with_organisation_set(
+        self,
+        authorized_client,
+        mock_f680_application_get,
+        f680_application_wizard_url,
+        set_f680_allowed_organisation,
+    ):
+        response = authorized_client.get(f680_application_wizard_url)
+        assert response.status_code == 200
+        assert isinstance(response.context["form"], NotesForCaseOfficerForm)
+
     def test_GET_no_feature_flag_forbidden(
         self,
         authorized_client,
@@ -111,6 +148,17 @@ def test_GET_no_feature_flag_forbidden(
         assert response.status_code == 200
         assert response.context["title"] == "Forbidden"
 
+    def test_GET_no_feature_organisation_allowed(
+        self,
+        authorized_client,
+        mock_f680_application_get,
+        f680_application_wizard_url,
+        unset_f680_allowed_organisation,
+    ):
+        response = authorized_client.get(f680_application_wizard_url)
+        assert response.status_code == 200
+        assert response.context["title"] == "Forbidden"
+
     def test_POST_approval_type_and_submit_wizard_success(
         self, post_to_step, goto_step, mock_f680_application_get, mock_patch_f680_application
     ):
@@ -123,7 +171,21 @@ def test_POST_approval_type_and_submit_wizard_success(
         assert mock_patch_f680_application.last_request.json() == {
             "application": {
                 "name": "F680 Test 1",
-                "additional_information": {"answers": {"note": "Some information"}, "questions": {"note": "Add note"}},
+                "sections": {
+                    "notes_for_case_officers": {
+                        "label": "Notes for case officers",
+                        "fields": [
+                            {
+                                "key": "note",
+                                "answer": "Some information",
+                                "raw_answer": "Some information",
+                                "question": "Add note",
+                                "datatype": "string",
+                            }
+                        ],
+                        "type": "single",
+                    }
+                },
             }
         }
 

exporter/f680/application_sections/additional_information/views.py

@@ -8,4 +8,5 @@ class NotesForCaseOfficersView(F680ApplicationSectionWizard):
     form_list = [
         (FormSteps.NOTES_FOR_CASEWORKER, NotesForCaseOfficerForm),
     ]
-    section = "additional_information"
+    section = "notes_for_case_officers"
+    section_label = "Notes for case officers"

exporter/f680/application_sections/approval_details/constants.py

@@ -1,2 +1,13 @@
 class FormSteps:
     APPROVAL_TYPE = "APPROVAL_TYPE"
+    PRODUCT_NAME = "PRODUCT_NAME"
+    PRODUCT_DESCRIPTION = "PRODUCT_DESCRIPTION"
+    PRODUCT_FOREIGN_TECHNOLOGY_OR_INFORMATION_SHARED = "PRODUCT_FOREIGN_TECHNOLOGY_OR_INFORMATION_SHARED"
+    PRODUCT_CONTROLLED_UNDER_ITAR = "PRODUCT_CONTROLLED_UNDER_ITAR"
+    PRODUCT_CONTROLLED_UNDER_ITAR_DETAILS = "PRODUCT_CONTROLLED_UNDER_ITAR_DETAILS"
+    PRODUCT_INCLUDE_CRYPTOGRAPHY = "PRODUCT_INCLUDE_CRYPTOGRAPHY"
+    PRODUCT_RATED_UNDER_MTCR = "PRODUCT_RATED_UNDER_MTCR"
+    PRODUCT_MANPAD = "PRODUCT_MANPAD"
+    PRODUCT_ELECTRONICMODDATA = "PRODUCT_ELECTRONICMODDATA"
+    PRODUCT_FUNDING = "PRODUCT_FUNDING"
+    PRODUCT_USED_BY_UK_ARMED_FORCES = "PRODUCT_USED_BY_UK_ARMED_FORCES"