Merge pull request #453 from DFE-Digital/feature/155067-integrate-get…

…-construct-projects 155067: integrate get construct projects
DFE-Digital · Feb 5, 2024 · e3c34ae · e3c34ae
2 parents 6293b4a + 23a3d8f
commit e3c34ae
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 18 deletions.
diff --git a/TramsDataApi.Test/FakeApi/FakeMfspApi.cs b/TramsDataApi.Test/FakeApi/FakeMfspApi.cs
@@ -14,26 +14,29 @@ public class FakeMfspApi
 
         public void Start()
         {
-            _server = new WebHostBuilder().UseKestrel(x => x.ListenLocalhost(5003)).Configure(app =>
+            _server = new WebHostBuilder().UseKestrel(x => x.ListenLocalhost(6784)).Configure(app =>
             {
                 app.Run(async context =>
                 {
-                    if (context.Request.Method == HttpMethods.Get && context.Request.Path == "/v2/fss/projects")
+                    if (context.Request.Method == HttpMethods.Get && context.Request.Path == "/api/v1/construct/projects")
                     {
-                        var response = new List<FssProjectResponse>()
+                        var response = new ApiResponseV2<FssProjectResponse>()
                         {
-                            new FssProjectResponse()
+                            Data = new List<FssProjectResponse>()
                             {
-                                CurrentFreeSchoolName = "This is my free school",
-                                AgeRange = "5-11",
-                                ProjectStatus = "Open",
-                            },
-                            new FssProjectResponse()
-                            {
-                                CurrentFreeSchoolName = "This is another free school",
-                                AgeRange = "11-16",
-                                ProjectStatus = "Open",
-                            },
+                                new FssProjectResponse()
+                                {
+                                    CurrentFreeSchoolName = "This is my free school",
+                                    AgeRange = "5-11",
+                                    ProjectStatus = "Open",
+                                },
+                                new FssProjectResponse()
+                                {
+                                    CurrentFreeSchoolName = "This is another free school",
+                                    AgeRange = "11-16",
+                                    ProjectStatus = "Open",
+                                },
+                            }
                         };
 
                         await context.Response.WriteAsJsonAsync(response);

diff --git a/TramsDataApi.Test/integration_settings.json b/TramsDataApi.Test/integration_settings.json
@@ -12,7 +12,7 @@
     "DefaultConnection": "Server=127.0.0.1,1433;Database=sip;User Id=sa;TrustServerCertificate=True;Password=StrongPassword905"
   },
   "Mfsp": {
-    "ApiEndpoint": "http://localhost:5003"
+    "ApiEndpoint": "http://localhost:6784"
   },
   "FeatureManagement": {
     "IsGetProjectsFromMfspEnabled": true

diff --git a/TramsDataApi/Configuration/MfspOptions.cs b/TramsDataApi/Configuration/MfspOptions.cs
@@ -3,5 +3,7 @@
     public class MfspOptions
     {
         public string ApiEndpoint { get; set; }
+
+        public string ApiKey { get; set; }
     }
 }
diff --git a/TramsDataApi/Startup.cs b/TramsDataApi/Startup.cs
@@ -52,6 +52,7 @@ public void ConfigureServices(IServiceCollection services)
             {
                 MfspOptions mfspOptions =  GetTypedConfigurationFor<MfspOptions>();
                 client.BaseAddress = new Uri(mfspOptions.ApiEndpoint);
+                client.DefaultRequestHeaders.Add("ApiKey", mfspOptions.ApiKey);
             });
 
             services.AddScoped<ITrustGateway, TrustGateway>();

diff --git a/TramsDataApi/TramsDataApi.csproj b/TramsDataApi/TramsDataApi.csproj
@@ -4,6 +4,12 @@
         <UserSecretsId>1ce62ee2-ff0b-4f40-9066-cfbdae2e889f</UserSecretsId>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+      <NoWarn>1701;1702;1591</NoWarn>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+      <NoWarn>1701;1702;1591</NoWarn>
+    </PropertyGroup>
     <ItemGroup>
       <Compile Remove="ServiceModels\**" />
       <Content Remove="ServiceModels\**" />

diff --git a/TramsDataApi/UseCases/GetAllFssProjects.cs b/TramsDataApi/UseCases/GetAllFssProjects.cs
@@ -31,9 +31,9 @@ public async Task<List<FssProjectResponse>> Execute()
 
             if (useMfspApi)
             {
-                var mfspProjects = await _mfspApiClient.Get<List<FssProjectResponse>>("/v2/fss/projects");
+                var mfspProjects = await _mfspApiClient.Get<ApiResponseV2<FssProjectResponse>>("/api/v1/construct/projects");
 
-                return mfspProjects;
+                return mfspProjects.Data.ToList();
             }
 
             return _fssProjectGateway.GetAll().Select(fssProject => FssProjectResponseFactory.Create(fssProject)).ToList();

diff --git a/TramsDataApi/appsettings.json b/TramsDataApi/appsettings.json
@@ -39,7 +39,8 @@
     }
   },
   "Mfsp": {
-    "ApiEndpoint": "<insert mfsp endpoint>"
+    "ApiEndpoint": "<insert mfsp endpoint>",
+    "ApiKey": "<insert mfsp api key>"
   },
   "FeatureManagement": {
     "IsGetProjectsFromMfspEnabled": false