From 44bcd9f1454971e51a6f0af3cd01d084648033ad Mon Sep 17 00:00:00 2001
From: Ching <loooching@gmail.com>
Date: Sat, 2 Mar 2024 18:37:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(api):=20=E4=BF=AE=E5=A4=8D=20location=20?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json |  5 +++++
 app.py                | 11 ++++++-----
 docker-compose.yml    |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..8774407
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "conventionalCommits.scopes": [
+    "api"
+  ]
+}
diff --git a/app.py b/app.py
index 1e3e1b9..069e0ad 100644
--- a/app.py
+++ b/app.py
@@ -26,7 +26,6 @@ GROCY_API_KEY = os.environ.get("GROCY_API_KEY")
 GROCY_PORT = os.environ.get("GROCY_PORT")
 GROCY_DEFAULT_QUANTITY_UNIT_ID = os.environ.get("GROCY_DEFAULT_QUANTITY_UNIT_ID")
 GROCY_DEFAULT_BEST_BEFORE_DAYS = os.environ.get("GROCY_DEFAULT_BEST_BEFORE_DAYS")
-GROCY_LOCATION = []
 X_RapidAPI_Key = os.environ.get("X_RapidAPI_Key")
 
 app = Flask(__name__)
@@ -46,7 +45,12 @@ def add_product(dict_good, location):
         good_name = dict_good["description_cn"]
     if not good_name:
         return False
-    location_map = {item['name']: item['id'] for item in GROCY_LOCATION}
+
+    locations = get_locations()
+    if not location:
+        location = locations[0]['name']
+
+    location_map = {item['name']: item['id'] for item in locations}
     data_grocy = {
         "name": good_name,
         "description": "",
@@ -178,9 +182,6 @@ def add():
     data = request.json
     location = data.get("location", "")
     barcode = data.get("barcode", "")
-    GROCY_LOCATION = get_locations()
-    if not location:
-        location = GROCY_LOCATION[0]['name']
 
     try:
         grocy.product_by_barcode(barcode)
diff --git a/docker-compose.yml b/docker-compose.yml
index b08d55c..89b7dc3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,8 @@ services:
     restart: always
     environment:
       - GROCY_API_KEY=your-api-key
-      - GROCY_BASE_URL=https://grocy.tunpok.com
-      - GROCY_BARCODE_HELPER_PORT=443
+      - GROCY_URL=https://grocy.tunpok.com
+      - GROCY_PORT=443
       - GROCY_DEFAULT_QUANTITY_UNIT_ID=1
       - GROCY_DEFAULT_BEST_BEFORE_DAYS=365
     ports: