From 2aed8b9f6550690bd2b922d0bcf34bbaf284aada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8C=E1=85=A1=E1=86=BC=E1=84=89=E1=85=A5=E1=86=AB?=
 =?UTF-8?q?=E1=84=8B=E1=85=A2?= <sa.jang@sdt.inc>
Date: Tue, 12 Sep 2023 14:25:05 +0900
Subject: [PATCH] =?UTF-8?q?deployerRequest=20parameters=20<String,=20Integ?=
 =?UTF-8?q?er>=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rest/api.http                                          |  8 ++++----
 .../application/DefaultTubeService.java                |  8 ++++----
 .../controlcentermanagement/domain/DeployRequest.java  | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/rest/api.http b/rest/api.http
index 1013dfb..90cf5fe 100644
--- a/rest/api.http
+++ b/rest/api.http
@@ -1,9 +1,9 @@
 ## ON/OFF 제어
 #PATCH http://13.209.39.139:30870/chamber/1/tube/toggle
-PATCH http://13.209.39.139:32171/chambers/1/tube/toggle
-#PATCH http://localhost:8087/chambers/1/tube/toggle
+#PATCH http://13.209.39.139:32171/chambers/1/tube/toggle
+PATCH http://localhost:8087/chambers/1/tube/toggle
 Content-Type: application/json
-Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6ImQxZGJlYWExLWY5ZTUtNGE4OC1hMWM4LTYzMWQ4NTMyOWJmYyIsInJvbGVzIjpbIlJPTEVfQURNSU5JU1RSQVRPUiJdLCJpZCI6IjdjYTBjZWQ5LTk1YjEtNDgzMC05YmJhLWZmZTUwNWVmYzgzMiIsInN1YiI6InNkdC5kZXZAc2R0LmluYyIsImlhdCI6MTY5NDQwNjA5NywiZXhwIjoxNjk0NDA5Njk3fQ.U1u44yrvZxT-jZzO3WN6i5hMvY2fDl5_DJFT49c6-0s
+Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6ImQxZGJlYWExLWY5ZTUtNGE4OC1hMWM4LTYzMWQ4NTMyOWJmYyIsInJvbGVzIjpbIlJPTEVfQURNSU5JU1RSQVRPUiJdLCJpZCI6IjdjYTBjZWQ5LTk1YjEtNDgzMC05YmJhLWZmZTUwNWVmYzgzMiIsInN1YiI6InNkdC5kZXZAc2R0LmluYyIsImlhdCI6MTY5NDQ5NjE4MiwiZXhwIjoxNjk0NDk5NzgyfQ.n5kpWEiOLrZCSwlc-MWYzJtxbFPGZCOk-NBdhKnlrog
 
 {
   "command" : "ON",
@@ -12,7 +12,7 @@ Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6ImQxZGJlYWExL
     {"slotNumber": "1", "code": "1"},
     {"slotNumber": "1", "code": "3"},
     {"slotNumber": "1", "code": "11"},
-    {"slotNumber": "4", "code": "16"}
+    {"slotNumber": "4", "code": "15"}
   ]
 }
 
diff --git a/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java b/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java
index d7be73b..80e8dad 100644
--- a/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java
+++ b/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java
@@ -43,13 +43,13 @@ class DefaultTubeService implements TubeService {
     @Override
     public void controlByTubeCode(String authorization, Slot slot) {
         log.info("[controlByTubeCode] slot: {}", slot);
-        Map<String, String> tubeMap = new LinkedHashMap<>();
+        Map<String, Integer> tubeMap = new LinkedHashMap<>();
         Slot request = this.get(slot.getChamberNumber(), slot.getTube().get(0).getSlotNumber()); // TODO: 현재 단건 컨트롤, 추후 변경 필요
         for (Tube tube : slot.getTube()) {
             Map<String, Integer> tubeOffsetMap = this.tubeOffset();
             int tubeOffset = tubeOffsetMap.getOrDefault(request.getSlotNumber(), 1);
             int tubeKey = Integer.parseInt(request.getTube().get(Integer.parseInt(tube.getCode())).getCode()) + tubeOffset;
-            tubeMap.put(String.valueOf(tubeKey), String.valueOf(slot.getCommand().ordinal()));
+            tubeMap.put(String.valueOf(tubeKey), slot.getCommand().ordinal());
         }
 
         DeployRequest deployRequest = DeployRequest.builder()
@@ -72,8 +72,8 @@ class DefaultTubeService implements TubeService {
             assets.add(slot.getAssetCode());
         }
         assets.forEach(assetCode -> {
-            Map<String, String> parameterMap = new LinkedHashMap<>();
-            parameterMap.put("total", String.valueOf(command.ordinal()));
+            Map<String, Integer> parameterMap = new LinkedHashMap<>();
+            parameterMap.put("total", command.ordinal());
             for (int i = 1; i <= 2; i++) {
                 DeployRequest deployRequest = DeployRequest.builder()
                         .assetCode(assetCode)
diff --git a/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java b/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java
index 33cfb31..cfbe053 100644
--- a/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java
+++ b/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java
@@ -11,9 +11,9 @@ public class DeployRequest {
     private String commandType;
     private String fileName;
     private String name;
-    private Map<String, String> parameters;
+    private Map<String, Integer> parameters;
 
-    public DeployRequest(String assetCode, String appName, String commandType, String fileName, String name, Map<String, String> parameters) {
+    public DeployRequest(String assetCode, String appName, String commandType, String fileName, String name, Map<String, Integer> parameters) {
         this.assetCode = assetCode;
         this.appName = appName;
         this.commandType = commandType;
@@ -47,7 +47,7 @@ public class DeployRequest {
         return name;
     }
 
-    public Map<String, String> getParameters() {
+    public Map<String, Integer> getParameters() {
         return parameters;
     }
 
@@ -69,7 +69,7 @@ public class DeployRequest {
         private String commandType;
         private String name;
         private String fileName;
-        private Map<String, String> parameters;
+        private Map<String, Integer> parameters;
 
         private Builder() {
         }
@@ -99,7 +99,7 @@ public class DeployRequest {
             return this;
         }
 
-        public Builder parameters(Map<String, String> parameters) {
+        public Builder parameters(Map<String, Integer> parameters) {
             this.parameters = parameters;
             return this;
         }