Merge pull request #4683 from dfe-analytical-services/EES-5022

EES-5022 Give AcademicYear identifier precedence over '* term' identi…
dfe-analytical-services · Mar 21, 2024 · 254c475 · 254c475
2 parents d3e7a31 + 275488e
commit 254c475
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/GovUk.Education.ExploreEducationStatistics.Common/Model/TimeIdentifier.cs b/src/GovUk.Education.ExploreEducationStatistics.Common/Model/TimeIdentifier.cs
@@ -11,6 +11,18 @@ namespace GovUk.Education.ExploreEducationStatistics.Common.Model
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     public enum TimeIdentifier
     {
+        [TimeIdentifierMeta("Autumn term", "T1", Term, Academic)]
+        AutumnTerm,
+
+        [TimeIdentifierMeta("Spring term", "T2", Term, Academic)]
+        SpringTerm,
+
+        [TimeIdentifierMeta("Autumn and spring term", "T1T2", Term, Academic)]
+        AutumnSpringTerm,
+
+        [TimeIdentifierMeta("Summer term", "T3", Term, Academic)]
+        SummerTerm,
+
         [TimeIdentifierMeta("Academic year", "AY", Category.AcademicYear, Academic, NoLabel)]
         AcademicYear,
 
@@ -82,18 +94,6 @@ public enum TimeIdentifier
         [TimeIdentifierMeta("Reporting year", "RY", Category.ReportingYear, Default, NoLabel)]
         ReportingYear,
 
-        [TimeIdentifierMeta("Autumn term", "T1", Term, Academic)]
-        AutumnTerm,
-
-        [TimeIdentifierMeta("Autumn and spring term", "T1T2", Term, Academic)]
-        AutumnSpringTerm,
-
-        [TimeIdentifierMeta("Spring term", "T2", Term, Academic)]
-        SpringTerm,
-
-        [TimeIdentifierMeta("Summer term", "T3", Term, Academic)]
-        SummerTerm,
-
         [TimeIdentifierMeta("Week 1", "W1", Week)]
         Week1,
 

diff --git a/...GovUk.Education.ExploreEducationStatistics.Data.Services.Tests/TimeIdentifierUtilTests.cs b/...GovUk.Education.ExploreEducationStatistics.Data.Services.Tests/TimeIdentifierUtilTests.cs
@@ -152,8 +152,8 @@ public void GetTermsReturnsTerms()
             Assert.Equal(new[]
             {
                 AutumnTerm,
-                AutumnSpringTerm,
                 SpringTerm,
+                AutumnSpringTerm,
                 SummerTerm
             }, TimeIdentifierUtil.GetTerms());
         }
@@ -168,4 +168,4 @@ public void GetFinancialYearPartsReturnsFinancialYearParts()
             }, TimeIdentifierUtil.GetFinancialYearParts());
         }
     }
-}
+}
diff --git a/src/GovUk.Education.ExploreEducationStatistics.Data.Services.Tests/TimePeriodUtilTests.cs b/src/GovUk.Education.ExploreEducationStatistics.Data.Services.Tests/TimePeriodUtilTests.cs
@@ -561,24 +561,24 @@ public void RangeIsGeneratedForTermQuery()
                 new List<(int Year, TimeIdentifier TimeIdentifier)>
                 {
                     (2019, AutumnTerm),
-                    (2019, AutumnSpringTerm),
                     (2019, SpringTerm),
+                    (2019, AutumnSpringTerm),
                     (2019, SummerTerm)
                 },
                 TimePeriodUtil.Range(new TimePeriodQuery(2019, AutumnTerm, 2019, SummerTerm)).ToList());
 
             CollectionAssert.AreEquivalent(
                 new List<(int Year, TimeIdentifier TimeIdentifier)>
                 {
-                    (2018, SpringTerm),
+                    (2018, AutumnSpringTerm),
                     (2018, SummerTerm),
                     (2019, AutumnTerm),
-                    (2019, AutumnSpringTerm),
                     (2019, SpringTerm),
+                    (2019, AutumnSpringTerm),
                     (2019, SummerTerm),
                     (2020, AutumnTerm)
                 },
-                TimePeriodUtil.Range(new TimePeriodQuery(2018, SpringTerm, 2020, AutumnTerm)).ToList());
+                TimePeriodUtil.Range(new TimePeriodQuery(2018, AutumnSpringTerm, 2020, AutumnTerm)).ToList());
         }
 
         [Fact]
@@ -609,4 +609,4 @@ public void RangeIsGeneratedForFinancialYearPartQuery()
                 TimePeriodUtil.Range(new TimePeriodQuery(2020, FinancialYearPart1, 2021, FinancialYearPart1)).ToList());
         }
     }
-}
+}