From 3931ed9bd1649edfde8cbe1dbe3cd88105b5a347 Mon Sep 17 00:00:00 2001
From: Daseul Kim <amekimm@gmail.com>
Date: Tue, 4 Feb 2025 13:14:57 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20objectNo=20=EC=BA=94=EB=B2=84?=
 =?UTF-8?q?=EC=8A=A4=20=EC=A1=B0=ED=9A=8C=20api=EC=97=90=EC=84=9C=20userId?=
 =?UTF-8?q?=20=EC=A1=B0=EA=B1=B4=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvasStatus/CanvasStatusController.java  | 10 ++++-----
 .../biz/canvasStatus/CanvasStatusMapper.java  |  4 ++--
 .../biz/canvasStatus/CanvasStatusService.java | 11 ++++------
 .../canvasStatus/canvasStatusMapper.xml       | 22 ++++++++-----------
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java
index 27ef93d3..ff9d85c7 100644
--- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java
+++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java
@@ -24,11 +24,11 @@ public class CanvasStatusController {
     return canvasStatusService.selectAllCanvasStatus(userId);
   }
 
-  @Operation(description = "사용자(userId)와 물건번호(objectNo)에 해당하는 캔버스를 조회 한다.")
-  @GetMapping("/canvas-statuses/by-object/{objectNo}/{userId}")
-  public List<CanvasStatusResponse> selectObjectNoCanvasStatus(
-      @PathVariable String objectNo, @PathVariable String userId) throws QcastException {
-    return canvasStatusService.selectObjectNoCanvasStatus(objectNo, userId);
+  @Operation(description = "물건번호(objectNo)에 해당하는 캔버스를 조회 한다.")
+  @GetMapping("/canvas-statuses/by-object/{objectNo}")
+  public List<CanvasStatusResponse> selectObjectNoCanvasStatus(@PathVariable String objectNo)
+      throws QcastException {
+    return canvasStatusService.selectObjectNoCanvasStatus(objectNo);
   }
 
   @Operation(description = "캔버스를 등록 한다.")
diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java
index 94c312e0..5be224e8 100644
--- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java
+++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java
@@ -17,8 +17,8 @@ public interface CanvasStatusMapper {
   // 전체 캔버스 조회 by 사용자(userId)
   public List<CanvasStatusResponse> selectAllCanvasStatus(String userId);
 
-  // 캔버스 조회 by 물건번호(objectNo) && 사용자(userId)
-  public List<CanvasStatusResponse> selectObjectNoCanvasStatus(String objectNo, String userId);
+  // 캔버스 조회 by 물건번호(objectNo)
+  public List<CanvasStatusResponse> selectObjectNoCanvasStatus(String objectNo);
 
   // 캔버스 조회 by Max(id)
   public List<CanvasStatusResponse> getMaxIdCanvasStatus(String objectNo, String userId);
diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java
index 281bb3e3..6491f380 100644
--- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java
+++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java
@@ -26,16 +26,13 @@ public class CanvasStatusService {
     return result;
   }
 
-  // 사용자(userId)와 물건번호(objectNo)에 해당하는 캔버스 조회
-  public List<CanvasStatusResponse> selectObjectNoCanvasStatus(String objectNo, String userId)
+  // 물건번호(objectNo)에 해당하는 캔버스 조회
+  public List<CanvasStatusResponse> selectObjectNoCanvasStatus(String objectNo)
       throws QcastException {
     List<CanvasStatusResponse> result = null;
 
-    if (objectNo != null
-        && !objectNo.trim().isEmpty()
-        && userId != null
-        && !userId.trim().isEmpty()) {
-      result = canvasStatusMapper.selectObjectNoCanvasStatus(objectNo, userId);
+    if (objectNo != null && !objectNo.trim().isEmpty()) {
+      result = canvasStatusMapper.selectObjectNoCanvasStatus(objectNo);
     } else {
       throw new QcastException(ErrorCode.INVALID_INPUT_VALUE, "올바르지 않은 입력값입니다.");
     }
diff --git a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml
index 92a207e8..ce40f4b7 100644
--- a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml
+++ b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml
@@ -38,22 +38,18 @@
 
   <select id="selectObjectNoCanvasStatus" parameterType="string"
     resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse">
-    /* sqlid : com.interplug.qcast.canvasStatus.selectObjectNoCanvasStatus 캔버스 조회 by (물건번호(objectNo)
-    and 사용자(userId)) */
+    /* sqlid : com.interplug.qcast.canvasStatus.selectObjectNoCanvasStatus 캔버스 조회 by 물건번호(objectNo) */
     SELECT id
-    , user_id
-    , object_no
-    , plan_no
-    , canvas_status
-    , regist_datetime
-    , last_edit_datetime
-    , bg_image_name
-    , map_position_address
+         , user_id
+         , object_no
+         , plan_no
+         , canvas_status
+         , regist_datetime
+         , last_edit_datetime
+         , bg_image_name
+         , map_position_address
     FROM TB_CANVAS_STATUS
     WHERE object_no = #{objectNo}
-    <if test="userId != null and userId != ''">
-      AND user_id = #{userId}
-    </if>
   </select>
 
   <select id="getMaxIdCanvasStatus" parameterType="string"