ECER-5269: ICRA international certification manage uploaded files piece added to repository layer

Author: farzadnadiri

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

@@ -1,35 +1,28 @@
-using AutoMapper;
-using ECER.Utilities.DataverseSdk.Model;
-using ECER.Utilities.ObjectStorage.Providers;
+using ECER.Utilities.DataverseSdk.Model;
 using ECER.Utilities.ObjectStorage.Providers.S3;
 using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.Xrm.Sdk.Client;
 
 namespace ECER.Resources.Documents.ICRA;
 
 internal sealed partial class ICRARepository
 {
-  private async Task UpdateInternationalCertifications(ecer_Application application, Contact contact, string ApplicantId, List<InternationalCertification> updatedEntities, CancellationToken ct)
+  private async Task UpdateInternationalCertifications(ecer_ICRAEligibilityAssessment icraEligibility, Contact contact, string ApplicantId, List<InternationalCertification> updatedEntities, CancellationToken ct)
   {
     await Task.CompletedTask;
 
-    var existingInternationalCertifications = context.ecer_InternationalCertificationSet.Where(t => t.ecer_Applicationid.Id == application.Id).ToList();
+    var existingInternationalCertifications = context.ecer_InternationalCertificationSet.Where(t => t.ecer_EligibilityAssessment.Id == icraEligibility.Id).ToList();
     foreach (var InternationalCertification in existingInternationalCertifications)
     {
       if (!updatedEntities.Any(t => t.Id == InternationalCertification.Id.ToString()))
       {
-        // This deletes all files and document urls before deleting the professional development object
+        // This deletes all files and document urls before deleting the international certifications object
         await DeleteFilesForInternationalCertification(InternationalCertification.ecer_InternationalCertificationId, Guid.Parse(ApplicantId), ct);
         context.DeleteObject(InternationalCertification);
       }
     }
 
-    // Update Existing Professional Developments
+    // Update existing International Certifications
     foreach (var InternationalCertification in updatedEntities.Where(d => !string.IsNullOrEmpty(d.Id)))
     {
       var oldInternationalCertification = existingInternationalCertifications.SingleOrDefault(t => t.Id.ToString() == InternationalCertification.Id);
@@ -49,15 +42,11 @@ private async Task UpdateInternationalCertifications(ecer_Application applicatio
     foreach (var InternationalCertification in updatedEntities.Where(d => string.IsNullOrEmpty(d.Id)))
     {
       var ecerInternationalCertification = mapper.Map<ecer_InternationalCertification>(InternationalCertification)!;
-      if (application.StatusCode == ecer_Application_StatusCode.Draft)
-      {
-        ecerInternationalCertification.StatusCode = ecer_InternationalCertification_StatusCode.Draft;
-      }
+      // no draft status handling required here beyond default mapping
       var newId = Guid.NewGuid();
       ecerInternationalCertification.ecer_InternationalCertificationId = newId;
       context.AddObject(ecerInternationalCertification);
-      context.AddLink(application, ecer_Application.Fields.ecer_ecer_InternationalCertification_Applicationi, ecerInternationalCertification);
-      context.AddLink(contact, Contact.Fields.ecer_ecer_InternationalCertification_Applicantid_, ecerInternationalCertification);
+      context.AddLink(icraEligibility, ecer_ICRAEligibilityAssessment.Fields.ecer_internationalcertification_EligibilityAssessment_ecer_icraeligibilityassessment, ecerInternationalCertification);
       await HandleInternationalCertificationFiles(ecerInternationalCertification, Guid.Parse(ApplicantId), InternationalCertification.NewFiles, InternationalCertification.DeletedFiles, ct);
     }
   }
@@ -108,7 +97,7 @@ private async Task HandleAddedFiles(ecer_InternationalCertification Internationa
         throw new InvalidOperationException($"InternationalCertification '{InternationalCertification}' not found");
       }
       // add file and create document url
-      // link it to professional development
+      // link it to international certification
       await AddFilesForInternationalCertification(InternationalCertification, applicantId, new List<string>() { fileId }, ct);
     }
   }
@@ -117,7 +106,7 @@ private async Task DeleteFilesForInternationalCertification(Guid? InternationalC
   {
     await Task.CompletedTask;
 
-    var files = context.bcgov_DocumentUrlSet.Where(d => d.ecer_bcgov_documenturl_InternationalCertificationId.ecer_InternationalCertificationId == InternationalCertificationId && d.bcgov_contact_bcgov_documenturl.ContactId == applicantId).ToList();
+    var files = context.bcgov_DocumentUrlSet.Where(d => d.ecer_bcgov_documenturl_internationalcertificationid.ecer_InternationalCertificationId == InternationalCertificationId && d.bcgov_contact_bcgov_documenturl.ContactId == applicantId).ToList();
     for (int i = 0; i < files.Count; i++)
     {
       var items = files[i].bcgov_Url.Split('/');
@@ -160,7 +149,7 @@ private async Task AddFilesForInternationalCertification(ecer_InternationalCerti
 
       context.AddObject(documenturl);
       context.AddLink(documenturl, bcgov_DocumentUrl.Fields.bcgov_contact_bcgov_documenturl, applicant);
-      context.AddLink(documenturl, bcgov_DocumentUrl.Fields.ecer_bcgov_documenturl_InternationalCertificationId, InternationalCertification);
+      context.AddLink(documenturl, bcgov_DocumentUrl.Fields.ecer_bcgov_documenturl_internationalcertificationid, InternationalCertification);
     }
   }
 

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

@@ -47,6 +47,8 @@ public async Task<IEnumerable<ICRAEligibility>> Query(ICRAQuery query, Cancellat
     var results = context.From(icras)
       .Join()
       .Include(a => a.ecer_icraeligibilityassessment_ApplicantId)
+      .Include(a => a.ecer_internationalcertification_EligibilityAssessment_ecer_icraeligibilityassessment)
+      .IncludeNested(a => a.ecer_bcgov_documenturl_internationalcertificationid)
       .Execute();
 
     return mapper.Map<IEnumerable<ICRAEligibility>>(results)!.ToList();
@@ -76,7 +78,8 @@ public async Task<string> Save(ICRAEligibility iCRAEligibility, CancellationToke
       icraEligibility.ecer_ICRAEligibilityAssessmentId = existingIcraEligibility.ecer_ICRAEligibilityAssessmentId;
       context.UpdateObject(icraEligibility);
     }
-
+    // Update international certifications and their files
+    await UpdateInternationalCertifications(icraEligibility, applicant, iCRAEligibility.ApplicantId, iCRAEligibility.InternationalCertifications.ToList(), cancellationToken);
     context.SaveChanges();
     return icraEligibility.ecer_ICRAEligibilityAssessmentId!.Value.ToString();
   }

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

@@ -15,11 +15,51 @@ public ICRARepositoryMapper()
       .ForMember(d => d.ecer_PortalStage, opts => opts.MapFrom(s => s.PortalStage))
       .ForMember(d => d.StatusCode, opts => opts.MapFrom(s => s.Status))
       .ReverseMap()
-      .ForMember(d => d.ApplicantId, opts => opts.MapFrom(s => s.ecer_icraeligibilityassessment_ApplicantId.Id));
+      .ForMember(d => d.ApplicantId, opts => opts.MapFrom(s => s.ecer_icraeligibilityassessment_ApplicantId.Id))
+      .ForMember(d => d.InternationalCertifications, opts => opts.MapFrom(s => s.ecer_internationalcertification_EligibilityAssessment_ecer_icraeligibilityassessment));
+
+    CreateMap<InternationalCertification, ecer_InternationalCertification>(MemberList.Source)
+      .ForSourceMember(s => s.NewFiles, opts => opts.DoNotValidate())
+      .ForSourceMember(s => s.DeletedFiles, opts => opts.DoNotValidate())
+      .ForSourceMember(s => s.Files, opts => opts.DoNotValidate())
+      .ForMember(d => d.ecer_InternationalCertificationId, opts => opts.MapFrom(s => s.Id))
+      .ForMember(d => d.ecer_Country, opts => opts.MapFrom(s => string.IsNullOrEmpty(s.CountryId) ? null : new EntityReference("ecer_country", Guid.Parse(s.CountryId))))
+      .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))
+      .ForMember(d => d.ecer_AuthorityWebsite, opts => opts.MapFrom(s => s.WebsiteOfRegulatoryAuthority))
+      .ForMember(d => d.ecer_CertificateValidationTool, opts => opts.MapFrom(s => s.OnlineCertificateValidationToolOfRegulatoryAuthority))
+      .ForMember(d => d.ecer_CertificationStatus, opts => opts.MapFrom(s => s.CertificateStatus))
+      .ForMember(d => d.ecer_CertificateTitle, opts => opts.MapFrom(s => s.CertificateTitle))
+      .ForMember(d => d.ecer_IssueDate, opts => opts.MapFrom(s => s.IssueDate))
+      .ForMember(d => d.ecer_Expirydate, opts => opts.MapFrom(s => s.ExpiryDate));
+
+    CreateMap<ecer_InternationalCertification, InternationalCertification>(MemberList.Source)
+      .ForMember(d => d.Id, opts => opts.MapFrom(s => s.ecer_InternationalCertificationId))
+      .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))
+      .ForMember(d => d.PhoneOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_AuthorityPhone))
+      .ForMember(d => d.WebsiteOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_AuthorityWebsite))
+      .ForMember(d => d.OnlineCertificateValidationToolOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_CertificateValidationTool))
+      .ForMember(d => d.CertificateStatus, opts => opts.MapFrom(s => s.ecer_CertificationStatus))
+      .ForMember(d => d.CertificateTitle, opts => opts.MapFrom(s => s.ecer_CertificateTitle))
+      .ForMember(d => d.IssueDate, opts => opts.MapFrom(s => s.ecer_IssueDate))
+      .ForMember(d => d.ExpiryDate, opts => opts.MapFrom(s => s.ecer_Expirydate))
+      .ForMember(d => d.NewFiles, opts => opts.Ignore())
+      .ForMember(d => d.DeletedFiles, opts => opts.Ignore())
+      .ForMember(d => d.Files, opts => opts.MapFrom(src => src.ecer_bcgov_documenturl_internationalcertificationid.ToList()));
 
     CreateMap<ICRAStatus, ecer_ICRAEligibilityAssessment_StatusCode>()
          .ConvertUsingEnumMapping(opts => opts.MapByName(true))
          .ReverseMap();
