Merge pull request #1450 from bcgov/bugs/ecer-5464-release-master

ECER-5464: Better handling of multiple application submissions

Author: pcatkins

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/Applications/ApplicationsEndpoints.cs

@@ -1,13 +1,13 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using AutoMapper;
+using AutoMapper;
 using ECER.Infrastructure.Common;
 using ECER.Managers.Registry.Contract.Applications;
 using ECER.Utilities.Hosting;
 using ECER.Utilities.Security;
 using MediatR;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Mvc;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 
 namespace ECER.Clients.RegistryPortal.Server.Applications;
 
@@ -57,7 +57,7 @@ public void Register(IEndpointRouteBuilder endpointRouteBuilder)
           {
             return TypedResults.NotFound();
           }
-          if (!result.IsSuccess && result.Error == SubmissionError.DraftApplicationValidationFailed)
+          if (!result.IsSuccess && result.Error == SubmissionError.DraftApplicationValidationFailed || result.Error == SubmissionError.SubmittedApplicationAlreadyExists)
           {
             var problemDetails = new ProblemDetails
             {
@@ -67,6 +67,7 @@ public void Register(IEndpointRouteBuilder endpointRouteBuilder)
             };
             return TypedResults.BadRequest(problemDetails);
           }
+
           return TypedResults.Ok(new SubmitApplicationResponse(mapper.Map<Application>(result.Application)));
         })
         .WithOpenApi("Submit an application", string.Empty, "application_post")
@@ -485,7 +486,8 @@ public enum ApplicationStatus
   InProgress,
   PendingQueue,
   ReconsiderationDecision,
-  AppealDecision
+  AppealDecision,
+  PendingPSPConsultationNeeded
 }
 
 public enum ApplicationOrigin
@@ -519,6 +521,7 @@ public enum ApplicationTypes
   New,
   Renewal,
   LabourMobility,
+  ICRA
 }
 
 public enum EducationOrigin

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/pages/Dashboard.vue

@@ -307,12 +307,7 @@ export default defineComponent({
       return (
         this.applicationStore.applicationStatus === undefined ||
         this.applicationStore.applicationStatus === "Draft" ||
-        this.applicationStore.applicationStatus === "Submitted" ||
-        this.applicationStore.applicationStatus === "Ready" ||
-        this.applicationStore.applicationStatus === "InProgress" ||
-        this.applicationStore.applicationStatus === "PendingQueue" ||
-        this.applicationStore.applicationStatus === "Pending" ||
-        this.applicationStore.applicationStatus === "Escalated"
+        this.applicationStore.hasSubmittedApplication
       );
     },
     showTransferCard(): boolean {

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/router.ts

@@ -7,6 +7,7 @@ import { useCertificationStore } from "./store/certification";
 import { useFormStore } from "./store/form";
 import { useMessageStore } from "./store/message";
 import { useWizardStore } from "./store/wizard";
+import { useConfigStore } from "./store/config";
 
 const router = createRouter({
   history: createWebHistory(),
@@ -297,7 +298,7 @@ const router = createRouter({
   ],
 });
 
-// Gaurd for authenticated routes
+// Guard for authenticated routes
 router.beforeEach(async (to, _) => {
   const oidcStore = useOidcStore();
   const userStore = useUserStore();
@@ -390,4 +391,13 @@ router.beforeEach((to, _, next) => {
   } else next();
 });
 
+// Guard to prevent users from accessing /application if they have already submitted an application
+router.beforeEach((to, _, next) => {
+  const applicationStore = useApplicationStore();
+  if (to.path === "/application" && applicationStore.hasSubmittedApplication) {
+    console.warn("User has already submitted an application, redirecting to home page.");
+    next({ path: "/" });
+  } else next();
+});
+
 export default router;

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/store/application.ts

@@ -79,6 +79,17 @@ export const useApplicationStore = defineStore("application", {
     hasDraftApplication(state): boolean {
       return state.draftApplication.id !== undefined;
     },
+    hasSubmittedApplication(state): boolean {
+      return (
+        state.application?.status === "Submitted" ||
+        state.application?.status === "Ready" ||
+        state.application?.status === "InProgress" ||
+        state.application?.status === "PendingQueue" ||
+        state.application?.status === "Pending" ||
+        state.application?.status === "PendingPSPConsultationNeeded" ||
+        state.application?.status === "Escalated"
+      );
+    },
     hasApplication(state): boolean {
       return state.application !== null;
     },
@@ -302,18 +313,14 @@ export const useApplicationStore = defineStore("application", {
 
       // One year renewal explanation letter
       if (oneYearRenewalExplanationId && oneYearRenewalExplanationOtherId) {
-        this.draftApplication.oneYearRenewalExplanationChoice =
-          wizardStore.wizardData[wizardStore.wizardConfig.steps.oneYearRenewalExplanation.form.inputs.oneYearRenewalExplanation.id];
-        this.draftApplication.renewalExplanationOther =
-          wizardStore.wizardData[wizardStore.wizardConfig.steps.oneYearRenewalExplanation.form.inputs.renewalExplanationOther.id];
+        this.draftApplication.oneYearRenewalExplanationChoice = wizardStore.wizardData[oneYearRenewalExplanationId];
+        this.draftApplication.renewalExplanationOther = wizardStore.wizardData[oneYearRenewalExplanationOtherId];
       }
 
       // Five year renewal explanation letter
       if (fiveYearRenewalExplanationId && fiveYearRenewalExplanationOtherId) {
-        this.draftApplication.fiveYearRenewalExplanationChoice =
-          wizardStore.wizardData[wizardStore.wizardConfig.steps.fiveYearRenewalExplanation.form.inputs.fiveYearRenewalExplanation.id];
-        this.draftApplication.renewalExplanationOther =
-          wizardStore.wizardData[wizardStore.wizardConfig.steps.fiveYearRenewalExplanation.form.inputs.renewalExplanationOther.id];
+        this.draftApplication.fiveYearRenewalExplanationChoice = wizardStore.wizardData[fiveYearRenewalExplanationId];
+        this.draftApplication.renewalExplanationOther = wizardStore.wizardData[fiveYearRenewalExplanationOtherId];
       }
 
       // Character References step data