Router gaurd and BE validation

Author: pcatkins

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

@@ -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")

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(),
@@ -390,4 +391,13 @@ router.beforeEach((to, _, next) => {
   } else next();
 });
 
+// Gaurd 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

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/types/openapi.d.ts

@@ -42,6 +42,7 @@ declare namespace Components {
       clientAuthenticationMethods?: {
         [name: string]: OidcAuthenticationSettings;
       } | null;
+      icraFeatureEnabled?: boolean;
     }
     export type ApplicationOrigin = "Manual" | "Oracle" | "Portal";
     export type ApplicationStatus =
@@ -58,6 +59,7 @@ declare namespace Components {
       | "Ready"
       | "InProgress"
       | "PendingQueue"
+      | "PendingPSPConsultationNeeded"
       | "ReconsiderationDecision"
       | "AppealDecision";
     export type ApplicationStatusReasonDetail =
@@ -85,7 +87,7 @@ declare namespace Components {
        */
       id?: string | null;
     }
-    export type ApplicationTypes = "New" | "Renewal" | "LabourMobility";
+    export type ApplicationTypes = "New" | "Renewal" | "LabourMobility" | "ICRA";
     /**
      * delete draft application response
      */
@@ -114,6 +116,7 @@ declare namespace Components {
       hasOtherName?: boolean | null;
     }
     export type CertificatePDFGeneration = "No" | "Requested" | "Yes";
+    export type CertificateStatus = "Valid" | "Expired";
     export type CertificateStatusCode = "Active" | "Cancelled" | "Expired" | "Inactive" | "Renewed" | "Reprinted" | "Suspended";
     export interface Certification {
       id?: string | null;
@@ -276,6 +279,7 @@ declare namespace Components {
       countryId?: string | null;
       countryName?: string | null;
       countryCode?: string | null;
+      isICRA?: boolean;
     }
     export type CourseOutlineOptions = "UploadNow" | "RegistryAlreadyHas";
     export interface DefaultContent {
@@ -309,6 +313,9 @@ declare namespace Components {
     export interface DraftApplicationResponse {
       application?: Application;
     }
+    export interface DraftICRAEligibilityResponse {
+      eligibility?: ICRAEligibility;
+    }
     export type EducationOrigin = "InsideBC" | "OutsideBC" | "OutsideofCanada";
     export type EducationRecognition = "Recognized" | "NotRecognized";
     export interface FileInfo {
@@ -349,6 +356,16 @@ declare namespace Components {
         [name: string]: string[];
       } | null;
     }
+    export interface ICRAEligibility {
+      id?: string | null;
+      applicantId?: string | null;
+      portalStage?: string | null;
+      signedDate?: string | null; // date-time
+      createdOn?: string | null; // date-time
+      status?: ICRAStatus;
+      internationalCertifications?: InternationalCertification[] | null;
+    }
+    export type ICRAStatus = "Active" | "Draft" | "Eligible" | "Inactive" | "Ineligible" | "InReview" | "ReadyforReview" | "Submitted";
     export interface IdentificationType {
       id?: string | null;
       name?: string | null;
@@ -363,6 +380,26 @@ declare namespace Components {
       size?: string | null;
     }
     export type InitiatedFrom = "Investigation" | "PortalUser" | "Registry";
+    export interface InternationalCertification {
+      id?: string | null;
+      otherFirstName?: string | null;
+      otherMiddleName?: string | null;
+      otherLastName?: string | null;
+      hasOtherName?: boolean;
+      countryId?: string | null;
+      nameOfRegulatoryAuthority?: string | null;
+      emailOfRegulatoryAuthority?: string | null;
+      phoneOfRegulatoryAuthority?: string | null;
+      websiteOfRegulatoryAuthority?: string | null;
+      onlineCertificateValidationToolOfRegulatoryAuthority?: string | null;
+      certificateStatus?: CertificateStatus;
+      certificateTitle?: string | null;
+      issueDate?: string | null; // date-time
+      expiryDate?: string | null; // date-time
+      files?: FileInfo[] | null;
+      deletedFiles?: string[] | null;
+      newFiles?: string[] | null;
+    }
     export type InviteType = "CharacterReference" | "WorkExperienceReference";
     export type LikertScale = "Yes" | "No";
     export interface OidcAuthenticationSettings {
@@ -506,6 +543,9 @@ declare namespace Components {
     export interface SaveDraftApplicationRequest {
       draftApplication?: DraftApplication;
     }
+    export interface SaveDraftICRAEligibilityRequest {
+      eligibility?: ICRAEligibility;
+    }
     /**
      * Send Message Request
      */
@@ -653,7 +693,9 @@ declare namespace Components {
       | "Rejected"
       | "Submitted"
       | "UnderReview"
-      | "WaitingforResponse";
+      | "WaitingforResponse"
+      | "ICRAEligibilitySubmitted"
+      | "EligibilityResponseSubmitted";
     export interface WorkExperienceReference {
       lastName?: string | null;
       emailAddress?: string | null;
@@ -991,6 +1033,36 @@ declare namespace Paths {
       export interface $404 {}
     }
   }
+  namespace IcraGet {
+    namespace Parameters {
+      export type ByStatus = Components.Schemas.ICRAStatus[];
+      export type Id = string;
+    }
+    export interface PathParameters {
+      id?: Parameters.Id;
+    }
+    export interface QueryParameters {
+      byStatus?: Parameters.ByStatus;
+    }
+    namespace Responses {
+      export type $200 = Components.Schemas.ICRAEligibility[];
+      export type $400 = Components.Schemas.HttpValidationProblemDetails;
+    }
+  }
+  namespace IcraPut {
+    namespace Parameters {
+      export type Id = string;
+    }
+    export interface PathParameters {
+      id?: Parameters.Id;
+    }
+    export type RequestBody = Components.Schemas.SaveDraftICRAEligibilityRequest;
+    namespace Responses {
+      export type $200 = Components.Schemas.DraftICRAEligibilityResponse;
+      export type $400 = Components.Schemas.HttpValidationProblemDetails;
+      export interface $404 {}
+    }
+  }
   namespace IdentificationTypesGet {
     namespace Parameters {
       export type ById = string;
@@ -1298,6 +1370,22 @@ export interface OperationMethods {
     data?: Paths.ReferenceOptout.RequestBody,
     config?: AxiosRequestConfig,
   ): OperationResponse<Paths.ReferenceOptout.Responses.$200>;
+  /**
+   * icra_get - Handles icra queries
+   */
+  "icra_get"(
+    parameters?: Parameters<Paths.IcraGet.QueryParameters & Paths.IcraGet.PathParameters> | null,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): OperationResponse<Paths.IcraGet.Responses.$200>;
+  /**
+   * icra_put - Save a draft icra eligibility for the current user
+   */
+  "icra_put"(
+    parameters?: Parameters<Paths.IcraPut.PathParameters> | null,
+    data?: Paths.IcraPut.RequestBody,
+    config?: AxiosRequestConfig,
+  ): OperationResponse<Paths.IcraPut.Responses.$200>;
   /**
    * files_certificate_get - Handles fetching certificate PDF's
    */
@@ -1649,6 +1737,24 @@ export interface PathsDictionary {
       config?: AxiosRequestConfig,
     ): OperationResponse<Paths.ReferenceOptout.Responses.$200>;
   };
+  ["/api/icra/{id}"]: {
+    /**
+     * icra_put - Save a draft icra eligibility for the current user
+     */
+    "put"(
+      parameters?: Parameters<Paths.IcraPut.PathParameters> | null,
+      data?: Paths.IcraPut.RequestBody,
+      config?: AxiosRequestConfig,
+    ): OperationResponse<Paths.IcraPut.Responses.$200>;
+    /**
+     * icra_get - Handles icra queries
+     */
+    "get"(
+      parameters?: Parameters<Paths.IcraGet.QueryParameters & Paths.IcraGet.PathParameters> | null,
+      data?: any,
+      config?: AxiosRequestConfig,
+    ): OperationResponse<Paths.IcraGet.Responses.$200>;
+  };
   ["/api/files/certificate/{certificateId}"]: {
     /**
      * files_certificate_get - Handles fetching certificate PDF's

src/ECER.Managers.Registry.Contract/Applications/Contract.cs

@@ -185,7 +185,8 @@ public enum OneYearRenewalexplanations
 public enum SubmissionError
 {
   DraftApplicationNotFound,
-  DraftApplicationValidationFailed
+  DraftApplicationValidationFailed,
+  SubmittedApplicationAlreadyExists,
 }
 
 public enum ApplicationStatus

src/ECER.Managers.Registry/ApplicationHandlers.cs

@@ -139,14 +139,31 @@ public async Task<ApplicationSubmissionResult> Handle(SubmitApplicationCommand r
   {
     ArgumentNullException.ThrowIfNull(request);
 
-    var applications = await applicationRepository.Query(new ApplicationQuery
+    var draftApplications = await applicationRepository.Query(new ApplicationQuery
     {
       ById = request.applicationId,
       ByApplicantId = request.userId,
       ByStatus = [Resources.Documents.Applications.ApplicationStatus.Draft]
     }, cancellationToken);
 
-    var draftApplicationResults = new ApplicationsQueryResults(mapper.Map<IEnumerable<Contract.Applications.Application>>(applications)!);
+    var submittedApplications = await applicationRepository.Query(new ApplicationQuery
+    {
+      ByApplicantId = request.userId,
+      ByStatus = new List<Resources.Documents.Applications.ApplicationStatus>
+      {
+        Resources.Documents.Applications.ApplicationStatus.Submitted,
+        Resources.Documents.Applications.ApplicationStatus.Ready,
+        Resources.Documents.Applications.ApplicationStatus.Escalated,
+        Resources.Documents.Applications.ApplicationStatus.Pending,
+        Resources.Documents.Applications.ApplicationStatus.InProgress,
+        Resources.Documents.Applications.ApplicationStatus.PendingPSPConsultationNeeded,
+        Resources.Documents.Applications.ApplicationStatus.PendingQueue,
+      }
+    }, cancellationToken);
+
+    var draftApplicationResults = new ApplicationsQueryResults(mapper.Map<IEnumerable<Contract.Applications.Application>>(draftApplications)!);
+    var submittedApplicationResults = new ApplicationsQueryResults(mapper.Map<IEnumerable<Contract.Applications.Application>>(submittedApplications)!);
+    
     if (!draftApplicationResults.Items.Any())
     {
       return new ApplicationSubmissionResult() { Application = null, Error = SubmissionError.DraftApplicationNotFound, ValidationErrors = new List<string>() { "draft application does not exist" } };
@@ -169,6 +186,12 @@ public async Task<ApplicationSubmissionResult> Handle(SubmitApplicationCommand r
     {
       return new ApplicationSubmissionResult() { Application = null, Error = SubmissionError.DraftApplicationNotFound, ValidationErrors = new List<string>() { "draft application does not exist" } };
     }
+
+    if (submittedApplicationResults.Items.Any())
+    {
+      return new ApplicationSubmissionResult() { Application = null, Error = SubmissionError.SubmittedApplicationAlreadyExists, ValidationErrors = new List<string>() { "submitted application already exists" } };
+    }
+    
     return new ApplicationSubmissionResult() { Application = mapper.Map<IEnumerable<Contract.Applications.Application>>(freshApplications)!.FirstOrDefault() };
   }