Remove legacy API calls

Laixer · Mar 13, 2024 · 079ab14 · 079ab14
1 parent 4e1c22b
commit 079ab14
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 131 deletions.
diff --git a/src/FunderMaps.Webservice/Controllers/ProductController.cs b/src/FunderMaps.Webservice/Controllers/ProductController.cs
@@ -12,13 +12,6 @@ namespace FunderMaps.Webservice.Controllers;
 [Route("api/v3/product")]
 public sealed class ProductController(ModelService modelService) : FunderMapsController
 {
-    // TODO: LEGACY
-    // GET: api/v3/product/analysis
-    [Authorize(Roles = "Service,Administrator")]
-    [HttpGet("analysis")]
-    public Task<AnalysisProduct> GetAnalysisLegacyAsync([FromQuery] string id)
-        => GetAnalysisAsync(id);
-
     // GET: api/v3/product/analysis
     /// <summary>
     ///     Request the analysis product.
@@ -28,16 +21,6 @@ public Task<AnalysisProduct> GetAnalysisLegacyAsync([FromQuery] string id)
     public Task<AnalysisProduct> GetAnalysisAsync(string id)
         => modelService.GetAnalysisAsync(id, TenantId);
 
-    // TODO: LEGACY
-    // GET: api/v3/product/at_risk
-    /// <summary>
-    ///     Request the risk index per id.
-    /// </summary>
-    [Authorize(Roles = "Service,Administrator")]
-    [HttpGet("at_risk")]
-    public Task<bool> GetRiskIndexLegacyAsync([FromQuery] string id)
-        => GetRiskIndexAsync(id);
-
     // GET: api/v3/product/at_risk
     /// <summary>
     ///     Request the risk index per id.
@@ -47,16 +30,6 @@ public Task<bool> GetRiskIndexLegacyAsync([FromQuery] string id)
     public Task<bool> GetRiskIndexAsync(string id)
         => modelService.GetRiskIndexAsync(id, TenantId);
 
-    // TODO: LEGACY
-    // GET: api/v3/product/statistics
-    /// <summary>
-    ///     Request the statistics product.
-    /// </summary>
-    [Authorize(Roles = "Service,Administrator")]
-    [HttpGet("statistics")]
-    public Task<StatisticsProduct> GetStatisticsLegacyAsync([FromQuery] string id)
-        => GetStatisticsAsync(id);
-
     // GET: api/v3/product/statistics
     /// <summary>
     ///     Request the statistics product.

diff --git a/tests/FunderMaps.Webservice.Tests/Controllers/AnalysisTests.cs b/tests/FunderMaps.Webservice.Tests/Controllers/AnalysisTests.cs
@@ -30,31 +30,16 @@ public async Task GetProductByIdReturnProduct(string address)
 
         Assert.NotNull(returnToken);
 
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/analysis?id={address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
-
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<AnalysisProduct>();
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(returnObject);
-            Assert.Equal("gfm-4f5e73d478ff452b86023a06e5b8d834", returnObject.BuildingId);
-            Assert.Equal("NL.IMBAG.PAND.0599100000685769", returnObject.ExternalBuildingId);
-        }
-
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/analysis/{address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
+        var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/analysis/{address}");
+        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
 
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<AnalysisProduct>();
+        var response = await client.SendAsync(request);
+        var returnObject = await response.Content.ReadFromJsonAsync<AnalysisProduct>();
 
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(returnObject);
-            Assert.Equal("gfm-4f5e73d478ff452b86023a06e5b8d834", returnObject.BuildingId);
-            Assert.Equal("NL.IMBAG.PAND.0599100000685769", returnObject.ExternalBuildingId);
-        }
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.NotNull(returnObject);
+        Assert.Equal("gfm-4f5e73d478ff452b86023a06e5b8d834", returnObject.BuildingId);
+        Assert.Equal("NL.IMBAG.PAND.0599100000685769", returnObject.ExternalBuildingId);
     }
 
     [Theory]
