TMI2-628 - Adds local authority enum for applicant org type (#118)

cabinetoffice · Feb 16, 2024 · a924329 · a924329
1 parent a56e877
commit a924329
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/gov/cabinetoffice/gap/applybackend/constants/MandatoryQuestionConstants.java b/src/main/java/gov/cabinetoffice/gap/applybackend/constants/MandatoryQuestionConstants.java
@@ -33,6 +33,7 @@ public class MandatoryQuestionConstants {
             GrantMandatoryQuestionOrgType.OTHER.toString(),
             GrantMandatoryQuestionOrgType.CHARITY.toString(),
             GrantMandatoryQuestionOrgType.INDIVIDUAL.toString(),
+            GrantMandatoryQuestionOrgType.LOCAL_AUTHORITY.toString(),
     };
 
     public static final String ORGANISATION_ADDRESS_TITLE = "Enter your organisations address";
@@ -64,7 +65,7 @@ public class MandatoryQuestionConstants {
     public static final String APPLICANT_FUNDING_LOCATION_TITLE = "Where will this funding be spent?";
     public static final String APPLICANT_FUNDING_LOCATION_HINT_TEXT = "Select the location where the grant funding will be spent. You can choose more than one, if it is being spent in more than one location.\n\nSelect all that apply:";
     public static final String APPLICANT_FUNDING_LOCATION_ADMIN_SUMMARY = "where the funding will be spent";
-    public static final String[] APPLICANT_FUNDING_LOCATION_OPTIONS = new String[]{
+    public static final String[] APPLICANT_FUNDING_LOCATION_OPTIONS = new String[] {
             "North East England",
             "North West England",
             "South East England",

diff --git a/src/main/java/gov/cabinetoffice/gap/applybackend/enums/GrantApplicantOrganisationType.java b/src/main/java/gov/cabinetoffice/gap/applybackend/enums/GrantApplicantOrganisationType.java
@@ -10,6 +10,7 @@ public enum GrantApplicantOrganisationType {
     UNREGISTERED_CHARITY("Unregistered charity"),
     CHARITY("Charity"),
     INDIVIDUAL("I am applying as an individual"),
+    LOCAL_AUTHORITY("Local authority"),
     OTHER("Other");
 
     private String name;

diff --git a/src/main/java/gov/cabinetoffice/gap/applybackend/enums/GrantMandatoryQuestionOrgType.java b/src/main/java/gov/cabinetoffice/gap/applybackend/enums/GrantMandatoryQuestionOrgType.java
@@ -9,6 +9,7 @@ public enum GrantMandatoryQuestionOrgType {
     UNREGISTERED_CHARITY("Unregistered charity"),
     CHARITY("Charity"),
     INDIVIDUAL("I am applying as an individual"),
+    LOCAL_AUTHORITY("Local authority"),
     OTHER("Other");
 
     private String name;

diff --git a/src/main/java/gov/cabinetoffice/gap/applybackend/web/SubmissionController.java b/src/main/java/gov/cabinetoffice/gap/applybackend/web/SubmissionController.java
@@ -224,7 +224,7 @@ public ResponseEntity<String> submitApplication(@RequestBody SubmitApplicationDt
 
         if (scheme.getVersion() > 1) {
             final GrantMandatoryQuestions mandatoryQuestions = mandatoryQuestionService.getGrantMandatoryQuestionBySubmissionIdAndApplicantSub(submission.getId(), grantApplicant.getUserId());
-            final boolean shouldSendToSpotlight = !isOrganisationIndividualOrOther(mandatoryQuestions);
+            final boolean shouldSendToSpotlight = !isOrganisationIndividualOrOtherOrLocalAuthority(mandatoryQuestions);
 
             if (shouldSendToSpotlight) {
                 spotlightService.createSpotlightCheck(mandatoryQuestions, scheme);
@@ -236,9 +236,10 @@ public ResponseEntity<String> submitApplication(@RequestBody SubmitApplicationDt
         return ResponseEntity.ok("Submitted");
     }
 
-    private boolean isOrganisationIndividualOrOther(GrantMandatoryQuestions mandatoryQuestions) {
+    private boolean isOrganisationIndividualOrOtherOrLocalAuthority(GrantMandatoryQuestions mandatoryQuestions) {
         return mandatoryQuestions.getOrgType().equals(GrantMandatoryQuestionOrgType.INDIVIDUAL) ||
-                mandatoryQuestions.getOrgType().equals(GrantMandatoryQuestionOrgType.OTHER);
+                mandatoryQuestions.getOrgType().equals(GrantMandatoryQuestionOrgType.OTHER) ||
+                mandatoryQuestions.getOrgType().equals(GrantMandatoryQuestionOrgType.LOCAL_AUTHORITY);
     }
 
     @PostMapping("/createSubmission/{applicationId}")

diff --git a/src/test/java/gov/cabinetoffice/gap/applybackend/web/SubmissionControllerTest.java b/src/test/java/gov/cabinetoffice/gap/applybackend/web/SubmissionControllerTest.java
@@ -648,7 +648,7 @@ void submitApplication_isSuccessfulAndReturnsExpectedResponse_ForV2Schemes() {
             }
 
             @ParameterizedTest
-            @EnumSource(value = GrantMandatoryQuestionOrgType.class, names = {"INDIVIDUAL", "OTHER"})
+            @EnumSource(value = GrantMandatoryQuestionOrgType.class, names = {"INDIVIDUAL", "OTHER", "LOCAL_AUTHORITY"})
             void submitApplication_DoesNotCreateSpotlightCheck_ForIndividualsOrOther_ForV2Schemes(GrantMandatoryQuestionOrgType orgType) {
 
                 // set up the V2 scheme