Skip to content

Commit

Permalink
Merge pull request #641 from DFE-Digital/create-ofsted-pages-feature
Browse files Browse the repository at this point in the history 
Create ofsted pages
  • Loading branch information
@dneed-nimble
dneed-nimble authored Dec 2, 2024
2 parents f1bee5d + 3648f53 commit c72ee73
Show file tree
Hide file tree
Showing 71 changed files with 3,486 additions and 1,449 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added

- Add trust page sub navigation
- Added Ofsted pages to service nav level

### Removed

- Remove academies in trust Ofsted page

### Changed

Expand Down
166 changes: 111 additions & 55 deletions DfE.FindInformationAcademiesTrusts.Data.AcademiesDb/Repositories/AcademyRepository.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Globalization;
using DfE.FindInformationAcademiesTrusts.Data.AcademiesDb.Contexts;
using DfE.FindInformationAcademiesTrusts.Data.AcademiesDb.Extensions;
using DfE.FindInformationAcademiesTrusts.Data.Repositories.Academy;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using System.Globalization;

namespace DfE.FindInformationAcademiesTrusts.Data.AcademiesDb.Repositories;

Expand Down Expand Up @@ -55,32 +55,33 @@ private async Task<Dictionary<string, AcademyOfstedRatings>> GetOfstedRatings(in
{
// Ofsted data is held in MisEstablishments for most academies
var ofstedRatings =
await academiesDbContext.MisEstablishments
.Where(me => urns.Contains(me.Urn!.Value))
.Select(me => new AcademyOfstedRatings(me.Urn!.Value,
new OfstedRating(
ConvertOverallEffectivenessToOfstedRatingScore(me.OverallEffectiveness),
(OfstedRatingScore?)me.QualityOfEducation ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.BehaviourAndAttitudes ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.PersonalDevelopment ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.EffectivenessOfLeadershipAndManagement ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.EarlyYearsProvisionWhereApplicable ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.SixthFormProvisionWhereApplicable ?? OfstedRatingScore.None,
OfstedRating.ConvertStringToCategoriesOfConcern(me.CategoryOfConcern),
OfstedRating.ConvertStringToSafeguardingScore(me.SafeguardingIsEffective),
me.InspectionStartDate.ParseAsNullableDate()),
new OfstedRating(
ConvertOverallEffectivenessToOfstedRatingScore(me.PreviousFullInspectionOverallEffectiveness),
(OfstedRatingScore?)me.PreviousQualityOfEducation ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.PreviousBehaviourAndAttitudes ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.PreviousPersonalDevelopment ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.PreviousEffectivenessOfLeadershipAndManagement ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.PreviousEarlyYearsProvisionWhereApplicable ?? OfstedRatingScore.None,
(OfstedRatingScore?)me.PreviousSixthFormProvisionWhereApplicable.ParseAsNullableInt() ?? OfstedRatingScore.None,
OfstedRating.ConvertStringToCategoriesOfConcern(me.PreviousCategoryOfConcern),
OfstedRating.ConvertStringToSafeguardingScore(me.PreviousSafeguardingIsEffective),
me.PreviousInspectionStartDate.ParseAsNullableDate())))
.ToListAsync();
await academiesDbContext.MisEstablishments
.Where(me => urns.Contains(me.Urn!.Value))
.Select(me => new AcademyOfstedRatings(
me.Urn!.Value,
new OfstedRating(
ConvertOverallEffectivenessToOfstedRatingScore(me.OverallEffectiveness),
ConvertNullableIntToOfstedRatingScore(me.QualityOfEducation),
ConvertNullableIntToOfstedRatingScore(me.BehaviourAndAttitudes),
ConvertNullableIntToOfstedRatingScore(me.PersonalDevelopment),
ConvertNullableIntToOfstedRatingScore(me.EffectivenessOfLeadershipAndManagement),
ConvertNullableIntToOfstedRatingScore(me.EarlyYearsProvisionWhereApplicable),
ConvertNullableIntToOfstedRatingScore(me.SixthFormProvisionWhereApplicable),
ConvertStringToCategoriesOfConcern(me.CategoryOfConcern),
ConvertStringToSafeguardingScore(me.SafeguardingIsEffective),
me.InspectionStartDate.ParseAsNullableDate()),
new OfstedRating(
ConvertOverallEffectivenessToOfstedRatingScore(me.PreviousFullInspectionOverallEffectiveness),
ConvertNullableIntToOfstedRatingScore(me.PreviousQualityOfEducation),
ConvertNullableIntToOfstedRatingScore(me.PreviousBehaviourAndAttitudes),
ConvertNullableIntToOfstedRatingScore(me.PreviousPersonalDevelopment),
ConvertNullableIntToOfstedRatingScore(me.PreviousEffectivenessOfLeadershipAndManagement),
ConvertNullableIntToOfstedRatingScore(me.PreviousEarlyYearsProvisionWhereApplicable),
ConvertNullableStringToOfstedRatingScore(me.PreviousSixthFormProvisionWhereApplicable),
ConvertStringToCategoriesOfConcern(me.PreviousCategoryOfConcern),
ConvertStringToSafeguardingScore(me.PreviousSafeguardingIsEffective),
me.PreviousInspectionStartDate.ParseAsNullableDate())))
.ToListAsync();

// Look in MisFurtherEducationEstablishments for academies not found in MisEstablishments
// Note: if an entry is in MisEstablishments then it will not be in MisFurtherEducationEstablishments, even if it has no ofsted data
Expand All @@ -91,38 +92,51 @@ await academiesDbContext.MisEstablishments
await academiesDbContext.MisFurtherEducationEstablishments
.Where(mfe => urnsNotInMisEstablishments.Contains(mfe.ProviderUrn))
.Select(mfe =>
new AcademyOfstedRatings(mfe.ProviderUrn, new OfstedRating(
(OfstedRatingScore?)mfe.OverallEffectiveness ?? OfstedRatingScore.None,
(OfstedRatingScore?)mfe.QualityOfEducation ?? OfstedRatingScore.None,
(OfstedRatingScore?)mfe.BehaviourAndAttitudes ?? OfstedRatingScore.None,
(OfstedRatingScore?)mfe.PersonalDevelopment ?? OfstedRatingScore.None,
(OfstedRatingScore?)mfe.EffectivenessOfLeadershipAndManagement ??
OfstedRatingScore.None,
OfstedRatingScore.None, OfstedRatingScore.None,
CategoriesOfConcern.None,
OfstedRating.ConvertStringToSafeguardingScore(mfe.IsSafeguardingEffective),
new AcademyOfstedRatings(
mfe.ProviderUrn,
new OfstedRating(
ConvertNullableIntToOfstedRatingScore(mfe.OverallEffectiveness),
ConvertNullableIntToOfstedRatingScore(mfe.QualityOfEducation),
ConvertNullableIntToOfstedRatingScore(mfe.BehaviourAndAttitudes),
ConvertNullableIntToOfstedRatingScore(mfe.PersonalDevelopment),
ConvertNullableIntToOfstedRatingScore(mfe.EffectivenessOfLeadershipAndManagement),
OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected,
CategoriesOfConcern.DoesNotApply,
ConvertStringToSafeguardingScore(mfe.IsSafeguardingEffective),
mfe.LastDayOfInspection.ParseAsNullableDate()),
new OfstedRating(
(OfstedRatingScore?)mfe.PreviousOverallEffectiveness ?? OfstedRatingScore.None,
(OfstedRatingScore?)mfe.PreviousQualityOfEducation ?? OfstedRatingScore.None,
(OfstedRatingScore?)mfe.PreviousBehaviourAndAttitudes ?? OfstedRatingScore.None,
(OfstedRatingScore?)mfe.PreviousPersonalDevelopment ?? OfstedRatingScore.None,
(OfstedRatingScore?)mfe.PreviousEffectivenessOfLeadershipAndManagement ??
OfstedRatingScore.None,
OfstedRatingScore.None, OfstedRatingScore.None,
CategoriesOfConcern.None,
OfstedRating.ConvertStringToSafeguardingScore(mfe.PreviousSafeguarding),
ConvertNullableIntToOfstedRatingScore(mfe.PreviousOverallEffectiveness),
ConvertNullableIntToOfstedRatingScore(mfe.PreviousQualityOfEducation),
ConvertNullableIntToOfstedRatingScore(mfe.PreviousBehaviourAndAttitudes),
ConvertNullableIntToOfstedRatingScore(mfe.PreviousPersonalDevelopment),
ConvertNullableIntToOfstedRatingScore(
mfe.PreviousEffectivenessOfLeadershipAndManagement),
OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected,
CategoriesOfConcern.DoesNotApply,
ConvertStringToSafeguardingScore(mfe.PreviousSafeguarding),
mfe.PreviousLastDayOfInspection.ParseAsNullableDate())))
.ToArrayAsync()
);
}

// Log any URNs that couldn't be found
foreach (var urn in urns.Except(ofstedRatings.Select(a => a.Urn)))
{
logger.LogError(
"URN {Urn} was not found in Mis.Establishments or Mis.FurtherEducationEstablishments. This indicates a data integrity issue with the Ofsted data in Academies Db.",
urn);
ofstedRatings.Add(new AcademyOfstedRatings(urn, OfstedRating.None, OfstedRating.None));
ofstedRatings.Add(new AcademyOfstedRatings(urn, OfstedRating.Unknown, OfstedRating.Unknown));
}

//Log any errors that occured during parsing (we have to do this outside of the EF call)
foreach (var ofstedRating in ofstedRatings.Where(rating =>
rating.Current.HasAnyUnknownRating || rating.Previous.HasAnyUnknownRating))
{
logger.LogError(
"URN {Urn} has some unrecognised ofsted ratings. This could be a data integrity issue with the Ofsted data in Academies Db.",
ofstedRating.Urn);
}

return ofstedRatings.ToDictionary(o => o.Urn.ToString(), o => o);
Expand Down Expand Up @@ -192,25 +206,67 @@ public async Task<AcademyOverview[]> GetOverviewOfAcademiesInTrustAsync(string u
))
.ToArrayAsync();
}

