Merge pull request #2205 from SkillsFundingAgency/CON-3854---Organisa…

…tion-can-be-deleted CON-3854 - Organisation can be deleted
SkillsFundingAgency · Sep 13, 2021 · 69465b7 · 69465b7
2 parents 9bf6c8e + b6fbecb
commit 69465b7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/...DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIRemoveALegalEntity.cs b/...DAS.EmployerAccounts.UnitTests/Commands/RemoveLegalEntityTests/WhenIRemoveALegalEntity.cs
@@ -114,7 +114,11 @@ public void Arrange()
                 {
                     new ApprenticeshipStatusSummary
                     {
-                        ActiveCount = 0,PausedCount = 0,PendingApprovalCount = 0,LegalEntityIdentifier = _expectedAgreement.LegalEntityCode
+                        ActiveCount = 0,
+                        PausedCount = 0,
+                        PendingApprovalCount = 0,
+                        CompletedCount = 0,
+                        LegalEntityIdentifier = _expectedAgreement.LegalEntityCode
                     }
                 });
 
@@ -229,7 +233,27 @@ public async Task ThenTheAgreementIsCheckedToSeeIfItHasBeenSignedAndHasActiveCom
                 {
                     new ApprenticeshipStatusSummary
                     {
-                        ActiveCount = 1,PausedCount = 1,PendingApprovalCount = 1,LegalEntityIdentifier = _expectedAgreement.LegalEntityCode
+                        ActiveCount = 1,
+                        PausedCount = 1,
+                        PendingApprovalCount = 1,
+                        LegalEntityIdentifier = _expectedAgreement.LegalEntityCode
+                    }
+                });
+
+            Assert.ThrowsAsync<InvalidRequestException>(() => _handler.Handle(_command));
+        }
+
+        [Test]
+        public async Task ThenTheAgreementIsCheckedToSeeIfItHasBeenSignedAndHasWithdrawnCommitments()
+        {
+            _commitmentsApi
+                .Setup(x => x.GetEmployerAccountSummary(ExpectedAccountId))
+                .ReturnsAsync(new List<ApprenticeshipStatusSummary>
+                {
+                    new ApprenticeshipStatusSummary
+                    {
+                        WithdrawnCount = 1,
+                        LegalEntityIdentifier = _expectedAgreement.LegalEntityCode
                     }
                 });
 

diff --git a/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs b/src/SFA.DAS.EmployerAccounts/Commands/RemoveLegalEntity/RemoveLegalEntityCommandHandler.cs
@@ -125,7 +125,7 @@ private async Task ValidateLegalEntityHasNoCommitments(EmployerAgreementView agr
                 && c.LegalEntityIdentifier.Equals(agreement.LegalEntityCode)
                 && c.LegalEntityOrganisationType == agreement.LegalEntitySource);
 
-            if (commitment != null && (commitment.ActiveCount + commitment.PausedCount + commitment.PendingApprovalCount) != 0)
+            if (commitment != null && (commitment.ActiveCount + commitment.PausedCount + commitment.PendingApprovalCount + commitment.WithdrawnCount) != 0)
             {
                 validationResult.AddError(nameof(agreement.HashedAgreementId), "Agreement has already been signed and has active commitments");
                 throw new InvalidRequestException(validationResult.ValidationDictionary);

diff --git a/src/SFA.DAS.EmployerAccounts/DependencyResolution/HashingRegistry.cs b/src/SFA.DAS.EmployerAccounts/DependencyResolution/HashingRegistry.cs
@@ -30,7 +30,7 @@ public HashingRegistry()
                 .Ctor<IHashingService>()
                 .Is(c =>
                     new HashingService.HashingService(
-                        c.GetInstance<EmployerAccountsConfiguration>() .PublicAllowedAccountLegalEntityHashstringCharacters,
+                        c.GetInstance<EmployerAccountsConfiguration>().PublicAllowedAccountLegalEntityHashstringCharacters,
                         c.GetInstance<EmployerAccountsConfiguration>().PublicAllowedAccountLegalEntityHashstringSalt));
 
         }

diff --git a/...erAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveQueryHandler.cs b/...erAccounts/Queries/GetAccountLegalEntityRemove/GetAccountLegalEntityRemoveQueryHandler.cs
@@ -84,6 +84,7 @@ private async Task<bool> SetRemovedStatusBasedOnCommitments(long accountId, Acco
 
             return commitmentConnectedToEntity == null || (commitmentConnectedToEntity.ActiveCount +
                                                            commitmentConnectedToEntity.PendingApprovalCount +
+                                                           commitmentConnectedToEntity.WithdrawnCount +
                                                            commitmentConnectedToEntity.PausedCount) == 0;
         }
     }