Merge pull request #673 from DFE-Digital/feature/193795-remove-person…

…s-api Removed PersonsApi logic
DFE-Digital · Jan 20, 2025 · 8090c61 · 8090c61
2 parents f1742d1 + 968d0ce
commit 8090c61
Show file tree

Hide file tree

Showing 96 changed files with 34 additions and 5,014 deletions.
diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
@@ -54,38 +54,26 @@ jobs:
     needs: [ set-env ]
     uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/[email protected]
     strategy:
-        matrix:
-          image: [
-            "Dockerfile",
-            "Dockerfile.PersonsApi"
-          ]
-          stage: [
-            "final"
-          ]
-          include:
-            - image: "Dockerfile"
-              aca_name: "ACA_CONTAINERAPP_NAME"
-              prefix: ""
-              name: "tramsapi-app"
-
-            - image: "Dockerfile"
-              aca_name: "ACA_CONTAINERAPP_NAME"
-              prefix: "init-"
-              name: "tramsapi-app"
-              stage: initcontainer
-
-            - image: "Dockerfile.PersonsApi"
-              aca_name: "ACA_CONTAINERAPP_PERSONS_API_NAME"
-              prefix: "persons-api-"
-              name: "personsapi-app"
+      matrix:
+        image: [
+          "Dockerfile"
+        ]
+        stage: [
+          "final",
+          "initcontainer"
+        ]
+        include:
+          - stage: "final"
+            prefix: ""
+          - stage: "initcontainer"
+            prefix: "init-"
     with:
-      docker-image-name: '${{ matrix.name }}'
+      docker-image-name: 'tramsapi-app'
       docker-build-file-name: './${{ matrix.image }}'
       docker-build-target: ${{ matrix.stage }}
       docker-tag-prefix: ${{ matrix.prefix }}
       environment: ${{ needs.set-env.outputs.environment }}
-      # Only annotate the release once, because both apps are deployed at the same time
-      annotate-release: ${{ matrix.name == 'tramsapi-app' && matrix.stage == 'final' }}
+      annotate-release: ${{ matrix.stage == 'final' }}
       import-without-deploy: ${{ matrix.stage == 'initcontainer' }}
       docker-build-args: |
         COMMIT_SHA="${{ needs.set-env.outputs.checked-out-sha }}"
@@ -96,7 +84,7 @@ jobs:
       azure-acr-client-id: ${{ secrets.ACR_CLIENT_ID }}
       azure-acr-name: ${{ secrets.ACR_NAME }}
       azure-aca-client-id: ${{ secrets.ACA_CLIENT_ID }}
-      azure-aca-name: ${{ secrets[matrix.aca_name] }}
+      azure-aca-name: ${{ secrets.ACA_CONTAINERAPP_NAME }}
       azure-aca-resource-group: ${{ secrets.ACA_RESOURCE_GROUP }}
 
   create-tag:

diff --git a/.github/workflows/build-and-push-package.yml b/.github/workflows/build-and-push-package.yml
diff --git a/.github/workflows/continuous-integration-dotnet.yml b/.github/workflows/continuous-integration-dotnet.yml
@@ -8,8 +8,6 @@ on:
     - 'Dfe.Academies.*/**'
     - 'TramsDataApi/**'
     - 'TramsDataApi.*/**'
-    - 'PersonsApi/**'
-    - 'PersonsApi.*/**'
     - '!Dfe.Academies.Performance/**'
   pull_request:
     branches: [ main ]
@@ -18,8 +16,6 @@ on:
     - 'Dfe.Academies.*/**'
     - 'TramsDataApi/**'
     - 'TramsDataApi.*/**'
-    - 'PersonsApi/**'
-    - 'PersonsApi.*/**'
     - '!Dfe.Academies.Performance/**'
 
 env:

diff --git a/.github/workflows/continuous-integration-javascript.yml b/.github/workflows/continuous-integration-javascript.yml
@@ -10,12 +10,13 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     defaults:
-      working-directory: CypressTests
+      run:
+        working-directory: CypressTests
     steps:
       - name: checkout code
         uses: actions/checkout@v4
 
       - name: lint cypress tests
         run: |
           npm ci
-          npm run lint        
+          npm run lint
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -4,7 +4,6 @@ on:
   pull_request:
     paths:
       - Dockerfile
-      - Dockerfile.PersonsApi
     types: [opened, synchronize]
 
 jobs:
@@ -14,14 +13,11 @@ jobs:
       matrix:
         image: [
           "Dockerfile",
-          "Dockerfile.PersonsApi"
         ]
         stage: [
-          "final"
+          "final",
+          "initcontainer"
         ]
-        include:
-          - image: "Dockerfile"
-            stage: "initcontainer"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -13,14 +13,11 @@ jobs:
       matrix:
         image: [
           "Dockerfile",
-          "Dockerfile.PersonsApi"
         ]
         stage: [
-          "final"
+          "final",
+          "initcontainer"
         ]
-        include:
-          - image: "Dockerfile"
-            stage: "initcontainer"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/Dfe.Academies.Api.Infrastructure/InfrastructureServiceCollectionExtensions.cs b/Dfe.Academies.Api.Infrastructure/InfrastructureServiceCollectionExtensions.cs
@@ -1,13 +1,8 @@
-using Dfe.Academies.Application.Common.Interfaces;
-using Dfe.Academies.Domain.Constituencies;
+using Dfe.Academies.Domain.Interfaces.Repositories;
 using Dfe.Academies.Infrastructure;
 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.Infrastructure.QueryServices;
-using Dfe.Academies.Domain.ValueObjects;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -39,41 +34,6 @@ public static IServiceCollection AddInfrastructureDependencyGroup(
             return services;
         }
 
-        public static IServiceCollection AddPersonsApiInfrastructureDependencyGroup(
-            this IServiceCollection services, IConfiguration config)
-        {
-            //Repos
-            services.AddScoped<ITrustRepository, TrustRepository>();
-            services.AddScoped<IEstablishmentRepository, EstablishmentRepository>();
-            services.AddScoped<IConstituencyRepository, ConstituencyRepository>();
-
-            // Query Services
-            services.AddScoped<IEstablishmentQueryService, EstablishmentQueryService>();
-            services.AddScoped<ITrustQueryService, TrustQueryService>();
-
-            //Cache service
-            services.AddServiceCaching(config);
-
-            //Db
-            var connectionString = config.GetConnectionString("DefaultConnection");
-
-            services.AddDbContext<MstrContext>(options =>
-                options.UseSqlServer(connectionString));
-
-            services.AddDbContext<MopContext>(options =>
-                options.UseSqlServer(connectionString));
-
-            services.AddDbContext<MisMstrContext>(options =>
-                options.UseSqlServer(connectionString));
-
-            AddInfrastructureHealthChecks(services);
-
-            // Authentication
-            services.AddCustomAuthorization(config);
-
-            return services;
-        }
-
         public static void AddInfrastructureHealthChecks(this IServiceCollection services) {
             services.AddHealthChecks()
                 .AddDbContextCheck<MstrContext>("Academies Database");

diff --git a/Dfe.Academies.Api.Infrastructure/MopContext.cs b/Dfe.Academies.Api.Infrastructure/MopContext.cs
diff --git a/Dfe.Academies.Api.Infrastructure/QueryServices/EstablishmentQueryService.cs b/Dfe.Academies.Api.Infrastructure/QueryServices/EstablishmentQueryService.cs