public static OfstedRatingScore ConvertOverallEffectivenessToOfstedRatingScore(string? rating)
{
if (string.IsNullOrWhiteSpace(rating))
return OfstedRatingScore.None;

// Check if it is 'Not judged' all other gradings are int based
if (rating.ToLower().Equals("not judged"))
if (rating?.ToLower().Equals("not judged") ?? false)
{
return OfstedRatingScore.NoJudgement;
}

// Attempt to parse the string as an integer
if (int.TryParse(rating, out int intRating) && Enum.IsDefined(typeof(OfstedRatingScore), intRating))
return ConvertNullableStringToOfstedRatingScore(rating);
}

private static OfstedRatingScore ConvertNullableIntToOfstedRatingScore(int? rating)
{
if (rating is null)
return OfstedRatingScore.NotInspected;

if (Enum.IsDefined(typeof(OfstedRatingScore), rating))
return (OfstedRatingScore)rating;

return OfstedRatingScore.Unknown;
}

private static OfstedRatingScore ConvertNullableStringToOfstedRatingScore(string? rating)
{
if (rating is null)
return OfstedRatingScore.NotInspected;

// Attempt to parse the string as an integer then cast to enum
if (int.TryParse(rating, out var intRating) && Enum.IsDefined(typeof(OfstedRatingScore), intRating))
{
return (OfstedRatingScore)intRating;
}

// Default case if parsing fails
return OfstedRatingScore.None;
return OfstedRatingScore.Unknown;
}

