diff --git a/src/main/java/com/interplug/qcast/biz/canvaspopupstatus/CanvasPopupStatusController.java b/src/main/java/com/interplug/qcast/biz/canvaspopupstatus/CanvasPopupStatusController.java index 3cdcdef4..086bd070 100644 --- a/src/main/java/com/interplug/qcast/biz/canvaspopupstatus/CanvasPopupStatusController.java +++ b/src/main/java/com/interplug/qcast/biz/canvaspopupstatus/CanvasPopupStatusController.java @@ -31,8 +31,7 @@ public class CanvasPopupStatusController { * @param objectNo 물건정보 번호 * @param planNo plan 번호 * @param popupType 캔버스 팝업 단계 - * @return 조회된 CanvasPopupStatus 객체 - * @throws QcastException 조회된 데이터가 없을 경우 예외 발생 + * @return 조회된 CanvasPopupStatus 객체, 조회된 데이터가 없을 경우 빈 객체 반환 */ @Operation(description = "캔버스 팝업 상태를 조회한다.") @GetMapping diff --git a/src/main/java/com/interplug/qcast/biz/canvaspopupstatus/CanvasPopupStatusService.java b/src/main/java/com/interplug/qcast/biz/canvaspopupstatus/CanvasPopupStatusService.java index aaffa1b1..2b0e86d4 100644 --- a/src/main/java/com/interplug/qcast/biz/canvaspopupstatus/CanvasPopupStatusService.java +++ b/src/main/java/com/interplug/qcast/biz/canvaspopupstatus/CanvasPopupStatusService.java @@ -18,16 +18,14 @@ public class CanvasPopupStatusService { * @param objectNo 조회할 object 번호 * @param planNo 조회할 plan 번호 * @param popupType 조회할 popup 타입 - * @return 조회된 CanvasPopupStatus 객체 - * @throws QcastException 조회된 데이터가 없을 경우 예외 발생 + * @return 조회된 CanvasPopupStatus 객체, 조회된 데이터가 없을 경우 빈 객체 반환 */ public CanvasPopupStatus selectCanvasPopupStatus( String objectNo, Integer planNo, String popupType) throws QcastException { CanvasPopupStatus request = CanvasPopupStatus.builder().objectNo(objectNo).planNo(planNo).popupType(popupType).build(); CanvasPopupStatus cps = canvasPopupStatusMapper.selectCanvasPopupStatus(request); - if (cps == null) throw new QcastException(ErrorCode.NOT_FOUND); - return cps; + return cps != null ? cps : CanvasPopupStatus.builder().build(); } /** @@ -80,8 +78,6 @@ public class CanvasPopupStatusService { * @throws QcastException 삭제 중 예외 발생 시 */ public void deleteCanvasPopupStatus(CanvasPopupStatus cps) throws QcastException { - // 존재 유무 확인 - selectCanvasPopupStatus(cps.getObjectNo(), cps.getPlanNo(), cps.getPopupType()); try { canvasPopupStatusMapper.deleteCanvasPopupStatus(cps); } catch (Exception e) {