From 0a7337a313bf98ca12940476c55424d5ba6bb7d8 Mon Sep 17 00:00:00 2001
From: Adrien <me@adrien.run>
Date: Sun, 22 Oct 2023 23:31:35 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Put=20api=5Fserver=20and?=
 =?UTF-8?q?=20db=5Fupdater=20scripts=20on=20the=20backend=20root?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/{Dockerfile.api => Dockerfile.api_server} | 4 +++-
 backend/Dockerfile.db_updater                     | 5 +++--
 backend/{api/main.py => api_server.py}            | 6 +++---
 backend/{api => }/config.local.yaml               | 0
 backend/{api => }/config.sample.yaml              | 0
 backend/{db_updater/fill_db.py => db_updater.py}  | 0
 6 files changed, 9 insertions(+), 6 deletions(-)
 rename backend/{Dockerfile.api => Dockerfile.api_server} (89%)
 rename backend/{api/main.py => api_server.py} (95%)
 rename backend/{api => }/config.local.yaml (100%)
 rename backend/{api => }/config.sample.yaml (100%)
 rename backend/{db_updater/fill_db.py => db_updater.py} (100%)

diff --git a/backend/Dockerfile.api b/backend/Dockerfile.api_server
similarity index 89%
rename from backend/Dockerfile.api
rename to backend/Dockerfile.api_server
index 3ec23d4..273ac51 100644
--- a/backend/Dockerfile.api
+++ b/backend/Dockerfile.api_server
@@ -30,5 +30,7 @@ env VIRTUAL_ENV=/app/.venv \
 COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
 COPY api /app/api
+COPY config.sample.yaml .
+COPY api_server.py .
 
-CMD ["python", "./api/main.py"]
+CMD ["./api_server.py"]
diff --git a/backend/Dockerfile.db_updater b/backend/Dockerfile.db_updater
index 3dcfbf1..59053ee 100644
--- a/backend/Dockerfile.db_updater
+++ b/backend/Dockerfile.db_updater
@@ -35,6 +35,7 @@ env VIRTUAL_ENV=/app/.venv \
 COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
 COPY api /app/api
-COPY db_updater /app/db_updater
+COPY config.sample.yaml .
+COPY db_updater.py .
 
-CMD ["python", "-m", "db_updater.fill_db"]
+CMD ["./db_updater.py"]
diff --git a/backend/api/main.py b/backend/api_server.py
similarity index 95%
rename from backend/api/main.py
rename to backend/api_server.py
index bcbaaaa..c16b406 100755
--- a/backend/api/main.py
+++ b/backend/api_server.py
@@ -12,9 +12,9 @@ from opentelemetry.sdk.resources import Resource, SERVICE_NAME
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
-from db import db
-from dependencies import idfm_interface, redis_backend, settings
-from routers import line, stop
+from api.db import db
+from api.dependencies import idfm_interface, redis_backend, settings
+from api.routers import line, stop
 
 
 @asynccontextmanager
diff --git a/backend/api/config.local.yaml b/backend/config.local.yaml
similarity index 100%
rename from backend/api/config.local.yaml
rename to backend/config.local.yaml
diff --git a/backend/api/config.sample.yaml b/backend/config.sample.yaml
similarity index 100%
rename from backend/api/config.sample.yaml
rename to backend/config.sample.yaml
diff --git a/backend/db_updater/fill_db.py b/backend/db_updater.py
similarity index 100%
rename from backend/db_updater/fill_db.py
rename to backend/db_updater.py