refactor resource

src/Spd.Engine.Search/Mappings.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using Spd.Resource.Applicants.Application;
+using Spd.Resource.Repository.Application;
 
 namespace Spd.Engine.Search;
 internal class Mappings : Profile

src/Spd.Engine.Search/SearchEngine.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
-using Spd.Resource.Applicants.Application;
-using Spd.Resource.Organizations.Identity;
-using Spd.Resource.Organizations.Org;
-using Spd.Resource.Organizations.Registration;
+using Spd.Resource.Repository;
+using Spd.Resource.Repository.Application;
+using Spd.Resource.Repository.Identity;
+using Spd.Resource.Repository.Org;
+using Spd.Resource.Repository.Registration;
 using Spd.Utilities.Shared;
-using Spd.Utilities.Shared.ResourceContracts;
 
 namespace Spd.Engine.Search
 {

src/Spd.Engine.Search/Spd.Engine.Search.csproj

@@ -6,8 +6,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Spd.Manager.Shared\Spd.Manager.Shared.csproj" />
-    <ProjectReference Include="..\Spd.Resource.Applicants\Spd.Resource.Applicants.csproj" />
-    <ProjectReference Include="..\Spd.Resource.Organizations\Spd.Resource.Organizations.csproj" />
+    <ProjectReference Include="..\Spd.Resource.Repository\Spd.Resource.Repository.csproj" />
   </ItemGroup>
 
 </Project>

src/Spd.Engine.Validation/Spd.Engine.Validation.csproj

@@ -5,6 +5,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Spd.Resource.Repository\Spd.Resource.Repository.csproj" />
     <ProjectReference Include="..\Spd.Utilities.Dynamics\Spd.Utilities.Dynamics.csproj" />
     <ProjectReference Include="..\Spd.Utilities.Hosting\Spd.Utilities.Hosting.csproj" />
   </ItemGroup>

src/Spd.Manager.Common/Admin/AdminManager.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using MediatR;
-using Spd.Resource.Organizations.Config;
-using Spd.Resource.Organizations.Org;
+using Spd.Resource.Repository.Config;
+using Spd.Resource.Repository.Org;
 using Spd.Utilities.Address;
 using Spd.Utilities.Shared;
 

src/Spd.Manager.Common/Admin/Mappings.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using Spd.Resource.Organizations.Org;
+using Spd.Resource.Repository.Org;
 using Spd.Utilities.Address;
 
 namespace Spd.Manager.Common.Admin

src/Spd.Manager.Common/Spd.Manager.Common.csproj

@@ -6,8 +6,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Spd.Resource.Applicants\Spd.Resource.Applicants.csproj" />
-    <ProjectReference Include="..\Spd.Resource.Organizations\Spd.Resource.Organizations.csproj" />
+    <ProjectReference Include="..\Spd.Resource.Repository\Spd.Resource.Repository.csproj" />
     <ProjectReference Include="..\Spd.Utilities.Address\Spd.Utilities.Address.csproj" />
     <ProjectReference Include="..\Spd.Utilities.Payment\Spd.Utilities.Payment.csproj" />
     <ProjectReference Include="..\Spd.Utilities.Shared\Spd.Utilities.Shared.csproj" />

src/Spd.Manager.Licence/FeeManager.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
 using MediatR;
 using Microsoft.Extensions.Logging;
-using Spd.Resource.Applicants.LicenceApplication;
-using Spd.Resource.Applicants.LicenceFee;
+using Spd.Resource.Repository.LicenceApplication;
+using Spd.Resource.Repository.LicenceFee;
 
 namespace Spd.Manager.Licence;
 internal class FeeManager :

src/Spd.Manager.Licence/LicenceManager.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using MediatR;
 using Microsoft.Extensions.Logging;
-using Spd.Resource.Applicants.Licence;
+using Spd.Resource.Repository.Licence;
 
 namespace Spd.Manager.Licence;
 

src/Spd.Manager.Licence/Mappings.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
-using Spd.Resource.Applicants.Application;
-using Spd.Resource.Applicants.Contact;
-using Spd.Resource.Applicants.Document;
-using Spd.Resource.Applicants.Licence;
-using Spd.Resource.Applicants.LicenceApplication;
-using Spd.Resource.Applicants.LicenceFee;
-using Spd.Utilities.Shared.ResourceContracts;
+using Spd.Resource.Repository;
+using Spd.Resource.Repository.Application;
+using Spd.Resource.Repository.Contact;
+using Spd.Resource.Repository.Document;
+using Spd.Resource.Repository.Licence;
+using Spd.Resource.Repository.LicenceApplication;
+using Spd.Resource.Repository.LicenceFee;
 using System.Collections.Immutable;
 
 namespace Spd.Manager.Licence;
@@ -52,19 +52,19 @@ public Mappings()
         CreateMap<LicAppFileInfo, CreateDocumentCmd>()
             .ForMember(d => d.DocumentType, opt => opt.MapFrom(s => GetDocumentType1Enum(s.LicenceDocumentTypeCode)))
             .ForMember(d => d.DocumentType2, opt => opt.MapFrom(s => GetDocumentType2Enum(s.LicenceDocumentTypeCode)));
-        CreateMap<Alias, Spd.Utilities.Shared.ResourceContracts.Alias>()
+        CreateMap<Alias, Spd.Resource.Repository.Alias>()
             .ReverseMap();
         CreateMap<LicenceAppListResp, WorkerLicenceAppListResponse>();
         CreateMap<WorkerLicenceAppAnonymousSubmitRequest, SaveLicenceApplicationCmd>()
-            .ForMember(d => d.CategoryCodes, opt => opt.MapFrom(s => GetCategories(s.CategoryCodes.ToArray())));
+            .ForMember(d => d.CategoryCodes, opt => opt.MapFrom(s => GetCategories(s.CategoryCodes)));
         CreateMap<WorkerLicenceAppAnonymousSubmitRequestJson, SaveLicenceApplicationCmd>()
             .ForMember(d => d.CategoryCodes, opt => opt.MapFrom(s => GetCategories(s.CategoryCodes)));
         CreateMap<UploadFileRequest, SpdTempFile>()
             .ForMember(d => d.TempFilePath, opt => opt.MapFrom(s => s.FilePath));
         CreateMap<LicAppFileInfo, SpdTempFile>();
     }
 
