ECER-5270: Country changes to international certification country

Author: farzadnadiri

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

@@ -49,6 +49,7 @@ public async Task<IEnumerable<ICRAEligibility>> Query(ICRAQuery query, Cancellat
       .Include(a => a.ecer_icraeligibilityassessment_ApplicantId)
       .Include(a => a.ecer_internationalcertification_EligibilityAssessment_ecer_icraeligibilityassessment)
       .IncludeNested(a => a.ecer_bcgov_documenturl_internationalcertificationid)
+      .IncludeNested(a => a.ecer_internationalcertification_CountryId)
       .Execute();
 
     return mapper.Map<IEnumerable<ICRAEligibility>>(results)!.ToList();

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

@@ -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_Country != null ? s.ecer_Country.Id.ToString() : null))
+      .ForMember(d => d.CountryId, opts => opts.MapFrom(s => s.ecer_internationalcertification_CountryId != null ? s.ecer_internationalcertification_CountryId.ecer_CountryId.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))