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 condition for select popular workshops #834

Merged
merged 2 commits into from
Sep 1, 2022
Merged

Add condition for select popular workshops #834

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
6155148
Add condition for select popular workshops
Aug 31, 2022
9555968
Change tests regarding CATOTTG
Sep 1, 2022
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
157 changes: 150 additions & 7 deletions OutOfSchool/OutOfSchool.WebApi.Tests/Services/StatisticServiceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,17 @@ public async Task GetPopularWorkshops_WhenCityNotQueried_ShouldReturnCertainWork
public async Task GetPopularWorkshops_WithCityQueried_ShouldReturnCertainWorkshops()
{
// Arrange
List<WorkshopCard> expectedWorkshopCards = ExpectedWorkshopCardsCityFilter();
List<Workshop> expectedWorkshops = ExpectedWorkshopCardsCityFilter();

SetupGetPopularWorkshops();
SetupGetPopularWorkshopsIncludingCATOTTG();

var expectedWorkshopCards = new List<WorkshopCard>();
mapper.Setup(m => m.Map<List<WorkshopCard>>(It.IsAny<List<Workshop>>()))
.Returns(expectedWorkshopCards);

// Act
var result = await service
.GetPopularWorkshopsFromDatabase(2, 4970)
.GetPopularWorkshopsFromDatabase(2, 31737)
.ConfigureAwait(false);

// Assert
Expand Down Expand Up @@ -172,6 +173,22 @@ private void SetupGetPopularWorkshops()
.Verifiable();
}

private void SetupGetPopularWorkshopsIncludingCATOTTG()
{
var workshopsMock = WithWorkshopsIncludingCATOTTG().AsQueryable().BuildMock();

workshopRepository
.Setup(w => w.Get(
It.IsAny<int>(),
It.IsAny<int>(),
It.IsAny<string>(),
It.IsAny<Expression<Func<Workshop, bool>>>(),
It.IsAny<Dictionary<Expression<Func<Workshop, object>>, SortDirection>>(),
It.IsAny<bool>()))
.Returns(workshopsMock)
.Verifiable();
}

private void SetupGetPopularDirections()
{
var workshopsMock = WithWorkshops().AsQueryable().BuildMock();
Expand Down Expand Up @@ -298,6 +315,106 @@ private IEnumerable<Workshop> WithWorkshops()
};
}

private IEnumerable<Workshop> WithWorkshopsIncludingCATOTTG()
{
return new List<Workshop>
{
new Workshop
{
Id = new Guid("953708d7-8c35-4607-bd9b-f034e853bb89"),
Title = "w1",
InstitutionHierarchyId = new Guid("af475193-6a1e-4a75-9ba3-439c4300f771"),
InstitutionHierarchy = new InstitutionHierarchy
{
Id = new Guid("af475193-6a1e-4a75-9ba3-439c4300f771"),
Directions = new List<Direction>
{
new Direction
{
Id = 1,
},
},
},
Address = new Address
{
CATOTTGId = 31739,
CATOTTG = new CATOTTG
{
Category = "B",
ParentId = 31737,
},
},
Applications = new List<Application>
{
new Application { Id = new Guid("0083633f-4e5b-4c09-a89d-52d8a9b89cdb") },
},
},
new Workshop
{
Id = new Guid("3a2fbb29-e097-4184-ad02-26ed1e5f5057"),
Title = "w2",
InstitutionHierarchyId = new Guid("01d08412-69d3-4620-8c54-7b997430e08d"),
InstitutionHierarchy = new InstitutionHierarchy
{
Id = new Guid("01d08412-69d3-4620-8c54-7b997430e08d"),
Directions = new List<Direction>
{
new Direction
{
Id = 2,
},
},
},
Address = new Address
{
CATOTTGId = 31737,
CATOTTG = new CATOTTG
{
Category = "K",
ParentId = null,
},
},
Applications = new List<Application>
{
new Application { Id = new Guid("7c5f8f7c-d850-44d0-8d4e-fd2de99453be") },
new Application { Id = new Guid("1745d16a-6181-43d7-97d0-a1d6cc34a8bd") },
},
},
new Workshop
{
Id = new Guid("6f8bf795-072d-4fca-ad89-e54a275eb674"),
Title = "w3",
InstitutionHierarchyId = new Guid("af628dd5-e9b6-4ad4-9d12-e87063d8707d"),
InstitutionHierarchy = new InstitutionHierarchy
{
Id = new Guid("af628dd5-e9b6-4ad4-9d12-e87063d8707d"),
Directions = new List<Direction>
{
new Direction
{
Id = 3,
},
},
},
Address = new Address
{
CATOTTGId = 5000,
CATOTTG = new CATOTTG
{
Category = "C",
ParentId = 4971,
},
},
Applications = new List<Application>
{
new Application { Id = new Guid("af628dd5-e9b6-4ad4-9d12-e87063d8707d") },
new Application { Id = new Guid("01d08412-69d3-4620-8c54-7b997430e08d") },
new Application { Id = new Guid("af475193-6a1e-4a75-9ba3-439c4300f771") },
},
},
};
}

private IEnumerable<Direction> WithDirections()
{
return new List<Direction>
Expand Down Expand Up @@ -454,12 +571,38 @@ private List<WorkshopCard> ExpectedWorkshopCardsNoCityFilter()
};
}

private List<WorkshopCard> ExpectedWorkshopCardsCityFilter()
private List<Workshop> ExpectedWorkshopCardsCityFilter()
{
return new List<WorkshopCard>
return new List<Workshop>
{
new WorkshopCard {WorkshopId = new Guid("3a2fbb29-e097-4184-ad02-26ed1e5f5057"), Title = "w2", Address = new AddressDto {CATOTTGId = 4970}},
new WorkshopCard {WorkshopId = new Guid("953708d7-8c35-4607-bd9b-f034e853bb89"), Title = "w1", Address = new AddressDto {CATOTTGId = 4970}},
new Workshop
{
Id = new Guid("3a2fbb29-e097-4184-ad02-26ed1e5f5057"),
Title = "w2",
Address = new Address
{
CATOTTGId = 31737,
CATOTTG = new CATOTTG
{
Category = "K",
ParentId = null,
},
},
},
new Workshop
{
Id = new Guid("953708d7-8c35-4607-bd9b-f034e853bb89"),
Title = "w1",
Address = new Address
{
CATOTTGId = 31739,
CATOTTG = new CATOTTG
{
Category = "B",
ParentId = 31737,
},
},
},
};
}

Expand Down
3 changes: 2 additions & 1 deletion OutOfSchool/OutOfSchool.WebApi/Services/StatisticService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using OutOfSchool.Common.Enums;
using OutOfSchool.Redis;
using OutOfSchool.Services.Enums;
using OutOfSchool.Services.Models;
Expand Down Expand Up @@ -168,7 +169,7 @@ public async Task<IEnumerable<WorkshopCard>> GetPopularWorkshopsFromDatabase(int
if (catottgId > 0)
{
workshops = workshops
.Where(w => w.Address.CATOTTGId == catottgId);
.Where(w => w.Address.CATOTTGId == catottgId || (w.Address.CATOTTG.Category == CodeficatorCategory.CityDistrict.Name && w.Address.CATOTTG.ParentId == catottgId));
}

var workshopsWithApplications = workshops.Select(w => new
Expand Down