change

bcgov · Jan 8, 2025 · d411e04 · d411e04
1 parent 1eccf74
commit d411e04
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/...anager.Printing/Documents/TransformationStrategies/BizLicencePrintingTransformStrategy.cs b/...anager.Printing/Documents/TransformationStrategies/BizLicencePrintingTransformStrategy.cs
@@ -42,10 +42,7 @@ protected override async Task<BizLicencePrintingJson> CreateDocument(BizLicenceP
         mapper.Map(biz, bizLicJson);
 
         //conditions
-        IncidentListResp resp = await incidentRepository.QueryAsync(
-            new IncidentQry() { ApplicationId = lic.LicenceAppId, IncludeInactive = true },
-            cancellationToken);
-        bizLicJson.Conditions = resp.Items.First().Conditions.Select(c => c.Name);
+        bizLicJson.Conditions = lic.Conditions.Select(c => c.Name);
 
         return bizLicJson;
     }

diff --git a/...er.Printing/Documents/TransformationStrategies/PersonalLicencePreviewTransformStrategy.cs b/...er.Printing/Documents/TransformationStrategies/PersonalLicencePreviewTransformStrategy.cs
@@ -51,10 +51,7 @@ protected override async Task<LicencePreviewJson> CreateDocument(PersonalLicence
         preview.SPD_CARD.TemporaryLicence = lic.IsTemporary ?? false;
 
         //conditions
-        IncidentListResp resp = await incidentRepository.QueryAsync(
-            new IncidentQry() { ApplicationId = lic.LicenceAppId, IncludeInactive = true },
-            cancellationToken);
-        preview.Conditions = resp.Items.First().Conditions.Select(c => c.Name);
+        preview.Conditions = lic.Conditions.Select(c => c.Name);
 
         return preview;
     }

diff --git a/src/Spd.Resource.Repository/Licence/Contract.cs b/src/Spd.Resource.Repository/Licence/Contract.cs
@@ -55,6 +55,8 @@ public record LicenceResp() : PermitLicence
 
         //sole proprietor
         public Guid? SoleProprietorOrgId { get; set; }
+
+        public IEnumerable<Condition> Conditions { get; set; } = Enumerable.Empty<Condition>();
     }
 
     public record Licence
@@ -88,6 +90,12 @@ public record PermitLicence : Licence
         public IEnumerable<PermitPurposeEnum>? PermitPurposeEnums { get; set; }
     }
 
+    public record Condition
+    {
+        public Guid Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+    }
+
     public enum LicenceStatusEnum
     {
         Active,

diff --git a/src/Spd.Resource.Repository/Licence/LicenceRepository.cs b/src/Spd.Resource.Repository/Licence/LicenceRepository.cs
@@ -24,6 +24,7 @@ public LicenceRepository(IDynamicsContextFactory ctx,
             licence = await _context.spd_licences
                 .Expand(i => i.spd_LicenceHolder_contact)
                 .Expand(i => i.spd_LicenceHolder_account)
+                .Expand(i => i.spd_spd_licence_spd_licencecondition)
                 .Expand(i => i.spd_CaseId)
                 .Expand(i => i.spd_SoleProprietorId)
                 .Expand(i => i.spd_spd_licence_spd_caselicencecategory_licenceid)
@@ -45,6 +46,7 @@ public async Task<LicenceListResp> QueryAsync(LicenceQry qry, CancellationToken
     {
         IQueryable<spd_licence> lics = _context.spd_licences
             .Expand(i => i.spd_spd_licence_spd_caselicencecategory_licenceid)
+            .Expand(i => i.spd_spd_licence_spd_licencecondition)
             .Expand(i => i.spd_LicenceHolder_contact)
             .Expand(i => i.spd_LicenceHolder_account)
             .Expand(i => i.spd_CaseId);

diff --git a/src/Spd.Resource.Repository/Licence/Mappings.cs b/src/Spd.Resource.Repository/Licence/Mappings.cs
@@ -45,8 +45,13 @@ public Mappings()
              .ForMember(d => d.IsDogsPurposeDetectionExplosives, opt => opt.MapFrom(s => SharedMappingFuncs.GetDogReasonFlag(s.spd_requestdogsreasons, RequestDogPurposeOptionSet.DetectionExplosives)))
              .ForMember(d => d.CarryAndUseRestraints, opt => opt.MapFrom(s => SharedMappingFuncs.GetBool(s.spd_requestrestraints)))
              .ForMember(d => d.UseDogs, opt => opt.MapFrom(s => SharedMappingFuncs.GetBool(s.spd_requestdogs)))
+             .ForMember(d => d.Conditions, opt => opt.MapFrom(s => s.spd_spd_licence_spd_licencecondition))
              ;
 
+            _ = CreateMap<spd_licencecondition, Condition>()
+            .ForMember(d => d.Id, opt => opt.MapFrom(s => s.spd_licenceconditionid))
+            .ForMember(d => d.Name, opt => opt.MapFrom(s => s.spd_conditionname));
+
             _ = CreateMap<spd_licence, Addr>()
              .ForMember(d => d.AddressLine1, opt => opt.MapFrom(s => s.spd_employeraddress1))
              .ForMember(d => d.AddressLine2, opt => opt.MapFrom(s => s.spd_employeraddress2))