Emad/populate licence fee lic apps

src/Spd.Manager.Licence/ControllingMemberCrcAppManager.cs

@@ -93,7 +93,7 @@ public async Task<ControllingMemberCrcAppCommandResponse> Handle(ControllingMemb
             await _controllingMemberCrcRepository.GetCrcApplicationAsync((Guid)cmd.ControllingMemberCrcAppRequest.ControllingMemberAppId, ct);
 
         ChangeSpec changes = await AddDynamicTasks(originalApp, request, cmd.LicAppFileInfos, ct);
-        
+
         //update application
         var response = await _controllingMemberCrcRepository.SaveControllingMemberCrcApplicationAsync(saveCmd, ct);
 
@@ -112,7 +112,7 @@ await UploadNewDocsAsync(request.DocumentExpiredInfos,
             null,
             null,
             ct);
-        await _licAppRepository.CommitLicenceApplicationAsync(response.ControllingMemberAppId, ApplicationStatusEnum.Submitted, ct);
+        await _licAppRepository.CommitLicenceApplicationAsync(response.ControllingMemberAppId, ApplicationStatusEnum.Submitted, null, ct);
         return _mapper.Map<ControllingMemberCrcAppCommandResponse>(response);
     }
     #region anonymous new
@@ -128,7 +128,7 @@ await ValidateInviteIdAsync(cmd.ControllingMemberCrcAppSubmitRequest.InviteId,
         //create contact for applicant
         CreateContactCmd contactCmd = _mapper.Map<CreateContactCmd>(request);
         ContactResp contact = await _contactRepository.ManageAsync(contactCmd, ct);
-       
+
         //save the application
         SaveControllingMemberCrcAppCmd createApp = _mapper.Map<SaveControllingMemberCrcAppCmd>(request);
         createApp.ContactId = contact.Id;
@@ -139,7 +139,7 @@ await ValidateInviteIdAsync(cmd.ControllingMemberCrcAppSubmitRequest.InviteId,
         await UploadNewDocsAsync(request.DocumentExpiredInfos, cmd.LicAppFileInfos, response.ControllingMemberAppId, response.ContactId, null, null, null, null, null, ct);
 
         //commit app
-        await _licAppRepository.CommitLicenceApplicationAsync(response.ControllingMemberAppId, ApplicationStatusEnum.Submitted, ct);
+        await _licAppRepository.CommitLicenceApplicationAsync(response.ControllingMemberAppId, ApplicationStatusEnum.Submitted, null, ct);
         await DeactiveInviteAsync(cmd.ControllingMemberCrcAppSubmitRequest.InviteId, ct);
 
         return _mapper.Map<ControllingMemberCrcAppCommandResponse>(response);
@@ -169,7 +169,7 @@ public async Task<ControllingMemberCrcAppCommandResponse> Handle(ControllingMemb
         var response = await this.Handle((ControllingMemberCrcUpsertCommand)cmd, ct);
         //move files from transient bucket to main bucket when app status changed to Submitted.
         await MoveFilesAsync(response.ControllingMemberAppId, ct);
-        await _licAppRepository.CommitLicenceApplicationAsync(response.ControllingMemberAppId, ApplicationStatusEnum.Submitted, ct);
+        await _licAppRepository.CommitLicenceApplicationAsync(response.ControllingMemberAppId, ApplicationStatusEnum.Submitted, null, ct);
         await DeactiveInviteAsync(cmd.ControllingMemberCrcAppUpsertRequest.InviteId, ct);
         return new ControllingMemberCrcAppCommandResponse { ControllingMemberAppId = response.ControllingMemberAppId };
     }
@@ -362,5 +362,5 @@ private static void ValidateFilesForUpdateAppAsync(ControllingMemberCrcAppUpdate
             throw new ApiException(HttpStatusCode.BadRequest, "Missing ProofOfFingerprint file.");
         }
     }
-    
+
 }

src/Spd.Manager.Licence/LicenceAppManagerBase.cs

@@ -50,18 +50,20 @@ protected async Task<decimal> CommitApplicationAsync(LicenceAppBase licAppBase,
             WorkerLicenceTypeEnum = licAppBase.WorkerLicenceTypeCode == null ? null : Enum.Parse<WorkerLicenceTypeEnum>(licAppBase.WorkerLicenceTypeCode.ToString()),
             HasValidSwl90DayLicence = HasSwl90DayLicence
         }, ct);
-        if (price?.LicenceFees.FirstOrDefault() == null || price?.LicenceFees.FirstOrDefault()?.Amount == 0)
+        LicenceFeeResp? licenceFee = price?.LicenceFees.FirstOrDefault();
+        if (licenceFee == null || licenceFee.Amount == 0)
         {
-            if (companionAppId != null) await _licAppRepository.CommitLicenceApplicationAsync((Guid)companionAppId, ApplicationStatusEnum.Submitted, ct);
-            await _licAppRepository.CommitLicenceApplicationAsync(licenceAppId, ApplicationStatusEnum.Submitted, ct);
+            if (companionAppId != null) await _licAppRepository.CommitLicenceApplicationAsync((Guid)companionAppId, ApplicationStatusEnum.Submitted, null, ct);
+            await _licAppRepository.CommitLicenceApplicationAsync(licenceAppId, ApplicationStatusEnum.Submitted, null, ct);
         }
         else
         {
-            if (companionAppId != null) await _licAppRepository.CommitLicenceApplicationAsync((Guid)companionAppId, ApplicationStatusEnum.PaymentPending, ct);
-            await _licAppRepository.CommitLicenceApplicationAsync(licenceAppId, ApplicationStatusEnum.PaymentPending, ct);
+            //companionAppId is the swl for sole proprietor which the business would pay for it, therefore the licence fee should be null here.
+            if (companionAppId != null) await _licAppRepository.CommitLicenceApplicationAsync((Guid)companionAppId, ApplicationStatusEnum.PaymentPending, null, ct);
+            await _licAppRepository.CommitLicenceApplicationAsync(licenceAppId, ApplicationStatusEnum.PaymentPending, licenceFee.Amount, ct);
         }
 
-        return price?.LicenceFees.FirstOrDefault()?.Amount ?? 0;
+        return licenceFee?.Amount ?? 0;
     }
 
     //upload file from cache to main bucket

src/Spd.Resource.Repository.IntegrationTest/LicAppRepositoryTest.cs

@@ -38,7 +38,7 @@ public async Task CommitLicenceApplicationAsync_ForApplicant_Run_Correctly()
         await _context.SaveChangesAsync();
 
         // Action
-        LicenceApplicationCmdResp? resp = await _licAppRepository.CommitLicenceApplicationAsync(appId, ApplicationStatusEnum.Submitted, CancellationToken.None);
+        LicenceApplicationCmdResp? resp = await _licAppRepository.CommitLicenceApplicationAsync(appId, ApplicationStatusEnum.Submitted, null, CancellationToken.None);
 
         //Assert
         Assert.NotNull(resp);
@@ -65,7 +65,7 @@ public async Task CommitLicenceApplicationAsync_ForBusiness_Run_Correctly()
         await _context.SaveChangesAsync();
 
         // Action
-        LicenceApplicationCmdResp? resp = await _licAppRepository.CommitLicenceApplicationAsync(appId, ApplicationStatusEnum.Submitted, CancellationToken.None);
+        LicenceApplicationCmdResp? resp = await _licAppRepository.CommitLicenceApplicationAsync(appId, ApplicationStatusEnum.Submitted, null, CancellationToken.None);
 
         //Assert
         Assert.NotNull(resp);

src/Spd.Resource.Repository/LicApp/Contract.cs

@@ -6,7 +6,7 @@ public partial interface ILicAppRepository
 {
     public Task<IEnumerable<LicenceAppListResp>> QueryAsync(LicenceAppQuery qry, CancellationToken cancellationToken);
     //connect spd_application with spd_contact and update application to correct status
-    public Task<LicenceApplicationCmdResp> CommitLicenceApplicationAsync(Guid applicationId, ApplicationStatusEnum status, CancellationToken ct);
+    public Task<LicenceApplicationCmdResp> CommitLicenceApplicationAsync(Guid applicationId, ApplicationStatusEnum status, decimal? price, CancellationToken ct);
 }
 
 public record LicenceAppQuery(Guid? ApplicantId, Guid? BizId, List<WorkerLicenceTypeEnum>? ValidWorkerLicenceTypeCodes, List<ApplicationPortalStatusEnum>? ValidPortalStatus);

src/Spd.Resource.Repository/LicApp/LicAppRepository.cs

@@ -18,7 +18,7 @@ public LicAppRepository(IDynamicsContextFactory ctx, IMapper mapper)
     }
 
     //for unauth, set applcation status to submitted.
-    public async Task<LicenceApplicationCmdResp> CommitLicenceApplicationAsync(Guid applicationId, ApplicationStatusEnum status, CancellationToken ct)
+    public async Task<LicenceApplicationCmdResp> CommitLicenceApplicationAsync(Guid applicationId, ApplicationStatusEnum status, decimal? price, CancellationToken ct)
     {
         spd_application? app = await _context.GetApplicationById(applicationId, ct);
         if (app == null)
@@ -36,6 +36,8 @@ public async Task<LicenceApplicationCmdResp> CommitLicenceApplicationAsync(Guid
 
         app.spd_submittedon = DateTimeOffset.Now;
         app.spd_portalmodifiedon = DateTimeOffset.Now;
+        if (price is > 0)
+            app.spd_licencefee = price;
         _context.UpdateObject(app);
         await _context.SaveChangesAsync(ct);