remove cm from biz app payload (#1376)

# Description

This PR includes the following proposed change(s):

- we need to remove controlling member from biz lic app payload as we
separately deal with members

Author: peggy-quartech

src/Spd.Manager.Licence.UnitTest/BizLicAppValidationTest.cs

@@ -194,56 +194,6 @@ public void PrivateInvestigatorSwlInfo_WhenHasEmptyFields_ShouldThrowException()
         result.ShouldHaveValidationErrorFor(r => r.PrivateInvestigatorSwlInfo);
     }
 
-    [Fact]
-    public void ControllingMembers_WhenHasEmptyFields_ShouldThrowException()
-    {
-        BizLicAppUpsertRequestValidator validator = new BizLicAppUpsertRequestValidator();
-
-        var model = GenerateValidRequest<BizLicAppUpsertRequest>();
-
-        List<SwlContactInfo> swlControllingMembers = new() { new SwlContactInfo() };
-        List<NonSwlContactInfo> nonSwlControllingMembers = new() { new NonSwlContactInfo() };
-        List<SwlContactInfo> employees = new() { new SwlContactInfo() };
-        Members members = new()
-        {
-            SwlControllingMembers = swlControllingMembers,
-            NonSwlControllingMembers = nonSwlControllingMembers,
-            Employees = employees
-        };
-        model.Members = members;
-
-        var result = validator.TestValidate(model);
-        result.ShouldHaveValidationErrorFor(r => r.Members.SwlControllingMembers);
-        result.ShouldHaveValidationErrorFor(r => r.Members.NonSwlControllingMembers);
-        result.ShouldHaveValidationErrorFor(r => r.Members.Employees);
-    }
-
-    [Fact]
-    public void ControllingMembers_WhenExceedsMaxAllowed_ShouldThrowException()
-    {
-        BizLicAppUpsertRequestValidator validator = new BizLicAppUpsertRequestValidator();
-
-        var model = GenerateValidRequest<BizLicAppUpsertRequest>();
-        List<SwlContactInfo> swlControllingMembers = fixture.CreateMany<SwlContactInfo>(10).ToList();
-        List<NonSwlContactInfo> nonSwlControllingMembers = fixture.Build<NonSwlContactInfo>()
-            .With(c => c.EmailAddress, "test@test.com")
-            .CreateMany(11)
-            .ToList();
-        List<SwlContactInfo> employees = fixture.CreateMany<SwlContactInfo>(21).ToList();
-
-        Members members = new()
-        {
-            SwlControllingMembers = swlControllingMembers,
-            NonSwlControllingMembers = nonSwlControllingMembers,
-            Employees = employees
-        };
-        model.Members = members;
-
-        var result = validator.TestValidate(model);
-        result.ShouldHaveValidationErrorFor(r => r.Members);
-        result.ShouldHaveValidationErrorFor(r => r.Members.Employees);
-    }
-
     private T GenerateValidRequest<T>()
     {
         object model;
@@ -266,13 +216,6 @@ private T GenerateValidRequest<T>()
         List<NonSwlContactInfo> nonSwlControllingMembers = new() { new NonSwlContactInfo() { Surname = "test", EmailAddress = "test@test.com" } };
         List<SwlContactInfo> employees = new() { new SwlContactInfo() { LicenceId = Guid.NewGuid() } };
 
-        Members members = new()
-        {
-            SwlControllingMembers = swlControllingMembers,
-            NonSwlControllingMembers = nonSwlControllingMembers,
-            Employees = employees
-        };
-
         if (typeof(T).Name == "BizLicAppUpsertRequest")
         {
             // Documents
@@ -297,7 +240,6 @@ private T GenerateValidRequest<T>()
                 .With(r => r.DocumentInfos, documentInfos)
                 .With(r => r.CategoryCodes, categories)
                 .With(r => r.ApplicantContactInfo, applicantContactInfo)
-                .With(r => r.Members, members)
                 .Create();
         }
         else
@@ -310,7 +252,6 @@ private T GenerateValidRequest<T>()
                 .With(r => r.NoBranding, false)
                 .With(r => r.CategoryCodes, categories)
                 .With(r => r.ApplicantContactInfo, applicantContactInfo)
-                .With(r => r.Members, members)
                 .Create();
         }
 

src/Spd.Manager.Licence.UnitTest/BizLicenceAppManagerTest.cs

