fix: 공지사항 서버 에러 해결

sowon2222 · sowon2222 · commit a8a6ab3468c2 · 2026-02-01T12:50:10.000+09:00
diff --git a/src/main/java/com/example/demo/config/PerformanceLoggingInterceptor.java b/src/main/java/com/example/demo/config/PerformanceLoggingInterceptor.java
@@ -65,5 +65,6 @@ public void afterCompletion(HttpServletRequest request, HttpServletResponse resp
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/controller/ScheduleController.java b/src/main/java/com/example/demo/controller/ScheduleController.java
@@ -18,6 +18,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -26,6 +27,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
+@Slf4j
 @Tag(name = "스케줄", description = "팀 스케줄 생성/수정/삭제 및 조회 API")
 @RestController
 @RequestMapping("/api/v1")
@@ -116,7 +118,11 @@ public ResponseEntity<?> updateSchedule(
             }
             ScheduleResponseDto response = scheduleService.updateSchedule(userId, scheduleId, request, scope);
             return ResponseEntity.ok(response);
+        } catch (IllegalArgumentException e) {
+            return handleIllegalArgumentException(e);
         } catch (Exception e) {
+            log.error("스케줄 수정 중 예상치 못한 오류 발생: scheduleId={}, userId={}, error={}", 
+                    scheduleId, jwtHelper.getCurrentUserId(), e.getMessage(), e);
             return createErrorResponse("스케줄 수정 중 오류가 발생했습니다.", HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
@@ -242,15 +248,76 @@ public ResponseEntity<?> getMySchedules(
         }
     }
 
-    private ResponseEntity<ErrorResponse> createUnauthorizedResponse(String message) {
-        ErrorResponse error = new ErrorResponse("UNAUTHORIZED", message);
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(error);
+    /**
+     * IllegalArgumentException 처리 (권한, 리소스 없음 등을 구분)
+     */
+    private ResponseEntity<ErrorResponse> handleIllegalArgumentException(IllegalArgumentException e) {
+        String message = e.getMessage();
+        log.debug("IllegalArgumentException 발생: {}", message);
+        
+        // 에러 코드가 포함된 경우 (예: "FORBIDDEN: ...", "SCHEDULE_NOT_FOUND: ...")
+        if (message != null && message.contains(":")) {
+            String errorCode = message.split(":")[0].trim();
+            String cleanMessage = message.split(":", 2)[1].trim();
+            
+            HttpStatus status;
+            if ("FORBIDDEN".equals(errorCode)) {
+                status = HttpStatus.FORBIDDEN;
+            } else if ("SCHEDULE_NOT_FOUND".equals(errorCode) || "TEAM_NOT_FOUND".equals(errorCode)) {
+                status = HttpStatus.NOT_FOUND;
+            } else {
+                status = HttpStatus.BAD_REQUEST;
+            }
+            
+            return ResponseEntity.status(status)
+                    .body(ErrorResponse.builder()
+                            .code(errorCode)
+                            .message(cleanMessage)
+                            .build());
+        }
+        
+        // 에러 코드가 없는 경우 메시지로 판단
+        String code = "INVALID_REQUEST";
+        HttpStatus status = HttpStatus.BAD_REQUEST;
+        
+        if (message != null) {
+            if (message.contains("권한") || message.contains("FORBIDDEN") || message.contains("팀원이 아닌")) {
+                code = "FORBIDDEN";
+                status = HttpStatus.FORBIDDEN;
+            } else if (message.contains("찾을 수 없습니다") || message.contains("NOT_FOUND")) {
+                code = "SCHEDULE_NOT_FOUND";
+                status = HttpStatus.NOT_FOUND;
+            }
+        }
+        
+        return ResponseEntity.status(status)
+                .body(ErrorResponse.builder()
+                        .code(code)
+                        .message(message != null ? message : "잘못된 요청입니다.")
+                        .build());
     }
-
-
+    
+    /**
+     * 에러 응답 생성
+     */
     private ResponseEntity<ErrorResponse> createErrorResponse(String message, HttpStatus status) {
-        ErrorResponse error = new ErrorResponse("INTERNAL_SERVER_ERROR", message);
-        return ResponseEntity.status(status).body(error);
+        String code = status == HttpStatus.INTERNAL_SERVER_ERROR ? "INTERNAL_SERVER_ERROR" : "INVALID_REQUEST";
+        return ResponseEntity.status(status)
+                .body(ErrorResponse.builder()
+                        .code(code)
+                        .message(message)
+                        .build());
+    }
+    
+    /**
+     * 인증 실패 응답 생성
+     */
+    private ResponseEntity<ErrorResponse> createUnauthorizedResponse(String message) {
+        return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+                .body(ErrorResponse.builder()
+                        .code("UNAUTHORIZED")
+                        .message(message)
+                        .build());
     }
 }
 
diff --git a/src/main/java/com/example/demo/controller/TodoController.java b/src/main/java/com/example/demo/controller/TodoController.java
@@ -18,6 +18,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -26,6 +27,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
+@Slf4j
 @Tag(name = "투두", description = "팀 투두 생성/수정/삭제 및 조회 API")
 @RestController
 @RequestMapping("/api/v1")
@@ -114,7 +116,11 @@ public ResponseEntity<?> updateTodo(
             }
             TodoResponseDto response = todoService.updateTodo(userId, todoId, request);
             return ResponseEntity.ok(response);
+        } catch (IllegalArgumentException e) {
+            return handleIllegalArgumentException(e);
         } catch (Exception e) {
+            log.error("투두 수정 중 예상치 못한 오류 발생: todoId={}, userId={}, error={}", 
+                    todoId, jwtHelper.getCurrentUserId(), e.getMessage(), e);
             return createErrorResponse("투두 수정 중 오류가 발생했습니다.", HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
@@ -158,14 +164,10 @@ public ResponseEntity<?> updateTodoStatus(
             TodoResponseDto response = todoService.updateTodoStatus(userId, todoId, request);
             return ResponseEntity.ok(response);
         } catch (IllegalArgumentException e) {
-            String message = e.getMessage();
-            if (message != null && message.contains("투두를 찾을 수 없습니다")) {
-                return createErrorResponse("TODO_NOT_FOUND", message, HttpStatus.NOT_FOUND);
-            } else if (message != null && message.contains("팀원이 아닌")) {
-                return createErrorResponse("FORBIDDEN", message, HttpStatus.FORBIDDEN);
-            }
-            return createErrorResponse("투두 완료 여부 수정 중 오류가 발생했습니다.", HttpStatus.INTERNAL_SERVER_ERROR);
+            return handleIllegalArgumentException(e);
         } catch (Exception e) {
+            log.error("투두 완료 여부 수정 중 예상치 못한 오류 발생: todoId={}, userId={}, error={}", 
+                    todoId, jwtHelper.getCurrentUserId(), e.getMessage(), e);
             return createErrorResponse("투두 완료 여부 수정 중 오류가 발생했습니다.", HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
@@ -283,20 +285,76 @@ public ResponseEntity<?> getMyTodos(
         }
     }
 
-    private ResponseEntity<ErrorResponse> createUnauthorizedResponse(String message) {
-        ErrorResponse error = new ErrorResponse("UNAUTHORIZED", message);
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(error);
+    /**
+     * IllegalArgumentException 처리 (권한, 리소스 없음 등을 구분)
+     */
+    private ResponseEntity<ErrorResponse> handleIllegalArgumentException(IllegalArgumentException e) {
+        String message = e.getMessage();
+        log.debug("IllegalArgumentException 발생: {}", message);
+        
+        // 에러 코드가 포함된 경우 (예: "FORBIDDEN: ...", "TODO_NOT_FOUND: ...")
+        if (message != null && message.contains(":")) {
+            String errorCode = message.split(":")[0].trim();
+            String cleanMessage = message.split(":", 2)[1].trim();
+            
+            HttpStatus status;
+            if ("FORBIDDEN".equals(errorCode)) {
+                status = HttpStatus.FORBIDDEN;
+            } else if ("TODO_NOT_FOUND".equals(errorCode) || "TEAM_NOT_FOUND".equals(errorCode)) {
+                status = HttpStatus.NOT_FOUND;
+            } else {
+                status = HttpStatus.BAD_REQUEST;
+            }
+            
+            return ResponseEntity.status(status)
+                    .body(ErrorResponse.builder()
+                            .code(errorCode)
+                            .message(cleanMessage)
+                            .build());
+        }
+        
+        // 에러 코드가 없는 경우 메시지로 판단
+        String code = "INVALID_REQUEST";
+        HttpStatus status = HttpStatus.BAD_REQUEST;
+        
+        if (message != null) {
+            if (message.contains("권한") || message.contains("FORBIDDEN") || message.contains("팀원이 아닌")) {
+                code = "FORBIDDEN";
+                status = HttpStatus.FORBIDDEN;
+            } else if (message.contains("찾을 수 없습니다") || message.contains("NOT_FOUND")) {
+                code = "TODO_NOT_FOUND";
+                status = HttpStatus.NOT_FOUND;
+            }
+        }
+        
+        return ResponseEntity.status(status)
+                .body(ErrorResponse.builder()
+                        .code(code)
+                        .message(message != null ? message : "잘못된 요청입니다.")
+                        .build());
     }
-
-
+    
+    /**
+     * 에러 응답 생성
+     */
     private ResponseEntity<ErrorResponse> createErrorResponse(String message, HttpStatus status) {
-        ErrorResponse error = new ErrorResponse("INTERNAL_SERVER_ERROR", message);
-        return ResponseEntity.status(status).body(error);
+        String code = status == HttpStatus.INTERNAL_SERVER_ERROR ? "INTERNAL_SERVER_ERROR" : "INVALID_REQUEST";
+        return ResponseEntity.status(status)
+                .body(ErrorResponse.builder()
+                        .code(code)
+                        .message(message)
+                        .build());
     }
-
-    private ResponseEntity<ErrorResponse> createErrorResponse(String code, String message, HttpStatus status) {
-        ErrorResponse error = new ErrorResponse(code, message);
-        return ResponseEntity.status(status).body(error);
+    
+    /**
+     * 인증 실패 응답 생성
+     */
+    private ResponseEntity<ErrorResponse> createUnauthorizedResponse(String message) {
+        return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+                .body(ErrorResponse.builder()
+                        .code("UNAUTHORIZED")
+                        .message(message)
+                        .build());
     }
 }
 
diff --git a/src/main/java/com/example/demo/domain/entity/ScheduleAttendee.java b/src/main/java/com/example/demo/domain/entity/ScheduleAttendee.java
@@ -59,5 +59,6 @@ public class ScheduleAttendee {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/domain/entity/ScheduleAttendeeId.java b/src/main/java/com/example/demo/domain/entity/ScheduleAttendeeId.java
@@ -49,5 +49,6 @@ public class ScheduleAttendeeId implements Serializable {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/domain/entity/SchedulePosition.java b/src/main/java/com/example/demo/domain/entity/SchedulePosition.java
@@ -62,5 +62,6 @@ public class SchedulePosition {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/domain/entity/SchedulePositionId.java b/src/main/java/com/example/demo/domain/entity/SchedulePositionId.java
@@ -49,5 +49,6 @@ public class SchedulePositionId implements Serializable {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/domain/entity/TodoAttendee.java b/src/main/java/com/example/demo/domain/entity/TodoAttendee.java
@@ -59,5 +59,6 @@ public class TodoAttendee {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/domain/entity/TodoAttendeeId.java b/src/main/java/com/example/demo/domain/entity/TodoAttendeeId.java
@@ -49,5 +49,6 @@ public class TodoAttendeeId implements Serializable {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/domain/entity/TodoPosition.java b/src/main/java/com/example/demo/domain/entity/TodoPosition.java
@@ -62,5 +62,6 @@ public class TodoPosition {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/domain/entity/TodoPositionId.java b/src/main/java/com/example/demo/domain/entity/TodoPositionId.java
@@ -49,5 +49,6 @@ public class TodoPositionId implements Serializable {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/domain/enums/RepeatType.java b/src/main/java/com/example/demo/domain/enums/RepeatType.java
@@ -37,5 +37,6 @@ public enum RepeatType {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/dto/team/PositionDeleteResponse.java b/src/main/java/com/example/demo/dto/team/PositionDeleteResponse.java
@@ -51,5 +51,6 @@ public class PositionDeleteResponse {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/dto/team/TeamDeleteResponse.java b/src/main/java/com/example/demo/dto/team/TeamDeleteResponse.java
@@ -48,5 +48,6 @@ public class TeamDeleteResponse {
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/dto/team/TeamInvitePreviewResponse.java b/src/main/java/com/example/demo/dto/team/TeamInvitePreviewResponse.java
@@ -42,3 +42,4 @@ public class TeamInvitePreviewResponse {
 
 
 
+
diff --git a/src/main/java/com/example/demo/dto/team/TeamMemberListResponse.java b/src/main/java/com/example/demo/dto/team/TeamMemberListResponse.java
@@ -49,3 +49,4 @@ public static class OwnerInfo {
 
 
 
+
diff --git a/src/main/java/com/example/demo/repository/SchedulePositionRepository.java b/src/main/java/com/example/demo/repository/SchedulePositionRepository.java
@@ -36,5 +36,6 @@ public interface SchedulePositionRepository extends JpaRepository<SchedulePositi
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/repository/TodoAttendeeRepository.java b/src/main/java/com/example/demo/repository/TodoAttendeeRepository.java
@@ -36,5 +36,6 @@ public interface TodoAttendeeRepository extends JpaRepository<TodoAttendee, Todo
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/repository/TodoPositionRepository.java b/src/main/java/com/example/demo/repository/TodoPositionRepository.java
@@ -36,5 +36,6 @@ public interface TodoPositionRepository extends JpaRepository<TodoPosition, Todo
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/service/ExpoNotificationService.java b/src/main/java/com/example/demo/service/ExpoNotificationService.java
@@ -341,3 +341,4 @@ public static class ExpoPushMessage {
 
 
 
+
diff --git a/src/main/java/com/example/demo/service/FcmNotificationService.java b/src/main/java/com/example/demo/service/FcmNotificationService.java
@@ -214,5 +214,6 @@ public void sendTeamMemberNotification(List<String> deviceTokens, String memberN
 
 
 
+
 
 
diff --git a/src/main/java/com/example/demo/service/ScheduleService.java b/src/main/java/com/example/demo/service/ScheduleService.java
@@ -154,6 +154,16 @@ public ScheduleResponseDto updateSchedule(Long userId, Long scheduleId, Schedule
             scheduleRepository.save(schedule);
         }
 
+        // 지연 로딩된 연관 관계 초기화 (LazyInitializationException 방지)
+        schedule.getTeam().getName(); // team 초기화
+        schedule.getCreatedBy().getName(); // createdBy 초기화
+        if (schedule.getPositions() != null) {
+            schedule.getPositions().forEach(sp -> {
+                sp.getPosition().getId(); // position 초기화
+                sp.getPosition().getColorHex(); // position 초기화
+            });
+        }
+
         // 스케줄 수정 알림 전송 (수정자 제외)
         sendScheduleChangeNotification(schedule, userId);
 
diff --git a/src/main/java/com/example/demo/service/TodoService.java b/src/main/java/com/example/demo/service/TodoService.java
diff --git a/src/main/resources/db/migration/V13__drop_notice_title_column.sql b/src/main/resources/db/migration/V13__drop_notice_title_column.sql
diff --git a/src/main/resources/db/migration/V6__shrink_title_length_to_20.sql b/src/main/resources/db/migration/V6__shrink_title_length_to_20.sql
diff --git a/src/main/resources/db/migration/V7__shrink_team_description_to_20.sql b/src/main/resources/db/migration/V7__shrink_team_description_to_20.sql
diff --git a/src/main/resources/db/migration/V8__add_user_id_unique_to_device_token.sql b/src/main/resources/db/migration/V8__add_user_id_unique_to_device_token.sql

Original file line number	Diff line number	Diff line change
`@@ -65,5 +65,6 @@ public void afterCompletion(HttpServletRequest request, HttpServletResponse resp`
`65`	`65`
`66`	`66`
`67`	`67`
	`68`	`+`
`68`	`69`
`69`	`70`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,6 @@ public class ScheduleAttendee {`
`59`	`59`
`60`	`60`
`61`	`61`
	`62`	`+`
`62`	`63`
`63`	`64`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,6 @@ public class ScheduleAttendeeId implements Serializable {`
`49`	`49`
`50`	`50`
`51`	`51`
	`52`	`+`
`52`	`53`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,6 @@ public class SchedulePosition {`
`62`	`62`
`63`	`63`
`64`	`64`
	`65`	`+`
`65`	`66`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,6 @@ public class TodoAttendee {`
`59`	`59`
`60`	`60`
`61`	`61`
	`62`	`+`
`62`	`63`
`63`	`64`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,6 @@ public class TodoAttendeeId implements Serializable {`
`49`	`49`
`50`	`50`
`51`	`51`
	`52`	`+`
`52`	`53`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,6 @@ public class TodoPosition {`
`62`	`62`
`63`	`63`
`64`	`64`
	`65`	`+`
`65`	`66`
`66`	`67`