From 999313788b879d93cbfda3c9e0f986333d798078 Mon Sep 17 00:00:00 2001
From: Kamil Monicz <kamil@monicz.pl>
Date: Wed, 9 Aug 2023 01:33:13 +0200
Subject: [PATCH] Simplify configuration

---
 .github/workflows/deploy-dev.yaml             | 2 +-
 .github/workflows/deploy-main.yaml            | 2 +-
 docker-compose.prod.yml => docker-compose.yml | 2 +-
 states/aed_state.py                           | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename docker-compose.prod.yml => docker-compose.yml (97%)

diff --git a/.github/workflows/deploy-dev.yaml b/.github/workflows/deploy-dev.yaml
index aa97ec2..9b85c4b 100644
--- a/.github/workflows/deploy-dev.yaml
+++ b/.github/workflows/deploy-dev.yaml
@@ -36,5 +36,5 @@ jobs:
             git reset --hard origin/dev
 
             echo "Building and starting containers"
-            LISTEN=49223 WORKERS=6 docker-compose -f docker-compose.prod.yml -p prod_develop up -d --build
+            LISTEN=49223 WORKERS=6 docker-compose up -d --build
           EOF
diff --git a/.github/workflows/deploy-main.yaml b/.github/workflows/deploy-main.yaml
index 096257b..201b530 100644
--- a/.github/workflows/deploy-main.yaml
+++ b/.github/workflows/deploy-main.yaml
@@ -36,5 +36,5 @@ jobs:
             git reset --hard origin/main
 
             echo "Building and starting containers"
-            LISTEN=49222 docker-compose -f docker-compose.prod.yml -p prod up -d --build
+            LISTEN=49222 docker-compose -f docker-compose.prod.yml up -d --build
           EOF
diff --git a/docker-compose.prod.yml b/docker-compose.yml
similarity index 97%
rename from docker-compose.prod.yml
rename to docker-compose.yml
index 7bd34c8..1ecda6a 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.yml
@@ -33,7 +33,7 @@ services:
     restart: unless-stopped
     command:
       [
-        "pipenv run uvicorn main:app --host 0.0.0.0 --workers ${WORKERS:-16} --timeout-keep-alive 300 --timeout-graceful-shutdown 5 --no-server-header",
+        "pipenv run uvicorn main:app --host 0.0.0.0 --workers ${WORKERS:-16} --timeout-keep-alive 300 --timeout-graceful-shutdown 5",
       ]
 
     depends_on:
diff --git a/states/aed_state.py b/states/aed_state.py
index 5ef20f1..aa05425 100644
--- a/states/aed_state.py
+++ b/states/aed_state.py
@@ -82,7 +82,8 @@ async def _assign_country_codes(aeds: Sequence[AED]) -> None:
                     {'id': aed.id},
                     {'$set': {'country_codes': tuple(id_codes_map[aed.id])}}))
 
-    await AED_COLLECTION.bulk_write(bulk_write_args, ordered=False)
+    if bulk_write_args:
+        await AED_COLLECTION.bulk_write(bulk_write_args, ordered=False)
 
 
 def _process_overpass_node(node: dict) -> AED: