From 1266247abbe843f97f310f1d74567358aae827ee Mon Sep 17 00:00:00 2001 From: Marc Woolfson Date: Fri, 3 Jan 2025 10:15:30 +0000 Subject: [PATCH] chore: Bumped `platform` dependencies --- platform/Directory.Packages.props | 12 +-- .../Platform.Api.Benchmark/packages.lock.json | 26 +++--- .../packages.lock.json | 34 +++---- .../Platform.Api.Insight/packages.lock.json | 26 +++--- .../Platform.Orchestrator/packages.lock.json | 6 +- platform/terraform/README.md | 4 +- .../terraform/modules/functions/README.md | 2 +- .../terraform/modules/functions/provider.tf | 2 +- platform/terraform/provider.tf | 2 +- .../Features/InsightBalance.feature | 4 +- .../Features/InsightCensus.feature | 12 +-- .../Features/InsightExpenditure.feature | 14 +-- .../Features/InsightIncome.feature | 8 +- .../Features/InsightSchools.feature | 88 +++++++++---------- .../Features/InsightTrusts.feature | 12 +-- .../Platform.ApiTests/packages.lock.json | 56 ++++++------ .../tests/Platform.Tests/packages.lock.json | 62 ++++++------- 17 files changed, 185 insertions(+), 185 deletions(-) diff --git a/platform/Directory.Packages.props b/platform/Directory.Packages.props index 8fdb0fb4c..a353fc13a 100644 --- a/platform/Directory.Packages.props +++ b/platform/Directory.Packages.props @@ -3,13 +3,13 @@ true - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -17,7 +17,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -53,7 +53,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/platform/src/apis/Platform.Api.Benchmark/packages.lock.json b/platform/src/apis/Platform.Api.Benchmark/packages.lock.json index 66a712948..241bbc6fa 100644 --- a/platform/src/apis/Platform.Api.Benchmark/packages.lock.json +++ b/platform/src/apis/Platform.Api.Benchmark/packages.lock.json @@ -4,12 +4,12 @@ "net8.0": { "AspNetCore.HealthChecks.SqlServer": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "sTcVVq7/zhfUrSTs0WAktvPdpU1He/sj14gRTogq4eFhn0oImolxNNhJczkYMgFF92RMMW+O+rlcFO7HVOpfiQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "UxCf65iCF2nU1u7AcB320abjL4CRg5swCgJECY6mKk1j5lrGMfVtskWwriGs1T29pYdRig9Vra3SPnP+4G82pA==", "dependencies": { - "Microsoft.Data.SqlClient": "5.2.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0" + "Microsoft.Data.SqlClient": "5.2.2", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11" } }, "Dapper.Contrib": { @@ -713,8 +713,8 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" + "resolved": "8.0.11", + "contentHash": "So3JUdRxozRjvQ3cxU6F3nI/i4emDnjane6yMYcJhvTTTu29ltlIdoXjkFGRceIWz8yKvuEpzXItZ0x5GvN2nQ==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -2132,13 +2132,13 @@ "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "CentralTransitive", "requested": "[8.0.7, )", - "resolved": "8.0.0", - "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", + "resolved": "8.0.11", + "contentHash": "zLgN22Zp9pk8RHlwssRTexw4+a6wqOnKWN+VejdPn5Yhjql4XiBhkFo35Nu8mmqHIk/UEmmCnMGLWq75aFfkOw==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.11", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Logging": { diff --git a/platform/src/apis/Platform.Api.Establishment/packages.lock.json b/platform/src/apis/Platform.Api.Establishment/packages.lock.json index 00e029792..99b1f814c 100644 --- a/platform/src/apis/Platform.Api.Establishment/packages.lock.json +++ b/platform/src/apis/Platform.Api.Establishment/packages.lock.json @@ -4,22 +4,22 @@ "net8.0": { "AspNetCore.HealthChecks.AzureSearch": { "type": "Direct", - "requested": "[8.0.1, )", - "resolved": "8.0.1", - "contentHash": "rEpoQN11MnaAXuWIL4N0z0cCxYmRg6u5vy1/tsxlMgnLwoQBJ5hun9noL5sxlGu21PXD/RsEEpd+j8PIRZg/QQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "+S8xLA2tAfVO+pYtLEYsGO+LnOuT3njdGBFZF6ENZ31e5X9BaybBmdM0FKqGP+281L+Qo+VCPV/e9GKAcCznHA==", "dependencies": { "Azure.Search.Documents": "11.5.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11" } }, "AspNetCore.HealthChecks.SqlServer": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "sTcVVq7/zhfUrSTs0WAktvPdpU1He/sj14gRTogq4eFhn0oImolxNNhJczkYMgFF92RMMW+O+rlcFO7HVOpfiQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "UxCf65iCF2nU1u7AcB320abjL4CRg5swCgJECY6mKk1j5lrGMfVtskWwriGs1T29pYdRig9Vra3SPnP+4G82pA==", "dependencies": { - "Microsoft.Data.SqlClient": "5.2.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0" + "Microsoft.Data.SqlClient": "5.2.2", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11" } }, "Dapper.Contrib": { @@ -712,8 +712,8 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" + "resolved": "8.0.11", + "contentHash": "So3JUdRxozRjvQ3cxU6F3nI/i4emDnjane6yMYcJhvTTTu29ltlIdoXjkFGRceIWz8yKvuEpzXItZ0x5GvN2nQ==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -2166,13 +2166,13 @@ "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "CentralTransitive", "requested": "[8.0.7, )", - "resolved": "8.0.0", - "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", + "resolved": "8.0.11", + "contentHash": "zLgN22Zp9pk8RHlwssRTexw4+a6wqOnKWN+VejdPn5Yhjql4XiBhkFo35Nu8mmqHIk/UEmmCnMGLWq75aFfkOw==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.11", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Logging": { diff --git a/platform/src/apis/Platform.Api.Insight/packages.lock.json b/platform/src/apis/Platform.Api.Insight/packages.lock.json index 4ff678068..34568ae55 100644 --- a/platform/src/apis/Platform.Api.Insight/packages.lock.json +++ b/platform/src/apis/Platform.Api.Insight/packages.lock.json @@ -4,12 +4,12 @@ "net8.0": { "AspNetCore.HealthChecks.SqlServer": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "sTcVVq7/zhfUrSTs0WAktvPdpU1He/sj14gRTogq4eFhn0oImolxNNhJczkYMgFF92RMMW+O+rlcFO7HVOpfiQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "UxCf65iCF2nU1u7AcB320abjL4CRg5swCgJECY6mKk1j5lrGMfVtskWwriGs1T29pYdRig9Vra3SPnP+4G82pA==", "dependencies": { - "Microsoft.Data.SqlClient": "5.2.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0" + "Microsoft.Data.SqlClient": "5.2.2", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11" } }, "Dapper.SqlBuilder": { @@ -693,8 +693,8 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" + "resolved": "8.0.11", + "contentHash": "So3JUdRxozRjvQ3cxU6F3nI/i4emDnjane6yMYcJhvTTTu29ltlIdoXjkFGRceIWz8yKvuEpzXItZ0x5GvN2nQ==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -2120,13 +2120,13 @@ "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "CentralTransitive", "requested": "[8.0.7, )", - "resolved": "8.0.0", - "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", + "resolved": "8.0.11", + "contentHash": "zLgN22Zp9pk8RHlwssRTexw4+a6wqOnKWN+VejdPn5Yhjql4XiBhkFo35Nu8mmqHIk/UEmmCnMGLWq75aFfkOw==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.11", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Logging": { diff --git a/platform/src/apis/Platform.Orchestrator/packages.lock.json b/platform/src/apis/Platform.Orchestrator/packages.lock.json index af5d7c65e..4f8c9f222 100644 --- a/platform/src/apis/Platform.Orchestrator/packages.lock.json +++ b/platform/src/apis/Platform.Orchestrator/packages.lock.json @@ -72,9 +72,9 @@ }, "Microsoft.Azure.Functions.Worker.Extensions.DurableTask": { "type": "Direct", - "requested": "[1.2.1, )", - "resolved": "1.2.1", - "contentHash": "e0zdFbhgqGbk/2SObQQQGpzxDKZ431jBd8E+PnpnBXgZrfhYPQZlepx4llzJlyeXRUyzZ+cywbVRIiKb62zW2Q==", + "requested": "[1.2.2, )", + "resolved": "1.2.2", + "contentHash": "4ozw+FXR4u8UTYls67z6Kwm1RbZLRTMq2SDHYWtw+JiUWZjsYZJlre3kV9+Fw5mfmWHJ+iUdVv0idNswg2HLMQ==", "dependencies": { "Microsoft.Azure.Functions.Worker.Core": "1.16.0", "Microsoft.Azure.Functions.Worker.Extensions.Abstractions": "1.3.0", diff --git a/platform/terraform/README.md b/platform/terraform/README.md index b9cc5aaaa..c005b2db4 100644 --- a/platform/terraform/README.md +++ b/platform/terraform/README.md @@ -4,13 +4,13 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9.8 | -| [azurerm](#requirement\_azurerm) | ~> 4.12.0 | +| [azurerm](#requirement\_azurerm) | ~> 4.14.0 | ## Providers | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | 4.12.0 | +| [azurerm](#provider\_azurerm) | 4.14.0 | | [external](#provider\_external) | 2.3.4 | ## Modules diff --git a/platform/terraform/modules/functions/README.md b/platform/terraform/modules/functions/README.md index ff73136cb..166eecdbd 100644 --- a/platform/terraform/modules/functions/README.md +++ b/platform/terraform/modules/functions/README.md @@ -4,7 +4,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9.8 | -| [azapi](#requirement\_azapi) | ~> 2.1.0 | +| [azapi](#requirement\_azapi) | ~> 2.2.0 | | [mssql](#requirement\_mssql) | 0.3.1 | ## Providers diff --git a/platform/terraform/modules/functions/provider.tf b/platform/terraform/modules/functions/provider.tf index 74cab1d8a..fb0b6b332 100644 --- a/platform/terraform/modules/functions/provider.tf +++ b/platform/terraform/modules/functions/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { azapi = { source = "azure/azapi" - version = "~> 2.1.0" + version = "~> 2.2.0" } mssql = { source = "betr-io/mssql" diff --git a/platform/terraform/provider.tf b/platform/terraform/provider.tf index 0e71f88bc..6cb780fae 100644 --- a/platform/terraform/provider.tf +++ b/platform/terraform/provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 4.12.0" + version = "~> 4.14.0" } } backend "azurerm" {} diff --git a/platform/tests/Platform.ApiTests/Features/InsightBalance.feature b/platform/tests/Platform.ApiTests/Features/InsightBalance.feature index fb953a7e5..e10b42c5f 100644 --- a/platform/tests/Platform.ApiTests/Features/InsightBalance.feature +++ b/platform/tests/Platform.ApiTests/Features/InsightBalance.feature @@ -18,7 +18,7 @@ | URN | 990000 | | SchoolName | Test school 176 | | SchoolType | Voluntary aided school | - | LAName | Bedford | + | LAName | Test Local Authority | | TotalPupils | 418.00 | | SchoolInYearBalance | | | InYearBalance | 121827.00 | @@ -32,7 +32,7 @@ | URN | 990000 | | SchoolName | Test school 176 | | SchoolType | Voluntary aided school | - | LAName | Bedford | + | LAName | Test Local Authority | | TotalPupils | 418.00 | | SchoolInYearBalance | 121827.00 | | InYearBalance | 121827.00 | diff --git a/platform/tests/Platform.ApiTests/Features/InsightCensus.feature b/platform/tests/Platform.ApiTests/Features/InsightCensus.feature index 0411bb402..0f58f4305 100644 --- a/platform/tests/Platform.ApiTests/Features/InsightCensus.feature +++ b/platform/tests/Platform.ApiTests/Features/InsightCensus.feature @@ -30,7 +30,7 @@ Then the census result should be ok and contain: | Field | Value | | AuxiliaryStaff | | - | LAName | Bedford | + | LAName | Test Local Authority | | NonClassroomSupportStaff | | | PercentTeacherWithQualifiedStatus | | | SchoolName | Test school 176 | @@ -49,7 +49,7 @@ Then the census result should be ok and contain: | Field | Value | | AuxiliaryStaff | 3.00 | - | LAName | Bedford | + | LAName | Test Local Authority | | NonClassroomSupportStaff | 0.00 | | PercentTeacherWithQualifiedStatus | 1.00 | | SchoolName | Test school 176 | @@ -86,10 +86,10 @@ | 990002 | When I submit the insights census request Then the census query result should be ok and contain: - | SchoolName | SchoolType | LAName | AuxiliaryStaff | NonClassroomSupportStaff | PercentTeacherWithQualifiedStatus | SeniorLeadership | Teachers | TeachingAssistant | TotalPupils | URN | Workforce | WorkforceHeadcount | - | Test school 176 | Voluntary aided school | Bedford | 3.00 | 0.00 | 1.00 | 16.00 | 116.00 | 1.00 | 337.00 | 990000 | 29.00 | 33.00 | - | Test school 241 | Voluntary aided school | Islington | 3.00 | 0.00 | 1.00 | 11.00 | 147.00 | 1.00 | 164.00 | 990001 | 27.00 | 39.00 | - | Test school 224 | Local authority nursery school | Isle of Wight | 2.00 | 0.00 | 1.00 | 4.00 | 136.00 | 1.00 | 86.00 | 990002 | 15.00 | 20.00 | + | SchoolName | SchoolType | LAName | AuxiliaryStaff | NonClassroomSupportStaff | PercentTeacherWithQualifiedStatus | SeniorLeadership | Teachers | TeachingAssistant | TotalPupils | URN | Workforce | WorkforceHeadcount | + | Test school 176 | Voluntary aided school | Test Local Authority | 3.00 | 0.00 | 1.00 | 16.00 | 116.00 | 1.00 | 337.00 | 990000 | 29.00 | 33.00 | + | Test school 241 | Voluntary aided school | Islington | 3.00 | 0.00 | 1.00 | 11.00 | 147.00 | 1.00 | 164.00 | 990001 | 27.00 | 39.00 | + | Test school 224 | Local authority nursery school | Isle of Wight | 2.00 | 0.00 | 1.00 | 4.00 | 136.00 | 1.00 | 86.00 | 990002 | 15.00 | 20.00 | Scenario: Sending a valid school census query request with company number and phase Given a valid school census query request with company number '8104190' and phase 'Secondary' diff --git a/platform/tests/Platform.ApiTests/Features/InsightExpenditure.feature b/platform/tests/Platform.ApiTests/Features/InsightExpenditure.feature index b9dde4247..fb2f10558 100644 --- a/platform/tests/Platform.ApiTests/Features/InsightExpenditure.feature +++ b/platform/tests/Platform.ApiTests/Features/InsightExpenditure.feature @@ -34,7 +34,7 @@ | URN | 990000 | | SchoolName | Test school 176 | | SchoolType | Voluntary aided school | - | LAName | Bedford | + | LAName | Test Local Authority | | TotalPupils | 418.00 | | TotalInternalFloorArea | 3021.00 | | SchoolTotalExpenditure | | @@ -130,7 +130,7 @@ | URN | 990000 | | SchoolName | Test school 176 | | SchoolType | Voluntary aided school | - | LAName | Bedford | + | LAName | Test Local Authority | | TotalPupils | 418.00 | | TotalInternalFloorArea | 3021.00 | | SchoolTotalExpenditure | 2790504.00 | @@ -226,7 +226,7 @@ | URN | 990000 | | SchoolName | Test school 176 | | SchoolType | Voluntary aided school | - | LAName | Bedford | + | LAName | Test Local Authority | | TotalPupils | 418.00 | | TotalInternalFloorArea | 3021.00 | | SchoolTotalExpenditure | 2790504.00 | @@ -343,10 +343,10 @@ | 990002 | When I submit the insights expenditure request Then the school expenditure query result should be ok and contain: - | SchoolName | SchoolType | LAName | URN | SchoolName | SchoolType | LAName | TotalPupils | TotalInternalFloorArea | SchoolTotalExpenditure | SchoolTotalTeachingSupportStaffCosts | SchoolTeachingStaffCosts | SchoolSupplyTeachingStaffCosts | SchoolEducationalConsultancyCosts | SchoolEducationSupportStaffCosts | SchoolAgencySupplyTeachingStaffCosts | SchoolTotalNonEducationalSupportStaffCosts | SchoolAdministrativeClericalStaffCosts | SchoolOtherStaffCosts | SchoolProfessionalServicesNonCurriculumCosts | SchoolTotalEducationalSuppliesCosts | SchoolExaminationFeesCosts | SchoolLearningResourcesNonIctCosts | SchoolLearningResourcesIctCosts | SchoolTotalPremisesStaffServiceCosts | SchoolCleaningCaretakingCosts | SchoolMaintenancePremisesCosts | SchoolOtherOccupationCosts | SchoolPremisesStaffCosts | SchoolTotalUtilitiesCosts | SchoolEnergyCosts | SchoolWaterSewerageCosts | SchoolAdministrativeSuppliesNonEducationalCosts | SchoolTotalGrossCateringCosts | SchoolTotalNetCateringCosts | SchoolCateringStaffCosts | SchoolCateringSuppliesCosts | SchoolTotalOtherCosts | SchoolDirectRevenueFinancingCosts | SchoolGroundsMaintenanceCosts | SchoolIndirectEmployeeExpenses | SchoolInterestChargesLoanBank | SchoolOtherInsurancePremiumsCosts | SchoolPrivateFinanceInitiativeCharges | SchoolRentRatesCosts | SchoolSpecialFacilitiesCosts | SchoolStaffDevelopmentTrainingCosts | SchoolStaffRelatedInsuranceCosts | SchoolSupplyTeacherInsurableCosts | SchoolCommunityFocusedSchoolStaff | SchoolCommunityFocusedSchoolCosts | TotalExpenditure | TotalTeachingSupportStaffCosts | TeachingStaffCosts | SupplyTeachingStaffCosts | EducationalConsultancyCosts | EducationSupportStaffCosts | AgencySupplyTeachingStaffCosts | TotalNonEducationalSupportStaffCosts | AdministrativeClericalStaffCosts | OtherStaffCosts | ProfessionalServicesNonCurriculumCosts | TotalEducationalSuppliesCosts | ExaminationFeesCosts | LearningResourcesNonIctCosts | LearningResourcesIctCosts | TotalPremisesStaffServiceCosts | CleaningCaretakingCosts | MaintenancePremisesCosts | OtherOccupationCosts | PremisesStaffCosts | TotalUtilitiesCosts | EnergyCosts | WaterSewerageCosts | AdministrativeSuppliesNonEducationalCosts | TotalGrossCateringCosts | TotalNetCateringCosts | CateringStaffCosts | CateringSuppliesCosts | TotalOtherCosts | DirectRevenueFinancingCosts | GroundsMaintenanceCosts | IndirectEmployeeExpenses | InterestChargesLoanBank | OtherInsurancePremiumsCosts | PrivateFinanceInitiativeCharges | RentRatesCosts | SpecialFacilitiesCosts | StaffDevelopmentTrainingCosts | StaffRelatedInsuranceCosts | SupplyTeacherInsurableCosts | CommunityFocusedSchoolStaff | CommunityFocusedSchoolCosts | - | Test school 176 | Voluntary aided school | Bedford | 990000 | Test school 176 | Voluntary aided school | Bedford | 418.00 | 3021.00 | 2790504.00 | 2044335.00 | 1437007.00 | 0.00 | 208376.00 | 301653.00 | 97299.00 | 202341.00 | 157417.00 | 12915.00 | 32009.00 | 70108.00 | 0.00 | 70108.00 | 24200.00 | 166932.00 | 47240.00 | 33774.00 | 33176.00 | 52742.00 | 31001.00 | 26060.00 | 4941.00 | 28505.00 | 84186.00 | 91847.00 | 2170.00 | 82016.00 | 141903.00 | 3006.00 | 615.00 | 38374.00 | 0.00 | 11862.00 | 0.00 | 73416.00 | 0.00 | 9115.00 | 2735.00 | 2780.00 | 0.00 | 0.00 | 2790504.00 | 2044335.00 | 1437007.00 | 0.00 | 208376.00 | 301653.00 | 97299.00 | 202341.00 | 157417.00 | 12915.00 | 32009.00 | 70108.00 | 0.00 | 70108.00 | 24200.00 | 166932.00 | 47240.00 | 33774.00 | 33176.00 | 52742.00 | 31001.00 | 26060.00 | 4941.00 | 28505.00 | 84186.00 | 91847.00 | 2170.00 | 82016.00 | 141903.00 | 3006.00 | 615.00 | 38374.00 | 0.00 | 11862.00 | 0.00 | 73416.00 | 0.00 | 9115.00 | 2735.00 | 2780.00 | 0.00 | 0.00 | - | Test school 241 | Voluntary aided school | Islington | 990001 | Test school 241 | Voluntary aided school | Islington | 303.00 | 2476.00 | 2054918.00 | 1521798.00 | 997855.00 | 0.00 | 220708.00 | 278722.00 | 24513.00 | 160770.00 | 92011.00 | 28511.00 | 40248.00 | 46521.00 | 0.00 | 46521.00 | 10779.00 | 143345.00 | 4254.00 | 38484.00 | 8972.00 | 91635.00 | 23799.00 | 21324.00 | 2475.00 | 21815.00 | 71734.00 | 90089.00 | 0.00 | 71734.00 | 54357.00 | 0.00 | 407.00 | 6586.00 | 0.00 | 10274.00 | 0.00 | 0.00 | 2695.00 | 1648.00 | 8736.00 | 24011.00 | 0.00 | 0.00 | 2054918.00 | 1521798.00 | 997855.00 | 0.00 | 220708.00 | 278722.00 | 24513.00 | 160770.00 | 92011.00 | 28511.00 | 40248.00 | 46521.00 | 0.00 | 46521.00 | 10779.00 | 143345.00 | 4254.00 | 38484.00 | 8972.00 | 91635.00 | 23799.00 | 21324.00 | 2475.00 | 21815.00 | 71734.00 | 90089.00 | 0.00 | 71734.00 | 54357.00 | 0.00 | 407.00 | 6586.00 | 0.00 | 10274.00 | 0.00 | 0.00 | 2695.00 | 1648.00 | 8736.00 | 24011.00 | 0.00 | 0.00 | - | Test school 224 | Local authority nursery school | Isle of Wight | 990002 | Test school 224 | Local authority nursery school | Isle of Wight | 191.00 | 2552.00 | 1719060.00 | 1189016.00 | 733333.00 | 0.00 | 151630.00 | 161948.00 | 142105.00 | 137246.00 | 103006.00 | 13488.00 | 20752.00 | 24992.00 | 0.00 | 24992.00 | 14462.00 | 110661.00 | 35684.00 | 22248.00 | 6416.00 | 46313.00 | 42196.00 | 37236.00 | 4960.00 | 17131.00 | 48949.00 | 57188.00 | 0.00 | 48949.00 | 134408.00 | 0.00 | 0.00 | 26539.00 | 0.00 | 6125.00 | 0.00 | 22580.00 | 1287.00 | 3568.00 | 7587.00 | 18030.00 | 47010.00 | 1682.00 | 1719060.00 | 1189016.00 | 733333.00 | 0.00 | 151630.00 | 161948.00 | 142105.00 | 137246.00 | 103006.00 | 13488.00 | 20752.00 | 24992.00 | 0.00 | 24992.00 | 14462.00 | 110661.00 | 35684.00 | 22248.00 | 6416.00 | 46313.00 | 42196.00 | 37236.00 | 4960.00 | 17131.00 | 48949.00 | 57188.00 | 0.00 | 48949.00 | 134408.00 | 0.00 | 0.00 | 26539.00 | 0.00 | 6125.00 | 0.00 | 22580.00 | 1287.00 | 3568.00 | 7587.00 | 18030.00 | 47010.00 | 1682.00 | + | SchoolName | SchoolType | LAName | URN | SchoolName | SchoolType | LAName | TotalPupils | TotalInternalFloorArea | SchoolTotalExpenditure | SchoolTotalTeachingSupportStaffCosts | SchoolTeachingStaffCosts | SchoolSupplyTeachingStaffCosts | SchoolEducationalConsultancyCosts | SchoolEducationSupportStaffCosts | SchoolAgencySupplyTeachingStaffCosts | SchoolTotalNonEducationalSupportStaffCosts | SchoolAdministrativeClericalStaffCosts | SchoolOtherStaffCosts | SchoolProfessionalServicesNonCurriculumCosts | SchoolTotalEducationalSuppliesCosts | SchoolExaminationFeesCosts | SchoolLearningResourcesNonIctCosts | SchoolLearningResourcesIctCosts | SchoolTotalPremisesStaffServiceCosts | SchoolCleaningCaretakingCosts | SchoolMaintenancePremisesCosts | SchoolOtherOccupationCosts | SchoolPremisesStaffCosts | SchoolTotalUtilitiesCosts | SchoolEnergyCosts | SchoolWaterSewerageCosts | SchoolAdministrativeSuppliesNonEducationalCosts | SchoolTotalGrossCateringCosts | SchoolTotalNetCateringCosts | SchoolCateringStaffCosts | SchoolCateringSuppliesCosts | SchoolTotalOtherCosts | SchoolDirectRevenueFinancingCosts | SchoolGroundsMaintenanceCosts | SchoolIndirectEmployeeExpenses | SchoolInterestChargesLoanBank | SchoolOtherInsurancePremiumsCosts | SchoolPrivateFinanceInitiativeCharges | SchoolRentRatesCosts | SchoolSpecialFacilitiesCosts | SchoolStaffDevelopmentTrainingCosts | SchoolStaffRelatedInsuranceCosts | SchoolSupplyTeacherInsurableCosts | SchoolCommunityFocusedSchoolStaff | SchoolCommunityFocusedSchoolCosts | TotalExpenditure | TotalTeachingSupportStaffCosts | TeachingStaffCosts | SupplyTeachingStaffCosts | EducationalConsultancyCosts | EducationSupportStaffCosts | AgencySupplyTeachingStaffCosts | TotalNonEducationalSupportStaffCosts | AdministrativeClericalStaffCosts | OtherStaffCosts | ProfessionalServicesNonCurriculumCosts | TotalEducationalSuppliesCosts | ExaminationFeesCosts | LearningResourcesNonIctCosts | LearningResourcesIctCosts | TotalPremisesStaffServiceCosts | CleaningCaretakingCosts | MaintenancePremisesCosts | OtherOccupationCosts | PremisesStaffCosts | TotalUtilitiesCosts | EnergyCosts | WaterSewerageCosts | AdministrativeSuppliesNonEducationalCosts | TotalGrossCateringCosts | TotalNetCateringCosts | CateringStaffCosts | CateringSuppliesCosts | TotalOtherCosts | DirectRevenueFinancingCosts | GroundsMaintenanceCosts | IndirectEmployeeExpenses | InterestChargesLoanBank | OtherInsurancePremiumsCosts | PrivateFinanceInitiativeCharges | RentRatesCosts | SpecialFacilitiesCosts | StaffDevelopmentTrainingCosts | StaffRelatedInsuranceCosts | SupplyTeacherInsurableCosts | CommunityFocusedSchoolStaff | CommunityFocusedSchoolCosts | + | Test school 176 | Voluntary aided school | Test Local Authority | 990000 | Test school 176 | Voluntary aided school | Bedford | 418.00 | 3021.00 | 2790504.00 | 2044335.00 | 1437007.00 | 0.00 | 208376.00 | 301653.00 | 97299.00 | 202341.00 | 157417.00 | 12915.00 | 32009.00 | 70108.00 | 0.00 | 70108.00 | 24200.00 | 166932.00 | 47240.00 | 33774.00 | 33176.00 | 52742.00 | 31001.00 | 26060.00 | 4941.00 | 28505.00 | 84186.00 | 91847.00 | 2170.00 | 82016.00 | 141903.00 | 3006.00 | 615.00 | 38374.00 | 0.00 | 11862.00 | 0.00 | 73416.00 | 0.00 | 9115.00 | 2735.00 | 2780.00 | 0.00 | 0.00 | 2790504.00 | 2044335.00 | 1437007.00 | 0.00 | 208376.00 | 301653.00 | 97299.00 | 202341.00 | 157417.00 | 12915.00 | 32009.00 | 70108.00 | 0.00 | 70108.00 | 24200.00 | 166932.00 | 47240.00 | 33774.00 | 33176.00 | 52742.00 | 31001.00 | 26060.00 | 4941.00 | 28505.00 | 84186.00 | 91847.00 | 2170.00 | 82016.00 | 141903.00 | 3006.00 | 615.00 | 38374.00 | 0.00 | 11862.00 | 0.00 | 73416.00 | 0.00 | 9115.00 | 2735.00 | 2780.00 | 0.00 | 0.00 | + | Test school 241 | Voluntary aided school | Islington | 990001 | Test school 241 | Voluntary aided school | Islington | 303.00 | 2476.00 | 2054918.00 | 1521798.00 | 997855.00 | 0.00 | 220708.00 | 278722.00 | 24513.00 | 160770.00 | 92011.00 | 28511.00 | 40248.00 | 46521.00 | 0.00 | 46521.00 | 10779.00 | 143345.00 | 4254.00 | 38484.00 | 8972.00 | 91635.00 | 23799.00 | 21324.00 | 2475.00 | 21815.00 | 71734.00 | 90089.00 | 0.00 | 71734.00 | 54357.00 | 0.00 | 407.00 | 6586.00 | 0.00 | 10274.00 | 0.00 | 0.00 | 2695.00 | 1648.00 | 8736.00 | 24011.00 | 0.00 | 0.00 | 2054918.00 | 1521798.00 | 997855.00 | 0.00 | 220708.00 | 278722.00 | 24513.00 | 160770.00 | 92011.00 | 28511.00 | 40248.00 | 46521.00 | 0.00 | 46521.00 | 10779.00 | 143345.00 | 4254.00 | 38484.00 | 8972.00 | 91635.00 | 23799.00 | 21324.00 | 2475.00 | 21815.00 | 71734.00 | 90089.00 | 0.00 | 71734.00 | 54357.00 | 0.00 | 407.00 | 6586.00 | 0.00 | 10274.00 | 0.00 | 0.00 | 2695.00 | 1648.00 | 8736.00 | 24011.00 | 0.00 | 0.00 | + | Test school 224 | Local authority nursery school | Isle of Wight | 990002 | Test school 224 | Local authority nursery school | Isle of Wight | 191.00 | 2552.00 | 1719060.00 | 1189016.00 | 733333.00 | 0.00 | 151630.00 | 161948.00 | 142105.00 | 137246.00 | 103006.00 | 13488.00 | 20752.00 | 24992.00 | 0.00 | 24992.00 | 14462.00 | 110661.00 | 35684.00 | 22248.00 | 6416.00 | 46313.00 | 42196.00 | 37236.00 | 4960.00 | 17131.00 | 48949.00 | 57188.00 | 0.00 | 48949.00 | 134408.00 | 0.00 | 0.00 | 26539.00 | 0.00 | 6125.00 | 0.00 | 22580.00 | 1287.00 | 3568.00 | 7587.00 | 18030.00 | 47010.00 | 1682.00 | 1719060.00 | 1189016.00 | 733333.00 | 0.00 | 151630.00 | 161948.00 | 142105.00 | 137246.00 | 103006.00 | 13488.00 | 20752.00 | 24992.00 | 0.00 | 24992.00 | 14462.00 | 110661.00 | 35684.00 | 22248.00 | 6416.00 | 46313.00 | 42196.00 | 37236.00 | 4960.00 | 17131.00 | 48949.00 | 57188.00 | 0.00 | 48949.00 | 134408.00 | 0.00 | 0.00 | 26539.00 | 0.00 | 6125.00 | 0.00 | 22580.00 | 1287.00 | 3568.00 | 7587.00 | 18030.00 | 47010.00 | 1682.00 | Scenario: Sending a valid school expenditure query request with company number and phase Given a valid school expenditure query request with company number '8104190' and phase 'Secondary' diff --git a/platform/tests/Platform.ApiTests/Features/InsightIncome.feature b/platform/tests/Platform.ApiTests/Features/InsightIncome.feature index 0f39f3cdb..b03399e1d 100644 --- a/platform/tests/Platform.ApiTests/Features/InsightIncome.feature +++ b/platform/tests/Platform.ApiTests/Features/InsightIncome.feature @@ -27,7 +27,7 @@ | URN | 990000 | | SchoolName | Test school 176 | | SchoolType | Voluntary aided school | - | LAName | Bedford | + | LAName | Test Local Authority | | TotalPupils | 418.00 | | TotalIncome | 2912331.00 | | TotalGrantFunding | 2851071.00 | @@ -63,7 +63,7 @@ | URN | 990000 | | SchoolName | Test school 176 | | SchoolType | Voluntary aided school | - | LAName | Bedford | + | LAName | Test Local Authority | | TotalPupils | 418.00 | | TotalIncome | 2912331.00 | | TotalGrantFunding | 2851071.00 | @@ -99,7 +99,7 @@ | URN | 990000 | | SchoolName | Test school 176 | | SchoolType | Voluntary aided school | - | LAName | Bedford | + | LAName | Test Local Authority | | TotalPupils | 418.00 | | TotalIncome | 2912331.00 | | TotalGrantFunding | 2851071.00 | @@ -179,7 +179,7 @@ Then the school income query result should be ok and contain: | URN | TotalIncome | TotalGrantFunding | TotalSelfGeneratedFunding | DirectRevenueFinancing | DirectGrants | PrePost16Funding | OtherDfeGrants | OtherIncomeGrants | CommunityGrants | IncomeFacilitiesServices | IncomeCatering | DonationsVoluntaryFunds | ReceiptsSupplyTeacherInsuranceClaims | SchoolTotalIncome | SchoolTotalGrantFunding | SchoolTotalSelfGeneratedFunding | SchoolDirectRevenueFinancing | SchoolDirectGrants | SchoolPrePost16Funding | SchoolOtherDfeGrants | SchoolOtherIncomeGrants | SchoolCommunityGrants | SchoolIncomeFacilitiesServices | SchoolIncomeCatering | SchoolDonationsVoluntaryFunds | | 777055 | 3685110.00 | 3595411.00 | 68353.00 | 0.00 | 2741553.00 | 2736638.00 | 0.00 | 4915.00 | 46914.00 | 41001.00 | 13600.00 | 14957.00 | 0.00 | 3685110.00 | 3595411.00 | 68353.00 | 0.00 | 2741553.00 | 2736638.00 | 0.00 | 4915.00 | 46914.00 | 41001.00 | 13600.00 | 14957.00 | - + Scenario: Sending a valid trust income request with category, dimension and exclude central services Given a valid trust income request with company number '10192252', category 'GrantFunding', dimension 'Actuals' and exclude central services = 'true' When I submit the insights income request diff --git a/platform/tests/Platform.ApiTests/Features/InsightSchools.feature b/platform/tests/Platform.ApiTests/Features/InsightSchools.feature index e76c642c7..86ce5323c 100644 --- a/platform/tests/Platform.ApiTests/Features/InsightSchools.feature +++ b/platform/tests/Platform.ApiTests/Features/InsightSchools.feature @@ -1,58 +1,58 @@ Feature: Insights schools endpoints - + Scenario: Sending a valid school characteristics request Given a valid school characteristics request with urn '990000' When I submit the insight schools request Then the school characteristics result should be ok and contain: - | Field | Value | - | URN | 990000 | - | SchoolName | Test school 176 | - | AddressTown | London | - | AddressPostcode | ABC208 | - | FinanceType | Maintained | - | OverallPhase | Primary | - | LAName | Bedford | - | TotalPupils | 337.00 | - | PercentFreeSchoolMeals | 11.00 | - | PercentSpecialEducationNeeds | 0.00 | - | LondonWeighting | Outer | - | BuildingAverageAge | 1945.00 | - | TotalInternalFloorArea | 2549.00 | - | OfstedDescription | Good | - | SchoolsInTrust | | - | IsPFISchool | false | - | TotalPupilsSixthForm | 0.0 | - | KS2Progress | 1.0 | - | KS4Progress | 32.0 | - | PercentWithVI | 4.0 | - | PercentWithSPLD | 3.0 | - | PercentWithSLD | 1.0 | - | PercentWithSLCN | 14.0 | - | PercentWithSEMH | 0.0 | - | PercentWithPMLD | 4.0 | - | PercentWithPD | 2.0 | - | PercentWithOTH | 2.0 | - | PercentWithMSI | 14.0 | - | PercentWithMLD | 0.0 | - | PercentWithHI | 94.0 | - | PercentWithASD | 26.0 | - | SchoolPosition | Deficit | - | Address | London, ABC208 | + | Field | Value | + | URN | 990000 | + | SchoolName | Test school 176 | + | AddressTown | London | + | AddressPostcode | ABC208 | + | FinanceType | Maintained | + | OverallPhase | Primary | + | LAName | Test Local Authority | + | TotalPupils | 337.00 | + | PercentFreeSchoolMeals | 11.00 | + | PercentSpecialEducationNeeds | 0.00 | + | LondonWeighting | Outer | + | BuildingAverageAge | 1945.00 | + | TotalInternalFloorArea | 2549.00 | + | OfstedDescription | Good | + | SchoolsInTrust | 269 | + | IsPFISchool | false | + | TotalPupilsSixthForm | 0.0 | + | KS2Progress | 1.0 | + | KS4Progress | 32.0 | + | PercentWithVI | 4.0 | + | PercentWithSPLD | 3.0 | + | PercentWithSLD | 1.0 | + | PercentWithSLCN | 14.0 | + | PercentWithSEMH | 0.0 | + | PercentWithPMLD | 4.0 | + | PercentWithPD | 2.0 | + | PercentWithOTH | 2.0 | + | PercentWithMSI | 14.0 | + | PercentWithMLD | 0.0 | + | PercentWithHI | 94.0 | + | PercentWithASD | 26.0 | + | SchoolPosition | Deficit | + | Address | London, ABC208 | Scenario: Sending an invalid school characteristics request Given an invalid school characteristics request with urn '1000000' When I submit the insight schools request Then the school characteristics result should be not found - + Scenario: Sending valid school characteristics requests Given a valid school characteristics request with urns: - | Urn | - | 990000 | - | 990001 | - | 990002 | + | Urn | + | 990000 | + | 990001 | + | 990002 | When I submit the insight schools request Then the school characteristics results should be ok and contain: - | URN | SchoolName | AddressTown | AddressPostcode | FinanceType | OverallPhase | LAName | TotalPupils | PercentFreeSchoolMeals | PercentSpecialEducationNeeds | LondonWeighting | BuildingAverageAge | TotalInternalFloorArea | OfstedDescription | SchoolsInTrust | IsPFISchool | TotalPupilsSixthForm | KS2Progress | KS4Progress | PercentWithVI | PercentWithSPLD | PercentWithSLD | PercentWithSLCN | PercentWithSEMH | PercentWithPMLD | PercentWithPD | PercentWithOTH | PercentWithMSI | PercentWithMLD | PercentWithHI | PercentWithASD | SchoolPosition | Address | - | 990000 | Test school 176 | London | ABC208 | Maintained | Primary | Bedford | 337.0 | 11.0 | 0.0 | Outer | 1945.0 | 2549.0 | Good | | False | 0.0 | 1.0 | 32.0 | 4.0 | 3.0 | 1.0 | 14.0 | 0.0 | 4.0 | 2.0 | 2.0 | 14.0 | 0.0 | 94.0 | 26.0 | Deficit | London, ABC208 | - | 990001 | Test school 241 | London | ABC281 | Maintained | Primary | Islington | 164.0 | 11.0 | 0.0 | Inner | 1945.0 | 2549.0 | Good | | False | 0.0 | 1.0 | 49.0 | 9.0 | 6.0 | 1.0 | 34.0 | 0.0 | 6.0 | 1.0 | 5.0 | 23.0 | 0.0 | 100.0 | 51.0 | Deficit | London, ABC281 | - | 990002 | Test school 224 | London | ABC262 | Maintained | Nursery | Isle of Wight | 86.0 | 14.0 | 0.0 | Inner | 1985.0 | 352.0 | Outstanding | | False | 0.0 | 1.0 | 41.0 | 8.0 | 7.0 | 1.0 | 54.0 | 0.0 | 2.0 | 0.0 | 5.0 | 14.0 | 0.0 | 100.0 | 0.0 | Deficit | London, ABC262 | + | URN | SchoolName | AddressTown | AddressPostcode | FinanceType | OverallPhase | LAName | TotalPupils | PercentFreeSchoolMeals | PercentSpecialEducationNeeds | LondonWeighting | BuildingAverageAge | TotalInternalFloorArea | OfstedDescription | SchoolsInTrust | IsPFISchool | TotalPupilsSixthForm | KS2Progress | KS4Progress | PercentWithVI | PercentWithSPLD | PercentWithSLD | PercentWithSLCN | PercentWithSEMH | PercentWithPMLD | PercentWithPD | PercentWithOTH | PercentWithMSI | PercentWithMLD | PercentWithHI | PercentWithASD | SchoolPosition | Address | + | 990000 | Test school 176 | London | ABC208 | Maintained | Primary | Test Local Authority | 337 | 11 | 0 | Outer | 1945 | 2549 | Good | 269 | False | 0 | 1 | 32 | 4 | 3 | 1 | 14 | 0 | 4 | 2 | 2 | 14 | 0 | 94 | 26 | Deficit | London, ABC208 | + | 990001 | Test school 241 | London | ABC281 | Maintained | Primary | Islington | 164 | 11 | 0 | Inner | 1945 | 2549 | Good | 269 | False | 0 | 1 | 49 | 9 | 6 | 1 | 34 | 0 | 6 | 1 | 5 | 23 | 0 | 100 | 51 | Deficit | London, ABC281 | + | 990002 | Test school 224 | London | ABC262 | Maintained | Nursery | Isle of Wight | 86 | 14 | 0 | Inner | 1985 | 352 | Outstanding | 269 | False | 0 | 1 | 41 | 8 | 7 | 1 | 54 | 0 | 2 | 0 | 5 | 14 | 0 | 100 | 0 | Deficit | London, ABC262 | \ No newline at end of file diff --git a/platform/tests/Platform.ApiTests/Features/InsightTrusts.feature b/platform/tests/Platform.ApiTests/Features/InsightTrusts.feature index 62067cb13..8474cc28d 100644 --- a/platform/tests/Platform.ApiTests/Features/InsightTrusts.feature +++ b/platform/tests/Platform.ApiTests/Features/InsightTrusts.feature @@ -10,12 +10,12 @@ | 10499174 | When I submit the insight trusts request Then the trust characteristics results should be ok and contain: - | CompanyNumber | TrustName | TotalIncome | TotalPupils | SchoolsInTrust | OpenDate | PercentFreeSchoolMeals | PercentSpecialEducationNeeds | TotalInternalFloorArea | - | 10020683 | Test Company/Trust 244 | | 128.0 | 1.0 | 9/1/2021 12:00:00 AM | 6.0 | 0.0 | 3710.0 | - | 10038640 | Test Company/Trust 334 | | 292.0 | 1.0 | 6/1/2016 12:00:00 AM | 14.0 | 0.0 | 25572.0 | - | 10050238 | Test Company/Trust 388 | | 139.0 | 1.0 | 9/1/2017 12:00:00 AM | 7.0 | 0.0 | 17322.0 | - | 10499174 | Heart of Mercia | | 747 | 3 | 3/1/2017 12:00:00 AM | 9.666666 | 0 | 7255 | - | 10749662 | Hamwic Education Trust | | 694 | 3 | 3/1/2014 12:00:00 AM | 10.333333 | 0 | 6686 | + | CompanyNumber | TrustName | TotalIncome | TotalPupils | SchoolsInTrust | OpenDate | PercentFreeSchoolMeals | PercentSpecialEducationNeeds | TotalInternalFloorArea | + | 10020683 | Test Company/Trust 244 | | 128 | 1 | 6/1/2016 12:00:00 AM | 6 | 0 | 3710 | + | 10038640 | Test Company/Trust 334 | | 292 | 1 | 9/1/2017 12:00:00 AM | 14 | 0 | 25572 | + | 10050238 | Test Company/Trust 388 | | 139 | 1 | 12/1/2018 12:00:00 AM | 7 | 0 | 17322 | + | 10499174 | Heart of Mercia | | 747 | 3 | 3/1/2017 12:00:00 AM | 9.666666 | 0 | 7255 | + | 10749662 | Hamwic Education Trust | | 694 | 3 | 3/1/2014 12:00:00 AM | 10.333333 | 0 | 6686 | And the phases should contain: | CompanyNumber | Phases | | 10020683 | Special: 1 | diff --git a/platform/tests/Platform.ApiTests/packages.lock.json b/platform/tests/Platform.ApiTests/packages.lock.json index 8dcaa3ab9..52283861d 100644 --- a/platform/tests/Platform.ApiTests/packages.lock.json +++ b/platform/tests/Platform.ApiTests/packages.lock.json @@ -24,11 +24,11 @@ }, "FluentAssertions": { "type": "Direct", - "requested": "[6.12.2, )", - "resolved": "6.12.2", - "contentHash": "8YE+xJmT8wgzEpFuzJ4S62oFhEL/AKouMz1RWPEMEUhy9H11aRQlGIWcHurH5BEy7tbF6gb0CJrs0wOw/AtDcQ==", + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "mTLbcU991EQ1SEmNbVBaGGGJy0YFzvGd1sYJGNZ07nlPKuyHSn1I22aeKzqQXgEiaKyRO6MSCto9eN9VxMwBdA==", "dependencies": { - "System.Configuration.ConfigurationManager": "4.4.0" + "System.Configuration.ConfigurationManager": "6.0.0" } }, "Microsoft.NET.Test.Sdk": { @@ -79,9 +79,9 @@ }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.8.2, )", - "resolved": "2.8.2", - "contentHash": "vm1tbfXhFmjFMUmS4M0J0ASXz3/U5XvXBa6DOQUL3fEz4Vt6YPhv+ESCarx6M6D+9kJkJYZKCNvJMas1+nVfmQ==" + "requested": "[3.0.0, )", + "resolved": "3.0.0", + "contentHash": "HggUqjQJe8PtDxcP25Q+CnR6Lz4oX3GElhD9V4oU2+75x9HI6A6sxbfKGS4UwU4t4yJaS9fBmAuriz8bQApNjw==" }, "Azure.Core": { "type": "Transitive", @@ -655,8 +655,8 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" + "resolved": "8.0.11", + "contentHash": "So3JUdRxozRjvQ3cxU6F3nI/i4emDnjane6yMYcJhvTTTu29ltlIdoXjkFGRceIWz8yKvuEpzXItZ0x5GvN2nQ==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -2020,7 +2020,7 @@ "platform.api.benchmark": { "type": "Project", "dependencies": { - "AspNetCore.HealthChecks.SqlServer": "[8.0.2, )", + "AspNetCore.HealthChecks.SqlServer": "[9.0.0, )", "Dapper.Contrib": "[2.0.78, )", "Dapper.SqlBuilder": "[2.0.78, )", "Microsoft.ApplicationInsights.WorkerService": "[2.22.0, )", @@ -2040,8 +2040,8 @@ "platform.api.establishment": { "type": "Project", "dependencies": { - "AspNetCore.HealthChecks.AzureSearch": "[8.0.1, )", - "AspNetCore.HealthChecks.SqlServer": "[8.0.2, )", + "AspNetCore.HealthChecks.AzureSearch": "[9.0.0, )", + "AspNetCore.HealthChecks.SqlServer": "[9.0.0, )", "Dapper.Contrib": "[2.0.78, )", "Dapper.SqlBuilder": "[2.0.78, )", "Microsoft.ApplicationInsights.WorkerService": "[2.22.0, )", @@ -2061,7 +2061,7 @@ "platform.api.insight": { "type": "Project", "dependencies": { - "AspNetCore.HealthChecks.SqlServer": "[8.0.2, )", + "AspNetCore.HealthChecks.SqlServer": "[9.0.0, )", "Dapper.SqlBuilder": "[2.0.78, )", "Microsoft.ApplicationInsights.WorkerService": "[2.22.0, )", "Microsoft.Azure.Functions.Worker": "[2.0.0, )", @@ -2111,22 +2111,22 @@ }, "AspNetCore.HealthChecks.AzureSearch": { "type": "CentralTransitive", - "requested": "[8.0.1, )", - "resolved": "8.0.1", - "contentHash": "rEpoQN11MnaAXuWIL4N0z0cCxYmRg6u5vy1/tsxlMgnLwoQBJ5hun9noL5sxlGu21PXD/RsEEpd+j8PIRZg/QQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "+S8xLA2tAfVO+pYtLEYsGO+LnOuT3njdGBFZF6ENZ31e5X9BaybBmdM0FKqGP+281L+Qo+VCPV/e9GKAcCznHA==", "dependencies": { "Azure.Search.Documents": "11.5.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11" } }, "AspNetCore.HealthChecks.SqlServer": { "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "sTcVVq7/zhfUrSTs0WAktvPdpU1He/sj14gRTogq4eFhn0oImolxNNhJczkYMgFF92RMMW+O+rlcFO7HVOpfiQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "UxCf65iCF2nU1u7AcB320abjL4CRg5swCgJECY6mKk1j5lrGMfVtskWwriGs1T29pYdRig9Vra3SPnP+4G82pA==", "dependencies": { - "Microsoft.Data.SqlClient": "5.2.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0" + "Microsoft.Data.SqlClient": "5.2.2", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11" } }, "Azure.Search.Documents": { @@ -2391,13 +2391,13 @@ "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "CentralTransitive", "requested": "[8.0.7, )", - "resolved": "8.0.0", - "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", + "resolved": "8.0.11", + "contentHash": "zLgN22Zp9pk8RHlwssRTexw4+a6wqOnKWN+VejdPn5Yhjql4XiBhkFo35Nu8mmqHIk/UEmmCnMGLWq75aFfkOw==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.11", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Logging": { diff --git a/platform/tests/Platform.Tests/packages.lock.json b/platform/tests/Platform.Tests/packages.lock.json index c9b0b93cb..bace95108 100644 --- a/platform/tests/Platform.Tests/packages.lock.json +++ b/platform/tests/Platform.Tests/packages.lock.json @@ -14,9 +14,9 @@ }, "coverlet.collector": { "type": "Direct", - "requested": "[6.0.2, )", - "resolved": "6.0.2", - "contentHash": "bJShQ6uWRTQ100ZeyiMqcFlhP7WJ+bCuabUs885dJiBEzMsJMSFr7BOyeCw4rgvQokteGi5rKQTlkhfQPUXg2A==" + "requested": "[6.0.3, )", + "resolved": "6.0.3", + "contentHash": "SvLbRq7gjzE34BI90vP6ge812+PAjinNoKhdFZHwVEu/ozJgZY+0KyDh1K0teDeMeuzQJuF8OvleRBYXsZDz0A==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", @@ -50,9 +50,9 @@ }, "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.8.2, )", - "resolved": "2.8.2", - "contentHash": "vm1tbfXhFmjFMUmS4M0J0ASXz3/U5XvXBa6DOQUL3fEz4Vt6YPhv+ESCarx6M6D+9kJkJYZKCNvJMas1+nVfmQ==" + "requested": "[3.0.0, )", + "resolved": "3.0.0", + "contentHash": "HggUqjQJe8PtDxcP25Q+CnR6Lz4oX3GElhD9V4oU2+75x9HI6A6sxbfKGS4UwU4t4yJaS9fBmAuriz8bQApNjw==" }, "Azure.Core": { "type": "Transitive", @@ -721,8 +721,8 @@ }, "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==" + "resolved": "8.0.11", + "contentHash": "So3JUdRxozRjvQ3cxU6F3nI/i4emDnjane6yMYcJhvTTTu29ltlIdoXjkFGRceIWz8yKvuEpzXItZ0x5GvN2nQ==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", @@ -2125,7 +2125,7 @@ "platform.api.benchmark": { "type": "Project", "dependencies": { - "AspNetCore.HealthChecks.SqlServer": "[8.0.2, )", + "AspNetCore.HealthChecks.SqlServer": "[9.0.0, )", "Dapper.Contrib": "[2.0.78, )", "Dapper.SqlBuilder": "[2.0.78, )", "Microsoft.ApplicationInsights.WorkerService": "[2.22.0, )", @@ -2145,8 +2145,8 @@ "platform.api.establishment": { "type": "Project", "dependencies": { - "AspNetCore.HealthChecks.AzureSearch": "[8.0.1, )", - "AspNetCore.HealthChecks.SqlServer": "[8.0.2, )", + "AspNetCore.HealthChecks.AzureSearch": "[9.0.0, )", + "AspNetCore.HealthChecks.SqlServer": "[9.0.0, )", "Dapper.Contrib": "[2.0.78, )", "Dapper.SqlBuilder": "[2.0.78, )", "Microsoft.ApplicationInsights.WorkerService": "[2.22.0, )", @@ -2166,7 +2166,7 @@ "platform.api.insight": { "type": "Project", "dependencies": { - "AspNetCore.HealthChecks.SqlServer": "[8.0.2, )", + "AspNetCore.HealthChecks.SqlServer": "[9.0.0, )", "Dapper.SqlBuilder": "[2.0.78, )", "Microsoft.ApplicationInsights.WorkerService": "[2.22.0, )", "Microsoft.Azure.Functions.Worker": "[2.0.0, )", @@ -2208,7 +2208,7 @@ "Microsoft.Azure.Core.NewtonsoftJson": "[2.0.0, )", "Microsoft.Azure.Functions.Worker": "[2.0.0, )", "Microsoft.Azure.Functions.Worker.ApplicationInsights": "[2.0.0, )", - "Microsoft.Azure.Functions.Worker.Extensions.DurableTask": "[1.2.1, )", + "Microsoft.Azure.Functions.Worker.Extensions.DurableTask": "[1.2.2, )", "Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues": "[5.5.0, )", "Microsoft.Azure.Functions.Worker.Extensions.Timer": "[4.3.1, )", "Microsoft.Azure.Functions.Worker.Sdk": "[2.0.0, )", @@ -2234,22 +2234,22 @@ }, "AspNetCore.HealthChecks.AzureSearch": { "type": "CentralTransitive", - "requested": "[8.0.1, )", - "resolved": "8.0.1", - "contentHash": "rEpoQN11MnaAXuWIL4N0z0cCxYmRg6u5vy1/tsxlMgnLwoQBJ5hun9noL5sxlGu21PXD/RsEEpd+j8PIRZg/QQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "+S8xLA2tAfVO+pYtLEYsGO+LnOuT3njdGBFZF6ENZ31e5X9BaybBmdM0FKqGP+281L+Qo+VCPV/e9GKAcCznHA==", "dependencies": { "Azure.Search.Documents": "11.5.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11" } }, "AspNetCore.HealthChecks.SqlServer": { "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "sTcVVq7/zhfUrSTs0WAktvPdpU1He/sj14gRTogq4eFhn0oImolxNNhJczkYMgFF92RMMW+O+rlcFO7HVOpfiQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "UxCf65iCF2nU1u7AcB320abjL4CRg5swCgJECY6mKk1j5lrGMfVtskWwriGs1T29pYdRig9Vra3SPnP+4G82pA==", "dependencies": { - "Microsoft.Data.SqlClient": "5.2.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0" + "Microsoft.Data.SqlClient": "5.2.2", + "Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.11" } }, "Azure.Search.Documents": { @@ -2377,9 +2377,9 @@ }, "Microsoft.Azure.Functions.Worker.Extensions.DurableTask": { "type": "CentralTransitive", - "requested": "[1.2.1, )", - "resolved": "1.2.1", - "contentHash": "e0zdFbhgqGbk/2SObQQQGpzxDKZ431jBd8E+PnpnBXgZrfhYPQZlepx4llzJlyeXRUyzZ+cywbVRIiKb62zW2Q==", + "requested": "[1.2.2, )", + "resolved": "1.2.2", + "contentHash": "4ozw+FXR4u8UTYls67z6Kwm1RbZLRTMq2SDHYWtw+JiUWZjsYZJlre3kV9+Fw5mfmWHJ+iUdVv0idNswg2HLMQ==", "dependencies": { "Microsoft.Azure.Functions.Worker.Core": "1.16.0", "Microsoft.Azure.Functions.Worker.Extensions.Abstractions": "1.3.0", @@ -2537,13 +2537,13 @@ "Microsoft.Extensions.Diagnostics.HealthChecks": { "type": "CentralTransitive", "requested": "[8.0.7, )", - "resolved": "8.0.0", - "contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==", + "resolved": "8.0.11", + "contentHash": "zLgN22Zp9pk8RHlwssRTexw4+a6wqOnKWN+VejdPn5Yhjql4XiBhkFo35Nu8mmqHIk/UEmmCnMGLWq75aFfkOw==", "dependencies": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.11", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" } }, "Microsoft.Extensions.Logging": {