+
+    CreateMap<bcgov_DocumentUrl, Applications.FileInfo>(MemberList.Destination)
+      .ForMember(d => d.Id, opts => opts.MapFrom(s => s.bcgov_DocumentUrlId))
+      .ForMember(d => d.Name, opts => opts.MapFrom(s => s.bcgov_FileName))
+      .ForMember(d => d.Size, opts => opts.MapFrom(s => s.bcgov_FileSize))
+      .ForMember(d => d.Url, opts => opts.MapFrom(s => s.bcgov_Url))
+      .ForMember(d => d.Extention, opts => opts.MapFrom(s => s.bcgov_FileExtension));
   }
 
   public static string IdOrEmpty(EntityReference? reference) =>

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

@@ -24,6 +24,7 @@ public record ICRAEligibility()
 }
 public record InternationalCertification
 {
+  public string? Id { get; set; }
   public string? CountryId { get; set; }
   public string? NameOfRegulatoryAuthority { get; set; }
   public string? EmailOfRegulatoryAuthority { get; set; }
@@ -34,6 +35,9 @@ public record InternationalCertification
   public string? CertificateTitle { get; set; }
   public DateTime? IssueDate { get; set; }
   public DateTime? ExpiryDate { get; set; }
+  public IEnumerable<Applications.FileInfo> Files { get; set; } = Array.Empty<Applications.FileInfo>();
+  public IEnumerable<string> DeletedFiles { get; set; } = Array.Empty<string>();
+  public IEnumerable<string> NewFiles { get; set; } = Array.Empty<string>();
 }
 
 public enum CertificateStatus