add issued category to licence response (#1337)

# Description This PR includes the following proposed change(s): - add issued category to licence response
bcgov · Aug 24, 2024 · 21f6ab0 · 21f6ab0
2 parents fb99fac + d7a54a2
commit 21f6ab0
Show file tree

Hide file tree

Showing 7 changed files with 12,419 additions and 2,528 deletions.
diff --git a/src/Spd.Manager.Licence/LicenceContract.cs b/src/Spd.Manager.Licence/LicenceContract.cs
@@ -23,6 +23,9 @@ public record LicenceBasicResponse
     public Guid? LicenceHolderId { get; set; }
     public string? NameOnCard { get; set; }
     public LicenceStatusCode LicenceStatusCode { get; set; }
+
+    //issued categories
+    public IEnumerable<WorkerCategoryTypeCode> CategoryCodes { get; set; } = Array.Empty<WorkerCategoryTypeCode>();
 };
 
 public record LicenceResponse : LicenceBasicResponse

diff --git a/src/Spd.Resource.Repository/Licence/Contract.cs b/src/Spd.Resource.Repository/Licence/Contract.cs
@@ -48,6 +48,9 @@ public record Licence
         public string? LicenceHolderMiddleName1 { get; set; }
         public LicenceStatusEnum LicenceStatusCode { get; set; }
         public string? NameOnCard { get; set; }
+
+        //issued categories 
+        public IEnumerable<WorkerCategoryTypeEnum> CategoryCodes { get; set; } = Array.Empty<WorkerCategoryTypeEnum>();
     }
 
     public record PermitLicence : Licence

diff --git a/src/Spd.Resource.Repository/Licence/LicenceRepository.cs b/src/Spd.Resource.Repository/Licence/LicenceRepository.cs
@@ -25,6 +25,7 @@ public LicenceRepository(IDynamicsContextFactory ctx,
                 .Expand(i => i.spd_LicenceHolder_contact)
                 .Expand(i => i.spd_LicenceHolder_account)
                 .Expand(i => i.spd_CaseId)
+                .Expand(i => i.spd_spd_licence_spd_caselicencecategory_licenceid)
                 .Where(l => l.spd_licenceid == licenceId)
                 .FirstOrDefaultAsync(ct);
         }
@@ -47,6 +48,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_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
@@ -1,5 +1,6 @@
 using AutoMapper;
 using Microsoft.Dynamics.CRM;
+using Spd.Resource.Repository.PersonLicApplication;
 using Spd.Utilities.Dynamics;
 
 namespace Spd.Resource.Repository.Licence
@@ -31,7 +32,8 @@ public Mappings()
              .ForMember(d => d.Rationale, opt => opt.MapFrom(s => s.spd_rationale))
              .ForMember(d => d.PhotoDocumentUrlId, opt => opt.MapFrom(s => s._spd_photographid_value))
              .ForMember(d => d.IsTemporary, opt => opt.MapFrom(s => SharedMappingFuncs.GetBool(s.spd_temporarylicence)))
-             .ForMember(d => d.PermitPurposeEnums, opt => opt.MapFrom(s => SharedMappingFuncs.GetPermitPurposeEnums(s.spd_permitpurpose)));
+             .ForMember(d => d.PermitPurposeEnums, opt => opt.MapFrom(s => SharedMappingFuncs.GetPermitPurposeEnums(s.spd_permitpurpose)))
+             .ForMember(d => d.CategoryCodes, opt => opt.MapFrom(s => GetCategoryCodes(s.spd_spd_licence_spd_caselicencecategory_licenceid.ToList())));
 
             _ = CreateMap<spd_licence, Addr>()
              .ForMember(d => d.AddressLine1, opt => opt.MapFrom(s => s.spd_employeraddress1))
@@ -65,5 +67,12 @@ public Mappings()
             if (optionset == null) return null;
             return Enum.Parse<LicenceStatusEnum>(Enum.GetName(typeof(LicenceStatusOptionSet), optionset));
         }
+
+        internal static IEnumerable<WorkerCategoryTypeEnum> GetCategoryCodes(List<spd_caselicencecategory> categories)
+        {
+            return categories
+                .Where(c => c.spd_accepted == (int)YesNoOptionSet.Yes)
+                .Select(c => Enum.Parse<WorkerCategoryTypeEnum>(DynamicsContextLookupHelpers.LookupLicenceCategoryKey(c._spd_licencecategoryid_value)));
+        }
     }
 }
diff --git a/src/Spd.Utilities.Dynamics/Connected Services/OData Service/ConnectedService.json b/src/Spd.Utilities.Dynamics/Connected Services/OData Service/ConnectedService.json
@@ -28,7 +28,7 @@
     "MakeTypesInternal": false,
     "OpenGeneratedFilesInIDE": false,
     "GenerateMultipleFiles": false,