@@ -156,7 +156,6 @@ public async void Handle_BizLicAppUpsertCommand_WithoutLicAppId_Return_BizLicApp
             WorkerLicenceTypeCode = WorkerLicenceTypeCode.SecurityWorkerLicence,
             BizId = bizId,
             DocumentInfos = new List<Document>() { workPermit },
-            Members = members
         };
 
         //Act
@@ -254,20 +253,12 @@ public async void Handle_BizLicAppSubmitCommand_WithoutLicAppId_Return_BizLicApp
             .With(d => d.LicenceDocumentTypeCode, LicenceDocumentTypeCode.WorkPermit)
             .Create();
 
-        Members members = new()
-        {
-            SwlControllingMembers = new List<SwlContactInfo>(),
-            NonSwlControllingMembers = new List<NonSwlContactInfo>(),
-            Employees = new List<SwlContactInfo>()
-        };
-
         BizLicAppUpsertRequest request = new()
         {
             LicenceAppId = null,
             WorkerLicenceTypeCode = WorkerLicenceTypeCode.SecurityWorkerLicence,
             BizId = bizId,
             DocumentInfos = new List<Document>() { workPermit },
-            Members = members
         };
 
         //Act

src/Spd.Manager.Licence/BizLicAppBaseValidation.cs

@@ -1,5 +1,4 @@
 using FluentValidation;
-using Microsoft.IdentityModel.Tokens;
 using System.Text.RegularExpressions;
 
 namespace Spd.Manager.Licence;
@@ -59,34 +58,5 @@ public BizLicAppBaseValidator()
                  r.BizTypeCode != BizTypeCode.NonRegisteredSoleProprietor &&
                  r.BizTypeCode != BizTypeCode.RegisteredSoleProprietor)
             .WithMessage("Missing private investigator information.");
-
-        // Controlling members
-        RuleFor(r => r.Members.SwlControllingMembers)
-            .ForEach(r => r
-                .Must(m => m.LicenceId != null && m.LicenceId != Guid.Empty))
-            .When(r => r.Members != null && r.Members.SwlControllingMembers != null)
-            .WithMessage("Missing licence Id in Controlling members (SWL)");
-
-        RuleFor(r => r.Members.NonSwlControllingMembers)
-            .ForEach(r => r
-                .Must(m => m.Surname.IsNullOrEmpty() != true)
-                .Must(m => m.EmailAddress != null ? emailRegex.IsMatch(m.EmailAddress) : true))
-                .WithMessage("Missing surname in Controlling members (not SWL)")
-            .When(r => r.Members != null && r.Members.NonSwlControllingMembers != null);
-
-        RuleFor(r => r.Members)
-            .Must(r => r.SwlControllingMembers.Count() + r.NonSwlControllingMembers.Count() <= 20)
-            .When(r => r.Members != null && r.Members.SwlControllingMembers != null && r.Members.NonSwlControllingMembers != null);
-
-        // Employees
-        RuleFor(r => r.Members.Employees)
-            .ForEach(r => r
-                .Must(m => m.LicenceId != null && m.LicenceId != Guid.Empty))
-            .When(r => r.Members != null && r.Members.Employees != null)
-            .WithMessage("Missing information in employees");
-        RuleFor(r => r.Members.Employees)
-            .Must(r => r.Count() <= 20)
-            .When(r => r.Members != null && r.Members.Employees != null)
-            .WithMessage("No more than 20 employees are allowed");
     }
 }

src/Spd.Manager.Licence/BizLicAppContract.cs

@@ -86,7 +86,6 @@ public abstract record BizLicenceApp : LicenceAppBase
 
     //non sole proprietor properties
     public ContactInfo? ApplicantContactInfo { get; set; }
-    public Members? Members { get; set; }
     public IEnumerable<WorkerCategoryTypeCode> CategoryCodes { get; set; } = Array.Empty<WorkerCategoryTypeCode>(); //todo: Matrix
     public PrivateInvestigatorSwlContactInfo? PrivateInvestigatorSwlInfo { get; set; } //it does not put into spd_businesscontact, so no id for it
     public bool? AgreeToCompleteAndAccurate { get; set; }

src/Spd.Manager.Licence/BizLicAppManager.cs