private static CategoriesOfConcern ConvertStringToCategoriesOfConcern(string? input)
{
return input switch
{
null => CategoriesOfConcern.NotInspected,
"" => CategoriesOfConcern.NoConcerns,
"SM" => CategoriesOfConcern.SpecialMeasures,
"SWK" => CategoriesOfConcern.SeriousWeakness,
"NTI" => CategoriesOfConcern.NoticeToImprove,
_ => CategoriesOfConcern.Unknown
};
}

private static SafeguardingScore ConvertStringToSafeguardingScore(string? input)
{
return input switch
{
null or "NULL" => SafeguardingScore.NotInspected,
"Yes" => SafeguardingScore.Yes,
"No" => SafeguardingScore.No,
"9" => SafeguardingScore.NotRecorded,
_ => SafeguardingScore.Unknown
};
}

private sealed record AcademyOfstedRatings(int Urn, OfstedRating Current, OfstedRating Previous);
}
8 changes: 8 additions & 0 deletions DfE.FindInformationAcademiesTrusts.Data/Enums/BeforeOrAfterJoining.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace DfE.FindInformationAcademiesTrusts.Data.Enums;

public enum BeforeOrAfterJoining
{
Before,
After,
NotYetInspected
}
97 changes: 36 additions & 61 deletions DfE.FindInformationAcademiesTrusts.Data/OfstedRating.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,84 +3,55 @@ namespace DfE.FindInformationAcademiesTrusts.Data;
public record OfstedRating(
OfstedRatingScore OverallEffectiveness,
OfstedRatingScore QualityOfEducation,
OfstedRatingScore BehaviourAndAttitudues,
OfstedRatingScore BehaviourAndAttitudes,
OfstedRatingScore PersonalDevelopment,
OfstedRatingScore EffectivenessOfLeadershipAndManagement,
OfstedRatingScore EarlyYearsProvision,
OfstedRatingScore SixthFormProvision,
CategoriesOfConcern CategoryOfConcern,
SafeguardingScore SafeguradingIsEffective,
SafeguardingScore SafeguardingIsEffective,
DateTime? InspectionDate)
{
public static readonly OfstedRating None = new(OfstedRatingScore.None, OfstedRatingScore.None,
OfstedRatingScore.None, OfstedRatingScore.None,
OfstedRatingScore.None, OfstedRatingScore.None, OfstedRatingScore.None, CategoriesOfConcern.None,
SafeguardingScore.None, null);
public static readonly OfstedRating NotInspected = new(OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected, OfstedRatingScore.NotInspected, OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected, OfstedRatingScore.NotInspected, OfstedRatingScore.NotInspected,
CategoriesOfConcern.NotInspected, SafeguardingScore.NotInspected, null);

public static readonly OfstedRating Unknown = new(OfstedRatingScore.Unknown, OfstedRatingScore.Unknown,
OfstedRatingScore.Unknown, OfstedRatingScore.Unknown, OfstedRatingScore.Unknown, OfstedRatingScore.Unknown,
OfstedRatingScore.Unknown, CategoriesOfConcern.Unknown, SafeguardingScore.Unknown, null);

public OfstedRating(int? overallEffectiveness, DateTime? inspectionDate)
: this(
(OfstedRatingScore?)overallEffectiveness ?? OfstedRatingScore.None,
OfstedRatingScore.None,
OfstedRatingScore.None,
OfstedRatingScore.None,
OfstedRatingScore.None,
OfstedRatingScore.None,
OfstedRatingScore.None,
CategoriesOfConcern.None,
SafeguardingScore.None,
(OfstedRatingScore?)overallEffectiveness ?? OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected,
OfstedRatingScore.NotInspected,
CategoriesOfConcern.NotInspected,
SafeguardingScore.NotInspected,
inspectionDate
)
{
}

public static SafeguardingScore ConvertStringToSafeguardingScore(string? input)
{
switch (input)
{
case SafeguardingScoreString.Yes:
return SafeguardingScore.Yes;
case SafeguardingScoreString.No:
return SafeguardingScore.No;
case SafeguardingScoreString.Nine:
return SafeguardingScore.NotRecorded;
default:
return SafeguardingScore.None;
}
}

public static CategoriesOfConcern ConvertStringToCategoriesOfConcern(string? input)
{
switch (input)
{
case CategoriesOfConcernString.SpecialMeasures:
return CategoriesOfConcern.SpecialMeasures;
case CategoriesOfConcernString.SeriousWeakness:
return CategoriesOfConcern.SeriousWeakness;
case CategoriesOfConcernString.NoticeToImprove:
return CategoriesOfConcern.NoticeToImprove;
default:
return CategoriesOfConcern.None;
}
}
}

