ECER-5270: Merge Conflicts resolved

Author: farzadnadiri

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

@@ -85,7 +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 bool HasOtherName { get; set; }
   public string? CountryId { get; set; }
   public string? NameOfRegulatoryAuthority { get; set; }
   public string? EmailOfRegulatoryAuthority { get; set; }

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

@@ -30,7 +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 bool HasOtherName { get; set; }
   public string? CountryId { get; set; }
   public string? NameOfRegulatoryAuthority { get; set; }
   public string? EmailOfRegulatoryAuthority { get; set; }
@@ -41,7 +41,7 @@ public record InternationalCertification
   public string? CertificateTitle { get; set; }
   public DateTime? IssueDate { get; set; }
   public DateTime? ExpiryDate { get; set; }
-  public IEnumerable<ECER.Managers.Registry.Contract.Applications.FileInfo> Files { get; set; } = Array.Empty<ECER.Managers.Registry.Contract.Applications.FileInfo>();
+  public IEnumerable<Applications.FileInfo> Files { get; set; } = Array.Empty<ECER.Managers.Registry.Contract.Applications.FileInfo>();
   public IEnumerable<string> DeletedFiles { get; set; } = Array.Empty<string>();
   public IEnumerable<string> NewFiles { get; set; } = Array.Empty<string>();
 }

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

@@ -30,7 +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_CertificateHasOtherName, opts => opts.MapFrom(s => s.HasOtherName))
       .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,7 +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.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.NameOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_AuthorityName))
       .ForMember(d => d.EmailOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_AuthorityEmail))

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

@@ -30,7 +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 bool HasOtherName { get; set; }
   public string? CountryId { get; set; }
   public string? NameOfRegulatoryAuthority { get; set; }
   public string? EmailOfRegulatoryAuthority { get; set; }

src/ECER.Utilities.DataverseSdk/Model/EcerContext.cs

@@ -535,17 +535,6 @@ public System.Linq.IQueryable<ECER.Utilities.DataverseSdk.Model.ecer_ICRAEligibi
 			}
 		}
 
-		/// <summary>
-		/// Gets a binding to the set of all <see cref="ECER.Utilities.DataverseSdk.Model.ecer_ICRARegulatedJurisdictions"/> entities.
-		/// </summary>
-		public System.Linq.IQueryable<ECER.Utilities.DataverseSdk.Model.ecer_ICRARegulatedJurisdictions> ecer_ICRARegulatedJurisdictionsSet
-		{
-			get
-			{
-				return this.CreateQuery<ECER.Utilities.DataverseSdk.Model.ecer_ICRARegulatedJurisdictions>();
-			}
-		}
-		
 		/// <summary>
 		/// Gets a binding to the set of all <see cref="ECER.Utilities.DataverseSdk.Model.ecer_identificationtype"/> entities.
 		/// </summary>