-    private static WorkerCategoryTypeEnum[] GetCategories(WorkerCategoryTypeCode[] codes)
+    private static WorkerCategoryTypeEnum[] GetCategories(IEnumerable<WorkerCategoryTypeCode> codes)
     {
         List<WorkerCategoryTypeEnum> categories = new List<WorkerCategoryTypeEnum> { };
         foreach (WorkerCategoryTypeCode code in codes)

src/Spd.Manager.Licence/PersonalLicenceAppContract.cs

@@ -65,12 +65,12 @@ public abstract record WorkerLicenceAppBase
     public GenderCode? GenderCode { get; set; }
     public bool? OneLegalName { get; set; }
     public string? ExpiredLicenceNumber { get; set; }
-    public Guid? ExpiredLicenceId { get; set; } = null;//for new application type, for renew, replace, update, it should be null.
-    public bool? HasExpiredLicence { get; set; } = null; //for new application type
+    public Guid? ExpiredLicenceId { get; set; } //for new application type, for renew, replace, update, it should be null.
+    public bool? HasExpiredLicence { get; set; }  //for new application type
     public LicenceTermCode? LicenceTermCode { get; set; }
     public bool? HasCriminalHistory { get; set; }
     public bool? HasPreviousName { get; set; }
-    public Alias[]? Aliases { get; set; }
+    public IEnumerable<Alias>? Aliases { get; set; }
     public bool? HasBcDriversLicence { get; set; }
     public string? BcDriversLicenceNumber { get; set; }
     public HairColourCode? HairColourCode { get; set; }
@@ -96,6 +96,7 @@ public abstract record WorkerLicenceAppBase
     public bool? IsDogsPurposeDetectionExplosives { get; set; }
     public bool? IsCanadianCitizen { get; set; }
     public bool? AgreeToCompleteAndAccurate { get; set; }
+    public IEnumerable<WorkerCategoryTypeCode> CategoryCodes { get; set; } = Array.Empty<WorkerCategoryTypeCode>();
 }
 
 public record DocumentExpiredInfo
@@ -118,8 +119,7 @@ public record WorkerLicenceResponse : WorkerLicenceAppBase
     public DateOnly? ExpiryDate { get; set; }
     public string? CaseNumber { get; set; }
     public ApplicationPortalStatusCode? ApplicationPortalStatus { get; set; }
-    public WorkerCategoryTypeCode[] CategoryCodes { get; set; } = Array.Empty<WorkerCategoryTypeCode>();
-    public Document[]? DocumentInfos { get; set; }
+    public IEnumerable<Document> DocumentInfos { get; set; } = Enumerable.Empty<Document>();
 }
 
 public record WorkerLicenceAppListResponse
@@ -129,15 +129,14 @@ public record WorkerLicenceAppListResponse
     public DateTimeOffset CreatedOn { get; set; }
     public DateTimeOffset? SubmittedOn { get; set; }
     public ApplicationTypeCode ApplicationTypeCode { get; set; }
