From 5de3ad1a1c9aa4d43911b83d33d5af0a9c873658 Mon Sep 17 00:00:00 2001
From: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Date: Wed, 29 Apr 2026 02:35:15 +0000
Subject: [PATCH] chore: update

Co-authored-by: Copilot <copilot@github.com>
---
 .../drinkool/controller/EateryController.java | 10 +++------
 k8s/{ => base}/account.yaml                   |  0
 k8s/{ => base}/eatery.yaml                    |  0
 k8s/{ => base}/gateway.yaml                   |  0
 k8s/{ => base}/kafdrop.yaml                   |  0
 k8s/{ => base}/kafka.yaml                     |  0
 k8s/base/kustomization.yaml                   |  7 +++++++
 k8s/{ => base}/redis.yaml                     |  0
 k8s/dev/kustomization.yaml                    | 10 +++++++++
 scripts/publish.sh                            | 21 ++++++++++++++++---
 10 files changed, 38 insertions(+), 10 deletions(-)
 rename k8s/{ => base}/account.yaml (100%)
 rename k8s/{ => base}/eatery.yaml (100%)
 rename k8s/{ => base}/gateway.yaml (100%)
 rename k8s/{ => base}/kafdrop.yaml (100%)
 rename k8s/{ => base}/kafka.yaml (100%)
 create mode 100644 k8s/base/kustomization.yaml
 rename k8s/{ => base}/redis.yaml (100%)
 create mode 100644 k8s/dev/kustomization.yaml

diff --git a/gateway-service/src/main/java/com/drinkool/controller/EateryController.java b/gateway-service/src/main/java/com/drinkool/controller/EateryController.java
index 6144809..b7de506 100644
--- a/gateway-service/src/main/java/com/drinkool/controller/EateryController.java
+++ b/gateway-service/src/main/java/com/drinkool/controller/EateryController.java
@@ -27,13 +27,9 @@ public class EateryController {
 		);
 
 		if (response.hasError()) {
-			List<String> errorMessages = response
-				.getErrors()
-				.stream()
-				.map(GraphQLError::getMessage)
-				.collect(Collectors.toList());
-
-			return Response.status(400).entity(errorMessages).build();
+			return Response.status(400)
+				.entity(response.getErrors().toString())
+				.build();
 		}
 
 		return jakarta.ws.rs.core.Response.ok(
diff --git a/k8s/account.yaml b/k8s/base/account.yaml
similarity index 100%
rename from k8s/account.yaml
rename to k8s/base/account.yaml
diff --git a/k8s/eatery.yaml b/k8s/base/eatery.yaml
similarity index 100%
rename from k8s/eatery.yaml
rename to k8s/base/eatery.yaml
diff --git a/k8s/gateway.yaml b/k8s/base/gateway.yaml
similarity index 100%
rename from k8s/gateway.yaml
rename to k8s/base/gateway.yaml
diff --git a/k8s/kafdrop.yaml b/k8s/base/kafdrop.yaml
similarity index 100%
rename from k8s/kafdrop.yaml
rename to k8s/base/kafdrop.yaml
diff --git a/k8s/kafka.yaml b/k8s/base/kafka.yaml
similarity index 100%
rename from k8s/kafka.yaml
rename to k8s/base/kafka.yaml
diff --git a/k8s/base/kustomization.yaml b/k8s/base/kustomization.yaml
new file mode 100644
index 0000000..3debba2
--- /dev/null
+++ b/k8s/base/kustomization.yaml
@@ -0,0 +1,7 @@
+resources:
+  - account.yaml
+  - eatery.yaml
+  - gateway.yaml
+  - redis.yaml
+  - kafdrop.yaml
+  - kafka.yaml
\ No newline at end of file
diff --git a/k8s/redis.yaml b/k8s/base/redis.yaml
similarity index 100%
rename from k8s/redis.yaml
rename to k8s/base/redis.yaml
diff --git a/k8s/dev/kustomization.yaml b/k8s/dev/kustomization.yaml
new file mode 100644
index 0000000..4108d69
--- /dev/null
+++ b/k8s/dev/kustomization.yaml
@@ -0,0 +1,10 @@
+resources:
+  - ../base
+
+patches:
+  - target:
+      kind: Deployment
+    patch: |
+      - op: add
+        path: /spec/template/spec/containers/0/resources
+        value: {}
\ No newline at end of file
diff --git a/scripts/publish.sh b/scripts/publish.sh
index e15d5d6..f2911e5 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -5,7 +5,22 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 
 cd "$SCRIPT_DIR/.."
 
-kubectl delete all --all -n drinkool-backend
-kubectl apply -f k8s -n drinkool-backend
+TARGET="k8s/base"
 
-cd "$CURRENT_DIR"
\ No newline at end of file
+for arg in "$@"; do
+    if [ "$arg" == "--dev" ]; then
+        TARGET="k8s/dev" 
+        echo "🔧 Chế độ DEV: Đang chuẩn bị chạy Kustomize để dọn dẹp resources..."
+        break
+    fi
+done
+
+echo "🧹 Đang dọn dẹp namespace drinkool-backend..."
+kubectl delete all --all -n drinkool-backend
+
+echo "🚀 Đang triển khai bằng Kustomize (-k) từ: $TARGET"
+kubectl apply -k "$TARGET" -n drinkool-backend
+
+# Quay lại thư mục ban đầu
+cd "$CURRENT_DIR"
+echo "✅ Hoàn thành!"
\ No newline at end of file