Skip to content

Commit

Permalink
EES-5740 Add filter hierarchy test data sets
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmyoungman
mmyoungman committed Dec 19, 2024
1 parent a9da4b4 commit b894047
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ...cation.ExploreEducationStatistics.Data.Processor/Models/FilterAndIndicatorValuesReader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public string GetFilterItemLabel(
return rowValues[columnIndex].Trim().NullIfWhiteSpace() ?? DefaultFilterItemLabel;
}

public string GetFilterGroupLabel( // @MarkFix
public string GetFilterGroupLabel(
IReadOnlyList<string> rowValues,
Guid filterId)
{
Expand Down
2 changes: 1 addition & 1 deletion src/GovUk.Education.ExploreEducationStatistics.Data.Processor/Models/MetaDataFileReader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public MetaRow GetMetaRow(IReadOnlyList<string> rowValues)
ColumnName = ReadMetaColumnValue(MetaColumns.col_name, rowValues),
ColumnType = Enum.Parse<ColumnType>(columnType!),
Label = ReadMetaColumnValue(MetaColumns.label, rowValues),
FilterGroupingColumn = ReadMetaColumnValue(MetaColumns.filter_grouping_column, rowValues), // @MarkFix
FilterGroupingColumn = ReadMetaColumnValue(MetaColumns.filter_grouping_column, rowValues),
FilterHint = ReadMetaColumnValue(MetaColumns.filter_hint, rowValues),
IndicatorGrouping = ReadMetaColumnValue(MetaColumns.indicator_grouping, rowValues),
IndicatorUnit = EnumUtil.GetFromEnumValue<IndicatorUnit>(!indicatorUnit.IsNullOrEmpty() ? indicatorUnit : ""),
Expand Down
17 changes: 17 additions & 0 deletions tests/test-data/files/small-files/filter-hierarchies/filter_hierarchy1.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
time_period,time_identifier,geographic_level,country_code,country_name,old_la_code,new_la_code,la_name,filter_one,filter_two,ind_one
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,One,1
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,One,2
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneOne,One,3
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,One,4
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,Two,5
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneOne,Two,6
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,Two,7
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,Two,8
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,Three,9
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,Three,10
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,Three,11
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,Three,12
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,Four,13
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,Four,14
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,Four,15
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,Four,16
4 changes: 4 additions & 0 deletions tests/test-data/files/small-files/filter-hierarchies/filter_hierarchy1.meta.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
col_name,col_type,label,indicator_grouping,indicator_unit,indicator_dp,filter_hint,filter_grouping_column
ind_one,Indicator,Indicator one,,,,,
filter_one,Filter,Filter one,,,,,
filter_two,Filter,Filter two,,,,,filter_one
17 changes: 17 additions & 0 deletions tests/test-data/files/small-files/filter-hierarchies/filter_hierarchy2.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
time_period,time_identifier,geographic_level,country_code,country_name,old_la_code,new_la_code,la_name,filter_one,filter_two,filter_three,ind_one
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoOne,ThreeOne,1
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoOne,ThreeOne,2
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneOne,TwoOne,ThreeTwo,3
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoOne,ThreeTwo,4
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoTwo,ThreeThree,5
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneOne,TwoTwo,ThreeThree,6
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoTwo,ThreeFour,7
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoTwo,ThreeFour,8
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,TwoThree,ThreeFive,9
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,TwoThree,ThreeFive,10
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,TwoThree,ThreeSix,11
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,TwoThree,ThreeSix,12
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,TwoFour,ThreeSeven,13
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,TwoFour,ThreeSeven,14
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,TwoFour,ThreeEight,15
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,TwoFour,ThreeEight,16
5 changes: 5 additions & 0 deletions tests/test-data/files/small-files/filter-hierarchies/filter_hierarchy2.meta.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
col_name,col_type,label,indicator_grouping,indicator_unit,indicator_dp,filter_hint,filter_grouping_column
ind_one,Indicator,Indicator one,,,,,
filter_one,Filter,Filter one,,,,,
filter_two,Filter,Filter two,,,,,filter_one
filter_three,Filter,Filter three,,,,,filter_two
17 changes: 17 additions & 0 deletions tests/test-data/files/small-files/filter-hierarchies/filter_hierarchy3.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
time_period,time_identifier,geographic_level,country_code,country_name,old_la_code,new_la_code,la_name,filter_one,filter_two,filter_three,other_filter_one,other_filter_two,ind_one
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoOne,ThreeOne,OneOne,TwoOne,1
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoOne,ThreeOne,OneOne,TwoTwo,2
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneOne,TwoOne,ThreeTwo,OneOne,TwoThree,3
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoOne,ThreeTwo,OneTwo,TwoThree,4
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoTwo,ThreeThree,OneTwo,TwoFour,5
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneOne,TwoTwo,ThreeThree,OneTwo,TwoFive,6
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoTwo,ThreeFour,OneThree,TwoSix,7
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneOne,TwoTwo,ThreeFour,OneThree,TwoSix,8
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,TwoThree,ThreeFive,OneThree,TwoSeven,9
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,TwoThree,ThreeFive,OneFour,TwoEight,10
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,TwoThree,ThreeSix,OneFour,TwoNine,11
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,TwoThree,ThreeSix,OneFour,TwoNine,12
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,TwoFour,ThreeSeven,OneFive,TwoTen,13
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,TwoFour,ThreeSeven,OneFive,TwoEleven,14
2018,Calendar year,Local authority,E92000001,England,330,E08000025,Birmingham,OneTwo,TwoFour,ThreeEight,OneFive,TwoTwelve,15
2018,Calendar year,Local authority,E92000001,England,370,E08000016,Barnsley,OneTwo,TwoFour,ThreeEight,OneSix,TwoTwelve,16
7 changes: 7 additions & 0 deletions tests/test-data/files/small-files/filter-hierarchies/filter_hierarchy3.meta.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
col_name,col_type,label,indicator_grouping,indicator_unit,indicator_dp,filter_hint,filter_grouping_column
ind_one,Indicator,Indicator one,,,,,
filter_one,Filter,Filter one,,,,,
filter_two,Filter,Filter two,,,,,filter_one
filter_three,Filter,Filter three,,,,,filter_two
other_filter_one,Filter,Other filter one,,,,,
other_filter_two,Filter,Other filter two,,,,,other_filter_one

0 comments on commit b894047

Please sign in to comment.