WIP fixed multiple drafts being created. TODO country is strange

Author: SoLetsDev

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

@@ -31,7 +31,14 @@
         </v-col>
       </v-row>
     </v-form>
-    <v-btn class="mt-6" rounded="lg" color="primary" :loading="loadingStore.isLoading('draftapplication_put')" @click="continueClick" id="btnContinue">
+    <v-btn
+      class="mt-6"
+      rounded="lg"
+      color="primary"
+      :loading="loadingStore.isLoading('draftapplication_put') || loadingStore.isLoading('icra_put')"
+      @click="continueClick"
+      id="btnContinue"
+    >
       Continue
     </v-btn>
   </v-container>

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/inputs/EceInternationalCertification.vue

@@ -372,12 +372,17 @@ export default defineComponent({
       certificateTitle: "",
       issueDate: "",
       expiryDate: "",
+      files: [],
+      newFiles: [],
+      deletedFiles: [],
+      //extended file data
+      newFilesWithData: [],
       //name fields
       previousNameRadio: undefined,
       otherFirstName: "",
       otherMiddleName: "",
       otherLastName: "",
-      certificateHasOtherName: false,
+      hasOtherName: false,
       //other data
 
       internationalCertificationFormMode: undefined,
@@ -483,10 +488,10 @@ export default defineComponent({
       this.otherFirstName = internationalCertification.otherFirstName;
       this.otherMiddleName = internationalCertification.otherMiddleName;
       this.otherLastName = internationalCertification.otherLastName;
-      this.certificateHasOtherName = internationalCertification.certificateHasOtherName;
+      this.hasOtherName = internationalCertification.hasOtherName;
 
       //set the radio button for previous names and field buttons correctly
-      if (internationalCertification.certificateHasOtherName) {
+      if (internationalCertification.hasOtherName) {
         let index = this.applicantNameRadioOptions.findIndex((option) => option.value === "other");
         this.previousNameRadio = this.applicantNameRadioOptions[index]?.value;
       } else {
@@ -530,7 +535,7 @@ export default defineComponent({
           otherFirstName: this.otherFirstName,
           otherMiddleName: this.otherMiddleName,
           otherLastName: this.otherLastName,
-          certificateHasOtherName: this.certificateHasOtherName,
+          hasOtherName: this.hasOtherName,
         };
         let updatedModelValue = this.modelValue?.slice() || []; //create a copy of the array
 
@@ -614,7 +619,7 @@ export default defineComponent({
       this.otherFirstName = "";
       this.otherMiddleName = "";
       this.otherLastName = "";
-      this.certificateHasOtherName = false;
+      this.hasOtherName = false;
       //selection
 
       this.internationalCertificationFormMode = undefined;
@@ -630,12 +635,12 @@ export default defineComponent({
         this.otherFirstName = "";
         this.otherMiddleName = "";
         this.otherLastName = "";
-        this.certificateHasOtherName = true;
+        this.hasOtherName = true;
       } else {
         this.otherFirstName = option.firstName;
         this.otherMiddleName = option.middleName;
         this.otherLastName = option.lastName;
-        this.certificateHasOtherName = false;
+        this.hasOtherName = false;
       }
     },
   },

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

@@ -72,9 +72,6 @@ export const useIcraStore = defineStore("icra", {
       const internationalCertificationId = wizardStore.wizardConfig?.steps?.internationalCertification?.form?.inputs?.internationalCertification?.id;
       const employmentExperienceId = wizardStore.wizardConfig?.steps?.employmentExperience?.form?.inputs?.employmentExperience?.id;
 
-      console.log(internationalCertificationId);
-      console.log(employmentExperienceId);
-
       // Set wizard stage to the current step stage
       this.draftIcraEligibility.portalStage = wizardStore.currentStepStage as IcraEligibilityStage;
 
@@ -121,6 +118,7 @@ export const useIcraStore = defineStore("icra", {
     },
     async saveDraft(): Promise<Components.Schemas.DraftICRAEligibilityResponse | null | undefined> {
       this.prepareDraftIcraEligibilityFromWizard();
+      console.log("Draft ICRA Eligibility to be saved:", this.draftIcraEligibility);
       return await this.upsertDraftIcraEligibility();
     },
     async patchDraft(draftIcraEligibility: Components.Schemas.ICRAEligibility): Promise<Components.Schemas.DraftICRAEligibilityResponse | null | undefined> {

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

@@ -339,7 +339,7 @@ declare namespace Components {
             otherFirstName?: string | null;
             otherMiddleName?: string | null;
             otherLastName?: string | null;
-            certificateHasOtherName?: boolean | null;
+            hasOtherName?: boolean;
             countryId?: string | null;
             nameOfRegulatoryAuthority?: string | null;
             emailOfRegulatoryAuthority?: string | null;

src/ECER.Resources.Documents/ICRA/ICRARepository.cs

@@ -78,6 +78,8 @@ public async Task<string> Save(ICRAEligibility iCRAEligibility, CancellationToke
       if (icraEligibility.ecer_DateSigned.HasValue && existingIcraEligibility.ecer_DateSigned.HasValue) icraEligibility.ecer_DateSigned = existingIcraEligibility.ecer_DateSigned;
 
       icraEligibility.ecer_ICRAEligibilityAssessmentId = existingIcraEligibility.ecer_ICRAEligibilityAssessmentId;
+      context.Detach(existingIcraEligibility);
+      context.Attach(icraEligibility);
       context.UpdateObject(icraEligibility);
     }
     // Update international certifications and their files

src/ECER.Resources.Documents/ICRA/ICRARepositoryMapper.cs

@@ -13,7 +13,7 @@ public ICRARepositoryMapper()
       .ForSourceMember(s => s.ApplicantId, opts => opts.DoNotValidate())
       .ForSourceMember(s => s.CreatedOn, opts => opts.DoNotValidate())
       .ForSourceMember(s => s.InternationalCertifications, opts => opts.DoNotValidate())
-      .ForMember(d => d.Id, opts => opts.MapFrom(s => s.Id))
+      .ForMember(d => d.ecer_ICRAEligibilityAssessmentId, opts => opts.MapFrom(s => s.Id))
       .ForMember(d => d.ecer_PortalStage, opts => opts.MapFrom(s => s.PortalStage))
       .ForMember(d => d.StatusCode, opts => opts.MapFrom(s => s.Status))
       .ForMember(d => d.ecer_DateSigned, opts => opts.MapFrom(s => s.SignedDate))
@@ -47,7 +47,7 @@ public ICRARepositoryMapper()
       .ForMember(d => d.OtherMiddleName, opts => opts.MapFrom(s => s.ecer_OtherMiddleName))
       .ForMember(d => d.OtherLastName, opts => opts.MapFrom(s => s.ecer_OtherLastName))
       .ForMember(d => d.HasOtherName, opts => opts.MapFrom(s => s.ecer_CertificateHasOtherName))
-      .ForMember(d => d.CountryId, opts => opts.MapFrom(s => s.ecer_internationalcertification_CountryId != null ? s.ecer_internationalcertification_CountryId.ecer_CountryId.ToString() : null))
+      .ForMember(d => d.CountryId, opts => opts.MapFrom(s => s.ecer_CountryId != null ? s.ecer_CountryId.Id.ToString() : null))
       .ForMember(d => d.NameOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_AuthorityName))
       .ForMember(d => d.EmailOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_AuthorityEmail))
       .ForMember(d => d.PhoneOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_AuthorityPhone))