ECER-5270: Countries Is ICRA flag handled in Queries and flag added to country endpoint. ECER-5270: Country Relationships Added to International Certification

Author: farzadnadiri

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/ConfigurationEndpoints.cs

@@ -113,7 +113,7 @@ public record OidcAuthenticationSettings
 public record IdentificationType(string Id, string Name, bool ForPrimary, bool ForSecondary);
 public record Province(string ProvinceId, string ProvinceName, string ProvinceCode);
 public record PostSecondaryInstitution(string Id, string Name, string ProvinceId);
-public record Country(string CountryId, string CountryName, string CountryCode);
+public record Country(string CountryId, string CountryName, string CountryCode, bool IsICRA);
 public record SystemMessage(string Name, string Subject, string Message)
 {
   public DateTime StartDate { get; set; }

src/ECER.Managers.Admin.Contract/Metadatas/Contract.cs

@@ -26,6 +26,8 @@ public record CountriesQuery : IRequest<CountriesQueryResults>
   public string? ById { get; set; }
   public string? ByCode { get; set; }
   public string? ByName { get; set; }
+  public bool? ByICRA { get; set; }
+
 }
 
 public record PostSecondaryInstitutionsQuery : IRequest<PostSecondaryInstitutionsQueryResults>
@@ -57,7 +59,7 @@ public record CountriesQueryResults(IEnumerable<Country> Items);
 public record PostSecondaryInstitutionsQueryResults(IEnumerable<PostSecondaryInstitution> Items);
 public record DynamicsConfigQueryResults(DynamicsConfig config);
 public record Province(string ProvinceId, string ProvinceName, string ProvinceCode);
-public record Country(string CountryId, string CountryName, string CountryCode);
+public record Country(string CountryId, string CountryName, string CountryCode, bool IsICRA);
 public record PostSecondaryInstitution(string Id, string Name, string ProvinceId);
 public record IdentificationType(string Id, string Name, bool ForPrimary, bool ForSecondary);
 public record DynamicsConfig(bool ICRAFeatureEnabled);

src/ECER.Resources.Documents/Applications/ApplicationRepositoryMapper.cs

@@ -180,7 +180,7 @@ public ApplicationRepositoryMapper()
       .ForMember(d => d.StudentMiddleName, opts => opts.MapFrom(s => s.ecer_StudentMiddleName))
       .ForMember(d => d.Country, opts => opts.MapFrom(src =>
         src.ecer_InstituteCountryId != null
-        ? new Country(src.ecer_InstituteCountryId.Id.ToString(), src.ecer_InstituteCountryIdName, string.Empty)
+        ? new Country(src.ecer_InstituteCountryId.Id.ToString(), src.ecer_InstituteCountryIdName, string.Empty,false)
         : null))
       .ForMember(d => d.Province, opts => opts.MapFrom(src =>
         src.ecer_ProvinceId != null

src/ECER.Resources.Documents/ICRA/ICRAChildren/InternationalCertifications.cs

@@ -47,6 +47,14 @@ private async Task UpdateInternationalCertifications(ecer_ICRAEligibilityAssessm
       ecerInternationalCertification.ecer_InternationalCertificationId = newId;
       context.AddObject(ecerInternationalCertification);
       context.AddLink(icraEligibility, ecer_ICRAEligibilityAssessment.Fields.ecer_internationalcertification_EligibilityAssessment_ecer_icraeligibilityassessment, ecerInternationalCertification);
+      if (InternationalCertification.CountryId != null)
+      {
+        var ecer_country = context.ecer_CountrySet.SingleOrDefault(c => c.ecer_CountryId == Guid.Parse(InternationalCertification.CountryId));
+        if (ecer_country != null)
+        {
+          context.AddLink(ecer_country, ecer_ICRAEligibilityAssessment.Fields.ecer_icraeligibilityassessment_CountryId, ecerInternationalCertification);
+        }
+      }
       await HandleInternationalCertificationFiles(ecerInternationalCertification, Guid.Parse(ApplicantId), InternationalCertification.NewFiles, InternationalCertification.DeletedFiles, ct);
     }
   }

src/ECER.Resources.Documents/MetadataResources/IMetadataResourceRepository.cs

@@ -22,7 +22,7 @@ public interface IMetadataResourceRepository
 }
 
 public record Province(string ProvinceId, string ProvinceName, string ProvinceCode);
-public record Country(string CountryId, string CountryName, string CountryCode);
+public record Country(string CountryId, string CountryName, string CountryCode, bool IsICRA);
 public record IdentificationType(string Id, string Name, bool ForPrimary, bool ForSecondary);
 public record PostSecondaryInstitution(string Id, string Name, string ProvinceId);
 public record SystemMessage(string Name, string Subject, string Message)
@@ -69,6 +69,7 @@ public record CountriesQuery
   public string? ById { get; set; }
   public string? ByCode { get; set; }
   public string? ByName { get; set; }
+  public bool? ByICRA { get; set; }
 }
 
 public record PostSecondaryInstitutionsQuery

src/ECER.Resources.Documents/MetadataResources/MetadataResourceRepository.cs

@@ -22,6 +22,7 @@ public async Task<IEnumerable<Country>> QueryCountries(CountriesQuery query, Can
     if (query.ById != null) countries = countries.Where(r => r.ecer_CountryId == Guid.Parse(query.ById));
     if (query.ByCode != null) countries = countries.Where(r => r.ecer_ShortName == query.ByCode);
     if (query.ByName != null) countries = countries.Where(r => r.ecer_Name == query.ByName);
+    if (query.ByICRA != null) countries = countries.Where(r => r.ecer_EligibleforICRA == query.ByICRA);
 
     return mapper.Map<IEnumerable<Country>>(countries)!.ToList();
   }

src/ECER.Resources.Documents/MetadataResources/MetadataResourceRepositoryMapper.cs

@@ -31,10 +31,12 @@ public MetadataResourceRepositoryMapper()
         .ForCtorParam(nameof(Country.CountryId), opt => opt.MapFrom(src => src.ecer_CountryId))
         .ForCtorParam(nameof(Country.CountryName), opt => opt.MapFrom(src => src.ecer_Name))
         .ForCtorParam(nameof(Country.CountryCode), opt => opt.MapFrom(src => src.ecer_ShortName))
+        .ForCtorParam(nameof(Country.IsICRA), opt => opt.MapFrom(src => src.ecer_EligibleforICRA))
         .ValidateMemberList(MemberList.Destination)
         .ReverseMap()
         .ForMember(dest => dest.ecer_CountryId, opt => opt.MapFrom(src => src.CountryId))
         .ForMember(dest => dest.ecer_Name, opt => opt.MapFrom(src => src.CountryName))
+        .ForMember(dest => dest.ecer_EligibleforICRA, opt => opt.MapFrom(src => src.IsICRA))
         .ForMember(dest => dest.ecer_ShortName, opt => opt.MapFrom(src => src.CountryCode));
 
     CreateMap<ecer_PostSecondaryInstitute, PostSecondaryInstitution>(MemberList.Source)