Merge pull request #77 from forza-mor-rotterdam/develop

develop -> main

app/apps/health/apps.py

@@ -7,6 +7,6 @@ class HealthConfig(AppConfig):
     verbose_name = "Health"
 
     def ready(self):
-        from apps.health.custom_checks import MeldingenAPIHealthCheck
+        from apps.health.custom_checks import MeldingenTokenCheck
 
-        plugin_dir.register(MeldingenAPIHealthCheck)
+        plugin_dir.register(MeldingenTokenCheck)

app/apps/health/custom_checks.py

@@ -1,23 +1,17 @@
-import requests
-from django.conf import settings
+from apps.meldingen.utils import get_meldingen_token
 from health_check.backends import BaseHealthCheckBackend
 from health_check.exceptions import HealthCheckException
 
 
-class MeldingenAPIHealthCheck(BaseHealthCheckBackend):
+class MeldingenTokenCheck(BaseHealthCheckBackend):
     critical_service = False
 
     def check_status(self):
-        health_check_response = requests.get(settings.MELDINGEN_API_HEALTH_CHECK_URL)
-
-        if health_check_response.status_code != 200:
-            raise HealthCheckException(
-                f"Meldingen API not ready: status code: {health_check_response.status_code}"
-            )
-        if health_check_response.status_code == 404:
-            raise HealthCheckException(
-                f"Meldingen API: health url not implemented: status code: {health_check_response.status_code}"
-            )
+        try:
+            get_meldingen_token()
+            return "OK"
+        except Exception as e:
+            raise HealthCheckException(e)
 
     def identifier(self):
         return self.__class__.__name__

docker-compose.test.yaml

@@ -3,7 +3,7 @@ services:
   app:
     build: ./app
     ports:
-      - "8010:8000"
+      - "8003:8000"
     env_file:
       - .env.test
     volumes:
@@ -19,13 +19,13 @@ services:
     networks:
       - regie_network
     ports:
-      - "7379:6379"
+      - "6379"
 
   database:
     image: postgis/postgis:11-3.3
     shm_size: '1024m'
     ports:
-      - "6432:5432"
+      - "5432"
     env_file:
       - .env.test
     healthcheck: