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

Add notification for updating status of application to AcceptedForSelection #1480

Merged
merged 2 commits into from
May 22, 2024
Merged

Add notification for updating status of application to AcceptedForSelection #1480

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
8fbeca7
Add notification for updating status of application to AcceptedForSel…
alrom May 14, 2024
4bcbdba
Fix
alrom May 16, 2024
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
13 changes: 8 additions & 5 deletions OutOfSchool/OutOfSchool.BusinessLogic/Services/ApplicationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using OutOfSchool.BusinessLogic.Models;
using OutOfSchool.BusinessLogic.Models.Application;
using OutOfSchool.BusinessLogic.Models.Workshops;
using System.Linq;

namespace OutOfSchool.BusinessLogic.Services;

Expand Down Expand Up @@ -930,9 +931,7 @@ await notificationService.Create(
additionalData,
groupedData).ConfigureAwait(false);

if (updatedApplication.Status == ApplicationStatus.Approved
|| updatedApplication.Status == ApplicationStatus.AcceptedForSelection
|| updatedApplication.Status == ApplicationStatus.Rejected)
if (GetStatusesForParentsNotification().Contains(updatedApplication.Status))
{
await SendApplicationUpdateStatusEmail(updatedApplication);
}
Expand All @@ -948,6 +947,11 @@ await notificationService.Create(
}
}

private ApplicationStatus[] GetStatusesForParentsNotification()
{
return new ApplicationStatus[] {ApplicationStatus.Approved, ApplicationStatus.Rejected, ApplicationStatus.AcceptedForSelection };
}

private async Task<IEnumerable<string>> GetNotificationsRecipientIds(
NotificationAction action,
Dictionary<string, string> additionalData,
Expand Down Expand Up @@ -978,8 +982,7 @@ private async Task<IEnumerable<string>> GetNotificationsRecipientIds(
&& additionalData.ContainsKey(StatusTitle)
&& Enum.TryParse(additionalData[StatusTitle], out ApplicationStatus applicationStatus))
{
if (applicationStatus == ApplicationStatus.Approved
|| applicationStatus == ApplicationStatus.Rejected)
if (GetStatusesForParentsNotification().Contains(applicationStatus))
{
recipientIds.Add(application.Parent.UserId);
}
Expand Down
13 changes: 9 additions & 4 deletions OutOfSchool/OutOfSchool.WebApi.Tests/Services/ApplicationServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,14 +548,16 @@ public async Task GetAllByChild_WhenIdIsNotValid_ShouldReturnEmptyCollection()
}

[Test]
[TestCase("provider", ApplicationStatus.Pending, ApplicationStatus.Approved)]
[TestCase("provider", ApplicationStatus.AcceptedForSelection, ApplicationStatus.Approved)]
[TestCase("provider", ApplicationStatus.AcceptedForSelection, ApplicationStatus.Rejected)]
[TestCase("provider", ApplicationStatus.Pending, ApplicationStatus.AcceptedForSelection)]
[TestCase("parent", ApplicationStatus.Approved, ApplicationStatus.Left)]
public async Task UpdateApplication_WhenIdIsValid_ShouldReturnApplication(string userRole, ApplicationStatus statusFrom, ApplicationStatus statusTo)
{
// Arrange
var statusKey = "Status";
var id = new Guid("1745d16a-6181-43d7-97d0-a1d6cc34a8bd");
var changedEntity = WithApplication(id, statusFrom).WithParent(ParentGenerator.Generate());
var changedEntity = WithApplication(id, statusFrom, true).WithParent(ParentGenerator.Generate());
changedEntity.Parent.User = UserGenerator.Generate();
changedEntity.Parent.UserId = changedEntity.Parent.User.Id;
changedEntity.Workshop.WithProvider(ProvidersGenerator.Generate());
Expand Down Expand Up @@ -610,7 +612,9 @@ public async Task UpdateApplication_WhenIdIsValid_ShouldReturnApplication(string

var recipientsIds = new List<string>();

if (statusTo == ApplicationStatus.Approved)
if (statusTo == ApplicationStatus.Approved
|| statusTo == ApplicationStatus.Rejected
|| statusTo == ApplicationStatus.AcceptedForSelection)
{
recipientsIds.Add(changedEntity.Parent.UserId);
}
Expand Down Expand Up @@ -1342,7 +1346,7 @@ private List<Application> WithApplicationsList()
};
}

private Application WithApplication(Guid id, ApplicationStatus status = ApplicationStatus.Pending)
private Application WithApplication(Guid id, ApplicationStatus status = ApplicationStatus.Pending, bool CompetitiveSelection = false)
{
return new Application()
{
Expand Down Expand Up @@ -1371,6 +1375,7 @@ private Application WithApplication(Guid id, ApplicationStatus status = Applicat
Id = new Guid("0083633f-4e5b-4c09-a89d-52d8a9b89cdb"),
ProviderId = new Guid("1aa8e8e0-d35f-45cb-b66d-a01faa8fe174"),
Status = WorkshopStatus.Open,
CompetitiveSelection = CompetitiveSelection,
},
};
}
Expand Down
Loading