@@ -67,31 +52,16 @@ public async Task AuthKeyGetProductByIdReturnProduct(string address)
     {
         using var client = factory.CreateClient();
 
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/analysis?id={address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("AuthKey", "fmsk.k0hEiTT0vDBvEqFHItz6wg0U6ejxceDW");
-
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<AnalysisProduct>();
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(returnObject);
-            Assert.Equal("gfm-4f5e73d478ff452b86023a06e5b8d834", returnObject.BuildingId);
-            Assert.Equal("NL.IMBAG.PAND.0599100000685769", returnObject.ExternalBuildingId);
-        }
-
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/analysis/{address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("AuthKey", "fmsk.k0hEiTT0vDBvEqFHItz6wg0U6ejxceDW");
+        var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/analysis/{address}");
+        request.Headers.Authorization = new AuthenticationHeaderValue("AuthKey", "fmsk.k0hEiTT0vDBvEqFHItz6wg0U6ejxceDW");
 
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<AnalysisProduct>();
+        var response = await client.SendAsync(request);
+        var returnObject = await response.Content.ReadFromJsonAsync<AnalysisProduct>();
 
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(returnObject);
-            Assert.Equal("gfm-4f5e73d478ff452b86023a06e5b8d834", returnObject.BuildingId);
-            Assert.Equal("NL.IMBAG.PAND.0599100000685769", returnObject.ExternalBuildingId);
-        }
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.NotNull(returnObject);
+        Assert.Equal("gfm-4f5e73d478ff452b86023a06e5b8d834", returnObject.BuildingId);
+        Assert.Equal("NL.IMBAG.PAND.0599100000685769", returnObject.ExternalBuildingId);
     }
 
     [Theory]
@@ -113,27 +83,14 @@ public async Task GetRiskIndexByIdReturnProduct(string address)
 
         Assert.NotNull(returnToken);
 
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/at_risk?id={address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
-
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<bool>();
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.True(returnObject);
-        }
-
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/at_risk/{address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
+        var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/at_risk/{address}");
+        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
 
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<bool>();
+        var response = await client.SendAsync(request);
+        var returnObject = await response.Content.ReadFromJsonAsync<bool>();
 
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.True(returnObject);
-        }
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.True(returnObject);
     }
 
     [Fact]

diff --git a/tests/FunderMaps.Webservice.Tests/Controllers/StatisticsTests.cs b/tests/FunderMaps.Webservice.Tests/Controllers/StatisticsTests.cs
@@ -29,27 +29,14 @@ public async Task GetProductByIdReturnProduct(string address)
 
         Assert.NotNull(returnToken);
 
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/statistics?id={address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
-
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<StatisticsProduct>();
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(returnObject);
-        }
-
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/statistics/{address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
+        var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/statistics/{address}");
+        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", returnToken.Token);
 
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<StatisticsProduct>();
+        var response = await client.SendAsync(request);
+        var returnObject = await response.Content.ReadFromJsonAsync<StatisticsProduct>();
 
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(returnObject);
-        }
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.NotNull(returnObject);
     }
 
     [Theory]
@@ -61,28 +48,14 @@ public async Task AuthKeyGetProductByIdReturnProduct(string address)
     {
         using var client = factory.CreateClient();
 
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/statistics?id={address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("AuthKey", "fmsk.k0hEiTT0vDBvEqFHItz6wg0U6ejxceDW");
-
-            var response = await client.SendAsync(request);
-
-            var returnObject = await response.Content.ReadFromJsonAsync<StatisticsProduct>();
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(returnObject);
-        }
-
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/statistics/{address}");
-            request.Headers.Authorization = new AuthenticationHeaderValue("AuthKey", "fmsk.k0hEiTT0vDBvEqFHItz6wg0U6ejxceDW");
+        var request = new HttpRequestMessage(HttpMethod.Get, $"api/v3/product/statistics/{address}");
+        request.Headers.Authorization = new AuthenticationHeaderValue("AuthKey", "fmsk.k0hEiTT0vDBvEqFHItz6wg0U6ejxceDW");
 
-            var response = await client.SendAsync(request);
-            var returnObject = await response.Content.ReadFromJsonAsync<StatisticsProduct>();
+        var response = await client.SendAsync(request);
+        var returnObject = await response.Content.ReadFromJsonAsync<StatisticsProduct>();
 
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(returnObject);
-        }
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.NotNull(returnObject);
     }
 
     [Fact]