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

Updated Testing logic and packages #628

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Updated Testing logic and packages #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b26156
Updated Testing logic and packages
FrostyApeOne Oct 15, 2024
dee0b66
Updated AutoMapper Profile to include UKPRN and URN for the Academy G…
FrostyApeOne Oct 15, 2024
491ac2c
Updated nuget package workflow to trigger on production-* tag push, a…
FrostyApeOne Oct 15, 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
6 changes: 2 additions & 4 deletions .github/workflows/build-and-push-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ name: Build and Push NuGet Package

on:
push:
branches:
- release/*
paths:
- 'Dfe.PersonsApi.Client*/**'
tags:
- 'production-*'

env:
DOTNET_VERSION: '8.0.x'
Expand Down
2 changes: 2 additions & 0 deletions Dfe.Academies.Application/MappingProfiles/AcademyWithGovernanceProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ public AcademyWithGovernanceProfile()
{
CreateMap<AcademyGovernanceQueryModel, AcademyGovernance>()
.ForMember(dest => dest.Id, opt => opt.MapFrom(src => (int)src.EducationEstablishmentGovernance.SK))
.ForMember(dest => dest.UKPRN, opt => opt.MapFrom(src => src.Establishment.UKPRN))
.ForMember(dest => dest.URN, opt => opt.MapFrom(src => src.Establishment.URN))
.ForMember(dest => dest.FirstName, opt => opt.MapFrom(src => src.EducationEstablishmentGovernance.Forename1))
.ForMember(dest => dest.LastName, opt => opt.MapFrom(src => src.EducationEstablishmentGovernance.Surname))
.ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.EducationEstablishmentGovernance.Email))
Expand Down
10 changes: 5 additions & 5 deletions ...s/Dfe.Academies.PersonsApi.Tests.Integration/Controllers/ConstituenciesControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Dfe.Academies.PersonsApi.Tests.Integration.Controllers
public class ConstituenciesControllerTests
{
[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetMemberOfParliamentByConstituencyAsync_ShouldReturnMp_WhenConstituencyExists(
CustomWebApplicationDbContextFactory<Startup> factory,
IConstituenciesClient constituenciesClient)
Expand All @@ -38,7 +38,7 @@ await dbContext.Constituencies
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetMemberOfParliamentByConstituencyAsync_ShouldReturnNotFound_WhenConstituencyDoesNotExist(
CustomWebApplicationDbContextFactory<Startup> factory,
IConstituenciesClient constituenciesClient)
Expand All @@ -56,7 +56,7 @@ public async Task GetMemberOfParliamentByConstituencyAsync_ShouldReturnNotFound_
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetMemberOfParliamentByConstituenciesAsync_ShouldReturnMps_WhenConstituenciesExists(
CustomWebApplicationDbContextFactory<Startup> factory,
IConstituenciesClient constituenciesClient)
Expand All @@ -82,7 +82,7 @@ await dbcontext.Constituencies.Where(x => x.ConstituencyName == "Test Constituen
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetMemberOfParliamentByConstituenciesAsync_ShouldReturnEmpty_WhenConstituenciesDontExists(
CustomWebApplicationDbContextFactory<Startup> factory,
IConstituenciesClient constituenciesClient)
Expand All @@ -100,7 +100,7 @@ public async Task GetMemberOfParliamentByConstituenciesAsync_ShouldReturnEmpty_W
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetMemberOfParliamentByConstituenciesAsync_ShouldThrowAnException_WhenConstituenciesNotProvided(
CustomWebApplicationDbContextFactory<Startup> factory,
IConstituenciesClient constituenciesClient)
Expand Down
10 changes: 5 additions & 5 deletions ...s/Dfe.Academies.PersonsApi.Tests.Integration/Controllers/EstablishmentsControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Dfe.Academies.PersonsApi.Tests.Integration.Controllers
public class EstablishmentsControllerTests
{
[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetAllPersonsAssociatedWithAcademyAsync_ShouldReturnPeople_WhenAcademyExists(
CustomWebApplicationDbContextFactory<Startup> factory,
IEstablishmentsClient establishmentsClient)
Expand All @@ -39,7 +39,7 @@ await dbContext.Establishments.Where(x => x.SK == 1)
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetAllPersonsAssociatedWithAcademyAsync_ShouldReturnEmptyList_WhenAcademyExistWithNoPeople(
CustomWebApplicationDbContextFactory<Startup> factory,
IEstablishmentsClient establishmentsClient)
Expand All @@ -61,7 +61,7 @@ await dbContext.Establishments.Where(x => x.SK == 2)
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetAllPersonsAssociatedWithAcademyAsync_ShouldThrowAnException_WhenAcademyDoesntExists(
CustomWebApplicationDbContextFactory<Startup> factory,
IEstablishmentsClient establishmentsClient)
Expand All @@ -77,7 +77,7 @@ public async Task GetAllPersonsAssociatedWithAcademyAsync_ShouldThrowAnException
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetGetMemberOfParliamentBySchoolUrnAsync_ShouldReturnMP_WhenSchoolExists(
CustomWebApplicationDbContextFactory<Startup> factory,
IEstablishmentsClient establishmentsClient)
Expand Down Expand Up @@ -106,7 +106,7 @@ await mopDbContext.Constituencies.Where(x => x.ConstituencyName == "Test Constit
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetGetMemberOfParliamentBySchoolUrnAsync_ShouldReturnNull_WhenSchoolDoesntExists(
CustomWebApplicationDbContextFactory<Startup> factory,
IEstablishmentsClient establishmentsClient)
Expand Down
8 changes: 4 additions & 4 deletions Tests/Dfe.Academies.PersonsApi.Tests.Integration/Controllers/TrustsControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Dfe.Academies.PersonsApi.Tests.Integration.Controllers
public class TrustsControllerTests
{
[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetAllPersonsAssociatedWithTrustAsync_ShouldReturnPeople_WhenTrustExists(
CustomWebApplicationDbContextFactory<Startup> factory,
ITrustsClient trustsClient)
Expand All @@ -32,7 +32,7 @@ public async Task GetAllPersonsAssociatedWithTrustAsync_ShouldReturnPeople_WhenT
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetAllPersonsAssociatedWithTrustAsync_ShouldReturnEmptyList_WhenTrustExistWithNoPeople(
CustomWebApplicationDbContextFactory<Startup> factory,
ITrustsClient trustsClient)
Expand All @@ -49,7 +49,7 @@ public async Task GetAllPersonsAssociatedWithTrustAsync_ShouldReturnEmptyList_Wh
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetAllPersonsAssociatedWithTrustAsync_ShouldThrowAnException_WhenTrustDoesntExists(
CustomWebApplicationDbContextFactory<Startup> factory,
ITrustsClient trustsClient)
Expand All @@ -65,7 +65,7 @@ public async Task GetAllPersonsAssociatedWithTrustAsync_ShouldThrowAnException_W
}

[Theory]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization<Startup>))]
[CustomAutoData(typeof(CustomWebApplicationDbContextFactoryCustomization))]
public async Task GetAllPersonsAssociatedWithTrustAsync_ShouldThrowAnException_WhenInvalidIdProvided(
CustomWebApplicationDbContextFactory<Startup> factory,
ITrustsClient trustsClient)
Expand Down
Loading
Loading