Add data extraction api

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 
 - WMTS Services are now supported as custom user layers.
+- Added data extraction API.
 
 ### Changed
 

docker-compose.yml

@@ -105,7 +105,7 @@ services:
       db:
         condition: service_healthy
     healthcheck:
-      test: "curl --fail http://127.0.0.1:5000/api/v2/version || exit 1"
+      test: "curl --fail http://127.0.0.1:5000/health || exit 1"
       interval: 20s
       timeout: 10s
       retries: 30
@@ -115,6 +115,7 @@ services:
       DOTNET_USE_POLLING_FILE_WATCHER: 1
       CONNECTIONSTRINGS__BdmsContext: Host=localhost;Username=SPAWNPLOW;Password=YELLOWSPATULA;Database=bdms;CommandTimeout=300
       ReverseProxy__Clusters__pythonApi__Destinations__legacyApi__Address: "http://localhost:8888/"
+      ReverseProxy__Clusters__dataExtractionApi__Destinations__dataExtractionApi__Address: "http://localhost:8000/"
       Auth__Authority: http://localhost:4011
       Auth__Audience: "bdms-client"
       Auth__GroupClaimType: "local_groups_claim"
@@ -124,6 +125,18 @@ services:
       S3__SECURE: 1
     extra_hosts:
       - "localhost:host-gateway"
+  dataextraction:
+    image: ghcr.io/swisstopo/swissgeol-boreholes-dataextraction-api:edge
+    restart: unless-stopped
+    ports:
+      - 8000:8000
+    environment:
+      AWS_ENDPOINT: http://minio:9000
+      AWS_ACCESS_KEY_ID: REDSQUIRREL
+      AWS_SECRET_ACCESS_KEY: YELLOWMONKEY
+      AWS_S3_BUCKET: cannonflea
+    healthcheck:
+      test: "curl --fail http://localhost:8000/health || exit 1"
   oidc-server:
     image: soluto/oidc-server-mock
     restart: unless-stopped

src/api/Dockerfile

@@ -51,7 +51,7 @@ ENV LC_ALL=C.UTF-8
 
 COPY --from=build /app/publish .
 
-HEALTHCHECK CMD curl --fail http://localhost:8080/health || exit 1
+HEALTHCHECK CMD ["bash", "-c", "curl --fail http://localhost:8080/health || exit 1"]
 
 # Switch to the non-root user 'app' defined in the base image
 USER $APP_UID

src/api/appsettings.Development.json

@@ -31,6 +31,13 @@
             "Address": "http://localhost:8888/"
           }
         }
+      },
+      "dataExtractionApi": {
+        "Destinations": {
+          "dataExtractionApi": {
+            "Address": "http://localhost:8000/"
+          }
+        }
       }
     }
   }

src/api/appsettings.json

@@ -22,6 +22,18 @@
         "Match": {
           "Path": "/api/v1/{**catch-all}"
         }
+      },
+      "dataExtractionApi": {
+        "ClusterId": "dataExtractionApi",
+        "AuthorizationPolicy": "Viewer",
+        "Match": {
+          "Path": "/dataextraction/{**catch-all}"
+        },
+        "Transforms": [
+          {
+            "PathRemovePrefix": "/dataextraction"
+          }
+        ]
       }
     }
   }

src/client/cypress/e2e/settings/mapSettings.cy.js

@@ -5,7 +5,7 @@ describe("map settings", () => {
     goToRouteAndAcceptTerms("/setting");
 
     const wmsName = "Army logistics centres (ALC)";
-    const wmtsName = "Wetness potential agricultural land";
+    const wmtsName = "Map swissTLM for 3D (color)";
 
     cy.contains("Map").click();
     // Add WMS

src/view-sync/docker-compose.services.yml

@@ -26,3 +26,7 @@ services:
     environment:
       # use development environment to enable seeding the database
       - ASPNETCORE_ENVIRONMENT=Development
+  minio:
+    extends:
+      file: ../../docker-compose.yml
+      service: minio