Merge pull request #1612 from bcgov/dev

Dev

Author: JamesPasta

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
@@ -81,7 +82,7 @@ public async Task DeleteTemplate(Guid id)
 
     public async Task<List<TemplateVariable>> GetTemplateVariables()
     {
-        var data =  await _templateVariablesRepository.GetListAsync();
-        return data;
+        var templateVariables =  await _templateVariablesRepository.GetQueryableAsync();
+        return templateVariables.OrderBy(x => x.Name).ToList();
     }
-}
+}

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/NotificationsDataSeedContributor.cs

@@ -48,7 +48,8 @@ public async Task SeedAsync(DataSeedContext context)
             new EmailTempateVariableDto { Name = "Project Summary", Token = "project_summary", MapTo = "projectSummary" },
             new EmailTempateVariableDto { Name = "Signing Authority Full Name", Token = "signing_authority_full_name", MapTo = "signingAuthorityFullName" },
             new EmailTempateVariableDto { Name = "Signing Authority Title", Token = "signing_authority_title", MapTo = "signingAuthorityTitle" },
-            new EmailTempateVariableDto { Name = "Applicant ID", Token = "applicant_id", MapTo = "applicant.unityApplicantId" }
+            new EmailTempateVariableDto { Name = "Applicant ID", Token = "applicant_id", MapTo = "applicant.unityApplicantId" },
+            new EmailTempateVariableDto { Name = "Requested Amount", Token = "requested_amount", MapTo = "requestedAmount" }
         };
 
         try

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/ApplicationFormDetailsDto.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Unity.GrantManager.ApplicationForms;
+
+public class ApplicationFormDetailsDto
+{
+    public Guid ApplicationId { get; set; }
+    public Guid ApplicationFormId { get; set; }
+    public string ApplicationFormName { get; set; } = string.Empty;
+    public string ApplicationFormDescription { get; set; } = string.Empty;
+    public string ApplicationFormCategory { get; set; } = string.Empty;
+    public Guid ApplicationFormVersionId { get; set; }
+    public int ApplicationFormVersion { get; set; }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicationForms/IApplicationFormAppService.cs

@@ -20,5 +20,6 @@ public interface IApplicationFormAppService : ICrudAppService<
         Task PatchOtherConfig(Guid id, OtherConfigDto config);
         Task<decimal?> GetFormPaymentApprovalThresholdByApplicationIdAsync(Guid applicationId);
         Task<bool> GetFormPreventPaymentStatusByApplicationId(Guid applicationId);
+        Task<ApplicationFormDetailsDto> GetFormDetailsByApplicationIdAsync(Guid applicationId);
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs

@@ -5,6 +5,7 @@
 
 namespace Unity.GrantManager.GrantApplications;
 
+// NOTE: Removing properties from this class will impact Email Notification Templates
 public class GrantApplicationDto : AuditedEntityDto<Guid>
 {
     public int RowCount { get; set; } = 0;

applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs

@@ -34,13 +34,15 @@ public class ApplicationFormAppService :
     private readonly IApplicationFormVersionRepository _applicationFormVersionRepository;
     private readonly IGrantApplicationAppService _applicationService;
     private readonly IRepository<ApplicationForm, Guid> _applicationFormRepository;
+    private readonly IApplicationFormSubmissionRepository _applicationFormSubmissionRepository;
 
     public ApplicationFormAppService(IRepository<ApplicationForm, Guid> repository,
         IStringEncryptionService stringEncryptionService,
         IApplicationFormVersionAppService applicationFormVersionAppService,
         IApplicationFormVersionRepository applicationFormVersionRepository,
         IGrantApplicationAppService applicationService,
-        IFormsApiService formsApiService)
+        IFormsApiService formsApiService,
+        IApplicationFormSubmissionRepository applicationFormSubmissionRepository)
         : base(repository)
     {
         _stringEncryptionService = stringEncryptionService;
@@ -49,6 +51,7 @@ public ApplicationFormAppService(IRepository<ApplicationForm, Guid> repository,
         _applicationFormVersionRepository = applicationFormVersionRepository;
         _applicationFormRepository = repository;
         _applicationService = applicationService;
+        _applicationFormSubmissionRepository = applicationFormSubmissionRepository;
     }
 
     [Authorize(GrantManagerPermissions.ApplicationForms.Default)]
@@ -189,4 +192,20 @@ public async Task SavePaymentConfiguration(FormPaymentConfigurationDto dto)
         ApplicationForm appForm = await _applicationFormRepository.GetAsync(formId);     
         return appForm.PaymentApprovalThreshold;
     }
+
+    public async Task<ApplicationFormDetailsDto> GetFormDetailsByApplicationIdAsync(Guid applicationId)
+    {
+        var formDetails = await _applicationFormSubmissionRepository.GetFormDetailsByApplicationIdAsync(applicationId);
+        
+        return new ApplicationFormDetailsDto
+        {
+            ApplicationId = formDetails.ApplicationId,
+            ApplicationFormId = formDetails.ApplicationFormId,
+            ApplicationFormName = formDetails.ApplicationFormName,
+            ApplicationFormDescription = formDetails.ApplicationFormDescription,
+            ApplicationFormCategory = formDetails.ApplicationFormCategory,
+            ApplicationFormVersionId = formDetails.ApplicationFormVersionId,
+            ApplicationFormVersion = formDetails.ApplicationFormVersion
+        };
+    }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs

@@ -222,6 +222,7 @@ private static GrantApplicationAssigneeDto BuildApplicationOwner(Person? applica
 
     public async Task<GrantApplicationDto> GetAsync(Guid id)
     {
+        // NOTE: Changes to this method can impact Email Notification Templates
         var application = await _applicationRepository.GetWithFullDetailsByIdAsync(id);
 
         if (application == null) return new GrantApplicationDto();

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormDetails.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace Unity.GrantManager.Applications;
+
+[Serializable]
+public class ApplicationFormDetails
+{
+    public Guid ApplicationId { get; set; }
+    public Guid ApplicationFormId { get; set; }
+    public string ApplicationFormName { get; set; } = string.Empty;
+    public string ApplicationFormDescription { get; set; } = string.Empty;
+    public string ApplicationFormCategory { get; set; } = string.Empty;
+    public Guid ApplicationFormVersionId { get; set; }
+    public int ApplicationFormVersion { get; set; }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationFormSubmissionRepository.cs

@@ -7,4 +7,5 @@ namespace Unity.GrantManager.Applications;
 public interface IApplicationFormSubmissionRepository : IRepository<ApplicationFormSubmission, Guid>
 {
     Task<ApplicationFormSubmission> GetByApplicationAsync(Guid applicationId);
+    Task<ApplicationFormDetails> GetFormDetailsByApplicationIdAsync(Guid applicationId);
 }

applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationFormSubmissionRepository.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.EntityFrameworkCore;
@@ -23,5 +24,37 @@ public async Task<ApplicationFormSubmission> GetByApplicationAsync(Guid applicat
             return await dbContext.ApplicationFormSubmissions
                 .FirstAsync(s => s.ApplicationId == applicationId);
         }
+
+        public async Task<ApplicationFormDetails> GetFormDetailsByApplicationIdAsync(Guid applicationId)
+        {
+            var dbContext = await GetDbContextAsync();
+            
+            // Join ApplicationFormSubmission with ApplicationForm and ApplicationFormVersion 
+            // to get all required data in a single query
+            return await dbContext.ApplicationFormSubmissions
+                .Where(s => s.ApplicationId == applicationId)
+                .Join(
+                    dbContext.ApplicationFormVersions,
+                    submission => submission.ApplicationFormVersionId,
+                    version => version.Id,
+                    (submission, version) => new { submission, version }
+                )
+                .Join(
+                    dbContext.ApplicationForms,
+                    formVersion => formVersion.version.ApplicationFormId,
+                    form => form.Id,
+                    (formVersion, form) => new ApplicationFormDetails
+                    {
+                        ApplicationId = applicationId,
+                        ApplicationFormId = form.Id,
+                        ApplicationFormName = form.ApplicationFormName ?? string.Empty,
+                        ApplicationFormDescription = form.ApplicationFormDescription ?? string.Empty,
+                        ApplicationFormCategory = form.Category ?? string.Empty,
+                        ApplicationFormVersionId = formVersion.version.Id,
+                        ApplicationFormVersion = formVersion.version.Version ?? 0
+                    }
+                )
+                .FirstOrDefaultAsync() ?? new ApplicationFormDetails { ApplicationId = applicationId };
+        }
     }
 }