- All schools must publish an attendance policy. This should outline expectations, procedures, and responsibilities for
- ensuring pupils attend school regularly and on time.
+ Schools can support children to attend regularly. If you have concerns about your child's attendance, speak to your school.
- Schools can support children to attend regularly. If you have concerns about your child's attendance, speak to your school.
+ All schools must publish an attendance policy. This should outline expectations, procedures, and responsibilities for
+ ensuring pupils attend school regularly and on time.
+
You can find out more about parents' and carers' responsibilities on school attendance on the Children's Commissioner website.
@@ -53,7 +60,7 @@
@if (Model.SchoolWebsite.IsAvailable)
{
- Visit the school website to view the attendance policy
+ Visit the school website to view the attendance policy
(opens in a new tab)
}
@@ -82,6 +89,11 @@
Information in this section is for the 2024 to 2025 academic year.
+ It only includes children who were aged 5 or over at the start of the academic year (31 August).
+
+
+
+ School attendance and absence comparisons are made with local and national averages for state-funded schools of the same phase, phases and type.
Attendance
@@ -114,43 +126,43 @@
- | @(Model.EstablishmentAttendance.IsAvailable? Model.EstablishmentAttendance.Value.AsPercentage() : Constants.NotAvailable) |
+ @Model.EstablishmentAttendance.DisplayPercentage() |
@if (Model.EstablishmentAttendance.IsAvailable)
{
- The number of sessions that all pupils attended compared to all possible sessions means that this school has a @Model.EstablishmentAttendance.Value.AsPercentage() attendance rate.
+ The number of sessions that all pupils attended compared to all possible sessions means that this school has a @Model.EstablishmentAttendance.DisplayPercentage() attendance rate.
}
else
{
- @Model.EstablishmentAttendance.DisplayText();
+ @Model.EstablishmentAttendance.DisplayText()
}
|
-
- | @(Model.LocalAuthorityAttendance.IsAvailable? Model.LocalAuthorityAttendance.Value.AsPercentage() : Constants.NotAvailable) |
+
+ @Model.LocalAuthorityAttendance.DisplayPercentage() |
@if (Model.LocalAuthorityAttendance.IsAvailable)
{
- The number of sessions that all pupils attended compared to all possible sessions means that secondary schools in @Model.LocalAuthority.DisplayText() have a @Model.LocalAuthorityAttendance.Value.AsPercentage() attendance rate.
+ The number of sessions that all pupils attended compared to all possible sessions means that schools of this type in @Model.LocalAuthority.DisplayText() have a @Model.LocalAuthorityAttendance.DisplayPercentage() attendance rate.
}
else
{
- @Model.LocalAuthorityAttendance.DisplayText();
+ @Model.LocalAuthorityAttendance.DisplayText()
}
|
-
- | @(Model.EnglandAttendance.IsAvailable? Model.EnglandAttendance.Value.AsPercentage() : Constants.NotAvailable) |
+
+ @Model.EnglandAttendance.DisplayPercentage() |
@if (Model.EnglandAttendance.IsAvailable)
{
- The number of sessions that all pupils attended compared to all possible sessions means that secondary schools in England have a @Model.EnglandAttendance.Value.AsPercentage() attendance rate.
+ The number of sessions that all pupils attended compared to all possible sessions means that schools of this type in England have a @Model.EnglandAttendance.DisplayPercentage() attendance rate.
}
else
{
- @Model.EnglandAttendance.DisplayText();
+ @Model.EnglandAttendance.DisplayText()
}
|
@@ -178,43 +190,47 @@
- | @(Model.EstablishmentPersistentAbsence.IsAvailable? Model.EstablishmentPersistentAbsence.Value.AsPercentage() : Constants.NotAvailable) |
+ @Model.EstablishmentPersistentAbsence.DisplayPercentage() |
@if (Model.EstablishmentPersistentAbsence.IsAvailable)
{
- Out of @Model.EstablishmentEnrolmentsTotal.DisplayText(t => t.ToString("N0")) pupils, @Model.EstablishmentPersistentAbsenceTotal.DisplayText(t => t.ToString("N0")) were persistently absent. This means that @Model.EstablishmentPersistentAbsence.Value.AsPercentage() were persistently absent.
+
+ Out of @Model.EstablishmentEnrolmentsTotal.DisplayText(formatter: d=> d.Value?.ToString("N0")!) pupils,
+ @Model.EstablishmentPersistentAbsenceTotal.DisplayText(formatter: d => d.Value?.ToString("N0")!) were persistently absent.
+ This means that @Model.EstablishmentPersistentAbsence.DisplayPercentage() were persistently absent.
+
}
else
{
- @Model.EstablishmentPersistentAbsence.DisplayText();
+ @Model.EstablishmentPersistentAbsence.DisplayText()
}
|
-
- | @(Model.LocalAuthorityPersistentAbsence.IsAvailable? Model.LocalAuthorityPersistentAbsence.Value.AsPercentage() : Constants.NotAvailable) |
+
+ @Model.LocalAuthorityPersistentAbsence.DisplayPercentage() |
@if (Model.LocalAuthorityPersistentAbsence.IsAvailable)
{
- Out of the total number of pupils in secondary schools in @Model.LocalAuthority.DisplayText(), have a @Model.LocalAuthorityPersistentAbsence.Value.AsPercentage() were persistently absent.
+ Out of the total number of pupils in @Model.LocalAuthority.DisplayText() in schools of this type, have a @Model.LocalAuthorityPersistentAbsence.DisplayPercentage() were persistently absent.
}
else
{
- @Model.LocalAuthorityPersistentAbsence.DisplayText();
+ @Model.LocalAuthorityPersistentAbsence.DisplayText()
}
|
-
- | @(Model.EnglandPersistentAbsence.IsAvailable? Model.EnglandPersistentAbsence.Value.AsPercentage() : Constants.NotAvailable) |
+
+ @Model.EnglandPersistentAbsence.DisplayPercentage() |
@if (Model.EnglandPersistentAbsence.IsAvailable)
{
- Out of the total number of pupils in secondary schools in England, @Model.EnglandPersistentAbsence.Value.AsPercentage() were persistently absent.
+ Out of the total number of pupils in England in schools of this type, @Model.EnglandPersistentAbsence.DisplayPercentage() were persistently absent.
}
else
{
- @Model.EnglandPersistentAbsence.DisplayText();
+ @Model.EnglandPersistentAbsence.DisplayText()
}
|
diff --git a/SAPPub.Web/Middleware/DependenciesExtensions.cs b/SAPPub.Web/Middleware/DependenciesExtensions.cs
index 92f6e58cb..24dd61f13 100644
--- a/SAPPub.Web/Middleware/DependenciesExtensions.cs
+++ b/SAPPub.Web/Middleware/DependenciesExtensions.cs
@@ -22,7 +22,6 @@
using SAPPub.Core.Services.KS4.AboutSchool;
using SAPPub.Core.Services.KS4.Absence;
using SAPPub.Core.Services.KS4.Admissions;
-using SAPPub.Core.Services.KS4.Attendance;
using SAPPub.Core.Services.KS4.Destinations;
using SAPPub.Core.Services.KS4.Performance;
using SAPPub.Core.Services.Performance;
diff --git a/Tests/SAPPub.Core.Tests/SAPPub.Core.Tests.csproj b/Tests/SAPPub.Core.Tests/SAPPub.Core.Tests.csproj
index c8051bd61..ca9ef169e 100644
--- a/Tests/SAPPub.Core.Tests/SAPPub.Core.Tests.csproj
+++ b/Tests/SAPPub.Core.Tests/SAPPub.Core.Tests.csproj
@@ -9,6 +9,12 @@
true
+
+
+
+
+
+
@@ -39,8 +45,4 @@
-
-
-
-
diff --git a/Tests/SAPPub.Core.Tests/Services/AttendanceServiceTests.cs b/Tests/SAPPub.Core.Tests/Services/AttendanceServiceTests.cs
new file mode 100644
index 000000000..56e42fb15
--- /dev/null
+++ b/Tests/SAPPub.Core.Tests/Services/AttendanceServiceTests.cs
@@ -0,0 +1,285 @@
+using Moq;
+using SAPPub.Core.Entities.KS4.Absence;
+using SAPPub.Core.Enums;
+using SAPPub.Core.Interfaces.Services;
+using SAPPub.Core.Interfaces.Services.KS4.Absence;
+using SAPPub.Core.ServiceModels;
+using SAPPub.Core.ServiceModels.KS4.Attendance;
+using SAPPub.Core.Services;
+using SAPPub.Core.ValueObjects;
+
+namespace SAPPub.Core.Tests.Services;
+
+public class AttendanceServiceTests
+{
+ private const int SpeEnrolmentsTotal = 1000;
+ private const int KS2EnrolmentsTotal = 1100;
+ private const int KS4EnrolmentsTotal = 1200;
+ private const int PersistentAbsenceTotal = 120;
+
+ private readonly Mock _mockEstablishmentService;
+ private readonly Mock _mockEstablishmentAbsenceService;
+ private readonly Mock _mockLAAbsenceService;
+ private readonly Mock _mockEnglandAbsenceService;
+ private readonly AttendanceService _service;
+
+ private static readonly (bool isKS2, bool isKS4, bool isSpecialSchool)[] SchoolTypes =
+ [
+ (false, false, true),
+ (false, true, false),
+ (true, false, false)
+ ];
+
+ private readonly EstablishmentMinimumServiceModel fakeEstablishment = new()
+ {
+ URN = "123456",
+ EstablishmentName = "Test Establishment",
+ LAName = "Council",
+ LAId = "E09000001"
+ };
+
+ private static readonly (double? est, double? la, double? eng)[] AttendanceAbsenceValues =
+ [
+ (5.55, 10.25, 15.55),
+ (10.12, 3.45, 7.35),
+ (null, null, null)
+ ];
+
+ private static readonly (double? est, double? la, double? eng)[] PersistentAbsenceValues =
+ [
+ (5.45, 11.25,12.55),
+ (10.12, 7.45, 8.35),
+ (null, null, null)
+ ];
+
+ public static IEnumerable AttendanceScenarios => CreateScenarios(AttendanceAbsenceValues);
+
+ public static IEnumerable PersistentAbsenceScenarios => CreateScenarios(PersistentAbsenceValues);
+
+ public AttendanceServiceTests()
+ {
+ _mockEstablishmentService = new();
+ _mockEstablishmentAbsenceService = new();
+ _mockLAAbsenceService = new();
+ _mockEnglandAbsenceService = new();
+
+ _service = new AttendanceService(
+ _mockEstablishmentService.Object,
+ _mockEstablishmentAbsenceService.Object,
+ _mockEnglandAbsenceService.Object,
+ _mockLAAbsenceService.Object);
+ }
+
+ [Fact]
+ public async Task GetAttendanceDetailsAsync_ShouldReturnEmptyModel_WhenEstablishmentNotFound()
+ {
+ // Arrange
+ var urn = "99999";
+ _mockEstablishmentService
+ .Setup(r => r.GetEstablishmentMinimumAsync(urn, It.IsAny()))
+ .ReturnsAsync(new EstablishmentMinimumServiceModel());
+
+ // Act
+ var result = await _service.GetAttendenceDetailsAsync(urn, CancellationToken.None);
+
+ // Assert - required members are set, but values are empty
+ Assert.NotNull(result);
+ Assert.Equal(urn, result.Urn);
+ Assert.Null(result.SchoolName);
+ Assert.Null(result.LocalAuthority);
+ Assert.False(result.EstablishmentAttendance.HasValue);
+ Assert.False(result.LocalAuthorityAttendance.HasValue);
+ Assert.False(result.EnglandAttendance.HasValue);
+ }
+
+ [Theory]
+ [MemberData(nameof(AttendanceScenarios))]
+ public async Task GetAttendenceDetailsAsync_ShouldReturn_AttendanceData_For_SchoolType(
+ bool isKS2, bool isKS4,bool isSpecialSchool,
+ (double? est, double? la, double? eng) absence)
+ {
+ // Arrange
+ var establishment = CreateEstablishment(isKS2, isKS4, isSpecialSchool);
+
+ var establishmentAbsence = new EstablishmentAbsence
+ {
+ Id = fakeEstablishment.URN,
+ Abs_Tot_Est_Current_Pct_Coded = CreateCoded(absence.est),
+ Abs_TotSPE_Est_Current_Pct_Coded = CreateCoded(absence.est),
+ Abs_TotKS2_Est_Current_Pct_Coded = CreateCoded(absence.est),
+ };
+
+ var lAAbsence = new LAAbsence
+ {
+ Id = fakeEstablishment.LAId,
+ Abs_Tot_LA_Current_Pct_Coded = CreateCoded(absence.la),
+ Abs_TotKS2_LA_Current_Pct_Coded = CreateCoded(absence.la),
+ Abs_TotSPE_LA_Current_Pct_Coded = CreateCoded(absence.la),
+ };
+
+ var englandAbsence = new EnglandAbsence
+ {
+ Id = fakeEstablishment.LAId,
+ Abs_Tot_Eng_Current_Pct_Coded = CreateCoded(absence.eng),
+ Abs_TotKS2_Eng_Current_Pct_Coded = CreateCoded(absence.eng),
+ Abs_TotSPE_Eng_Current_Pct_Coded = CreateCoded(absence.eng),
+ };
+
+ SeupMocks(establishment, establishmentAbsence, lAAbsence, englandAbsence);
+
+ // Act
+ var result = await _service.GetAttendenceDetailsAsync(establishment.URN, CancellationToken.None);
+
+ // Assert (common)
+ AssertCommon(result, establishment);
+
+ Assert.Equal(GetAsAttendance(absence.est), result.EstablishmentAttendance.Value);
+ Assert.Equal(GetAsAttendance(absence.la), result.LocalAuthorityAttendance.Value);
+ Assert.Equal(GetAsAttendance(absence.eng), result.EnglandAttendance.Value);
+ Assert.Equal(isKS2, result.IsKS2);
+ Assert.Equal(isKS4, result.IsKS4);
+ }
+
+
+ [Theory]
+ [MemberData(nameof(PersistentAbsenceScenarios))]
+ public async Task GetAttendanceDetailsAsync_ShouldReturn_PersisentAbsenceData_For_SchoolTyp(
+ bool isKS2, bool isKS4, bool isSpecialSchool,
+ (double? est, double? la, double? eng) absence)
+ {
+ // Arrange
+ var establishment = CreateEstablishment(isKS2, isKS4, isSpecialSchool);
+
+ fakeEstablishment.IsKS4 = true;
+
+ var establishmentAbsence = new EstablishmentAbsence
+ {
+ Id = fakeEstablishment.URN,
+ Enrolments_Tot_Est_Current_Num_Coded = CreateCoded(KS4EnrolmentsTotal),
+ Enrolments_TotKS2_Est_Current_Num_Coded = CreateCoded(KS2EnrolmentsTotal),
+ Enrolments_TotSPE_Est_Current_Num_Coded = CreateCoded(SpeEnrolmentsTotal),
+ Abs_Persistent_Est_Current_Pct_Coded = CreateCoded(absence.est),
+ Abs_PersistentKS2_Est_Current_Pct_Coded = CreateCoded(absence.est),
+ Abs_PersistentSPE_Est_Current_Pct_Coded = CreateCoded(absence.est),
+ Abs_Persistent_Est_Current_Num_Coded = CreateCoded(PersistentAbsenceTotal),
+ Abs_PersistentKS2_Est_Current_Num_Coded = CreateCoded(PersistentAbsenceTotal),
+ Abs_PersistentSPE_Est_Current_Num_Coded = CreateCoded(PersistentAbsenceTotal)
+ };
+
+ var lAAbsence = new LAAbsence
+ {
+ Id = fakeEstablishment.LAId,
+ Abs_Persistent_LA_Current_Pct_Coded = CreateCoded(absence.la),
+ Abs_PersistentKS2_LA_Current_Pct_Coded = CreateCoded(absence.la),
+ Abs_PersistentSPE_LA_Current_Pct_Coded = CreateCoded(absence.la),
+ };
+
+ var englandAbsence = new EnglandAbsence
+ {
+ Id = fakeEstablishment.LAId,
+ Abs_Persistent_Eng_Current_Pct_Coded = CreateCoded(absence.eng),
+ Abs_PersistentKS2_Eng_Current_Pct_Coded = CreateCoded(absence.eng),
+ Abs_PersistentSPE_Eng_Current_Pct_Coded = CreateCoded(absence.eng),
+ };
+
+ SeupMocks(establishment, establishmentAbsence, lAAbsence, englandAbsence);
+
+ // Act
+ var result = await _service.GetAttendenceDetailsAsync(establishment.URN, CancellationToken.None);
+
+ // Assert (common)
+ AssertCommon(result, establishment);
+
+ Assert.Equal(absence.est, result.EstablishmentPersistentAbsence.Value);
+ Assert.Equal(absence.la, result.LocalAuthorityPersistentAbsence.Value);
+ Assert.Equal(absence.eng, result.EnglandPersistentAbsence.Value);
+
+ Assert.Equal(PersistentAbsenceTotal, result.EstablishmentPersistentAbsenceTotal.Value);
+ Assert.Equal(isKS2, result.IsKS2);
+ Assert.Equal(isKS4, result.IsKS4);
+
+ if (isKS2)
+ {
+ Assert.Equal(KS2EnrolmentsTotal, result.EstablishmentEnrolmentsTotal.Value);
+ }
+ if (isKS4)
+ {
+ Assert.Equal(KS4EnrolmentsTotal, result.EstablishmentEnrolmentsTotal.Value);
+ }
+ if (isSpecialSchool)
+ {
+ Assert.Equal(SpeEnrolmentsTotal, result.EstablishmentEnrolmentsTotal.Value);
+ }
+ }
+
+ private void SeupMocks(
+ EstablishmentMinimumServiceModel establishment,
+ EstablishmentAbsence establishmentAbsence,
+ LAAbsence lAAbsence,
+ EnglandAbsence englandAbsence)
+ {
+ _mockEstablishmentService
+ .Setup(r => r.GetEstablishmentMinimumAsync(It.IsAny(), It.IsAny()))
+ .ReturnsAsync(establishment);
+
+ _mockEstablishmentAbsenceService
+ .Setup(r => r.GetEstablishmentAbsenceAsync(It.IsAny(), It.IsAny()))
+ .ReturnsAsync(establishmentAbsence);
+
+ _mockLAAbsenceService
+ .Setup(r => r.GetLAAbsenceAsync(It.IsAny(), It.IsAny()))
+ .ReturnsAsync(lAAbsence);
+
+ _mockEnglandAbsenceService
+ .Setup(r => r.GetEnglandAbsenceAsync(It.IsAny()))
+ .ReturnsAsync(englandAbsence);
+ }
+
+ private static EstablishmentMinimumServiceModel CreateEstablishment(bool isKS2, bool isKS4, bool isSpecialSchool)
+ {
+ return new EstablishmentMinimumServiceModel
+ {
+ URN = "123456",
+ EstablishmentName = "School",
+ LAName = "TEST LA",
+ LAId= "123",
+ IsKS2 = isKS2,
+ IsKS4 = isKS4,
+ TypeOfEstablishment = isSpecialSchool ? TypeOfEstablishment.CommunitySpecialSchool : TypeOfEstablishment.CommunitySchool
+ };
+ }
+
+ private static CodedDouble CreateCoded(double? value)
+ {
+ return new CodedDouble(value, string.Empty, value?.ToString() ?? string.Empty);
+ }
+
+ private static CodedDouble CreateCoded(int value)
+ {
+ return new CodedDouble(value, string.Empty, value.ToString());
+ }
+
+ private static IEnumerable CreateScenarios((double? est, double? la, double? eng)[] vals)
+ {
+ foreach (var schoolType in SchoolTypes)
+ {
+ foreach (var value in vals)
+ {
+ yield return [schoolType.isKS2, schoolType.isKS4, schoolType.isSpecialSchool, value];
+ }
+ }
+ }
+
+ private static void AssertCommon(AttendanceModel result, EstablishmentMinimumServiceModel establishment)
+ {
+ Assert.NotNull(result);
+ Assert.Equal(establishment.URN, result.Urn);
+ Assert.Equal(establishment.EstablishmentName, result.SchoolName);
+ Assert.Equal(establishment.LAName, result.LocalAuthority);
+ }
+
+ private static double? GetAsAttendance(double? absence)
+ {
+ return absence.HasValue ? 100 - absence.Value : null;
+ }
+}
diff --git a/Tests/SAPPub.Core.Tests/Services/KS4/Absence/EnglandAbsenceServiceTests.cs b/Tests/SAPPub.Core.Tests/Services/KS4/Absence/EnglandAbsenceServiceTests.cs
index 320b79f1e..33471f556 100644
--- a/Tests/SAPPub.Core.Tests/Services/KS4/Absence/EnglandAbsenceServiceTests.cs
+++ b/Tests/SAPPub.Core.Tests/Services/KS4/Absence/EnglandAbsenceServiceTests.cs
@@ -2,6 +2,7 @@
using SAPPub.Core.Entities.KS4.Absence;
using SAPPub.Core.Interfaces.Repositories.KS4.Absence;
using SAPPub.Core.Services.KS4.Absence;
+using SAPPub.Core.ValueObjects;
namespace SAPPub.Core.Tests.Services.KS4.Absence;
@@ -21,7 +22,7 @@ public EnglandAbsenceServiceTests()
public async Task GetEnglandAbsenceAsync_ShouldReturnData()
{
// Arrange
- var expected = new EnglandAbsence { Abs_Tot_Eng_Current_Pct = 10.99 };
+ var expected = new EnglandAbsence { Abs_Tot_Eng_Current_Pct_Coded = new CodedDouble(10.99, string.Empty, "10.99") };
_mockRepo
.Setup(r => r.GetEnglandAbsenceAsync(It.IsAny()))
@@ -32,7 +33,7 @@ public async Task GetEnglandAbsenceAsync_ShouldReturnData()
// Assert
Assert.NotNull(result);
- Assert.Equal(expected.Abs_Tot_Eng_Current_Pct, result.Abs_Tot_Eng_Current_Pct);
+ Assert.Equal(expected.Abs_Tot_Eng_Current_Pct_Coded.Value, result.Abs_Tot_Eng_Current_Pct_Coded.Value);
}
[Fact]
diff --git a/Tests/SAPPub.Core.Tests/Services/KS4/Absence/EstablishmentAbsenceServiceTests.cs b/Tests/SAPPub.Core.Tests/Services/KS4/Absence/EstablishmentAbsenceServiceTests.cs
index 935c8855e..17f047b61 100644
--- a/Tests/SAPPub.Core.Tests/Services/KS4/Absence/EstablishmentAbsenceServiceTests.cs
+++ b/Tests/SAPPub.Core.Tests/Services/KS4/Absence/EstablishmentAbsenceServiceTests.cs
@@ -2,6 +2,7 @@
using SAPPub.Core.Entities.KS4.Absence;
using SAPPub.Core.Interfaces.Repositories.KS4.Absence;
using SAPPub.Core.Services.KS4.Absence;
+using SAPPub.Core.ValueObjects;
namespace SAPPub.Core.Tests.Services.KS4.Absence
{
@@ -22,8 +23,8 @@ public async Task GetAllEstablishmentAbsenceAsync_ShouldReturnAllItems()
// Arrange
var expectedAbsences = new List
{
- new() { Id = "100", Abs_Tot_Est_Current_Pct = 99.99 },
- new() { Id = "101", Abs_Tot_Est_Current_Pct = 90.00 }
+ new() { Id = "100", Abs_Tot_Est_Current_Pct_Coded = new CodedDouble(99.99, string.Empty, "99.99") },
+ new() { Id = "101", Abs_Tot_Est_Current_Pct_Coded = new CodedDouble(90.00, string.Empty, "90.00") }
};
_mockRepo
@@ -36,8 +37,8 @@ public async Task GetAllEstablishmentAbsenceAsync_ShouldReturnAllItems()
// Assert
Assert.NotNull(result);
Assert.Equal(2, result.Count());
- Assert.Contains(result, a => a.Abs_Tot_Est_Current_Pct == 99.99);
- Assert.Contains(result, a => a.Abs_Tot_Est_Current_Pct == 90.00);
+ Assert.Contains(result, a => a.Abs_Tot_Est_Current_Pct_Coded.Value == 99.99);
+ Assert.Contains(result, a => a.Abs_Tot_Est_Current_Pct_Coded.Value == 90.00);
}
[Fact]
@@ -61,7 +62,7 @@ public async Task GetEstablishmentAbsenceAsync_ShouldReturnCorrectItem_WhenUrnEx
{
// Arrange
var urn = "100";
- var expectedAbsence = new EstablishmentAbsence { Id = urn, Abs_Tot_Est_Current_Pct = 100 };
+ var expectedAbsence = new EstablishmentAbsence { Id = urn, Abs_Tot_Est_Current_Pct_Coded = new CodedDouble(100, string.Empty, "100") };
_mockRepo
.Setup(r => r.GetEstablishmentAbsenceAsync(urn, It.IsAny()))
@@ -73,7 +74,7 @@ public async Task GetEstablishmentAbsenceAsync_ShouldReturnCorrectItem_WhenUrnEx
// Assert
Assert.NotNull(result);
Assert.Equal(urn, result.Id);
- Assert.Equal(100, result.Abs_Tot_Est_Current_Pct);
+ Assert.Equal(100, result.Abs_Tot_Est_Current_Pct_Coded.Value);
}
[Fact]
diff --git a/Tests/SAPPub.Core.Tests/Services/KS4/Absence/LAAbsenceServiceTests.cs b/Tests/SAPPub.Core.Tests/Services/KS4/Absence/LAAbsenceServiceTests.cs
index 99adeb96b..e9281b240 100644
--- a/Tests/SAPPub.Core.Tests/Services/KS4/Absence/LAAbsenceServiceTests.cs
+++ b/Tests/SAPPub.Core.Tests/Services/KS4/Absence/LAAbsenceServiceTests.cs
@@ -2,6 +2,7 @@
using SAPPub.Core.Entities.KS4.Absence;
using SAPPub.Core.Interfaces.Repositories.KS4.Absence;
using SAPPub.Core.Services.KS4.Absence;
+using SAPPub.Core.ValueObjects;
namespace SAPPub.Core.Tests.Services.KS4.Absence;
@@ -21,7 +22,7 @@ public async Task GetLAAbsenceAsync_ShouldReturnCorrectItem_WhenLaCodeExists()
{
// Arrange
var laCode = "100";
- var expected = new LAAbsence { Id = laCode, Abs_Tot_LA_Current_Pct = 5.5 };
+ var expected = new LAAbsence { Id = laCode, Abs_Tot_LA_Current_Pct_Coded = new CodedDouble(5.5, string.Empty, "5.5") };
_mockRepo
.Setup(r => r.GetLAAbsenceAsync(laCode, It.IsAny()))
@@ -33,7 +34,7 @@ public async Task GetLAAbsenceAsync_ShouldReturnCorrectItem_WhenLaCodeExists()
// Assert
Assert.NotNull(result);
Assert.Equal(laCode, result.Id);
- Assert.Equal(expected.Abs_Tot_LA_Current_Pct, result.Abs_Tot_LA_Current_Pct);
+ Assert.Equal(expected.Abs_Tot_LA_Current_Pct_Coded.Value, result.Abs_Tot_LA_Current_Pct_Coded.Value);
}
[Fact]
@@ -51,7 +52,7 @@ public async Task GetLAAbsenceAsync_ShouldReturnDefault_WhenLaCodeDoesNotExist()
// Assert
Assert.NotNull(result);
- Assert.Null(result.Abs_Tot_LA_Current_Pct);
+ Assert.False(result.Abs_Tot_LA_Current_Pct_Coded.HasValue);
}
[Fact]
diff --git a/Tests/SAPPub.Core.Tests/Services/KS4/Attendance/AttendanceServiceTests.cs b/Tests/SAPPub.Core.Tests/Services/KS4/Attendance/AttendanceServiceTests.cs
deleted file mode 100644
index 9ce109b62..000000000
--- a/Tests/SAPPub.Core.Tests/Services/KS4/Attendance/AttendanceServiceTests.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-using Moq;
-using SAPPub.Core.Entities;
-using SAPPub.Core.Entities.KS4.Absence;
-using SAPPub.Core.Interfaces.Services;
-using SAPPub.Core.Interfaces.Services.KS4.Absence;
-using SAPPub.Core.ServiceModels;
-using SAPPub.Core.Services.KS4.Attendance;
-
-namespace SAPPub.Core.Tests.Services.KS4.Attendance;
-
-public class AttendanceServiceTests
-{
- private readonly Mock _mockEstablishmentService;
- private readonly Mock _mockEstablishmentAbsenceService;
- private readonly Mock _mockLAAbsenceService;
- private readonly Mock _mockEnglandAbsenceService;
- private readonly AttendanceService _service;
-
- private readonly EstablishmentMinimumServiceModel fakeEstablishment = new()
- {
- URN = "123456",
- EstablishmentName = "Test Establishment",
- LAName = "Council",
- LAId = "E09000001"
- };
-
- public static IEnumerable AttendanceData =>
- [
- [(est: (double?)5.55, la: (double?)10.25, eng: (double?)15.55), (est: (double?)94.4, la: (double?)89.8, eng: (double?)84.4)],
- [(est: (double?)10.12, la: (double?)3.45, eng: (double?)7.35), (est: (double?)89.9, la: (double?)96.6, eng: (double?)92.6)],
- [(est: (double?)null, la: (double?)null, eng: (double?)null), (est: (double?)null, la: (double?)null, eng: (double?)null)],
- ];
-
- public static IEnumerable AbsenceData =>
- [
- [(est: (double?)5.45, la: (double?)11.25, eng: (double?)12.55), (est: (double?)5.4, la: (double?)11.2, eng: (double?)12.6)],
- [(est: (double?)10.12, la: (double?)7.45, eng: (double?)8.35), (est: (double?)10.1, la: (double?)7.4, eng: (double?)8.4)],
- [(est: (double?)null, la: (double?)null, eng: (double?)null), (est: (double?)null, la: (double?)null, eng: (double?)null)],
- ];
-
-
- public AttendanceServiceTests()
- {
- _mockEstablishmentService = new();
- _mockEstablishmentAbsenceService = new();
- _mockLAAbsenceService = new();
- _mockEnglandAbsenceService = new();
-
- _service = new AttendanceService(
- _mockEstablishmentService.Object,
- _mockEstablishmentAbsenceService.Object,
- _mockEnglandAbsenceService.Object,
- _mockLAAbsenceService.Object);
- }
-
- [Fact]
- public async Task GetAttendenceDetailsAsync_ShouldReturnEmptyModel_WhenEstablishmentNotFound()
- {
- // Arrange
- var urn = "99999";
- _mockEstablishmentService
- .Setup(r => r.GetEstablishmentMinimumAsync(urn, It.IsAny()))
- .ReturnsAsync(new EstablishmentMinimumServiceModel()); // not found
-
- // Act
- var result = await _service.GetAttendenceDetailsAsync(urn, CancellationToken.None);
-
- // Assert - required members are set, but values are empty
- Assert.NotNull(result);
- Assert.Equal(urn, result.Urn);
- Assert.Null(result.SchoolName);
- Assert.Null(result.LocalAuthority);
- Assert.Null(result.EstablishmentAttendance);
- Assert.Null(result.LocalAuthorityAttendance);
- Assert.Null(result.EnglandAttendance);
- }
-
- [Theory]
- [MemberData(nameof(AttendanceData))]
- public async Task GetAttendenceDetailsAsync_ShouldReturnData(
- (double? est, double? la, double? eng) absence,
- (double? est, double? la, double? eng) expected)
- {
- // Arrange
- var establishmentAbsence = new EstablishmentAbsence
- {
- Id = fakeEstablishment.URN,
- Abs_Tot_Est_Current_Pct = absence.est
- };
-
- var lAAbsence = new LAAbsence
- {
- Id = fakeEstablishment.LAId,
- Abs_Tot_LA_Current_Pct = absence.la
- };
-
- var englandAbsence = new EnglandAbsence
- {
- Id = fakeEstablishment.LAId,
- Abs_Tot_Eng_Current_Pct = absence.eng
- };
-
- _mockEstablishmentService
- .Setup(r => r.GetEstablishmentMinimumAsync(It.IsAny(), It.IsAny()))
- .ReturnsAsync(fakeEstablishment);
-
- _mockEstablishmentAbsenceService
- .Setup(r => r.GetEstablishmentAbsenceAsync(It.IsAny(), It.IsAny()))
- .ReturnsAsync(establishmentAbsence);
-
- _mockLAAbsenceService
- .Setup(r => r.GetLAAbsenceAsync(It.IsAny(), It.IsAny()))
- .ReturnsAsync(lAAbsence);
-
- _mockEnglandAbsenceService
- .Setup(r => r.GetEnglandAbsenceAsync(It.IsAny()))
- .ReturnsAsync(englandAbsence);
-
- // Act
- var result = await _service.GetAttendenceDetailsAsync(fakeEstablishment.URN, CancellationToken.None);
-
- // Assert (common)
- Assert.NotNull(result);
- Assert.Equal(fakeEstablishment.URN, result.Urn);
- Assert.Equal(fakeEstablishment.EstablishmentName, result.SchoolName);
- Assert.Equal(fakeEstablishment.LAName, result.LocalAuthority);
-
- Assert.Equal(expected.est, result.EstablishmentAttendance);
- Assert.Equal(expected.la, result.LocalAuthorityAttendance);
- Assert.Equal(expected.eng, result.EnglandAttendance);
- }
-
- [Theory]
- [MemberData(nameof(AbsenceData))]
- public async Task GetAttendenceDetailsAsync_ShouldReturn_Absence_Data(
- (double? est, double? la, double? eng) absence,
- (double? est, double? la, double? eng) expected)
- {
- // Arrange
- var enrolmentsTotal = 1200;
- var absenceTotal = 120;
-
- var establishmentAbsence = new EstablishmentAbsence
- {
- Id = fakeEstablishment.URN,
- Abs_Persistent_Est_Current_Pct = absence.est,
- Enrolments_Tot_Est_Current_Num = enrolmentsTotal,
- Abs_Persistent_Est_Current_Num = absenceTotal
- };
-
- var lAAbsence = new LAAbsence
- {
- Id = fakeEstablishment.LAId,
- Abs_Persistent_LA_Current_Pct = absence.la
- };
-
- var englandAbsence = new EnglandAbsence
- {
- Id = fakeEstablishment.LAId,
- Abs_Persistent_Eng_Current_Pct = absence.eng
- };
-
- _mockEstablishmentService
- .Setup(r => r.GetEstablishmentMinimumAsync(It.IsAny(), It.IsAny()))
- .ReturnsAsync(fakeEstablishment);
-
- _mockEstablishmentAbsenceService
- .Setup(r => r.GetEstablishmentAbsenceAsync(It.IsAny(), It.IsAny()))
- .ReturnsAsync(establishmentAbsence);
-
- _mockLAAbsenceService
- .Setup(r => r.GetLAAbsenceAsync(It.IsAny(), It.IsAny()))
- .ReturnsAsync(lAAbsence);
-
- _mockEnglandAbsenceService
- .Setup(r => r.GetEnglandAbsenceAsync(It.IsAny()))
- .ReturnsAsync(englandAbsence);
-
- // Act
- var result = await _service.GetAttendenceDetailsAsync(fakeEstablishment.URN, CancellationToken.None);
-
- // Assert (common)
- Assert.NotNull(result);
- Assert.Equal(fakeEstablishment.URN, result.Urn);
- Assert.Equal(fakeEstablishment.EstablishmentName, result.SchoolName);
- Assert.Equal(fakeEstablishment.LAName, result.LocalAuthority);
-
- Assert.Equal(expected.est, result.EstablishmentPersistentAbsence);
- Assert.Equal(expected.la, result.LocalAuthorityPersistentAbsence);
- Assert.Equal(expected.eng, result.EnglandPersistentAbsence);
-
- Assert.Equal(enrolmentsTotal, result.EstablishmentEnrolmentsTotal);
- Assert.Equal(absenceTotal, result.EstablishmentPersistentAbsenceTotal);
- }
-}
diff --git a/Tests/SAPPub.Infrastructure.Tests/Repositories/Absence/EstablishmentAbsenceRepositoryTests.cs b/Tests/SAPPub.Infrastructure.Tests/Repositories/Absence/EstablishmentAbsenceRepositoryTests.cs
index 70d1a5f83..7101d6f63 100644
--- a/Tests/SAPPub.Infrastructure.Tests/Repositories/Absence/EstablishmentAbsenceRepositoryTests.cs
+++ b/Tests/SAPPub.Infrastructure.Tests/Repositories/Absence/EstablishmentAbsenceRepositoryTests.cs
@@ -2,6 +2,7 @@
using Moq;
using SAPPub.Core.Entities.KS4.Absence;
using SAPPub.Core.Interfaces.Repositories.Generic;
+using SAPPub.Core.ValueObjects;
using SAPPub.Infrastructure.Repositories.KS4.Absence;
using System.Collections.Generic;
using System.Linq;
@@ -31,8 +32,8 @@ public async Task GetAllEstablishmentAbsenceAsync_ReturnsAllItemsFromGenericRepo
// Arrange
var expected = new List
{
- new() { Id = "1", Abs_Tot_Est_Current_Pct = 99.99 },
- new() { Id = "2", Abs_Tot_Est_Current_Pct = 88.88 }
+ new() { Id = "1", Abs_Tot_Est_Current_Pct_Coded = new CodedDouble(99.99, string.Empty, "99.99") },
+ new() { Id = "2", Abs_Tot_Est_Current_Pct_Coded = new CodedDouble(88.88, string.Empty, "88.88") }
};
_mockGenericRepo
@@ -74,7 +75,7 @@ public async Task GetEstablishmentAbsenceAsync_ReturnsCorrectItemWhenUrnExists()
{
// Arrange
var urn = "1";
- var expected = new EstablishmentAbsence { Id = urn, Abs_Tot_Est_Current_Pct = 99.99 };
+ var expected = new EstablishmentAbsence { Id = urn, Abs_Tot_Est_Current_Pct_Coded = new CodedDouble(99.99, string.Empty, "99.99") };
_mockGenericRepo
.Setup(r => r.ReadAsync(urn, It.IsAny()))
@@ -86,7 +87,7 @@ public async Task GetEstablishmentAbsenceAsync_ReturnsCorrectItemWhenUrnExists()
// Assert
Assert.NotNull(result);
Assert.Equal(urn, result.Id);
- Assert.Equal(99.99, result.Abs_Tot_Est_Current_Pct);
+ Assert.Equal(99.99, result.Abs_Tot_Est_Current_Pct_Coded.Value);
_mockGenericRepo.Verify(r => r.ReadAsync(urn, It.IsAny()), Times.Once);
}
diff --git a/Tests/SAPPub.Web.Tests/Unit/Areas/Profiles/Controllers/AttendanceControllerTests.cs b/Tests/SAPPub.Web.Tests/Unit/Areas/Profiles/Controllers/AttendanceControllerTests.cs
index 12f43021f..f320173f0 100644
--- a/Tests/SAPPub.Web.Tests/Unit/Areas/Profiles/Controllers/AttendanceControllerTests.cs
+++ b/Tests/SAPPub.Web.Tests/Unit/Areas/Profiles/Controllers/AttendanceControllerTests.cs
@@ -1,11 +1,13 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Moq;
+using NuGet.Protocol.Plugins;
using SAPPub.Core.Enums;
using SAPPub.Core.Interfaces.Services.KS4.Attendance;
using SAPPub.Core.ServiceModels;
using SAPPub.Core.ServiceModels.KS4.Attendance;
using SAPPub.Core.Tests.TestBuilders;
+using SAPPub.Core.ValueObjects;
using SAPPub.Web.Areas.Profiles.Controllers;
using SAPPub.Web.Areas.Profiles.ViewModels.Attendance;
using SAPPub.Web.Constants;
@@ -74,9 +76,9 @@ public async Task Get_Attendance_Info_ReturnsOk(double? estAttendance, double? l
Urn = _fakeEstablishment.URN,
SchoolName = _fakeEstablishment.EstablishmentName,
LocalAuthority = _fakeEstablishment.LAName,
- EstablishmentAttendance = estAttendance,
- LocalAuthorityAttendance = laAttendance,
- EnglandAttendance = engAttendance,
+ EstablishmentAttendance = new CodedDouble(estAttendance,string.Empty, estAttendance?.ToString()!),
+ LocalAuthorityAttendance = new CodedDouble(laAttendance, string.Empty, laAttendance?.ToString()!),
+ EnglandAttendance = new CodedDouble(engAttendance, string.Empty, engAttendance?.ToString()!),
IsKS2 = false,
IsKS4 = true,
IsKS5 = false
@@ -107,7 +109,7 @@ public async Task Get_Attendance_Info_ReturnsOk(double? estAttendance, double? l
}
[Theory]
- [InlineData(5.5, 7.81, 10.2)]
+ [InlineData(5.5, 7.8, 10.2)]
[InlineData(null, null, null)]
public async Task Get_Attendance_Absence_Info_ReturnsOk(double? estAbsence, double? laAbsence, double? engAbsence)
{
@@ -120,11 +122,11 @@ public async Task Get_Attendance_Absence_Info_ReturnsOk(double? estAbsence, doub
Urn = _fakeEstablishment.URN,
SchoolName = _fakeEstablishment.EstablishmentName,
LocalAuthority = _fakeEstablishment.LAName,
- EstablishmentPersistentAbsence = estAbsence,
- LocalAuthorityPersistentAbsence = laAbsence,
- EnglandPersistentAbsence = engAbsence,
- EstablishmentEnrolmentsTotal = enrolmentsTotal,
- EstablishmentPersistentAbsenceTotal = absenceTotal,
+ EstablishmentPersistentAbsence = new CodedDouble(estAbsence, string.Empty, estAbsence?.ToString()!),
+ LocalAuthorityPersistentAbsence = new CodedDouble(laAbsence, string.Empty, laAbsence?.ToString()!),
+ EnglandPersistentAbsence = new CodedDouble(engAbsence, string.Empty, engAbsence?.ToString()!),
+ EstablishmentEnrolmentsTotal = new CodedDouble(enrolmentsTotal, string.Empty, enrolmentsTotal.ToString()!),
+ EstablishmentPersistentAbsenceTotal = new CodedDouble(absenceTotal, string.Empty, absenceTotal.ToString()!),
IsKS2 = false,
IsKS4 = true,
IsKS5 = false
diff --git a/Tests/SAPPub.Web.Tests/Unit/Page/Areas/Profiles/AttendancePageTests.cs b/Tests/SAPPub.Web.Tests/Unit/Page/Areas/Profiles/AttendancePageTests.cs
index 871be7535..74b612938 100644
--- a/Tests/SAPPub.Web.Tests/Unit/Page/Areas/Profiles/AttendancePageTests.cs
+++ b/Tests/SAPPub.Web.Tests/Unit/Page/Areas/Profiles/AttendancePageTests.cs
@@ -1,6 +1,7 @@
using Moq;
using SAPPub.Core.Interfaces.Services.KS4.Attendance;
using SAPPub.Core.ServiceModels.KS4.Attendance;
+using SAPPub.Core.ValueObjects;
using SAPPub.Web.Tests.UI.Helpers;
using SAPPub.Web.Tests.Unit.Page.Infrastructure;
using static SAPPub.Web.Constants.Constants;
@@ -114,9 +115,9 @@ public async Task AttendancePage_Displays_VerticalNavigation()
{
Urn = urn,
SchoolName = establishmentName,
- EstablishmentAttendance = null,
- LocalAuthorityAttendance = null,
- EnglandAttendance = null,
+ EstablishmentAttendance = CodedDouble.Empty,
+ LocalAuthorityAttendance = CodedDouble.Empty,
+ EnglandAttendance = CodedDouble.Empty,
IsKS2 = false,
IsKS4 = true,
IsKS5 = false
@@ -287,9 +288,9 @@ public async Task AttendancePage_Displays_Attendance_Table()
Urn = urn,
SchoolName = establishmentName,
LocalAuthority = "Sheffield",
- EstablishmentAttendance = 50.5,
- LocalAuthorityAttendance = 70.9,
- EnglandAttendance = 65.7,
+ EstablishmentAttendance = new CodedDouble(50.5, string.Empty, "50.5"),
+ LocalAuthorityAttendance = new CodedDouble(70.9, string.Empty, "70.9"),
+ EnglandAttendance = new CodedDouble(65.7, string.Empty, "65.7"),
IsKS2 = true,
IsKS4 = true,
IsKS5 = false
@@ -321,9 +322,9 @@ public async Task AttendancePage_Displays_Attendance_Table_With_NotAvailable()
{
Urn = urn,
SchoolName = establishmentName,
- EstablishmentAttendance = null,
- LocalAuthorityAttendance = null,
- EnglandAttendance = null,
+ EstablishmentAttendance = CodedDouble.Empty,
+ LocalAuthorityAttendance = CodedDouble.Empty,
+ EnglandAttendance = CodedDouble.Empty,
IsKS2 = true,
IsKS4 = true,
IsKS5 = false
@@ -358,11 +359,11 @@ public async Task AttendancePage_Displays_PersistentAbsence_Table()
Urn = urn,
SchoolName = establishmentName,
LocalAuthority = "Sheffield",
- EstablishmentPersistentAbsence = 10.3,
- LocalAuthorityPersistentAbsence = 5.9,
- EnglandPersistentAbsence = 6.7,
- EstablishmentEnrolmentsTotal = enrolmentsTotal,
- EstablishmentPersistentAbsenceTotal = absenceTotal,
+ EstablishmentPersistentAbsence = new CodedDouble(10.3, string.Empty, "10.3"),
+ LocalAuthorityPersistentAbsence = new CodedDouble(5.9, string.Empty, "5.9"),
+ EnglandPersistentAbsence = new CodedDouble(6.7, string.Empty, "6.7"),
+ EstablishmentEnrolmentsTotal = new CodedDouble(enrolmentsTotal, string.Empty, enrolmentsTotal.ToString()),
+ EstablishmentPersistentAbsenceTotal = new CodedDouble(absenceTotal, string.Empty, absenceTotal.ToString()),
IsKS2 = true,
IsKS4 = true,
IsKS5 = false
@@ -400,9 +401,9 @@ public async Task AttendancePage_Displays_PersistentAbsence_Table_With_NotAvaila
{
Urn = urn,
SchoolName = establishmentName,
- EstablishmentAttendance = null,
- LocalAuthorityAttendance = null,
- EnglandAttendance = null,
+ EstablishmentAttendance = CodedDouble.Empty,
+ LocalAuthorityAttendance = CodedDouble.Empty,
+ EnglandAttendance = CodedDouble.Empty,
IsKS2 = true,
IsKS4 = true,
IsKS5 = false