public static class SafeguardingScoreString
{
public const string Yes = "Yes";
public const string No = "No";
public const string Nine = "9";
}

public static class CategoriesOfConcernString
{
public const string SpecialMeasures = "SM";
public const string SeriousWeakness = "SWK";
public const string NoticeToImprove = "NTI";
public bool HasAnyUnknownRating => OverallEffectiveness == OfstedRatingScore.Unknown
|| QualityOfEducation == OfstedRatingScore.Unknown
|| BehaviourAndAttitudes == OfstedRatingScore.Unknown
|| PersonalDevelopment == OfstedRatingScore.Unknown
|| EffectivenessOfLeadershipAndManagement == OfstedRatingScore.Unknown
|| EarlyYearsProvision == OfstedRatingScore.Unknown
|| SixthFormProvision == OfstedRatingScore.Unknown
|| CategoryOfConcern == CategoriesOfConcern.Unknown
|| SafeguardingIsEffective == SafeguardingScore.Unknown;
}

public enum OfstedRatingScore
{
None = -1,
Unknown = -99,
NotInspected = -1,
InsufficientEvidence = 0,
Outstanding = 1,
Good = 2,
Expand All @@ -92,15 +63,19 @@ public enum OfstedRatingScore

public enum SafeguardingScore
{
None = -1,
Unknown = -99,
NotInspected = -1,
Yes,
No,
NotRecorded = 9
}

public enum CategoriesOfConcern
{
None = -1,
Unknown = -99,
NotInspected = -1,
DoesNotApply,
NoConcerns,
SpecialMeasures,
SeriousWeakness,
NoticeToImprove
Expand Down
Loading

0 comments on commit c72ee73

Please sign in to comment.