Merge pull request #1300 from bcgov/dev

Dev

Author: jimmyPasta

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

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations.Schema;
 using Volo.Abp.Application.Dtos;
 
 namespace Unity.GrantManager.ApplicationForms
@@ -15,5 +16,7 @@ public class ApplicationFormVersionDto : EntityDto<Guid>
         public string ReportColumns { get; set; } = string.Empty;
         public string ReportKeys { get; set; } = string.Empty;
         public string ReportViewName { get; set; } = string.Empty;
+        [Column(TypeName = "jsonb")]
+        public string? FormSchema { get; set; } = string.Empty;
     }
 }

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

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -59,19 +60,22 @@ public async Task<Guid> ProcessFormSubmissionAsync(ApplicationForm applicationFo
             var application = await CreateNewApplicationAsync(intakeMap, applicationForm);
             await _intakeFormSubmissionMapper.SaveChefsFiles(formSubmission, application.Id);
 
+            JObject submission = JObject.Parse(formSubmission.ToString());
+            JToken? dataNode = submission.SelectToken("submission");
+
             var newSubmission = new ApplicationFormSubmission
             {
                 OidcSub = Guid.Empty.ToString(),
                 ApplicantId = application.ApplicantId,
                 ApplicationFormId = applicationForm.Id,
                 ChefsSubmissionGuid = intakeMap.SubmissionId ?? $"{Guid.Empty}",
                 ApplicationId = application.Id,
-                Submission = ChefsFormIOReplacement.ReplaceAdvancedFormIoControls(formSubmission)
+                Submission = dataNode?.ToString() ?? string.Empty
             };
 
             _ = await _applicationFormSubmissionRepository.InsertAsync(newSubmission);
 
-            var localFormVersion = await _applicationFormVersionRepository.GetByChefsFormVersionAsync(Guid.Parse(formVersionId));
+            ApplicationFormVersion? localFormVersion = await _applicationFormVersionRepository.GetByChefsFormVersionAsync(Guid.Parse(formVersionId));
             await _customFieldsIntakeSubmissionMapper.MapAndPersistCustomFields(application.Id,
                 localFormVersion?.Id ?? Guid.Empty,
                 formSubmission,

applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/IntakeFormSubmissionManager.cs

@@ -10,7 +10,20 @@ public class ApplicationFormSubmission : AuditedAggregateRoot<Guid>, IMultiTenan
     public string OidcSub { get; set; } = string.Empty;
     public Guid ApplicantId { get; set; }
     public Guid ApplicationFormId { get; set; }
-    public Guid ApplicationId { get; set; } = Guid.Empty; // TODO : harden this contraint
+    private Guid _applicationId = Guid.Empty;    
+    public Guid ApplicationId 
+    { 
+        get => _applicationId; 
+        set
+        {
+            if (value == Guid.Empty)
+            {
+                throw new ArgumentException("ApplicationId cannot be an empty GUID.");
+            }
+            _applicationId = value;
+        }
+    }
+
     public string ChefsSubmissionGuid { get; set; } = string.Empty;
     [Column(TypeName = "jsonb")]
     public string Submission { get; set; } = string.Empty;

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

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations.Schema;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.MultiTenancy;
 
@@ -17,4 +18,6 @@ public class ApplicationFormVersion : AuditedAggregateRoot<Guid>, IMultiTenant
     public string ReportColumns { get; set; } = string.Empty;
     public string ReportKeys { get; set; } = string.Empty;
     public string ReportViewName { get; set; } = string.Empty;
+    [Column(TypeName = "jsonb")]
+    public string? FormSchema { get; set; } = string.Empty;
 }

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

@@ -103,6 +103,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
                 b.ConfigureByConvention(); //auto configure for the base class props
                 b.HasOne<ApplicationForm>().WithMany().HasForeignKey(x => x.ApplicationFormId).IsRequired();
+                b.Property(x => x.FormSchema).HasColumnType("jsonb");
             });
 
             modelBuilder.Entity<ApplicationStatus>(b =>