Merge branch 'develop' into feature/email-service

Laixer · Jan 18, 2021 · 0cbf104 · 0cbf104
2 parents edf8cf1 + 76740e6
commit 0cbf104
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/FunderMaps.Core/Types/BuildingType.cs b/src/FunderMaps.Core/Types/BuildingType.cs
@@ -16,9 +16,9 @@ public enum BuildingType
         Shed = 1,
 
         /// <summary>
-        ///     House boat.
+        ///     Houseboat.
         /// </summary>
-        HouseBoat = 2,
+        Houseboat = 2,
 
         /// <summary>
         ///     Mobile home.

diff --git a/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs b/src/FunderMaps.Data/Providers/NpgsqlDbProvider.cs
@@ -49,6 +49,7 @@ static NpgsqlDbProvider()
             NpgsqlConnection.GlobalTypeMapper.MapEnum<ApplicationRole>("application.role");
             NpgsqlConnection.GlobalTypeMapper.MapEnum<AuditStatus>("report.audit_status");
             NpgsqlConnection.GlobalTypeMapper.MapEnum<BaseMeasurementLevel>("report.base_measurement_level");
+            NpgsqlConnection.GlobalTypeMapper.MapEnum<BuildingType>("geocoder.building_type");
             NpgsqlConnection.GlobalTypeMapper.MapEnum<BundleStatus>("maplayer.bundle_status");
             NpgsqlConnection.GlobalTypeMapper.MapEnum<ConstructionPile>("report.construction_pile");
             NpgsqlConnection.GlobalTypeMapper.MapEnum<CrackType>("report.crack_type");

diff --git a/src/FunderMaps.WebApi/Controllers/Application/ReviewerController.cs b/src/FunderMaps.WebApi/Controllers/Application/ReviewerController.cs
@@ -44,7 +44,7 @@ public ReviewerController(IMapper mapper, Core.AppContext appContext, IOrganizat
         ///     Return all reviewers.
         /// </summary>
         /// <remarks>Cache response for 1 hour.</remarks>
-        [HttpGet("reviewer"), ResponseCache(Duration = 60 * 60)]
+        [HttpGet("reviewer")]
         public async Task<IActionResult> GetAllAsync([FromQuery] PaginationDto pagination)
         {
             // Act.

diff --git a/tests/FunderMaps.Core.Tests/Entities/BuildingTests.cs b/tests/FunderMaps.Core.Tests/Entities/BuildingTests.cs
@@ -20,7 +20,7 @@ public void ValidateBuilding()
                 Geometry = "7b2274797065223a224d756c7469506f6c79676f6e222c22636f6f7264696e61746573223a5b5b5b5b352e3833333038343731312c35332e3039333332373638385d2c5b352e3833333033393531392c35332e3039333331343130385d2c5b352e3833333031393439362c35332e30393333333832325d2c5b352e3833323938353930392c35332e3039333332383132385d2c5b352e3833333036303236382c35332e3039333233383438355d2c5b352e38333331333930362c35332e3039333236323136365d2c5b352e3833333038343731312c35332e3039333332373638385d5d5d5d7d",
                 ExternalId = "external-1",
                 ExternalSource = ExternalDataSource.NlBag,
-                BuildingType = BuildingType.HouseBoat,
+                BuildingType = BuildingType.Houseboat,
                 NeighborhoodId = "gfm-neighborhood",
             };
             var entity2 = new Building

diff --git a/tests/FunderMaps.IntegrationTests/Backend/Application/ReviewerTests.cs b/tests/FunderMaps.IntegrationTests/Backend/Application/ReviewerTests.cs
@@ -92,8 +92,6 @@ public async Task GetAllReviewerReturnAllReviewer(OrganizationRole role, int exp
             // Assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Equal(expectedCount, returnList.Count);
-            Assert.True(response.Headers.CacheControl.Public);
-            Assert.NotNull(response.Headers.CacheControl.MaxAge);
         }
     }
 }