Merge pull request #132 from Link-MIND/test

[Merge] json decode 에러 해결 후 merge
Link-MIND · Jan 17, 2024 · e421c0a · e421c0a
2 parents 579ea20 + 83e7bea
commit e421c0a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/linkmind/src/main/java/com/app/toaster/exception/Error.java b/linkmind/src/main/java/com/app/toaster/exception/Error.java
@@ -35,6 +35,8 @@ public enum Error {
 	REQUEST_METHOD_VALIDATION_EXCEPTION(HttpStatus.BAD_REQUEST, "잘못된 메소드입니다."),
 	REQUEST_MEDIA_TYPE_VALIDATION_EXCEPTION(HttpStatus.BAD_REQUEST, "미디어 타입을 확인해주세요."),
 	BAD_REQUEST_URL(HttpStatus.BAD_REQUEST, "죄송합니다. 이해할 수 없는 url입니다."),
+	BAD_REQUEST_CREATE_TIMER_EXCEPTION(HttpStatus.BAD_REQUEST, "타이머는 최대 5개까지만 등록가능합니다."),
+	BAD_REQUEST_CREATE_CLIP_EXCEPTION(HttpStatus.BAD_REQUEST, "클립은 최대 15개까지만 등록가능합니다."),
 
 	/**
 	 * 401 UNAUTHORIZED EXCEPTION
@@ -52,9 +54,7 @@ public enum Error {
 	 * 422 UNPROCESSABLE_ENTITY
 	 */
 	UNPROCESSABLE_ENTITY_DELETE_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "서버에서 요청을 이해해 삭제하려는 도중 문제가 생겼습니다."),
-	UNPROCESSABLE_ENTITY_CREATE_TIMER_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "타이머는 최대 5개까지만 등록가능합니다."),
 	UNPROCESSABLE_CREATE_TIMER_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "이미 타이머가 존재하는 클립입니다."),
-	UNPROCESSABLE_ENTITY_CREATE_CLIP_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "클립은 최대 50개까지만 등록가능합니다."),
 	UNPROCESSABLE_PRESIGNEDURL_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "presignedUrl 발급 중 에러가 발생했습니다."),
 	UNPROCESSABLE_KAKAO_SERVER_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "카카오서버와 통신 중 오류가 발생했습니다."),
 

diff --git a/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java b/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java
@@ -49,7 +49,7 @@ public void createCategory(final Long userId, final CreateCategoryDto createCate
         val categoryNum= categoryRepository.findAllByUser(presentUser).size();
 
         if(categoryNum > MAX_CATERGORY_NUMBER){
-            throw new CustomException(Error.UNPROCESSABLE_ENTITY_CREATE_CLIP_EXCEPTION, Error.UNPROCESSABLE_ENTITY_CREATE_CLIP_EXCEPTION.getMessage());
+            throw new CustomException(Error.BAD_REQUEST_CREATE_CLIP_EXCEPTION, Error.BAD_REQUEST_CREATE_CLIP_EXCEPTION.getMessage());
         }
 
         //카테고리 생성

diff --git a/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java b/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java
@@ -55,8 +55,8 @@ public void createTimer(Long userId, CreateTimerRequestDto createTimerRequestDto
 
         int timerNum = timerRepository.findAllByUser(presentUser).size();
 
-        if(timerNum>=MaxTimerNumber){
-            throw new CustomException(Error.UNPROCESSABLE_ENTITY_CREATE_TIMER_EXCEPTION, Error.UNPROCESSABLE_ENTITY_CREATE_TIMER_EXCEPTION.getMessage());
+        if(timerNum>MaxTimerNumber){
+            throw new CustomException(Error.BAD_REQUEST_CREATE_TIMER_EXCEPTION, Error.BAD_REQUEST_CREATE_TIMER_EXCEPTION.getMessage());
         }
 
         if(createTimerRequestDto.categoryId() != 0) {
@@ -218,17 +218,17 @@ private boolean isCompletedTimer(Reminder reminder){
 
     // 완료된 타이머 날짜,시간 포맷
     private CompletedTimerDto createCompletedTimerDto(Reminder reminder) {
-        String time = reminder.getRemindTime().format(DateTimeFormatter.ofPattern("a hh:mm"));
-        String date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("E요일"));
+        String time = reminder.getRemindTime().format(DateTimeFormatter.ofPattern("a hh:mm",locale));
+        String date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("E요일",locale));
         return CompletedTimerDto.of(reminder, time, date);
     }
 
     // 대기중인 타이머 날짜,시간 포맷
     private WaitingTimerDto createWaitingTimerDto(Reminder reminder) {
         LocalDateTime now = LocalDateTime.now();
         String time = (reminder.getRemindTime().getMinute() == 0)
-                ? reminder.getRemindTime().format(DateTimeFormatter.ofPattern("a h시"))
-                : reminder.getRemindTime().format(DateTimeFormatter.ofPattern("a h시 mm분"));
+                ? reminder.getRemindTime().format(DateTimeFormatter.ofPattern("a h시",locale))
+                : reminder.getRemindTime().format(DateTimeFormatter.ofPattern("a h시 mm분",locale));
 
         String dates = reminder.getRemindDates().stream()
                 .map(this::mapIndexToDayString)
@@ -240,7 +240,7 @@ private WaitingTimerDto createWaitingTimerDto(Reminder reminder) {
     // 인덱스로 요일 알아내기
     private String mapIndexToDayString(int index) {
         DayOfWeek dayOfWeek = DayOfWeek.of(index);
-        String dayName = dayOfWeek.getDisplayName(java.time.format.TextStyle.FULL, Locale.getDefault());
+        String dayName = dayOfWeek.getDisplayName(java.time.format.TextStyle.FULL, locale);
 
         return dayName.substring(0, 1);
     }