adding certificateHasOtherNameFlag

Author: SoLetsDev

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/ICRA/ICRAEligibilitiesEndpoints.cs

@@ -85,6 +85,7 @@ public record InternationalCertification
   public string? OtherFirstName { get; set; }
   public string? OtherMiddleName { get; set; }
   public string? OtherLastName { get; set; }
+  public bool? CertificateHasOtherName { get; set; }
   public string? CountryId { get; set; }
   public string? NameOfRegulatoryAuthority { get; set; }
   public string? EmailOfRegulatoryAuthority { get; set; }

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

@@ -79,8 +79,8 @@
         <v-col md="8" lg="6" xl="4">
           <p>What is your certification status?</p>
           <v-radio-group id="certificateStatusRadio" v-model="certificateStatus" :rules="[Rules.requiredRadio('Select the status of your certification')]">
-            <v-radio label="Valid" :value="'valid'"></v-radio>
-            <v-radio label="Expired" :value="'expired'"></v-radio>
+            <v-radio label="Valid" :value="'Valid'"></v-radio>
+            <v-radio label="Expired" :value="'Expired'"></v-radio>
           </v-radio-group>
         </v-col>
       </v-row>
@@ -377,7 +377,7 @@ export default defineComponent({
       otherFirstName: "",
       otherMiddleName: "",
       otherLastName: "",
-      // isNameUnverified: false, TODO needs name verification
+      certificateHasOtherName: false,
       //other data
 
       internationalCertificationFormMode: undefined,
@@ -483,10 +483,10 @@ export default defineComponent({
       this.otherFirstName = internationalCertification.otherFirstName;
       this.otherMiddleName = internationalCertification.otherMiddleName;
       this.otherLastName = internationalCertification.otherLastName;
-      this.isNameUnverified = internationalCertification.isNameUnverified;
+      this.certificateHasOtherName = internationalCertification.certificateHasOtherName;
 
       //set the radio button for previous names and field buttons correctly
-      if (internationalCertification.isNameUnverified) {
+      if (internationalCertification.certificateHasOtherName) {
         let index = this.applicantNameRadioOptions.findIndex((option) => option.value === "other");
         this.previousNameRadio = this.applicantNameRadioOptions[index]?.value;
       } else {
@@ -530,7 +530,7 @@ export default defineComponent({
           otherFirstName: this.otherFirstName,
           otherMiddleName: this.otherMiddleName,
           otherLastName: this.otherLastName,
-          isNameUnverified: this.isNameUnverified,
+          certificateHasOtherName: this.certificateHasOtherName,
         };
         let updatedModelValue = this.modelValue?.slice() || []; //create a copy of the array
 
@@ -614,7 +614,7 @@ export default defineComponent({
       this.otherFirstName = "";
       this.otherMiddleName = "";
       this.otherLastName = "";
-      this.isNameUnverified = false;
+      this.certificateHasOtherName = false;
       //selection
 
       this.internationalCertificationFormMode = undefined;
@@ -630,12 +630,12 @@ export default defineComponent({
         this.otherFirstName = "";
         this.otherMiddleName = "";
         this.otherLastName = "";
-        this.isNameUnverified = true;
+        this.certificateHasOtherName = true;
       } else {
         this.otherFirstName = option.firstName;
         this.otherMiddleName = option.middleName;
         this.otherLastName = option.lastName;
-        this.isNameUnverified = false;
+        this.certificateHasOtherName = false;
       }
     },
   },

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

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

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

@@ -30,6 +30,7 @@ public record InternationalCertification
   public string? OtherFirstName { get; set; }
   public string? OtherMiddleName { get; set; }
   public string? OtherLastName { get; set; }
+  public bool? CertificateHasOtherName { get; set; }
   public string? CountryId { get; set; }
   public string? NameOfRegulatoryAuthority { get; set; }
   public string? EmailOfRegulatoryAuthority { get; set; }
@@ -62,4 +63,3 @@ public enum ICRAStatus
   ReadyforReview,
   Submitted
 }
-

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

@@ -22,7 +22,6 @@ public ICRARepositoryMapper()
       .ForMember(d => d.InternationalCertifications, opts => opts.MapFrom(s => s.ecer_internationalcertification_EligibilityAssessment_ecer_icraeligibilityassessment))
       .ForMember(d => d.CreatedOn, opts => opts.MapFrom(s => s.CreatedOn));
 
-
     CreateMap<InternationalCertification, ecer_InternationalCertification>(MemberList.Source)
       .ForSourceMember(s => s.NewFiles, opts => opts.DoNotValidate())
       .ForSourceMember(s => s.DeletedFiles, opts => opts.DoNotValidate())
@@ -31,6 +30,7 @@ public ICRARepositoryMapper()
       .ForMember(d => d.ecer_OtherFirstName, opts => opts.MapFrom(s => s.OtherFirstName))
       .ForMember(d => d.ecer_OtherMiddleName, opts => opts.MapFrom(s => s.OtherMiddleName))
       .ForMember(d => d.ecer_OtherLastName, opts => opts.MapFrom(s => s.OtherLastName))
+      .ForMember(d => d.ecer_CertificateHasOtherName, opts => opts.MapFrom(s => s.CertificateHasOtherName))
       .ForMember(d => d.ecer_AuthorityName, opts => opts.MapFrom(s => s.NameOfRegulatoryAuthority))
       .ForMember(d => d.ecer_AuthorityEmail, opts => opts.MapFrom(s => s.EmailOfRegulatoryAuthority))
       .ForMember(d => d.ecer_AuthorityPhone, opts => opts.MapFrom(s => s.PhoneOfRegulatoryAuthority))
@@ -46,6 +46,7 @@ public ICRARepositoryMapper()
       .ForMember(d => d.OtherFirstName, opts => opts.MapFrom(s => s.ecer_OtherFirstName))
       .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.CertificateHasOtherName, opts => opts.MapFrom(s => s.ecer_CertificateHasOtherName))
       .ForMember(d => d.CountryId, opts => opts.MapFrom(s => s.ecer_Country != null ? s.ecer_Country.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))
@@ -67,6 +68,6 @@ public ICRARepositoryMapper()
 
   public static string IdOrEmpty(EntityReference? reference) =>
       reference != null && reference.Id != Guid.Empty
-          ? reference.Id.ToString()  
-          : string.Empty;              
+          ? reference.Id.ToString()
+          : string.Empty;
 }

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

@@ -30,6 +30,7 @@ public record InternationalCertification
   public string? OtherFirstName { get; set; }
   public string? OtherMiddleName { get; set; }
   public string? OtherLastName { get; set; }
+  public bool? CertificateHasOtherName { get; set; }
   public string? CountryId { get; set; }
   public string? NameOfRegulatoryAuthority { get; set; }
   public string? EmailOfRegulatoryAuthority { get; set; }
@@ -50,6 +51,7 @@ public enum CertificateStatus
   Valid,
   Expired
 }
+
 public enum ICRAStatus
 {
   Active,