EES-5663 Remove /api prefix from public API routes

dfe-analytical-services · Nov 18, 2024 · 0c204af · 0c204af
1 parent 6c0e642
commit 0c204af
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/infrastructure/templates/template.json b/infrastructure/templates/template.json
@@ -2114,7 +2114,7 @@
         "NEXT_CONFIG_MODE": "server",
         "NODE_ENV": "production",
         "PUBLIC_URL": "[concat(variables('publicAppUrl'), '/')]",
-        "PUBLIC_API_BASE_URL": "[concat('https://', parameters('publicApiUrl'), '/api/v1')]",
+        "PUBLIC_API_BASE_URL": "[concat('https://', parameters('publicApiUrl'), '/v1')]",
         "PUBLIC_API_DOCS_URL": "[concat('https://', parameters('publicApiDocsUrl'))]",
         "WEBSITE_NODE_DEFAULT_VERSION": "20.16.0",
         "WEBSITES_PORT": 3000

diff --git a/...Uk.Education.ExploreEducationStatistics.Admin/Services/Public.Data/PublicDataApiClient.cs b/...Uk.Education.ExploreEducationStatistics.Admin/Services/Public.Data/PublicDataApiClient.cs
@@ -35,7 +35,7 @@ public async Task<Either<ActionResult, HttpResponseMessage>> GetDataSetVersionCh
     {
         return await SendRequest(
             () => httpClient.GetAsync(
-                $"api/v1/data-sets/{dataSetId}/versions/{dataSetVersion}/changes",
+                $"v1/data-sets/{dataSetId}/versions/{dataSetVersion}/changes",
                 cancellationToken
             ),
             cancellationToken

diff --git a/...reEducationStatistics.Public.Data.Api.Tests/Controllers/DataSetVersionsControllerTests.cs b/...reEducationStatistics.Public.Data.Api.Tests/Controllers/DataSetVersionsControllerTests.cs
@@ -20,7 +20,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Api.Tests.Contr
 
 public abstract class DataSetVersionsControllerTests(TestApplicationFactory testApp) : IntegrationTestFixture(testApp)
 {
-    private const string BaseUrl = "api/v1/data-sets";
+    private const string BaseUrl = "v1/data-sets";
 
     public class ListDataSetVersionsTests(TestApplicationFactory testApp) : DataSetVersionsControllerTests(testApp)
     {

diff --git a/...eEducationStatistics.Public.Data.Api.Tests/Controllers/DataSetsControllerGetQueryTests.cs b/...eEducationStatistics.Public.Data.Api.Tests/Controllers/DataSetsControllerGetQueryTests.cs
@@ -23,7 +23,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Api.Tests.Contr
 
 public abstract class DataSetsControllerGetQueryTests(TestApplicationFactory testApp) : IntegrationTestFixture(testApp)
 {
-    private const string BaseUrl = "api/v1/data-sets";
+    private const string BaseUrl = "v1/data-sets";
 
     private readonly TestDataSetVersionPathResolver _dataSetVersionPathResolver = new()
     {

diff --git a/...EducationStatistics.Public.Data.Api.Tests/Controllers/DataSetsControllerPostQueryTests.cs b/...EducationStatistics.Public.Data.Api.Tests/Controllers/DataSetsControllerPostQueryTests.cs
@@ -25,7 +25,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Api.Tests.Contr
 
 public abstract class DataSetsControllerPostQueryTests(TestApplicationFactory testApp) : IntegrationTestFixture(testApp)
 {
-    private const string BaseUrl = "api/v1/data-sets";
+    private const string BaseUrl = "v1/data-sets";
 
     private readonly TestDataSetVersionPathResolver _dataSetVersionPathResolver = new()
     {

diff --git a/...n.ExploreEducationStatistics.Public.Data.Api.Tests/Controllers/DataSetsControllerTests.cs b/...n.ExploreEducationStatistics.Public.Data.Api.Tests/Controllers/DataSetsControllerTests.cs
@@ -25,7 +25,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Api.Tests.Contr
 
 public abstract class DataSetsControllerTests(TestApplicationFactory testApp) : IntegrationTestFixture(testApp)
 {
-    private const string BaseUrl = "api/v1/data-sets";
+    private const string BaseUrl = "v1/data-sets";
 
     public class GetDataSetTests(TestApplicationFactory testApp) : DataSetsControllerTests(testApp)
     {

diff --git a/...ploreEducationStatistics.Public.Data.Api.Tests/Controllers/PublicationsControllerTests.cs b/...ploreEducationStatistics.Public.Data.Api.Tests/Controllers/PublicationsControllerTests.cs
@@ -21,7 +21,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Api.Tests.Contr
 
 public abstract class PublicationsControllerTests(TestApplicationFactory testApp) : IntegrationTestFixture(testApp)
 {
-    private const string BaseUrl = "api/v1/publications";
+    private const string BaseUrl = "v1/publications";
 
     public class ListPublicationsTests(TestApplicationFactory testApp) : PublicationsControllerTests(testApp)
     {

diff --git a/...ation.ExploreEducationStatistics.Public.Data.Api/Controllers/DataSetVersionsController.cs b/...ation.ExploreEducationStatistics.Public.Data.Api/Controllers/DataSetVersionsController.cs
@@ -12,7 +12,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Api.Controllers
 
 [ApiVersion("1")]
 [ApiController]
-[Route("api/v{version:apiVersion}/data-sets/{dataSetId:guid}/versions")]
+[Route("v{version:apiVersion}/data-sets/{dataSetId:guid}/versions")]
 public class DataSetVersionsController(
     IDataSetService dataSetService,
     IDataSetVersionChangeService dataSetVersionChangeService)

diff --git a/...Uk.Education.ExploreEducationStatistics.Public.Data.Api/Controllers/DataSetsController.cs b/...Uk.Education.ExploreEducationStatistics.Public.Data.Api/Controllers/DataSetsController.cs
@@ -13,7 +13,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Api.Controllers
 
 [ApiVersion("1")]
 [ApiController]
-[Route("api/v{version:apiVersion}/data-sets")]
+[Route("v{version:apiVersion}/data-sets")]
 public class DataSetsController(
     IDataSetService dataSetService,
     IDataSetQueryService dataSetQueryService)

diff --git a/...ducation.ExploreEducationStatistics.Public.Data.Api/Controllers/PublicationsController.cs b/...ducation.ExploreEducationStatistics.Public.Data.Api/Controllers/PublicationsController.cs
@@ -12,7 +12,7 @@ namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Api.Controllers
 
 [ApiVersion("1")]
 [ApiController]
-[Route("api/v{version:apiVersion}/publications")]
+[Route("v{version:apiVersion}/publications")]
 public class PublicationsController(IPublicationService publicationService, IDataSetService dataSetService)
     : ControllerBase
 {

diff --git a/src/explore-education-statistics-frontend/.env b/src/explore-education-statistics-frontend/.env
@@ -1,6 +1,6 @@
 CONTENT_API_BASE_URL=http://localhost:5010/api
 DATA_API_BASE_URL=http://localhost:5000/api
-PUBLIC_API_BASE_URL=http://localhost:5050/api/v1
+PUBLIC_API_BASE_URL=http://localhost:5050/v1
 PUBLIC_API_DOCS_URL=https://dev.statistics.api.education.gov.uk/docs
 NOTIFICATION_API_BASE_URL=http://localhost:7073/api
 GA_TRACKING_ID=