-    public string CaseNumber { get; set; }
+    public string CaseNumber { get; set; } = null!;
     public ApplicationPortalStatusCode ApplicationPortalStatusCode { get; set; }
 }
 #endregion
 
 #region authenticated user
 public record WorkerLicenceAppUpsertRequest : WorkerLicenceAppBase
 {
-    public WorkerCategoryTypeCode[] CategoryCodes { get; set; } = Array.Empty<WorkerCategoryTypeCode>();
     public Document[]? DocumentInfos { get; set; }
     public Guid? LicenceAppId { get; set; }
 };
@@ -155,17 +154,15 @@ public record WorkerLicenceAppUpsertResponse
 //for anonymous user, deprecated
 public record WorkerLicenceAppAnonymousSubmitRequest : WorkerLicenceAppBase 
 {
-    public IEnumerable<WorkerCategoryTypeCode> CategoryCodes { get; set; } = Array.Empty<WorkerCategoryTypeCode>();
     public IEnumerable<DocumentExpiredInfo> DocumentExpiredInfos { get; set; } = Array.Empty<DocumentExpiredInfo>();
     public string Recaptcha { get; set; } = null!;
 }
 
 public record WorkerLicenceAppAnonymousSubmitRequestJson : WorkerLicenceAppBase //for anonymous user
 {
-    public WorkerCategoryTypeCode[] CategoryCodes { get; set; } = Array.Empty<WorkerCategoryTypeCode>();
-    public DocumentExpiredInfo[]? DocumentExpiredInfos { get; set; }
-    public Guid[]? DocumentKeyCodes { get; set; }
-    public Guid[]? PreviousDocumentIds { get; set; } //documentUrlId, used for renew
+    public IEnumerable<DocumentExpiredInfo> DocumentExpiredInfos { get; set; } = Enumerable.Empty<DocumentExpiredInfo>();
+    public IEnumerable<Guid>? DocumentKeyCodes { get; set; }
+    public IEnumerable<Guid>? PreviousDocumentIds { get; set; } //documentUrlId, used for renew
     public Guid? OriginalApplicationId { get; set; } //for new, it should be null. for renew, replace, update, it should be original application id. 
     public Guid? OriginalLicenceId { get; set; } //for new, it should be null. for renew, replace, update, it should be original licence id. 
     public bool? Reprint { get; set; }
@@ -178,7 +175,7 @@ public record WorkerLicenceCreateResponse
 
 public record LicenceAppDocumentsCache
 {
-    public List<LicAppFileInfo> Items { get; set; } = new List<LicAppFileInfo>();
+    public IEnumerable<LicAppFileInfo> Items { get; set; } = Enumerable.Empty<LicAppFileInfo>();
 }
 public record LicAppFileInfo
 {

src/Spd.Manager.Licence/PersonalLicenceAppManager.Document.cs

@@ -1,6 +1,6 @@
-using Spd.Resource.Applicants.Application;
-using Spd.Resource.Applicants.Document;
-using Spd.Resource.Applicants.LicenceApplication;
+using Spd.Resource.Repository.Application;
+using Spd.Resource.Repository.Document;
+using Spd.Resource.Repository.LicenceApplication;
 using Spd.Utilities.TempFileStorage;
 
 namespace Spd.Manager.Licence;

src/Spd.Manager.Licence/PersonalLicenceAppManager.cs

@@ -2,14 +2,14 @@
 using MediatR;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
-using Spd.Resource.Applicants.Application;
-using Spd.Resource.Applicants.Contact;
-using Spd.Resource.Applicants.Document;
-using Spd.Resource.Applicants.Licence;
-using Spd.Resource.Applicants.LicenceApplication;
-using Spd.Resource.Applicants.LicenceFee;
-using Spd.Resource.Applicants.Tasks;
-using Spd.Resource.Organizations.Identity;
+using Spd.Resource.Repository.Application;
+using Spd.Resource.Repository.Contact;
+using Spd.Resource.Repository.Document;
+using Spd.Resource.Repository.Licence;
+using Spd.Resource.Repository.LicenceApplication;
+using Spd.Resource.Repository.LicenceFee;
+using Spd.Resource.Repository.Tasks;
+using Spd.Resource.Repository.Identity;
 using Spd.Utilities.Cache;
 using Spd.Utilities.Dynamics;
 using Spd.Utilities.Shared.Exceptions;
@@ -73,7 +73,7 @@ public PersonalLicenceAppManager(
     public async Task<WorkerLicenceAppUpsertResponse> Handle(WorkerLicenceUpsertCommand cmd, CancellationToken ct)
     {
         _logger.LogDebug($"manager get WorkerLicenceUpsertCommand={cmd}");
-        var identityResult = await _identityRepository.Query(new IdentityQry(cmd.BcscGuid, null, Resource.Organizations.Registration.IdentityProviderTypeEnum.BcServicesCard), ct);
+        var identityResult = await _identityRepository.Query(new IdentityQry(cmd.BcscGuid, null, Resource.Repository.Registration.IdentityProviderTypeEnum.BcServicesCard), ct);
         if (identityResult.Items.Any())
         {
             Guid contactId = (Guid)identityResult.Items.First().ContactId;
@@ -253,7 +253,7 @@ public async Task<WorkerLicenceAppUpsertResponse> Handle(AnonymousWorkerLicenceA
         await UploadNewDocs(request, response.LicenceAppId, response.ContactId, ct);
 
         //copying all old files to new application in PreviousFileIds 
-        if (cmd.LicenceAnonymousRequest.PreviousDocumentIds != null && cmd.LicenceAnonymousRequest.PreviousDocumentIds.Length != 0)
+        if (cmd.LicenceAnonymousRequest.PreviousDocumentIds != null && cmd.LicenceAnonymousRequest.PreviousDocumentIds.Any())
         {
             foreach (var docUrlId in cmd.LicenceAnonymousRequest.PreviousDocumentIds)
             {
@@ -413,7 +413,7 @@ private async Task<ChangeSpec> GetChanges(LicenceApplicationResp originalApp, Wo
     {
         ChangeSpec changes = new ChangeSpec();
         //categories changed
-        if (newApp.CategoryCodes.Length != originalApp.CategoryCodes.Length)
+        if (newApp.CategoryCodes.Count() != originalApp.CategoryCodes.Length)
             changes.CategoriesChanged = true;
         else
         {
@@ -437,7 +437,6 @@ private async Task<ChangeSpec> GetChanges(LicenceApplicationResp originalApp, Wo
         IEnumerable<LicAppFileInfo> items = await GetAllNewDocsInfo(newApp.DocumentKeyCodes, ct);
 
         //PeaceOfficerStatusChanged
-
         PoliceOfficerRoleCode? originalRoleCode = originalApp.PoliceOfficerRoleCode == null ? null
             : Enum.Parse<PoliceOfficerRoleCode>(originalApp.PoliceOfficerRoleCode.ToString());
 
@@ -465,7 +464,7 @@ private async Task<ChangeSpec> GetChanges(LicenceApplicationResp originalApp, Wo
     }
     private async Task UploadNewDocs(WorkerLicenceAppAnonymousSubmitRequestJson request, Guid licenceAppId, Guid contactId, CancellationToken ct)
     {
-        if (request.DocumentKeyCodes != null && request.DocumentKeyCodes.Length > 0)
+        if (request.DocumentKeyCodes != null && request.DocumentKeyCodes.Any())
         {
             IEnumerable<LicAppFileInfo> items = await GetAllNewDocsInfo(request.DocumentKeyCodes, ct);
 

src/Spd.Manager.Licence/PersonalLicenceAppValidation.cs

@@ -1,6 +1,6 @@
 using FluentValidation;
 using Microsoft.Extensions.Configuration;
-using Spd.Resource.Applicants.Document;
+using Spd.Resource.Repository.Document;
 using Spd.Utilities.Shared.Exceptions;
 
 namespace Spd.Manager.Licence;
@@ -288,7 +288,7 @@ public class WorkerLicenceAppAnonymousSubmitRequestJsonValidator : WorkerLicence
     public WorkerLicenceAppAnonymousSubmitRequestJsonValidator(IConfiguration configuration)
     {
         //category
-        RuleFor(r => r.CategoryCodes).NotEmpty().Must(d => d.Length > 0 && d.Length < 7);
+        RuleFor(r => r.CategoryCodes).NotEmpty().Must(d => d.Any() && d.Count() < 7);
         var invalidCategoryMatrix = configuration.GetSection("InvalidWorkerLicenceCategoryMatrix").Get<Dictionary<WorkerCategoryTypeCode, List<WorkerCategoryTypeCode>>>();
         if (invalidCategoryMatrix == null)
             throw new ApiException(System.Net.HttpStatusCode.InternalServerError, "missing configuration for invalid worker licence category matrix");

src/Spd.Manager.Licence/Spd.Manager.Licence.csproj

@@ -8,8 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Spd.Manager.Shared\Spd.Manager.Shared.csproj" />
-    <ProjectReference Include="..\Spd.Resource.Applicants\Spd.Resource.Applicants.csproj" />
-    <ProjectReference Include="..\Spd.Resource.Organizations\Spd.Resource.Organizations.csproj" />
+    <ProjectReference Include="..\Spd.Resource.Repository\Spd.Resource.Repository.csproj" />
     <ProjectReference Include="..\Spd.Utilities.Cache\Spd.Utilities.Cache.csproj" />
     <ProjectReference Include="..\Spd.Utilities.LogonUser\Spd.Utilities.LogonUser.csproj" />
   </ItemGroup>

src/Spd.Manager.Licence/UserProfileManager.cs

@@ -2,13 +2,13 @@
 using MediatR;
 using Microsoft.Extensions.Logging;
 using Spd.Manager.Shared;
-using Spd.Resource.Applicants.Application;
-using Spd.Resource.Applicants.Contact;
-using Spd.Resource.Applicants.PortalUser;
-using Spd.Resource.Organizations.Identity;
-using Spd.Resource.Organizations.Org;
-using Spd.Resource.Organizations.Registration;
-using Spd.Resource.Organizations.User;
+using Spd.Resource.Repository.Application;
+using Spd.Resource.Repository.Contact;
+using Spd.Resource.Repository.PortalUser;
+using Spd.Resource.Repository.Identity;
+using Spd.Resource.Repository.Org;
+using Spd.Resource.Repository.Registration;
+using Spd.Resource.Repository.User;
 
 namespace Spd.Manager.Licence
 {

src/Spd.Manager.Licence/UserProfileMappings.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
-using Spd.Resource.Applicants.Contact;
-using Spd.Resource.Organizations.Identity;
-using Spd.Resource.Organizations.Org;
-using Spd.Resource.Organizations.User;
-using Spd.Utilities.Shared.ResourceContracts;
+using Spd.Resource.Repository;
+using Spd.Resource.Repository.Contact;
+using Spd.Resource.Repository.Identity;
+using Spd.Resource.Repository.Org;
+using Spd.Resource.Repository.User;
 
 namespace Spd.Manager.Licence
 {

src/Spd.Manager.Payment/Mappings.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
-using Spd.Resource.Applicants.Invoice;
-using Spd.Resource.Applicants.Payment;
+using Spd.Resource.Repository.Invoice;
+using Spd.Resource.Repository.Payment;
 using Spd.Utilities.Payment;
 
 namespace Spd.Manager.Payment

src/Spd.Manager.Payment/PaymentManager.cs

@@ -7,20 +7,20 @@
 using Polly;
 using Polly.Retry;
 using Spd.Manager.Shared;
-using Spd.Resource.Applicants.Application;
-using Spd.Resource.Applicants.Document;
-using Spd.Resource.Applicants.DocumentTemplate;
-using Spd.Resource.Applicants.Invoice;
-using Spd.Resource.Applicants.LicenceApplication;
-using Spd.Resource.Applicants.LicenceFee;
-using Spd.Resource.Applicants.Payment;
-using Spd.Resource.Organizations.Config;
+using Spd.Resource.Repository;
+using Spd.Resource.Repository.Application;
+using Spd.Resource.Repository.Config;
+using Spd.Resource.Repository.Document;
+using Spd.Resource.Repository.DocumentTemplate;
+using Spd.Resource.Repository.Invoice;
+using Spd.Resource.Repository.LicenceApplication;
+using Spd.Resource.Repository.LicenceFee;
+using Spd.Resource.Repository.Payment;
 using Spd.Utilities.Cache;
 using Spd.Utilities.FileStorage;
 using Spd.Utilities.Payment;
 using Spd.Utilities.Shared;
 using Spd.Utilities.Shared.Exceptions;
-using Spd.Utilities.Shared.ResourceContracts;
 using System.Net;
 
 namespace Spd.Manager.Payment

src/Spd.Manager.Payment/Spd.Manager.Payment.csproj

@@ -13,8 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Spd.Manager.Shared\Spd.Manager.Shared.csproj" />
-    <ProjectReference Include="..\Spd.Resource.Applicants\Spd.Resource.Applicants.csproj" />
-    <ProjectReference Include="..\Spd.Resource.Organizations\Spd.Resource.Organizations.csproj" />
+    <ProjectReference Include="..\Spd.Resource.Repository\Spd.Resource.Repository.csproj" />
     <ProjectReference Include="..\Spd.Utilities.FileStorage\Spd.Utilities.FileStorage.csproj" />
     <ProjectReference Include="..\Spd.Utilities.Payment\Spd.Utilities.Payment.csproj" />
   </ItemGroup>