LTD-5856 add initial question and feature flag to start f680 flow

conf/base.py

@@ -352,3 +352,4 @@ def show_toolbar(request):
 GTM_ID = env.str("GTM_ID", default="")
 
 GIT_COMMIT = env.str("GIT_COMMIT", default="")
+FEATURE_FLAG_ALLOW_F680 = env.bool("FEATURE_FLAG_ALLOW_F680", default=False)  # PS-IGNORE

conf/exporter.py

@@ -18,6 +18,7 @@
     "exporter.applications",
     "exporter.organisation",
     "exporter.goods",
+    "exporter.f680",
 ]
 
 if MOCK_SSO_ACTIVATE_ENDPOINTS:

exporter/apply_for_a_licence/forms/triage_questions.py

@@ -34,6 +34,16 @@ def opening_question():
                 "before you provide access to controlled technology, software or data."
             ),
         ),
+        Option(
+            key="f680",  # PS-IGNORE
+            value="Security Approval",
+            description=(
+                "Select if you need approval to give classified products or information to non-UK organisations, "
+                "governments and individuals. This includes F680 approval. You should apply for security approval"  # PS-IGNORE
+                " before you apply for a licence."
+            ),
+            disabled=not settings.FEATURE_FLAG_ALLOW_F680,  # PS-IGNORE
+        ),
         Option(
             key="transhipment",
             value="Transhipment licence",
@@ -52,15 +62,6 @@ def opening_question():
             ),
             disabled=settings.FEATURE_FLAG_ONLY_ALLOW_SIEL,
         ),
-        Option(
-            key="mod",
-            value="MOD clearance",
-            description=(
-                "Select if you need to share information (an F680) or to go to an exhibition, or if you're gifting "
-                "surplus products."
-            ),
-            disabled=settings.FEATURE_FLAG_ONLY_ALLOW_SIEL,
-        ),
     ]
     if settings.FEATURE_FLAG_ONLY_ALLOW_SIEL:
         description = render_to_string("applications/use-spire-triage.html")

exporter/apply_for_a_licence/urls.py

@@ -14,7 +14,12 @@
 if not settings.FEATURE_FLAG_ONLY_ALLOW_SIEL:
     urlpatterns += [
         path("transhipment/", views.TranshipmentQuestions.as_view(), name="transhipment_questions"),
-        path("mod/", views.MODClearanceQuestions.as_view(), name="mod_questions"),
+        # path("mod/", views.MODClearanceQuestions.as_view(), name="mod_questions"),
         path("<str:ogl>/", views.OpenGeneralLicenceQuestions.as_view(), name="ogl_questions"),
         path("<str:ogl>/<uuid:pk>/", views.OpenGeneralLicenceSubmit.as_view(), name="ogl_submit"),
     ]
+
+if settings.FEATURE_FLAG_ALLOW_F680:  # /PS-IGNORE
+    urlpatterns += [
+        path("f680/", views.F680Questions.as_view(), name="f680_questions"),  # /PS-IGNORE
+    ]

exporter/apply_for_a_licence/views.py

@@ -18,7 +18,7 @@
 from exporter.core.services import post_open_general_licence_cases
 from lite_forms.views import SingleFormView, MultiFormView
 
-from core.auth.views import LoginRequiredMixin
+from core.auth.views import LoginRequiredMixin, RedirectView
 
 
 class LicenceType(LoginRequiredMixin, SingleFormView):
@@ -69,17 +69,17 @@ def get_success_url(self):
             return reverse_lazy("applications:task_list", kwargs={"pk": pk})
 
 
-class MODClearanceQuestions(LoginRequiredMixin, MultiFormView):
-    def init(self, request, **kwargs):
-        self.forms = MOD_questions(None)
-        self.action = post_applications
+# class MODClearanceQuestions(LoginRequiredMixin, MultiFormView):
+#     def init(self, request, **kwargs):
+#         self.forms = MOD_questions(None)
+#         self.action = post_applications
 
-    def on_submission(self, request, **kwargs):
-        self.forms = MOD_questions(request.POST.copy().get("application_type"))
+#     def on_submission(self, request, **kwargs):
+#         self.forms = MOD_questions(request.POST.copy().get("application_type"))
 
