canvas thumbnail CRUD 2차리뷰 후 수정

src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java

@@ -3,12 +3,12 @@ package com.interplug.qcast.biz.canvasStatus;
 import com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus;
 import com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
-@Slf4j
 @RestController
 @RequestMapping("/api/canvasStatus")
 @RequiredArgsConstructor
@@ -16,41 +16,28 @@ public class CanvasStatusController {
   // @Autowired private CanvasStatusService canvasStatusService;
   private final CanvasStatusService canvasStatusService;
 
-  @PostMapping("/v1.0/canvasStatus")
-  public void canvasStatus(@RequestBody CanvasStatusResponse cs) {
-    log.warn(String.valueOf(log.isDebugEnabled()));
-    if (log.isDebugEnabled()) {
-      log.debug("id : " + cs.getId());
-      log.debug("userId : " + cs.getUserId());
-      log.debug("objectNo : " + cs.getObjectNo());
-      log.debug("imageName : " + cs.getImageName());
-      log.debug("canvasStatus : " + cs.getCanvasStatus());
-    }
-  }
-
   // 전체 견적서 조회
   @GetMapping("/{userId}")
-  public CanvasStatus selectAllCanvasStatus(@RequestBody CanvasStatus cs) {
+  public List<CanvasStatusResponse> selectAllCanvasStatus(@PathVariable String userId) {
-    return canvasStatusService.selectAllCanvasStatus(cs);
+    return canvasStatusService.selectAllCanvasStatus(userId);
   }
   
   //견적서 조회
  @GetMapping("/{objectNo}")
- public CanvasStatus selectObjectNoCanvasStatus(@PathVariable String objectNo) {
+ public List<CanvasStatusResponse> selectObjectNoCanvasStatus(@PathVariable String objectNo) {
    return canvasStatusService.selectObjectNoCanvasStatus(objectNo);
  }
   
   // 견적서 등록
   @PostMapping
   @ResponseStatus(HttpStatus.CREATED)
-  public String insertCanvasStatus(@RequestBody CanvasStatusResponse cs) {
+  public String insertCanvasStatus(@RequestBody CanvasStatus cs) {
-      String objectNo = canvasStatusService.insertCanvasStatus(cs);
+      return canvasStatusService.insertCanvasStatus(cs);
-      return objectNo;
   }
 
   // 견적서 수정
   @PutMapping
-  public void updateCanvasStatus(@RequestBody CanvasStatusResponse cs) {
+  public void updateCanvasStatus(@RequestBody CanvasStatus cs) {
       canvasStatusService.updateCanvasStatus(cs);
   }
   
@@ -62,10 +49,10 @@ public class CanvasStatusController {
   }
   
   // 이미지(템플릿) 삭제
-  @DeleteMapping
+  @DeleteMapping("/{id}")
   @ResponseStatus(HttpStatus.NO_CONTENT)
-  public void deleteImageNameCanvasStatus(@RequestBody CanvasStatus cs) {
+  public void deleteImageNameCanvasStatus(@PathVariable Integer id) {
-      canvasStatusService.deleteImageNameCanvasStatus(cs);
+      canvasStatusService.deleteImageNameCanvasStatus(id);
   }
   
 }

src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java

@@ -2,6 +2,9 @@ package com.interplug.qcast.biz.canvasStatus;
 
 import com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus;
 import com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse;
+
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -14,22 +17,22 @@ interface CanvasStatusMapper {
 	public String getCanvasStatusImageAdd(String objectNo);
 	
 	// 전체 견적서 조회
-	public CanvasStatus selectAllCanvasStatus(CanvasStatus cs);
+	public List<CanvasStatusResponse> selectAllCanvasStatus(String userId);
 	
 	// 견적서 조회(objectNo)
-	public CanvasStatus selectObjectNoCanvasStatus(String objectNo);
+	public List<CanvasStatusResponse> selectObjectNoCanvasStatus(String objectNo);
 	
 	// 견적서 등록
-	public void insertCanvasStatus(CanvasStatusResponse cs);
+	public void insertCanvasStatus(CanvasStatus cs);
 	
 	// 견적서 수정
-	public void updateCanvasStatus(CanvasStatusResponse cs);
+	public void updateCanvasStatus(CanvasStatus cs);
 	
 	// 견적서 삭제
 	public void deleteObjectNoCanvasStatus(String objectNo);
 	
 	// 이미지(템플릿) 삭제
-	public void deleteImageNameCanvasStatus(CanvasStatus cs);
+	public void deleteImageNameCanvasStatus(Integer id);
 
   
 }

src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java

@@ -3,12 +3,12 @@ package com.interplug.qcast.biz.canvasStatus;
 import com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus;
 import com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse;
 
-import ch.qos.logback.classic.Logger;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
-@Slf4j
 @Service
 @RequiredArgsConstructor
 public class CanvasStatusService {
@@ -16,17 +16,17 @@ public class CanvasStatusService {
     private final CanvasStatusMapper canvasStatusMapper;
 
     // 전체 견적서 조회
-	public CanvasStatus selectAllCanvasStatus(CanvasStatus cs) {
+	public List<CanvasStatusResponse> selectAllCanvasStatus(String userId) {
-		return canvasStatusMapper.selectAllCanvasStatus(cs);
+		return canvasStatusMapper.selectAllCanvasStatus(userId);
 	}
 	
 	// 견적서 조회(objectNo)
-	public CanvasStatus selectObjectNoCanvasStatus(String objectNo) {
+	public List<CanvasStatusResponse> selectObjectNoCanvasStatus(String objectNo) {
 		return canvasStatusMapper.selectObjectNoCanvasStatus(objectNo);
 	}
 
 	// 견적서 등록
-	public String insertCanvasStatus(CanvasStatusResponse cs) {
+	public String insertCanvasStatus(CanvasStatus cs) {
 		
 		try {	    
 			// objectNo 없음(신규)
@@ -57,7 +57,7 @@ public class CanvasStatusService {
     }
 
 	// 견적서 수정
-    public void updateCanvasStatus(CanvasStatusResponse cs) {
+    public void updateCanvasStatus(CanvasStatus cs) {
     	canvasStatusMapper.updateCanvasStatus(cs);
     }
 
@@ -67,8 +67,8 @@ public class CanvasStatusService {
     }
     
     // 이미지(템플릿) 삭제
-    public void deleteImageNameCanvasStatus(CanvasStatus cs) {
+    public void deleteImageNameCanvasStatus(Integer id) {
-        canvasStatusMapper.deleteImageNameCanvasStatus(cs);
+        canvasStatusMapper.deleteImageNameCanvasStatus(id);
     }
   
 }

src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatus.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class CanvasStatus {
+	private Integer id; 		//PK ID
     private String userId; 		//사용자 ID
     private String objectNo; 	//견적서 번호
     private String imageName;	//이미지명

src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml

@@ -20,7 +20,7 @@
     </select>
     
     <select id="selectAllCanvasStatus" parameterType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus"
-            resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
+            resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse">
         /* sqlid : com.interplug.qcast.canvasStatus.selectAllCanvasStatus 전체 견적서 조회 */
         SELECT id
              , user_id
@@ -34,7 +34,7 @@
     </select>
     
     <select id="selectObjectNoCanvasStatus" parameterType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus"
-            resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
+            resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse">
         /* sqlid : com.interplug.qcast.canvasStatus.selectObjectNoCanvasStatus 견적서 조회 */
         SELECT id
              , user_id
@@ -48,7 +48,7 @@
            AND object_no = #{objectNo}
     </select>    
     
-    <insert id="insertCanvasStatus" parameterType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse">
+    <insert id="insertCanvasStatus" parameterType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
         /* sqlid : com.interplug.qcast.canvasStatus.insertCanvasStatus 견적서 등록 */
         INSERT INTO TB_CANVAS_STATUS 
                   ( 
@@ -67,13 +67,12 @@
                   )
     </insert>
         
-    <update id="updateCanvasStatus" parameterType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse">
+    <update id="updateCanvasStatus" parameterType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
         /* sqlid : com.interplug.qcast.canvasStatus.updateCanvasStatus 견적서 수정 */
         UPDATE TB_CANVAS_STATUS
            SET canvas_status = #{canvasStatus}
              , last_edit_datetime = GETDATE()
-         WHERE object_no = #{objectNo}
+         WHERE id = #{id}
-           AND image_name = #{imageName}
     </update>
     
     <delete id="deleteObjectNoCanvasStatus" parameterType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
@@ -85,8 +84,7 @@
     <delete id="deleteImageNameCanvasStatus" parameterType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
         /* sqlid : com.interplug.qcast.canvasStatus.deleteImageNameCanvasStatus 이미지(템플릿) 삭제 */
         DELETE FROM TB_CANVAS_STATUS
-         WHERE object_no = #{objectNo}
+         WHERE id = #{id}
-           AND image_name = #{imageName}
     </delete>
     
 </mapper>