Allow to override POSTGRES_HOST

Author: thenav56

django/apps/aggregated/management/commands/update_aggregated_data.py

@@ -75,12 +75,14 @@
 
 TASK_GROUP_METADATA_QUERY = f"""
         SELECT
-            P.project_id,
+            G.project_id,
             G.group_id,
-            CASE
-                -- Hide area for Footprint
-                WHEN P.project_type = {Project.Type.FOOTPRINT.value} THEN 0
-                ELSE G.total_area
+            (
+                CASE
+                    -- Hide area for Footprint
+                    WHEN P.project_type = {Project.Type.FOOTPRINT.value} THEN 0
+                    ELSE G.total_area
+                END
             ) as total_task_group_area,
             G.time_spent_max_allowed
         FROM groups G

docker-compose.yaml

@@ -30,7 +30,7 @@ x-django: &base_django
       DJANGO_DB_NAME: '${POSTGRES_DB}'
       DJANGO_DB_USER: '${POSTGRES_USER}'
       DJANGO_DB_PWD: '${POSTGRES_PASSWORD}'
-      DJANGO_DB_HOST: 'postgres'
+      DJANGO_DB_HOST: '${POSTGRES_HOST:-postgres}'
       DJANGO_DB_PORT: 5432
       DJANGO_STATIC_ROOT: '/assets/static/'
       DJANGO_MEDIA_ROOT: '/assets/media/'
@@ -62,7 +62,7 @@ x-mapswipe-workers: &base_mapswipe_workers
         POSTGRES_PASSWORD: '${POSTGRES_PASSWORD}'
         POSTGRES_USER: '${POSTGRES_USER}'
         POSTGRES_DB: '${POSTGRES_DB}'
-        POSTGRES_HOST: 'postgres'
+        POSTGRES_HOST: '${POSTGRES_HOST:-postgres}'
         POSTGRES_PORT: 5432
         PGDATA: '/var/lib/postgresql/mapswipe'
         IMAGE_BING_API_KEY: '${IMAGE_BING_API_KEY}'