-    def get_success_url(self):
-        pk = self.get_validated_data()["id"]
-        return reverse_lazy("applications:task_list", kwargs={"pk": pk})
+#     def get_success_url(self):
+#         pk = self.get_validated_data()["id"]
+#         return reverse_lazy("applications:task_list", kwargs={"pk": pk})
 
 
 class OpenGeneralLicenceQuestions(LoginRequiredMixin, MultiFormView):
@@ -101,3 +101,8 @@ def get_success_url(self):
 class OpenGeneralLicenceSubmit(LoginRequiredMixin, TemplateView):
     def get(self, request, *args, **kwargs):
         return open_general_licence_submit_success_page(request, **kwargs)
+
+
+class F680Questions(LoginRequiredMixin, RedirectView):  # /PS-IGNORE
+    def get_redirect_url(self, *args, **kwargs):
+        return reverse("f680:apply")  # /PS-IGNORE

exporter/f680/constants.py

@@ -0,0 +1,2 @@
+class ApplicationFormSteps:
+    APPLICATION_NAME = "APPLICATION_NAME"

exporter/f680/forms.py

@@ -0,0 +1,27 @@
+from django import forms
+
+from core.common.forms import BaseForm
+
+
+class ApplicationNameForm(BaseForm):
+    class Layout:
+        TITLE = "Name of the application"
+        TITLE_AS_LABEL_FOR = "name"
+        SUBMIT_BUTTON_TEXT = "Continue"
+
+    name = forms.CharField(
+        label="",
+        help_text="Give the application a reference name so you can refer back to it when needed",
+    )
+
+    def get_layout_fields(self):
+        return ("name",)
+
+
+class ApplicationSubmissionForm(BaseForm):
+    class Layout:
+        TITLE = ""
+        SUBMIT_BUTTON_TEXT = "Submit"
+
+    def get_layout_fields(self):
+        return []

exporter/f680/payloads.py

@@ -0,0 +1,13 @@
+from core.wizard.payloads import MergingPayloadBuilder
+from exporter.applications.views.goods.common.payloads import get_cleaned_data
+from .constants import ApplicationFormSteps  # /PS-IGNORE
+
+
+class F680CreatePayloadBuilder(MergingPayloadBuilder):  # /PS-IGNORE
+    payload_dict = {
+        ApplicationFormSteps.APPLICATION_NAME: get_cleaned_data,  # /PS-IGNORE
+    }
+
+    def build(self, form_dict):
+        payload = super().build(form_dict)
+        return {"application": payload}

exporter/f680/services.py

@@ -0,0 +1,11 @@
+from core import client
+
+
+def post_f680_application(request, json):
+    data = client.post(request, "/exporter/f680/application/", json)
+    return data.json(), data.status_code
+
+
+def get_f680_application(request, application_id):
+    data = client.get(request, f"/exporter/f680/application/{application_id}/")
+    return data.json()

exporter/f680/urls.py

@@ -0,0 +1,11 @@
+from django.urls import path
+
+from . import views
+
+
+app_name = "f680"
+
+urlpatterns = [
+    path("apply/", views.F680ApplicationCreateView.as_view(), name="apply"),  # PS-IGNORE
+    path("<uuid:pk>/apply/", views.F680ApplicationSummaryView.as_view(), name="summary"),  # PS-IGNORE
+]

exporter/f680/views.py

@@ -0,0 +1,77 @@
+from http import HTTPStatus
+
+from django.shortcuts import redirect
+from django.urls import reverse
+from django.views.generic import FormView
+
+from core.auth.views import LoginRequiredMixin
+from core.decorators import expect_status
+from core.wizard.views import BaseSessionWizardView
+
+from .constants import (
+    ApplicationFormSteps,
+)
+from .forms import (
+    ApplicationNameForm,
+    ApplicationSubmissionForm,
+)
+from .payloads import (
+    F680CreatePayloadBuilder,  # PS-IGNORE
+)
+from .services import (
+    post_f680_application,  # PS-IGNORE
+    get_f680_application,  # PS-IGNORE
+)
+
+
+class F680ApplicationCreateView(LoginRequiredMixin, BaseSessionWizardView):  # PS-IGNORE
+    form_list = [
+        (ApplicationFormSteps.APPLICATION_NAME, ApplicationNameForm),
+    ]
+
+    @expect_status(
+        HTTPStatus.CREATED,
+        "Error creating F680 application",  # PS-IGNORE
+        "Unexpected error creating F680 application",  # PS-IGNORE
+    )
+    def post_f680_application(self, data):  # PS-IGNORE
+        return post_f680_application(self.request, data)  # PS-IGNORE
+
+    def get_success_url(self, application_id):
+        return reverse(
+            "f680:summary",  # PS-IGNORE
+            kwargs={
+                "pk": application_id,
+            },
+        )
+
+    def get_payload(self, form_dict):
+        return F680CreatePayloadBuilder().build(form_dict)  # /PS-IGNORE
+
+    def done(self, form_list, form_dict, **kwargs):
+        data = self.get_payload(form_dict)
+
+        response_data, _ = self.post_f680_application(data)  # PS-IGNORE
+
+        return redirect(self.get_success_url(response_data["id"]))
+
+
+class F680ApplicationSummaryView(LoginRequiredMixin, FormView):  # PS-IGNORE
+    form_class = ApplicationSubmissionForm
+    template_name = "f680/summary.html"  # PS-IGNORE
+
+    def setup(self, request, *args, **kwargs):
+        super().setup(request, *args, **kwargs)
+
+        self.application = get_f680_application(request, kwargs["pk"])
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["application"] = self.application
+
+        return context
+
+    # This method currently just redirects back to the app summary but this will eventually
+    # submit the clearnace application.
+    def get_success_url(self):
+        return reverse("f680:summary", kwargs={"pk": self.application["id"]})  # PS-IGNORE

exporter/templates/f680/summary.html

@@ -0,0 +1,37 @@
+{% extends "layouts/base.html" %}
+
+{% load crispy_forms_tags %}
+
+{% block title %}Apply for an F680 Application{% endblock%}
+
+{% block body %}
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <h1 class="govuk-heading-l govuk-!-margin-bottom-2">F680 Application</h1>
+        <ol class="lite-task-list">
+            <li>
+                <h2 class="lite-task-list__section">
+                    <span class="lite-task-list__section-number">1. </span>
+                    Create Application
+                </h2>
+                <ul class="lite-task-list__items">
+                    <li class="lite-task-list__item">
+                        <div class="lite-task-list__item-header">
+                            Your reference
+                            <div class="lite-tag lite-tag--blue">
+                                Saved
+                            </div>
+                        </div>
+                        <div class="lite-task-list__item-details govuk-caption-m">
+                            {{ application.application.name }}
+                        </div>
+                    </li>
+                </ul>
+            </li>
+        </ol>
+        <div class="app-submit-bar">
+            {% crispy form %}
+        </div>
+    </div>
+</div>
+{% endblock %}

exporter/urls.py

@@ -53,3 +53,8 @@
     urlpatterns = [
         path("__debug__/", include(debug_toolbar.urls)),
     ] + urlpatterns
+
+if settings.FEATURE_FLAG_ALLOW_F680:
+    urlpatterns += [
+        path("f680/", include("exporter.f680.urls")),
+    ]

tests.caseworker.env

@@ -52,3 +52,4 @@ NOTIFY_FEEDBACK_EMAIL="feedback@lite"
 FILE_UPLOAD_HANDLERS="django.core.files.uploadhandler.MemoryFileUploadHandler,django.core.files.uploadhandler.TemporaryFileUploadHandler"
 
 SESSION_COOKIE_NAME=caseworker
+FEATURE_FLAG_ALLOW_F680=True # PS-IGNORE

tests.exporter.env

@@ -47,3 +47,4 @@ NOTIFY_FEEDBACK_EMAIL="feedback@lite"
 FILE_UPLOAD_HANDLERS="django.core.files.uploadhandler.MemoryFileUploadHandler,django.core.files.uploadhandler.TemporaryFileUploadHandler"
 
 SESSION_COOKIE_NAME=exporter
+FEATURE_FLAG_ALLOW_F680=True # PS-IGNORE

unit_tests/conftest.py

@@ -555,6 +555,23 @@ def data_open_case():
     }
 
 
+@pytest.fixture
+def data_f680_case(data_organisation):
+    return {
+        "id": "6cf7b401-62dc-4577-ad1d-4282f2aabc96",
+        "application": {"name": "F680 Test 1"},
+        "reference_code": None,
+        "organisation": {
+            "id": "3913ff20-5a2b-468a-bf5d-427228459b06",
+            "name": "Archway Communications",
+            "type": "commercial",
+            "status": "active",
+        },
+        "submitted_at": None,
+        "submitted_by": None,
+    }
+
+
 @pytest.fixture
 def data_standard_case(
     data_organisation,