From fb16a12b02391f6a872337766aa7d3360ff795d8 Mon Sep 17 00:00:00 2001
From: Yuki Watanabe <ukwhatn@gmail.com>
Date: Sun, 2 Jun 2024 00:19:31 +0900
Subject: [PATCH] impr: fix env modes

---
 compose.dev.yml               |  2 ++
 compose.prod.yml              |  2 ++
 nginx/conf.d/server.prod.conf |  4 ----
 server/main.py                | 15 ++++++---------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/compose.dev.yml b/compose.dev.yml
index daaa83b..236b450 100644
--- a/compose.dev.yml
+++ b/compose.dev.yml
@@ -51,6 +51,8 @@ services:
     env_file:
       - ./envs/db.env
       - ./envs/server.env
+    environment:
+      - ENV_MODE=development
     restart: always
     depends_on:
       db:
diff --git a/compose.prod.yml b/compose.prod.yml
index d372fa9..b85746f 100644
--- a/compose.prod.yml
+++ b/compose.prod.yml
@@ -48,6 +48,8 @@ services:
     env_file:
       - ./envs/db.env
       - ./envs/server.env
+    environment:
+      - ENV_MODE=production
     restart: always
     depends_on:
       db:
diff --git a/nginx/conf.d/server.prod.conf b/nginx/conf.d/server.prod.conf
index b1312f6..6f39576 100644
--- a/nginx/conf.d/server.prod.conf
+++ b/nginx/conf.d/server.prod.conf
@@ -2,10 +2,6 @@ upstream server {
 	server server:80;
 }
 
-upstream front {
-	server front:5173;
-}
-
 server{
     listen 80;
 
diff --git a/server/main.py b/server/main.py
index 8639cc3..c789709 100644
--- a/server/main.py
+++ b/server/main.py
@@ -10,27 +10,24 @@
 from util.env import get_env
 
 # get environment mode
-env_mode = get_env("ENV_MODE", "development")
+env_mode = get_env("ENV_MODE", "production")
 
 # logger config
 logging.basicConfig(level=logging.WARN)
 logger = logging.getLogger("uvicorn")
 
+# production時，docsを表示しない
+app_params = {}
 if env_mode == "development":
     logger.setLevel(level=logging.DEBUG)
+    app_params["docs_url"] = "/api/docs"
+    app_params["redoc_url"] = "/api/redoc"
+    app_params["openapi_url"] = "/api/openapi.json"
 elif env_mode == "production":
     logger.setLevel(level=logging.INFO)
-
-# production時，docsを表示しない
-app_params = {}
-if env_mode == "production":
     app_params["docs_url"] = None
     app_params["redoc_url"] = None
     app_params["openapi_url"] = None
-else:
-    app_params["docs_url"] = "/api/docs"
-    app_params["redoc_url"] = "/api/redoc"
-    app_params["openapi_url"] = "/api/openapi.json"
 
 # create app
 app = FastAPI(**app_params)