@@ -103,11 +103,6 @@ public async Task<BizLicAppCommandResponse> Handle(BizLicAppUpsertCommand cmd, C
         if (cmd.BizLicAppUpsertRequest.LicenceAppId == null)
             cmd.BizLicAppUpsertRequest.LicenceAppId = response.LicenceAppId;
 
-        if (cmd.BizLicAppUpsertRequest.Members != null && cmd.BizLicAppUpsertRequest.BizId != null)
-            await UpdateMembersAsync(cmd.BizLicAppUpsertRequest.Members,
-                cmd.BizLicAppUpsertRequest.BizId,
-                cancellationToken);
-
         if (cmd.BizLicAppUpsertRequest.DocumentInfos != null && cmd.BizLicAppUpsertRequest.DocumentInfos.Any())
             await UpdateDocumentsAsync(
                 (Guid)cmd.BizLicAppUpsertRequest.LicenceAppId,
@@ -151,12 +146,6 @@ public async Task<BizLicAppCommandResponse> Handle(BizLicAppReplaceCommand cmd,
 
         decimal cost = await CommitApplicationAsync(request, response.LicenceAppId, cancellationToken);
 
-        // Update members
-        if (cmd.LicenceRequest.Members != null)
-            await UpdateMembersAsync(cmd.LicenceRequest.Members,
-                (Guid)originalLic.BizId,
-                cancellationToken);
-
         return new BizLicAppCommandResponse { LicenceAppId = response.LicenceAppId, Cost = cost };
     }
 
@@ -197,12 +186,6 @@ await ValidateFilesForRenewUpdateAppAsync(cmd.LicenceRequest,
         createApp.UploadedDocumentEnums = GetUploadedDocumentEnums(cmd.LicAppFileInfos, existingFiles);
         BizLicApplicationCmdResp response = await _bizLicApplicationRepository.CreateBizLicApplicationAsync(createApp, cancellationToken);
 
-        // Update members
-        if (cmd.LicenceRequest.Members != null)
-            await UpdateMembersAsync(cmd.LicenceRequest.Members,
-                (Guid)originalBizLic.BizId,
-                cancellationToken);
-
         // Upload new files
         await UploadNewDocsAsync(null,
                 cmd.LicAppFileInfos,
@@ -290,12 +273,6 @@ await _documentRepository.ManageAsync(
             cost = await CommitApplicationAsync(request, response.LicenceAppId, cancellationToken);
         }
 
-        // Update members
-        if (cmd.LicenceRequest.Members != null)
-            await UpdateMembersAsync(cmd.LicenceRequest.Members,
-                (Guid)originalLicApp.BizId,
-                cancellationToken);
-
         return new BizLicAppCommandResponse { LicenceAppId = response?.LicenceAppId ?? originalLicApp.LicenceAppId, Cost = cost };
     }
 
@@ -544,24 +521,6 @@ private async Task<CreateBizLicApplicationCmd> SetBizManagerInfo(
         return createApp;
     }
 
-
-    //todo: if fe can make seperate call to members and application, then we can give all members related info to BizMemberManager, then this function
-    //can be removed.
-    private async Task<Unit> UpdateMembersAsync(Members members, Guid bizId, CancellationToken ct)
-    {
-        List<BizContactResp> contacts = _mapper.Map<List<BizContactResp>>(members.NonSwlControllingMembers);
-        contacts.AddRange(_mapper.Map<IList<BizContactResp>>(members.SwlControllingMembers));
-        IList<BizContactResp> employees = _mapper.Map<IList<BizContactResp>>(members.Employees);
-        foreach (var e in employees)
-        {
-            e.BizContactRoleCode = BizContactRoleEnum.Employee;
-        }
-        contacts.AddRange(employees);
-        BizContactUpsertCmd upsertCmd = new(bizId, contacts);
-        await _bizContactRepository.ManageBizContactsAsync(upsertCmd, ct);
-        return default;
-    }
-
     private sealed record ChangeSpec
     {
         public bool CategoriesChanged { get; set; }

src/Spd.Presentation.Licensing/Controllers/BizLicensingController.cs

@@ -49,8 +49,6 @@ public BizLicensingController(IPrincipal currentUser,
         public async Task<BizLicAppResponse> GetBizLicenceApplication([FromRoute][Required] Guid licenceAppId, CancellationToken ct)
         {
             BizLicAppResponse response = await _mediator.Send(new GetBizLicAppQuery(licenceAppId));
-            if (response.BizId != null)
-                response.Members = await _mediator.Send(new GetBizMembersQuery((Guid)response.BizId, null), ct);
             return response;
         }