-    "CustomHttpHeaders": "Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ims0Y3BkRmdybU0yMHJhcThYVVRxMVlpaXNISSIsImtpZCI6Ims0Y3BkRmdybU0yMHJhcThYVVRxMVlpaXNISSJ9.eyJhdWQiOiJodHRwczovL3NwZC1zcGFyYy5kZXYuamFnLmdvdi5iYy5jYS9hcGkvZGF0YS92OS4wLyIsImlzcyI6Imh0dHA6Ly9zdHN0ZXN0Lmdvdi5iYy5jYS9hZGZzL3NlcnZpY2VzL3RydXN0IiwiaWF0IjoxNzIzNTA2MDM0LCJuYmYiOjE3MjM1MDYwMzQsImV4cCI6MTcyMzUwOTYzNCwidXBuIjoic3BkX29zYWRAZ292LmJjLmNhIiwidW5pcXVlX25hbWUiOiJJRElSXFxTUERfT1NBRCIsImFwcHR5cGUiOiJDb25maWRlbnRpYWwiLCJhcHBpZCI6IjAxNzRiMjAzLWNkY2YtNDE2NC04NTMyLTBhNGM0ZmRmZGY2MiIsImF1dGhtZXRob2QiOiJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YWM6Y2xhc3NlczpQYXNzd29yZFByb3RlY3RlZFRyYW5zcG9ydCIsImF1dGhfdGltZSI6IjIwMjQtMDgtMTJUMjM6NDA6MzQuMjQ3WiIsInZlciI6IjEuMCIsInNjcCI6Im9wZW5pZCJ9.XeGJBZISQhbCt4KuEyot-Kt25LVoLC2ASRyO8aZfVFInBjsVhrfAkKDecUws4ihUqeN3wTrO8ZI5qI8M1TMo_tOM2UFw0_WprlcC0Tm4-LdcKXOo1TOeSNQvVoej9OaXmW07yCZDvoEMhj64lCcZln74K_GrwHksfF4QMfyV9hgq7VTvGWaidOAq96kz1_FHLXH1jCixRiaFVqMAP9f3KfN0Pxwb6gu7-wHcMDdm-OVXP0DjaXCLpiRROLwZTJigkNCoVWhIhn-qC1R9z-ccRmDUs_tokwWMqKpZNHmnRwX3O2RlRBkD3_-y39DPh1we03aiFykkS9ClHtthDtD87w",
+    "CustomHttpHeaders": "Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ims0Y3BkRmdybU0yMHJhcThYVVRxMVlpaXNISSIsImtpZCI6Ims0Y3BkRmdybU0yMHJhcThYVVRxMVlpaXNISSJ9.eyJhdWQiOiJodHRwczovL3NwZC1zcGFyYy5kZXYuamFnLmdvdi5iYy5jYS9hcGkvZGF0YS92OS4wLyIsImlzcyI6Imh0dHA6Ly9zdHN0ZXN0Lmdvdi5iYy5jYS9hZGZzL3NlcnZpY2VzL3RydXN0IiwiaWF0IjoxNzI0NDM3MzYyLCJuYmYiOjE3MjQ0MzczNjIsImV4cCI6MTcyNDQ0MDk2MiwidXBuIjoic3BkX29zYWRAZ292LmJjLmNhIiwidW5pcXVlX25hbWUiOiJJRElSXFxTUERfT1NBRCIsImFwcHR5cGUiOiJDb25maWRlbnRpYWwiLCJhcHBpZCI6IjAxNzRiMjAzLWNkY2YtNDE2NC04NTMyLTBhNGM0ZmRmZGY2MiIsImF1dGhtZXRob2QiOiJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YWM6Y2xhc3NlczpQYXNzd29yZFByb3RlY3RlZFRyYW5zcG9ydCIsImF1dGhfdGltZSI6IjIwMjQtMDgtMjNUMTg6MjI6NDIuNzA4WiIsInZlciI6IjEuMCIsInNjcCI6Im9wZW5pZCJ9.HpCzkP5zAnCgcgEIeVuJgxQn8YWtA2CMoG-7TS4pq55aVyLtM56IxXfCEqYzzLxrOfZh3Md9nhNa_XI6iBFR3-1Ft3J1zY8_iGIKJGwOAUdw0y7WzG2FQvIyYG6wNoUQKV7t47QDK8lu6wtiTGcX61PSGp3dMQipHuhwhyxjHpnna3ALb79KA8OxpjBr-vgv3Nf386ZquZ_K5hd0i_BF6gKVYIStzBz4Yh0DGuMPDzYJsjCX-2TBPah9sDYmcziq-Ok3QBKRxyugT4ntL-7uRtRCz8lmhDX1ED7sGYe_yCxtmJ0AbtNBV0dlTe_6M60rHarWQrlox2aguhAMJjrT8Q",
     "IncludeWebProxy": false,
     "WebProxyHost": null,
     "IncludeWebProxyNetworkCredentials": false,