-
Notifications
You must be signed in to change notification settings - Fork 1
APPMAN-1314 display max funding on edit apprenticeship page #1868
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.
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d51cff9
added funding band endpoint
Pauljgraham 0062ccc
remove whitespace
Pauljgraham 62c9ade
Merge branch 'master' into APPMAN-1314-max-funding
Pauljgraham 5366f7a
added funding fields to add first apprenticeship
Pauljgraham 2dea444
added AddAnother API endpoint
Pauljgraham 4ce9a2d
added mising fields
Pauljgraham e9371ed
updated edit with funding details
Pauljgraham 76d10ad
removed aold assert
Pauljgraham c7d503d
Merge remote-tracking branch 'origin/master' into APPMAN-1314-max-fun…
Najamuddin-Muhammad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
78 changes: 78 additions & 0 deletions
78
...pprovals.Api.UnitTests/Controllers/TrainingCourses/WhenGettingCourseFundingBandDetails.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
using System; | ||
using System.Net; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
using AutoFixture.NUnit3; | ||
using FluentAssertions; | ||
using MediatR; | ||
using Microsoft.AspNetCore.Mvc; | ||
using Moq; | ||
using NUnit.Framework; | ||
using SFA.DAS.Approvals.Api.Controllers; | ||
using SFA.DAS.Approvals.Application.Courses.Queries; | ||
using SFA.DAS.Testing.AutoFixture; | ||
|
||
namespace SFA.DAS.Approvals.Api.UnitTests.Controllers.TrainingCourses | ||
{ | ||
public class WhenGettingCourseFundingBandDetails | ||
{ | ||
[Test, MoqAutoData] | ||
public async Task Then_Gets_FundingBand_From_Mediator( | ||
string courseCode, | ||
DateTime startDate, | ||
GetFundingBandResult mediatorResult, | ||
[Frozen] Mock<IMediator> mockMediator, | ||
[Greedy] TrainingCoursesController controller) | ||
{ | ||
mockMediator | ||
.Setup(mediator => mediator.Send( | ||
It.Is<GetFundingBandQuery>(x => x.CourseCode == courseCode && x.StartDate == startDate), | ||
It.IsAny<CancellationToken>())) | ||
.ReturnsAsync(mediatorResult); | ||
|
||
var controllerResult = await controller.GetFundingBand(courseCode, startDate) as ObjectResult; | ||
|
||
Assert.That(controllerResult, Is.Not.Null); | ||
controllerResult.StatusCode.Should().Be((int)HttpStatusCode.OK); | ||
var model = controllerResult.Value as GetFundingBandResult; | ||
Assert.That(model, Is.Not.Null); | ||
model.Should().BeEquivalentTo(mediatorResult); | ||
} | ||
|
||
[Test, MoqAutoData] | ||
public async Task And_Then_No_FundingBand_Is_Returned_From_Mediator( | ||
string courseCode, | ||
DateTime startDate, | ||
[Frozen] Mock<IMediator> mockMediator, | ||
[Greedy] TrainingCoursesController controller) | ||
{ | ||
mockMediator | ||
.Setup(mediator => mediator.Send( | ||
It.Is<GetFundingBandQuery>(x => x.CourseCode == courseCode && x.StartDate == startDate), | ||
It.IsAny<CancellationToken>())) | ||
.ReturnsAsync((GetFundingBandResult)null); | ||
|
||
var controllerResult = await controller.GetFundingBand(courseCode, startDate) as NotFoundResult; | ||
|
||
controllerResult.StatusCode.Should().Be((int)HttpStatusCode.NotFound); | ||
} | ||
|
||
[Test, MoqAutoData] | ||
public async Task And_Exception_Then_Returns_InternalServerError( | ||
string courseCode, | ||
DateTime startDate, | ||
[Frozen] Mock<IMediator> mockMediator, | ||
[Greedy] TrainingCoursesController controller) | ||
{ | ||
mockMediator | ||
.Setup(mediator => mediator.Send( | ||
It.IsAny<GetFundingBandQuery>(), | ||
It.IsAny<CancellationToken>())) | ||
.Throws<InvalidOperationException>(); | ||
|
||
var controllerResult = await controller.GetFundingBand(courseCode, startDate) as StatusCodeResult; | ||
|
||
controllerResult.StatusCode.Should().Be((int)HttpStatusCode.InternalServerError); | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
...AS.Approvals.UnitTests/Application/Apprentices/Queries/GetFundingBandQueryHandlerTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
using System.Collections.Generic; | ||
using System; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
using AutoFixture; | ||
using FluentAssertions; | ||
using Moq; | ||
using NUnit.Framework; | ||
using SFA.DAS.Approvals.Application.Courses.Queries; | ||
using SFA.DAS.Approvals.InnerApi.CommitmentsV2Api.Requests.Courses; | ||
using SFA.DAS.Approvals.InnerApi.CommitmentsV2Api.Responses; | ||
using SFA.DAS.SharedOuterApi.Configuration; | ||
using SFA.DAS.SharedOuterApi.Interfaces; | ||
|
||
namespace SFA.DAS.Approvals.UnitTests.Application.Apprentices.Queries; | ||
|
||
[TestFixture] | ||
public class GetFundingBandQueryHandlerTests | ||
{ | ||
private GetFundingBandQueryHandler _handler; | ||
private Mock<ICommitmentsV2ApiClient<CommitmentsV2ApiConfiguration>> _apiClient; | ||
|
||
private GetTrainingProgrammeResponse _trainingProgrammeResponse; | ||
private GetFundingBandQuery _query; | ||
|
||
[SetUp] | ||
public void Setup() | ||
{ | ||
var fixture = new Fixture(); | ||
|
||
_query = fixture.Create<GetFundingBandQuery>(); | ||
_trainingProgrammeResponse = new GetTrainingProgrammeResponse(); | ||
_trainingProgrammeResponse.TrainingProgramme = new TrainingProgramme | ||
{ | ||
CourseCode = _query.CourseCode, | ||
StandardUId = "XXXX", | ||
StandardPageUrl = "https://test123", | ||
FundingPeriods = new List<TrainingProgrammeFundingPeriod>() | ||
{ | ||
new TrainingProgrammeFundingPeriod | ||
{EffectiveFrom = DateTime.MinValue, EffectiveTo = DateTime.MaxValue, FundingCap = 1234} | ||
} | ||
}; | ||
|
||
_apiClient = new Mock<ICommitmentsV2ApiClient<CommitmentsV2ApiConfiguration>>(); | ||
|
||
_apiClient.Setup(x => | ||
x.Get<GetTrainingProgrammeResponse>(It.Is<GetCalculatedVersionOfTrainingProgrammeRequest>(r => | ||
r.CourseCode == _query.CourseCode && r.StartDate == _query.StartDate.Value))) | ||
.ReturnsAsync(_trainingProgrammeResponse); | ||
|
||
_handler = new GetFundingBandQueryHandler(_apiClient.Object); | ||
} | ||
|
||
[Test] | ||
public async Task Handle_Returns_FundingInfo_From_Commitments_Api() | ||
{ | ||
var result = await _handler.Handle(_query, CancellationToken.None); | ||
result.StandardPageUrl.Should().Be(_trainingProgrammeResponse.TrainingProgramme.StandardPageUrl); | ||
result.Version.Should().Be(_trainingProgrammeResponse.TrainingProgramme.Version); | ||
} | ||
|
||
[Test] | ||
public async Task Handle_Returns_null_if_FundingInfo_not_found() | ||
{ | ||
_apiClient.Setup(x => | ||
x.Get<GetTrainingProgrammeResponse>(It.Is<GetCalculatedVersionOfTrainingProgrammeRequest>(r => | ||
r.CourseCode == _query.CourseCode && r.StartDate == _query.StartDate.Value))) | ||
.ReturnsAsync((GetTrainingProgrammeResponse) null); | ||
|
||
var result = await _handler.Handle(_query, CancellationToken.None); | ||
Assert.That(result, Is.Null); | ||
} | ||
} | ||
|
11 changes: 11 additions & 0 deletions
11
src/Approvals/SFA.DAS.Approvals/Application/Courses/Queries/GetFundingBandQuery.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
using System; | ||
using MediatR; | ||
|
||
namespace SFA.DAS.Approvals.Application.Courses.Queries | ||
{ | ||
public class GetFundingBandQuery : IRequest<GetFundingBandResult> | ||
{ | ||
public string CourseCode { get; set; } | ||
public DateTime? StartDate { get; set; } | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
src/Approvals/SFA.DAS.Approvals/Application/Courses/Queries/GetFundingBandQueryHandler.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
using MediatR; | ||
using SFA.DAS.Approvals.InnerApi.CommitmentsV2Api.Requests.Courses; | ||
using SFA.DAS.Approvals.InnerApi.CommitmentsV2Api.Responses; | ||
using SFA.DAS.SharedOuterApi.Configuration; | ||
using SFA.DAS.SharedOuterApi.Interfaces; | ||
|
||
namespace SFA.DAS.Approvals.Application.Courses.Queries; | ||
|
||
public class GetFundingBandQueryHandler : IRequestHandler<GetFundingBandQuery, GetFundingBandResult> | ||
{ | ||
private readonly ICommitmentsV2ApiClient<CommitmentsV2ApiConfiguration> _apiClient; | ||
|
||
public GetFundingBandQueryHandler(ICommitmentsV2ApiClient<CommitmentsV2ApiConfiguration> apiClient) | ||
{ | ||
_apiClient = apiClient; | ||
} | ||
|
||
public async Task<GetFundingBandResult> Handle(GetFundingBandQuery request, CancellationToken cancellationToken) | ||
{ | ||
var result = await _apiClient.Get<GetTrainingProgrammeResponse>(new GetCalculatedVersionOfTrainingProgrammeRequest(request.CourseCode, request.StartDate)); | ||
|
||
if (result?.TrainingProgramme == null) | ||
return null; | ||
|
||
return new GetFundingBandResult | ||
{ | ||
StandardUId = result.TrainingProgramme.StandardUId, | ||
Version = result.TrainingProgramme.Version, | ||
StandardPageUrl = result.TrainingProgramme.StandardPageUrl, | ||
ProposedMaxFunding = GetFundingBandForDate(result.TrainingProgramme.FundingPeriods, request.StartDate), | ||
}; | ||
} | ||
|
||
private static int? GetFundingBandForDate(List<TrainingProgrammeFundingPeriod> bands, DateTime? forDate) | ||
{ | ||
forDate ??= DateTime.Today; | ||
var match = bands.FirstOrDefault(x => | ||
x.EffectiveFrom <= forDate && (x.EffectiveTo ?? DateTime.Today.AddYears(5)) >= forDate); | ||
return match?.FundingCap; | ||
} | ||
} | ||
|
||
|
9 changes: 9 additions & 0 deletions
9
src/Approvals/SFA.DAS.Approvals/Application/Courses/Queries/GetFundingBandResult.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
namespace SFA.DAS.Approvals.Application.Courses.Queries; | ||
|
||
public class GetFundingBandResult | ||
{ | ||
public string StandardUId { get; set; } | ||
public string Version { get; set; } | ||
public string StandardPageUrl { get; set; } | ||
public int? ProposedMaxFunding { get; set; } | ||
} |
19 changes: 19 additions & 0 deletions
19
...erApi/CommitmentsV2Api/Requests/Courses/GetCalculatedVersionOfTrainingProgrammeRequest.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
using System; | ||
using SFA.DAS.SharedOuterApi.Interfaces; | ||
|
||
namespace SFA.DAS.Approvals.InnerApi.CommitmentsV2Api.Requests.Courses | ||
{ | ||
public class GetCalculatedVersionOfTrainingProgrammeRequest : IGetApiRequest | ||
{ | ||
public readonly string CourseCode; | ||
public readonly DateTime StartDate; | ||
|
||
public GetCalculatedVersionOfTrainingProgrammeRequest(string courseCode, DateTime? startDate) | ||
{ | ||
CourseCode = courseCode; | ||
StartDate = startDate.HasValue ? startDate.Value : DateTime.Today; | ||
} | ||
|
||
public string GetUrl => $"api/TrainingProgramme/calculate-version/{CourseCode}?startDate={StartDate.ToString("yyyy-MM-dd")}"; | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.