#13 API Response Code(결과코드) Enum 변경 처리

- 하드코딩 결과코드(BaseResponse.setCode) 일괄변경 - 테스트 코드 일괄변경
SNUH-SMILE · Dec 10, 2021 · 2230a20 · 2230a20
1 parent 7df39f1
commit 2230a20
Show file tree

Hide file tree

Showing 11 changed files with 207 additions and 144 deletions.
diff --git a/src/main/java/kr/co/hconnect/common/ApiResponseCode.java b/src/main/java/kr/co/hconnect/common/ApiResponseCode.java
@@ -0,0 +1,61 @@
+package kr.co.hconnect.common;
+
+/**
+ * API 결과코드 정보
+ */
+public enum ApiResponseCode {
+
+    /**
+     * 정상 처리
+     */
+    SUCCESS("00"),
+    /**
+     * 로그인 비밀번호 불일치
+     */
+    NOT_MATCH_PATIENT_PASSWORD("10"),
+    /**
+     * 환자정보가 존재하지 않는 경우
+     */
+    NOT_FOUND_PATIENT_INFO("11"),
+    /**
+     * 동일한 환자정보가 존재하는 경우
+     */
+    DUPLICATE_PATIENT_INFO("12"),
+    /**
+     * 동일한 로그인ID 존재하는 경우
+     */
+    DUPLICATE_PATIENT_LOGIN_ID("13"),
+    /**
+     * 격리상태 내역이 존재하지 않는 경우
+     */
+    NOT_FOUND_QUARANTINE_INFO("14"),
+
+    /**
+     * 내원중인 격리/입소내역이 존재하지 않는 경우
+     */
+    NOT_FOUND_ADMISSION_INFO("21"),
+    /**
+     * 내원중인 격리/입소내역이 중복된 경우
+     */
+    DUPLICATE_ACTIVE_ADMISSION_INFO("22"),
+
+
+    /**
+     * 유효하지 않은 요청 파라메터 코드
+     */
+    CODE_INVALID_REQUEST_PARAMETER("99");
+
+    private final String code;
+
+    /**
+     * 생성자
+     * @param code 반환 코드
+     */
+    ApiResponseCode(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}
diff --git a/src/main/java/kr/co/hconnect/common/RestControllerExceptionHandler.java b/src/main/java/kr/co/hconnect/common/RestControllerExceptionHandler.java
@@ -19,7 +19,7 @@ public class RestControllerExceptionHandler {
     /**
      * 유효하지 않은 요청 파라메터 코드
      */
-    public static final String CODE_INVALID_REQUEST_PARAMETER = "99";
+    public static final String CODE_INVALID_REQUEST_PARAMETER = ApiResponseCode.CODE_INVALID_REQUEST_PARAMETER.getCode();
 
     /**
      * {@link InvalidFormatException} 예외 처리

diff --git a/src/main/java/kr/co/hconnect/rest/LoginRestController.java b/src/main/java/kr/co/hconnect/rest/LoginRestController.java
@@ -1,5 +1,6 @@
 package kr.co.hconnect.rest;
 
+import kr.co.hconnect.common.ApiResponseCode;
 import kr.co.hconnect.domain.*;
 import kr.co.hconnect.exception.InvalidRequestArgumentException;
 import kr.co.hconnect.exception.NotFoundPatientInfoException;
@@ -64,17 +65,18 @@ public IdentityResult checkIdentity(@Valid @RequestBody IdentityInfo identityInf
 
             if (identityResult != null) {
                 // 환자정보 존재
-                identityResult.setCode("00");
-                // identityResult.setMessage("본인인증 조회 완료");
+                identityResult.setCode(ApiResponseCode.SUCCESS.getCode());
                 identityResult.setMessage(messageSource.getMessage("message.success.Identity", null, Locale.getDefault()));;
             } else {
                 // 환자정보 존재하지 않음
-                identityResult = setFailIdentityResult("00", messageSource.getMessage("message.success.Identity", null, Locale.getDefault()));
+                identityResult = setFailIdentityResult(ApiResponseCode.SUCCESS.getCode()
+                    , messageSource.getMessage("message.success.Identity", null, Locale.getDefault()));
             }
         } catch (MyBatisSystemException e) {
             // 다중 입소내역으로 인한 오류
             if (e.getCause() instanceof TooManyResultsException) {
-                identityResult = setFailIdentityResult("22", messageSource.getMessage("message.duplicate.admissionInfo", null, Locale.getDefault()));
+                identityResult = setFailIdentityResult(ApiResponseCode.DUPLICATE_ACTIVE_ADMISSION_INFO.getCode()
+                    , messageSource.getMessage("message.duplicate.admissionInfo", null, Locale.getDefault()));
             }
         }
 
@@ -114,14 +116,13 @@ public BaseResponse login(@Valid @RequestBody LoginInfo loginInfo, BindingResult
 
         try {
             Patient patient = patientService.selectPatientByLoginInfo(loginInfo);
-            baseResponse.setCode("00");
-            // baseResponse.setMessage(String.format("%s 님 로그인 성공", patient.getPatientNm()));
+            baseResponse.setCode(ApiResponseCode.SUCCESS.getCode());
             baseResponse.setMessage(messageSource.getMessage("message.success.login", null, Locale.getDefault()));
         } catch (NotFoundPatientInfoException e) {
-            baseResponse.setCode("11");
+            baseResponse.setCode(ApiResponseCode.NOT_FOUND_PATIENT_INFO.getCode());
             baseResponse.setMessage(e.getMessage());
         } catch (NotMatchPatientPasswordException e) {
-            baseResponse.setCode("10");
+            baseResponse.setCode(ApiResponseCode.NOT_MATCH_PATIENT_PASSWORD.getCode());
             baseResponse.setMessage(e.getMessage());
         }
 

diff --git a/src/main/java/kr/co/hconnect/rest/MeasurementResultRestController.java b/src/main/java/kr/co/hconnect/rest/MeasurementResultRestController.java
@@ -1,5 +1,6 @@
 package kr.co.hconnect.rest;
 
+import kr.co.hconnect.common.ApiResponseCode;
 import kr.co.hconnect.common.ItemId;
 import kr.co.hconnect.common.ResultType;
 import kr.co.hconnect.domain.*;
@@ -91,11 +92,11 @@ public MainContentDetail mainContent(@Valid @RequestBody LoginId loginId, Bindin
         resultListsSize += mainContentDetail.getTodaySleepTimeList().size();
         resultListsSize += mainContentDetail.getTodayStepCountList().size();
         if(resultListsSize>0){
-            mainContentDetail.setCode("00");
+            mainContentDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             mainContentDetail.setMessage(messageSource.getMessage("message.success.searchResultList", null, Locale.getDefault()));
         }
         else if(resultListsSize==0){
-            mainContentDetail.setCode("00");
+            mainContentDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             mainContentDetail.setMessage(messageSource.getMessage("message.notfound.searchResultList", null, Locale.getDefault()));
         }
         return mainContentDetail;
@@ -116,7 +117,7 @@ public ExistResult unReadNotice(@Valid @RequestBody LoginId loginId, BindingResu
 
         int result = measurementResultService.unReadNotice(getAdmissionId(loginId.getLoginId()));
         ExistResult existResult = new ExistResult();
-        existResult.setCode("00");
+        existResult.setCode(ApiResponseCode.SUCCESS.getCode());
         // 알림 있을때
         if (result > 0) {
             existResult.setMessage(messageSource.getMessage("message.found.notice", null, Locale.getDefault()));;
@@ -146,12 +147,12 @@ public BtResultDetail selectBtList(@Valid @RequestBody SearchResultInfo searchRe
         BtResultDetail btResultDetail = new BtResultDetail();
         btResultDetail.setBtList(measurementResultService.selectBtLIst(searchResultInfo));
         if(btResultDetail.getBtList().size() > 0){
-            btResultDetail.setCode("00");
+            btResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             btResultDetail.setMessage(messageSource.getMessage("message.success.searchResultList", null, Locale.getDefault()));
 
         }
         else if(btResultDetail.getBtList().size() == 0){
-            btResultDetail.setCode("00");
+            btResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             btResultDetail.setMessage(messageSource.getMessage("message.notfound.searchResultList", null, Locale.getDefault()));
         }
         return btResultDetail;
@@ -173,11 +174,11 @@ public HrResultDetail selectHrList(@Valid @RequestBody SearchResultInfo searchRe
         HrResultDetail hrResultDetail = new HrResultDetail();
         hrResultDetail.setHrList(measurementResultService.selectHrList(searchResultInfo));
         if(hrResultDetail.getHrList().size() > 0){
-            hrResultDetail.setCode("00");
+            hrResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             hrResultDetail.setMessage(messageSource.getMessage("message.success.searchResultList", null, Locale.getDefault()));
         }
         else if(hrResultDetail.getHrList().size() == 0){
-            hrResultDetail.setCode("00");
+            hrResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             hrResultDetail.setMessage(messageSource.getMessage("message.notfound.searchResultList", null, Locale.getDefault()));
         }
         return hrResultDetail;
@@ -200,11 +201,11 @@ public SpO2ResultDetail selectSpO2List(@Valid @RequestBody SearchResultInfo sear
         SpO2ResultDetail spO2ResultDetail = new SpO2ResultDetail();
         spO2ResultDetail.setSpO2List(measurementResultService.selectSpO2List(searchResultInfo));
         if(spO2ResultDetail.getSpO2List().size() > 0){
-            spO2ResultDetail.setCode("00");
+            spO2ResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             spO2ResultDetail.setMessage(messageSource.getMessage("message.success.searchResultList", null, Locale.getDefault()));
         }
         else if(spO2ResultDetail.getSpO2List().size() == 0){
-            spO2ResultDetail.setCode("00");
+            spO2ResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             spO2ResultDetail.setMessage(messageSource.getMessage("message.notfound.searchResultList", null, Locale.getDefault()));
         }
         return spO2ResultDetail;
@@ -228,11 +229,11 @@ public StepCountResultDetail selectStepList(@Valid @RequestBody SearchResultInfo
         StepCountResultDetail stepCountResultDetail = new StepCountResultDetail();
         stepCountResultDetail.setStepCountList(measurementResultService.selectStepList(searchResultInfos));
         if(stepCountResultDetail.getStepCountList().size() > 0){
-            stepCountResultDetail.setCode("00");
+            stepCountResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             stepCountResultDetail.setMessage(messageSource.getMessage("message.success.searchResultList", null, Locale.getDefault()));
         }
         else if(stepCountResultDetail.getStepCountList().size() == 0){
-            stepCountResultDetail.setCode("00");
+            stepCountResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             stepCountResultDetail.setMessage(messageSource.getMessage("message.notfound.searchResultList", null, Locale.getDefault()));
         }
         return stepCountResultDetail;
@@ -255,11 +256,11 @@ public BpResultDetail selectBpList(@Valid @RequestBody SearchResultInfos searchR
         BpResultDetail bpResultDetail = new BpResultDetail();
         bpResultDetail.setBpList(measurementResultService.selectBpList(searchResultInfos));
         if(bpResultDetail.getBpList().size() > 0){
-            bpResultDetail.setCode("00");
+            bpResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             bpResultDetail.setMessage(messageSource.getMessage("message.success.searchResultList", null, Locale.getDefault()));
         }
         else if(bpResultDetail.getBpList().size() == 0){
-            bpResultDetail.setCode("00");
+            bpResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             bpResultDetail.setMessage(messageSource.getMessage("message.notfound.searchResultList", null, Locale.getDefault()));
         }
         return bpResultDetail;
@@ -289,15 +290,15 @@ public SleepTimeResultDetail selectSleepList(@Valid @RequestBody SearchSleepResu
 
         sleepTimeResultDetail.setSleepTimeList(measurementResultService.selectSleepTimeList(searchSleepResultInfo));
         if(sleepTimeResultDetail.getSleepTimeList().size() > 0){
-            sleepTimeResultDetail.setCode("00");
+            sleepTimeResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             sleepTimeResultDetail.setMessage(messageSource.getMessage("message.success.searchResultList", null, Locale.getDefault()));
             //총 수면시간
             List<SleepTimeResult> sleepTimeResultList = sleepTimeResultDetail.getSleepTimeList();
             int tempTotalSleep = measurementResultService.getTempTotalSleep(sleepTimeResultList);
             sleepTimeResultDetail.setTotalSleepTime(Integer.toString(tempTotalSleep / 60));
         }
         else if(sleepTimeResultDetail.getSleepTimeList().size() == 0){
-            sleepTimeResultDetail.setCode("00");
+            sleepTimeResultDetail.setCode(ApiResponseCode.SUCCESS.getCode());
             sleepTimeResultDetail.setMessage(messageSource.getMessage("message.notfound.searchResultList", null, Locale.getDefault()));
             sleepTimeResultDetail.setTotalSleepTime("0");
         }
@@ -352,7 +353,7 @@ public BaseResponse saveBtResult(@Valid @RequestBody SaveBtResultInfo resultInfo
 
         // 반환정보
         BaseResponse baseResponse = new BaseResponse();
-        baseResponse.setCode("00");
+        baseResponse.setCode(ApiResponseCode.SUCCESS.getCode());
         baseResponse.setMessage(messageSource.getMessage("message.success.saveResult", null, Locale.getDefault()));
 
         return baseResponse;
@@ -410,7 +411,7 @@ public BaseResponse saveBpResult(@Valid @RequestBody SaveBpResultInfo resultInfo
 
         // 반환정보
         BaseResponse baseResponse = new BaseResponse();
-        baseResponse.setCode("00");
+        baseResponse.setCode(ApiResponseCode.SUCCESS.getCode());
         baseResponse.setMessage(messageSource.getMessage("message.success.saveResult", null, Locale.getDefault()));
 
         return baseResponse;
@@ -461,7 +462,7 @@ public BaseResponse saveHrResult(@Valid @RequestBody SaveHrResultInfo resultInfo
 
         // 반환정보
         BaseResponse baseResponse = new BaseResponse();
-        baseResponse.setCode("00");
+        baseResponse.setCode(ApiResponseCode.SUCCESS.getCode());
         baseResponse.setMessage(messageSource.getMessage("message.success.saveResult", null, Locale.getDefault()));
 
         return baseResponse;
@@ -512,7 +513,7 @@ public BaseResponse saveSpO2Result(@Valid @RequestBody SaveSpO2ResultInfo result
 
         // 반환정보
         BaseResponse baseResponse = new BaseResponse();
-        baseResponse.setCode("00");
+        baseResponse.setCode(ApiResponseCode.SUCCESS.getCode());
         baseResponse.setMessage(messageSource.getMessage("message.success.saveResult", null, Locale.getDefault()));
 
         return baseResponse;
@@ -570,7 +571,7 @@ public BaseResponse saveStepCountResult(@Valid @RequestBody SaveStepCountResultI
 
         // 반환정보
         BaseResponse baseResponse = new BaseResponse();
-        baseResponse.setCode("00");
+        baseResponse.setCode(ApiResponseCode.SUCCESS.getCode());
         baseResponse.setMessage(messageSource.getMessage("message.success.saveResult", null, Locale.getDefault()));
 
         return baseResponse;
@@ -593,7 +594,7 @@ public BaseResponse saveSleepTimeResult(@Valid @RequestBody SaveSleepResultInfo
 
         // 반환정보
         BaseResponse baseResponse = new BaseResponse();
-        baseResponse.setCode("00");
+        baseResponse.setCode(ApiResponseCode.SUCCESS.getCode());
         baseResponse.setMessage(messageSource.getMessage("message.success.saveResult", null, Locale.getDefault()));
 
         return baseResponse;

diff --git a/src/main/java/kr/co/hconnect/rest/PatientDeviceRestController.java b/src/main/java/kr/co/hconnect/rest/PatientDeviceRestController.java
@@ -1,5 +1,6 @@
 package kr.co.hconnect.rest;
 
+import kr.co.hconnect.common.ApiResponseCode;
 import kr.co.hconnect.domain.BaseResponse;
 import kr.co.hconnect.domain.PatientDevice;
 import kr.co.hconnect.domain.SavePatientDeviceInfo;
@@ -69,7 +70,7 @@ public BaseResponse insertPatientDevice(@Valid @RequestBody SavePatientDeviceInf
         patientDeviceService.insertPatientDevice(savePatientDeviceInfo.getPatientDeviceList());
 
         BaseResponse baseResponse = new BaseResponse();
-        baseResponse.setCode("00");
+        baseResponse.setCode(ApiResponseCode.SUCCESS.getCode());
         // baseResponse.setMessage("환자별 장비 저장 완료.");
         baseResponse.setMessage(messageSource.getMessage("message.success.savePatientDevice", null, Locale.getDefault()));