Updated to use new NuGet packages (#625)

DFE-Digital · Oct 10, 2024 · 5976f41 · 5976f41
1 parent ce0706a
commit 5976f41
Show file tree

Hide file tree

Showing 56 changed files with 336 additions and 734 deletions.
diff --git a/Dfe.Academies.Api.Infrastructure/Caching/CacheSettings.cs b/Dfe.Academies.Api.Infrastructure/Caching/CacheSettings.cs
diff --git a/Dfe.Academies.Api.Infrastructure/Caching/MemoryCacheService.cs b/Dfe.Academies.Api.Infrastructure/Caching/MemoryCacheService.cs
diff --git a/Dfe.Academies.Api.Infrastructure/Dfe.Academies.Infrastructure.csproj b/Dfe.Academies.Api.Infrastructure/Dfe.Academies.Infrastructure.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.0.1" />
-    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.10" />
+    <PackageReference Include="DfE.CoreLibs.Caching" Version="1.0.7" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">

diff --git a/Dfe.Academies.Api.Infrastructure/InfrastructureServiceCollectionExtensions.cs b/Dfe.Academies.Api.Infrastructure/InfrastructureServiceCollectionExtensions.cs
@@ -1,13 +1,11 @@
 using Dfe.Academies.Application.Common.Interfaces;
 using Dfe.Academies.Domain.Constituencies;
 using Dfe.Academies.Infrastructure;
-using Dfe.Academies.Infrastructure.Caching;
 using Dfe.Academies.Infrastructure.Repositories;
 using Dfe.Academies.Infrastructure.Security.Authorization;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Dfe.Academies.Domain.Interfaces.Repositories;
-using Dfe.Academies.Domain.Interfaces.Caching;
 using Dfe.Academies.Infrastructure.QueryServices;
 using Dfe.Academies.Domain.ValueObjects;
 
@@ -48,10 +46,8 @@ public static IServiceCollection AddPersonsApiInfrastructureDependencyGroup(
             services.AddScoped<IEstablishmentQueryService, EstablishmentQueryService>();
             services.AddScoped<ITrustQueryService, TrustQueryService>();
 
-
             //Cache service
-            services.Configure<CacheSettings>(config.GetSection("CacheSettings"));
-            services.AddSingleton<ICacheService, MemoryCacheService>();
+            services.AddServiceCaching(config);
 
             //Db
             var connectionString = config.GetConnectionString("DefaultConnection");

diff --git a/...es/Queries/GetMemberOfParliamentByConstituencies/GetMemberOfParliamentByConstituencies.cs b/...es/Queries/GetMemberOfParliamentByConstituencies/GetMemberOfParliamentByConstituencies.cs
@@ -1,9 +1,9 @@
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
 using Dfe.Academies.Application.Common.Models;
-using Dfe.Academies.Domain.Interfaces.Caching;
 using Dfe.Academies.Domain.Interfaces.Repositories;
-using Dfe.Academies.Utils.Caching;
+using DfE.CoreLibs.Caching.Helpers;
+using DfE.CoreLibs.Caching.Interfaces;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
@@ -14,7 +14,7 @@ public record GetMembersOfParliamentByConstituenciesQuery(List<string> Constitue
     public class GetMembersOfParliamentByConstituenciesQueryHandler(
         IConstituencyRepository constituencyRepository,
         IMapper mapper,
-        ICacheService cacheService)
+        ICacheService<IMemoryCacheType> cacheService)
         : IRequestHandler<GetMembersOfParliamentByConstituenciesQuery, List<MemberOfParliament>>
     {
         public async Task<List<MemberOfParliament>> Handle(GetMembersOfParliamentByConstituenciesQuery request, CancellationToken cancellationToken)

diff --git a/...encies/Queries/GetMemberOfParliamentByConstituency/GetMemberOfParliamentByConstituency.cs b/...encies/Queries/GetMemberOfParliamentByConstituency/GetMemberOfParliamentByConstituency.cs
@@ -1,9 +1,9 @@
 using AutoMapper;
 using Dfe.Academies.Application.Common.Models;
-using MediatR;
-using Dfe.Academies.Utils.Caching;
-using Dfe.Academies.Domain.Interfaces.Caching;
 using Dfe.Academies.Domain.Interfaces.Repositories;
+using DfE.CoreLibs.Caching.Helpers;
+using DfE.CoreLibs.Caching.Interfaces;
+using MediatR;
 
 namespace Dfe.Academies.Application.Constituencies.Queries.GetMemberOfParliamentByConstituency
 {
@@ -12,7 +12,7 @@ public record GetMemberOfParliamentByConstituencyQuery(string ConstituencyName)
     public class GetMemberOfParliamentByConstituencyQueryHandler(
         IConstituencyRepository constituencyRepository,
         IMapper mapper,
-        ICacheService cacheService)
+        ICacheService<IMemoryCacheType> cacheService)
         : IRequestHandler<GetMemberOfParliamentByConstituencyQuery, MemberOfParliament?>
     {
         public async Task<MemberOfParliament?> Handle(GetMemberOfParliamentByConstituencyQuery request, CancellationToken cancellationToken)

diff --git a/Dfe.Academies.Application/Dfe.Academies.Application.csproj b/Dfe.Academies.Application/Dfe.Academies.Application.csproj
@@ -8,7 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.10" />
+    <PackageReference Include="DfE.CoreLibs.Caching" Version="1.0.7" />
+    <PackageReference Include="DfE.CoreLibs.Contracts" Version="1.0.5" />
     <PackageReference Include="FluentValidation" Version="11.9.2" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />

diff --git a/Dfe.Academies.Application/EducationalPerformance/EducationalPerformanceQueries.cs b/Dfe.Academies.Application/EducationalPerformance/EducationalPerformanceQueries.cs
@@ -1,6 +1,6 @@
 using Dfe.Academies.Domain.Interfaces.Repositories;
-using Dfe.Academies.Contracts.V1.EducationalPerformance;
 using Dfe.Academies.Domain.EducationalPerformance;
+using DfE.CoreLibs.Contracts.Academies.V1.EducationalPerformance;
 
 namespace Dfe.Academies.Application.EducationalPerformance
 {

diff --git a/Dfe.Academies.Application/EducationalPerformance/IEducationalPerformanceQueries.cs b/Dfe.Academies.Application/EducationalPerformance/IEducationalPerformanceQueries.cs
@@ -1,4 +1,4 @@
-using Dfe.Academies.Contracts.V1.EducationalPerformance;
+using DfE.CoreLibs.Contracts.Academies.V1.EducationalPerformance;
 
 namespace Dfe.Academies.Application.EducationalPerformance
 {

diff --git a/Dfe.Academies.Application/Establishment/EstablishmentDtoBuilder.cs b/Dfe.Academies.Application/Establishment/EstablishmentDtoBuilder.cs
@@ -1,9 +1,7 @@
-using Dfe.Academies.Contracts.V4;
-using Dfe.Academies.Contracts.V4.Establishments;
-using Dfe.Academies.Domain.Census;
-using System;
-using System.Globalization;
+using Dfe.Academies.Domain.Census;
 using Dfe.Academies.Utils.Extensions;
+using DfE.CoreLibs.Contracts.Academies.V4;
+using DfE.CoreLibs.Contracts.Academies.V4.Establishments;
 
 namespace Dfe.Academies.Application.Establishment
 {

diff --git a/Dfe.Academies.Application/Establishment/EstablishmentQueries.cs b/Dfe.Academies.Application/Establishment/EstablishmentQueries.cs
@@ -1,5 +1,5 @@
-using Dfe.Academies.Contracts.V4.Establishments;
-using Dfe.Academies.Domain.Interfaces.Repositories;
+using Dfe.Academies.Domain.Interfaces.Repositories;
+using DfE.CoreLibs.Contracts.Academies.V4.Establishments;
 
 namespace Dfe.Academies.Application.Establishment
 {

diff --git a/Dfe.Academies.Application/Establishment/IEstablishmentQueries.cs b/Dfe.Academies.Application/Establishment/IEstablishmentQueries.cs
@@ -1,4 +1,4 @@
-using Dfe.Academies.Contracts.V4.Establishments;
+using DfE.CoreLibs.Contracts.Academies.V4.Establishments;
 
 namespace Dfe.Academies.Application.Establishment
 {

diff --git a/...ueries/GetAllPersonsAssociatedWithAcademyByUrn/GetAllPersonsAssociatedWithAcademyByUrn.cs b/...ueries/GetAllPersonsAssociatedWithAcademyByUrn/GetAllPersonsAssociatedWithAcademyByUrn.cs
@@ -2,8 +2,8 @@
 using AutoMapper.QueryableExtensions;
 using Dfe.Academies.Application.Common.Interfaces;
 using Dfe.Academies.Application.Common.Models;
-using Dfe.Academies.Domain.Interfaces.Caching;
-using Dfe.Academies.Utils.Caching;
+using DfE.CoreLibs.Caching.Helpers;
+using DfE.CoreLibs.Caching.Interfaces;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
@@ -14,7 +14,7 @@ public record GetAllPersonsAssociatedWithAcademyByUrnQuery(int Urn) : IRequest<L
     public class GetAllPersonsAssociatedWithAcademyByUrnQueryHandler(
         IEstablishmentQueryService establishmentQueryService,
         IMapper mapper,
-        ICacheService cacheService)
+        ICacheService<IMemoryCacheType> cacheService)
         : IRequestHandler<GetAllPersonsAssociatedWithAcademyByUrnQuery, List<AcademyGovernance>?>
     {
         public async Task<List<AcademyGovernance>?> Handle(GetAllPersonsAssociatedWithAcademyByUrnQuery request, CancellationToken cancellationToken)

diff --git a/Dfe.Academies.Application/Trust/ITrustQueries.cs b/Dfe.Academies.Application/Trust/ITrustQueries.cs
@@ -1,5 +1,5 @@
-using Dfe.Academies.Contracts.V4.Trusts;
-using Dfe.Academies.Domain.Trust;
+using Dfe.Academies.Domain.Trust;
+using DfE.CoreLibs.Contracts.Academies.V4.Trusts;
 
 namespace Dfe.Academies.Application.Trust
 {

diff --git a/...AllPersonsAssociatedWithTrustByTrnOrUkprn/GetAllPersonsAssociatedWithTrustByTrnOrUkprn.cs b/...AllPersonsAssociatedWithTrustByTrnOrUkprn/GetAllPersonsAssociatedWithTrustByTrnOrUkprn.cs
@@ -2,10 +2,10 @@
 using AutoMapper.QueryableExtensions;
 using Dfe.Academies.Application.Common.Interfaces;
 using Dfe.Academies.Application.Common.Models;
-using Dfe.Academies.Domain.Interfaces.Caching;
-using Dfe.Academies.Utils.Caching;
 using Dfe.Academies.Utils.Enums;
 using Dfe.Academies.Utils.Helpers;
+using DfE.CoreLibs.Caching.Helpers;
+using DfE.CoreLibs.Caching.Interfaces;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
@@ -16,7 +16,7 @@ public record GetAllPersonsAssociatedWithTrustByTrnOrUkprnQuery(string Id) : IRe
     public class GetAllPersonsAssociatedWithTrustByTrnOrUkprnQueryHandler(
         ITrustQueryService trustQueryService,
         IMapper mapper,
-        ICacheService cacheService)
+        ICacheService<IMemoryCacheType> cacheService)
         : IRequestHandler<GetAllPersonsAssociatedWithTrustByTrnOrUkprnQuery, List<TrustGovernance>?>
     {
         public async Task<List<TrustGovernance>?> Handle(GetAllPersonsAssociatedWithTrustByTrnOrUkprnQuery request, CancellationToken cancellationToken)

diff --git a/Dfe.Academies.Application/Trust/TrustQueries.cs b/Dfe.Academies.Application/Trust/TrustQueries.cs
@@ -1,7 +1,7 @@
 using Dfe.Academies.Domain.Interfaces.Repositories;
-using Dfe.Academies.Contracts.V4;
-using Dfe.Academies.Contracts.V4.Trusts;
 using Dfe.Academies.Domain.Trust;
+using DfE.CoreLibs.Contracts.Academies.V4;
+using DfE.CoreLibs.Contracts.Academies.V4.Trusts;
 
 namespace Dfe.Academies.Application.Trust
 {
@@ -51,7 +51,7 @@ private static TrustDto MapToTrustDto(Domain.Trust.Trust trust)
                 CompaniesHouseNumber = trust.CompaniesHouseNumber,
                 ReferenceNumber = trust.GroupID,
                 Ukprn = trust.UKPRN,
-                Type = new Contracts.V4.Establishments.NameAndCodeDto() { Code = trust.TrustType?.Code, Name = trust.TrustType?.Name },
+                Type = new DfE.CoreLibs.Contracts.Academies.V4.Establishments.NameAndCodeDto() { Code = trust.TrustType?.Code, Name = trust.TrustType?.Name },
                 Address = new AddressDto()
                 {
                     Street = trust.AddressLine1,

diff --git a/Dfe.Academies.Domain/Dfe.Academies.Domain.csproj b/Dfe.Academies.Domain/Dfe.Academies.Domain.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.10" />
+    <PackageReference Include="DfE.CoreLibs.Contracts" Version="1.0.5" />
     <PackageReference Include="MediatR" Version="12.4.0" />
   </ItemGroup>
 

diff --git a/Dfe.Academies.Domain/Interfaces/Caching/ICacheService.cs b/Dfe.Academies.Domain/Interfaces/Caching/ICacheService.cs
diff --git a/Dfe.Academies.Utils/Caching/CacheKeyHelper.cs b/Dfe.Academies.Utils/Caching/CacheKeyHelper.cs
diff --git a/PersonsApi/PersonsApi.csproj b/PersonsApi/PersonsApi.csproj
@@ -10,9 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="CsvHelper" Version="33.0.1" />
-	  <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.10" />
-	  <PackageReference Include="Dfe.Academisation.CorrelationIdMiddleware" Version="2.0.2" />
+	  <PackageReference Include="DfE.CoreLibs.Http" Version="1.0.5" />
 	  <PackageReference Include="FluentValidation" Version="11.9.2" />
 	  <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
 	  <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.8" />
@@ -37,6 +35,7 @@
 	  <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
 	  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
 	  <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.7.3" />
+	  <PackageReference Include="System.Text.Json" Version="8.0.5" />
 	  <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
 	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>

diff --git a/PersonsApi/Startup.cs b/PersonsApi/Startup.cs
@@ -1,5 +1,6 @@
 using Dfe.Academies.Application.MappingProfiles;
-using Dfe.Academisation.CorrelationIdMiddleware;
+using DfE.CoreLibs.Http.Interfaces;
+using DfE.CoreLibs.Http.Middlewares.CorrelationId;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.FeatureManagement;

diff --git a/PersonsApi/appsettings.json b/PersonsApi/appsettings.json
@@ -37,11 +37,13 @@
   "FeatureManagement": {
   },
   "CacheSettings": {
-    "DefaultDurationInSeconds": 60,
-    "Durations": {
-      "GetMembersOfParliamentByConstituenciesQueryHandler": 86400,
-      "GetMemberOfParliamentByConstituencyQueryHandler": 86400,
-      "GetAllPersonsAssociatedWithTrustByTrnOrUkprnQueryHandler": 86400
+    "Memory": {
+      "DefaultDurationInSeconds": 60,
+      "Durations": {
+        "GetMembersOfParliamentByConstituenciesQueryHandler": 86400,
+        "GetMemberOfParliamentByConstituencyQueryHandler": 86400,
+        "GetAllPersonsAssociatedWithTrustByTrnOrUkprnQueryHandler": 86400
+      }
     }
   },
   "Authorization": {

diff --git a/...es.Application.Tests/Queries/EducationalPerformance/EducationalPerformanceQueriesTests.cs b/...es.Application.Tests/Queries/EducationalPerformance/EducationalPerformanceQueriesTests.cs
@@ -1,8 +1,8 @@
 using AutoFixture;
 using Dfe.Academies.Application.EducationalPerformance;
-using Dfe.Academies.Contracts.V1.EducationalPerformance;
 using Dfe.Academies.Domain.EducationalPerformance;
 using Dfe.Academies.Domain.Interfaces.Repositories;
+using DfE.CoreLibs.Contracts.Academies.V1.EducationalPerformance;
 using FluentAssertions;
 using Moq;
 

diff --git a/Tests/Dfe.Academies.Application.Tests/Queries/Establishment/EstablishmentQueriesTests.cs b/Tests/Dfe.Academies.Application.Tests/Queries/Establishment/EstablishmentQueriesTests.cs
@@ -1,7 +1,7 @@
 using AutoFixture;
 using Dfe.Academies.Application.Establishment;
-using Dfe.Academies.Contracts.V4.Establishments;
 using Dfe.Academies.Domain.Interfaces.Repositories;
+using DfE.CoreLibs.Contracts.Academies.V4.Establishments;
 using FluentAssertions;
 using Moq;
 using System.Globalization;

diff --git a/Tests/Dfe.Academies.Application.Tests/Queries/Trust/TrustQueriesTests.cs b/Tests/Dfe.Academies.Application.Tests/Queries/Trust/TrustQueriesTests.cs
@@ -1,10 +1,10 @@
 using AutoFixture;
 using Dfe.Academies.Application.Trust;
-using Dfe.Academies.Contracts.V4.Trusts;
+using Dfe.Academies.Domain.Interfaces.Repositories;
 using Dfe.Academies.Domain.Trust;
+using DfE.CoreLibs.Contracts.Academies.V4.Trusts;
 using FluentAssertions;
 using Moq;
-using Dfe.Academies.Domain.Interfaces.Repositories;
 
 namespace Dfe.Academies.Application.Tests.Queries.Trust
 {