Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Con 2237 amend eligibility logic to check for agreement version #2114

Merged
merged 2 commits into from
Aug 11, 2020
Merged

Con 2237 amend eligibility logic to check for agreement version #2114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f81c90e
Update EmployerFeatureAuthorisationHandler.cs
Aug 11, 2020
adeaa33
Update EmployerFeatureAuthorisationHandlerTests.cs
Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ....DAS.EmployerAccounts.UnitTests/Authorisation/EmployerFeatureAuthorisationHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ public EmployerFeatureAuthorisationHandlerTestsFixture SetMediatorResponse(int a
StatusId = agreementStatus,
AccountLegalEntity = new AccountLegalEntity
{
SignedAgreementVersion = agreementVersion
SignedAgreementVersion = agreementStatus == EmployerAgreementStatus.Signed ? (int?)agreementVersion : null,
PendingAgreementVersion = agreementStatus == EmployerAgreementStatus.Pending ? (int?)agreementVersion : null
}

}
}
};
Expand Down
9 changes: 2 additions & 7 deletions src/SFA.DAS.EmployerAccounts/Authorisation/EmployerFeatureAuthorisationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,9 @@ public async Task<AuthorizationResult> GetAuthorizationResult(IReadOnlyCollectio
var (accountId, _) = authorizationContext.GetEmployerFeatureValues();

var agreements = await _mediator.SendAsync(new GetEmployerAgreementsByAccountIdRequest { AccountId = accountId.GetValueOrDefault(0) }).ConfigureAwait(false);
var minAgreementVersion = agreements.EmployerAgreements.Select(ea => ea.AccountLegalEntity.SignedAgreementVersion.GetValueOrDefault(0)).Min();

var minAgreementVersion = agreements.EmployerAgreements.
Where(a => a.StatusId == Models.EmployerAgreement.EmployerAgreementStatus.Signed &&
a.AccountLegalEntity.SignedAgreementVersion.GetValueOrDefault(0) > 0).Select(b => b.AccountLegalEntity.SignedAgreementVersion ?? 0)
.DefaultIfEmpty()
.Min();

if (minAgreementVersion < featureToggle.EnabledByAgreementVersion || agreements.EmployerAgreements.Any(a => a.StatusId == Models.EmployerAgreement.EmployerAgreementStatus.Pending))
if (minAgreementVersion < featureToggle.EnabledByAgreementVersion)
{
authorizationResult.AddError(new EmployerFeatureAgreementNotSigned());
}
Expand Down