♻️ schedule 도메인 리팩터링 및 새로운 기능 추가

deploy/local.init.sql

@@ -35,4 +35,16 @@ values (default, '2024-12-10', null, 1, 'title', 'content');
 INSERT INTO notice (id, created_date, updated_date, club_id, title, content)
 values (default, '2024-12-11', null, 1, 'title2', 'content2');
 INSERT INTO notice (id, created_date, updated_date, club_id, title, content)
-values (default, '2024-12-12', null, 1, 'title3', 'content4');
+values (default, '2024-12-12', null, 1, 'title3', 'content4');
+
+-- 스케줄 생성(3번 동아리)
+insert into `schedule` (id, club_id, created_date, updated_date, title, location, start_time, end_time, min_people, category, note, attend, non_attend, is_close, view_count)
+values (default, 3, '2024-03-06 14:30:00', null, '운동 매치 스케줄', '서울시 마포구', '2024-03-11 14:30:00', '2024-03-11 17:30:00', 10, 'REGULAR_TRAINING', 'note', 10, 12, 0, 0);
+insert into `schedule` (id, club_id, created_date, updated_date, title, location, start_time, end_time, min_people, category, note, attend, non_attend, is_close, view_count)
+values (default, 3, '2024-03-06 14:30:00', null, '운동 매치 스케줄2', '서울시 마포구', '2024-03-11 14:30:00', '2024-03-11 17:30:00', 10, 'REGULAR_TRAINING', 'note', 10, 12, 0, 0);
+insert into `schedule` (id, club_id, created_date, updated_date, title, location, start_time, end_time, min_people, category, note, attend, non_attend, is_close, view_count)
+values (default, 3, '2024-03-05 14:30:00', null,  '운동 매치 스케줄3', '서울시 마포구', '2024-03-12 14:30:00', '2024-03-12 17:30:00', 10, 'REGULAR_TRAINING', 'note', 10, 12, 0, 1);
+insert into `schedule` (id, club_id, created_date, updated_date, title, location, start_time, end_time, min_people, category, note, attend, non_attend, is_close, view_count, opponent_team_name, opponent_team_age_range)
+values (default, 3, '2024-04-01 14:30:00', null,  '운동 매치 스케줄4', '서울시 마포구', '2024-04-05 14:30:00', '2024-04-05 17:30:00', 10, 'FRIENDLY_MATCH', 'note', 10, 12, 0, 10, 'opponent_team_name', 'TWENTIES');
+insert into `schedule` (id, club_id, created_date, updated_date, title, location, start_time, end_time, min_people, category, note, attend, non_attend, is_close, view_count, opponent_team_name, opponent_team_age_range)
+values (default, 3, '2024-02-22 14:30:00', null,  '운동 매치 스케줄5', '서울시 마포구', '2024-02-27 14:30:00', '2024-02-27 17:30:00', 10, 'FRIENDLY_MATCH', 'note', 10, 12, 0, 5, 'opponent_team_name', 'THIRTIES');

src/main/java/com/example/moim/club/entity/Club.java

@@ -65,20 +65,17 @@ public class Club extends BaseEntity {
     /**
      * TODO : university 는 없을 수도 있으므로, null 일 경우를 처리해주기
      */
-    public static Club createClub(ClubInput clubInput, FileInfo fileInfo) {
+    public static Club from(ClubInput clubInput, FileInfo fileInfo) {
         Club club = new Club();
         club.title = clubInput.getTitle();
         club.explanation = clubInput.getExplanation();
         club.introduction = clubInput.getIntroduction();
-        club.clubCategory = ClubCategory.fromKoreanName(clubInput.getClubCategory()).get();
+        club.clubCategory = ClubCategory.fromKoreanName(clubInput.getClubCategory()).orElseThrow(() -> new ClubControllerAdvice(ResponseCode.INVALID_CLUB_CATEGORY));
         club.university = clubInput.getUniversity();
-        club.gender = Gender.fromKoreanName(clubInput.getGender()).get();
-        club.activityArea = ActivityArea.fromKoreanName(clubInput.getActivityArea()).get();
-        club.sportsType = SportsType.fromKoreanName(clubInput.getSportsType()).get();
-        club.ageRange = AgeRange.fromKoreanName(clubInput.getAgeRange()).get();
-        if (!clubInput.getClubPassword().equals(clubInput.getClubCheckPassword())) {
-            throw new ClubControllerAdvice(ResponseCode.CLUB_CHECK_PASSWORD_INCORRECT);
-        }
+        club.gender = Gender.fromKoreanName(clubInput.getGender()).orElseThrow(() -> new ClubControllerAdvice(ResponseCode.INVALID_GENDER));
+        club.activityArea = ActivityArea.fromKoreanName(clubInput.getActivityArea()).orElseThrow(() -> new ClubControllerAdvice(ResponseCode.INVALID_ACTIVITY_AREA));
+        club.sportsType = SportsType.fromKoreanName(clubInput.getSportsType()).orElseThrow(() -> new ClubControllerAdvice(ResponseCode.INVALID_SPORTS_TYPE));
+        club.ageRange = AgeRange.fromKoreanName(clubInput.getAgeRange()).orElseThrow(() -> new ClubControllerAdvice(ResponseCode.INVALID_AGE_RANGE));
         club.clubPassword = clubInput.getClubPassword();
         if (fileInfo != null) {
             club.imgUrl = fileInfo.getFileUrl();
@@ -91,7 +88,7 @@ public static Club createClub(ClubInput clubInput, FileInfo fileInfo) {
         return club;
     }
 
-    public Club updateClubSearch(ClubSearch clubSearch) {
+    public Club updateSearch(ClubSearch clubSearch) {
         this.clubSearch = clubSearch;
         return this;
     }
@@ -104,7 +101,7 @@ public void plusMemberCount() {
         memberCount++;
     }
 
-    public void updateClub(ClubUpdateInput clubUpdateInput, FileInfo fileInfo) {
+    public void update(ClubUpdateInput clubUpdateInput, FileInfo fileInfo) {
         if (StringUtils.hasText(clubUpdateInput.getTitle())) {
             this.title = clubUpdateInput.getTitle();
         }
@@ -139,7 +136,7 @@ public void updateClub(ClubUpdateInput clubUpdateInput, FileInfo fileInfo) {
         }
     }
 
-    public void updateClubPassword(String newPassword) {
+    public void updatePassword(String newPassword) {
         this.clubPassword = newPassword;
     }
 }

src/main/java/com/example/moim/club/service/ClubCommandServiceImpl.java

@@ -41,7 +41,7 @@ public class ClubCommandServiceImpl implements ClubCommandService {
 
     @Transactional
     public ClubSaveOutput saveClub(User user, ClubInput clubInput) throws IOException {
-        Club club = clubRepository.save(Club.createClub(clubInput, fileService.upload(clubInput.getProfileImg(), "/club-profile")));
+        Club club = clubRepository.save(Club.from(clubInput, fileService.upload(clubInput.getProfileImg(), "/club-profile")));
         // 검색을 위한 저장
         saveClubSearch(club);
 
@@ -67,8 +67,8 @@ public ClubUpdateOutput updateClub(User user, ClubUpdateInput clubUpdateInput, L
         if (clubUpdateInput.getProfileImg() != null) {
             fileService.remove(club.getStoredImgName());
         }
+        club.update(clubUpdateInput, fileService.upload(clubUpdateInput.getProfileImg(), "/club-profile"));
 
-        club.updateClub(clubUpdateInput, fileService.upload(clubUpdateInput.getProfileImg(), "/club-profile"));
         // 검색 정보 동기화를 위한 처리
         club.getClubSearch().updateFrom(club);
         List<UserClubOutput> userList = userClubRepository.findAllByClub(club).stream().map(UserClubOutput::new).toList();
@@ -87,9 +87,7 @@ public UserClubOutput saveClubUser(User user, ClubUserSaveInput clubUserSaveInpu
             }
             club.plusMemberCount();
             UserClub userClub = userClubRepository.save(UserClub.createUserClub(user, club));
-            /**
-             * TODO: 알림 보내는 것 새로운 방식에 맞춰서 다시 구현해야 함
-             */
+
             eventPublisher.publishEvent(new ClubJoinEvent(user, club));
             return new UserClubOutput(userClub);
         }
@@ -146,7 +144,7 @@ public String clubPasswordUpdate(User user, ClubPswdUpdateInput clubPswdUpdateIn
             throw new ClubControllerAdvice(ResponseCode.CLUB_CHECK_PASSWORD_INCORRECT);
         }
 
-        club.updateClubPassword(clubPswdUpdateInput.getNewPassword());
+        club.updatePassword(clubPswdUpdateInput.getNewPassword());
 
         return club.getTitle() + "의 비밀번호를 변경하였습니다.";
     }
@@ -178,7 +176,7 @@ private void saveClubSearch(Club club) {
                 .allFieldsConcat(TextUtils.concatClean("|", club.getTitle(), club.getIntroduction(), club.getExplanation()))
                 .build();
 
-        club.updateClubSearch(clubSearchRepository.save(clubSearch));
+        club.updateSearch(clubSearchRepository.save(clubSearch));
     }
 
 //    @Transactional

src/main/java/com/example/moim/club/service/NoticeCommandServiceImpl.java

@@ -12,18 +12,25 @@
 import com.example.moim.global.enums.ClubRole;
 import com.example.moim.global.exception.ResponseCode;
 import com.example.moim.user.entity.User;
+import com.example.moim.notification.dto.NoticeSaveEvent;
+import com.example.moim.user.entity.User;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
+import org.springframework.transaction.annotation.Transactional;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class NoticeCommandServiceImpl implements NoticeCommandService {
     private final NoticeRepository noticeRepository;
     private final ClubRepository clubRepository;
     private final UserClubRepository userClubRepository;
+    private final ApplicationEventPublisher eventPublisher;
 
+    @Transactional
     public NoticeOutput saveNotice(User user, NoticeInput noticeInput, Long clubId) {
         log.debug("saveNotice 진입");
         Club club = clubRepository.findById(clubId).orElseThrow(() -> new ClubControllerAdvice(ResponseCode.CLUB_NOT_FOUND));
@@ -36,9 +43,7 @@ public NoticeOutput saveNotice(User user, NoticeInput noticeInput, Long clubId)
 
         Notice notice = noticeRepository.save(Notice.createNotice(club, noticeInput.getTitle(), noticeInput.getContent()));
 
-        /**
-         * TODO: 알림 보내는 부분 구현해야함
-         */
+        eventPublisher.publishEvent(new NoticeSaveEvent(user, club));
 
         return new NoticeOutput(notice);
     }

src/main/java/com/example/moim/config/security/SecurityConfig.java

@@ -69,7 +69,7 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
          * FIXME: 이건 API 수동 테스트할때만 필요한 것
          */
         httpSecurity.csrf(csrf -> csrf
-                .ignoringRequestMatchers("/club/**")
+                .ignoringRequestMatchers("/clubs/**", "/schedules/**", "/notices/**")
         );
         httpSecurity.csrf(csrf -> csrf.ignoringRequestMatchers("/notice/**"));
 
@@ -78,7 +78,7 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
         //http basic 인증 방식 disable
         httpSecurity.httpBasic(AbstractHttpConfigurer::disable);
         /**
-         * FIXME: 이건 API 수동 테스트할때만 필요한 것
+         * FIXME: 이건 API 수동 테스트할때만 필요한 것 : 주석 제거하기
          */
         //경로별 인가 작업
 //        httpSecurity.authorizeHttpRequests((auth) -> auth
@@ -92,7 +92,7 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
         httpSecurity.authorizeHttpRequests((auth) -> auth.anyRequest().permitAll());
 
         /**
-         * FIXME: 이건 API 수동 테스트할때만 필요한 것
+         * FIXME: 이건 API 수동 테스트할때만 필요한 것 : 주석 제거해야 함
          */
         //JWTFilter 등록
 //        httpSecurity

src/main/java/com/example/moim/external/fcm/FcmConfig.java

@@ -1,41 +1,41 @@
-package com.example.moim.external.fcm;
-
-import com.google.auth.oauth2.GoogleCredentials;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
-import com.google.firebase.messaging.FirebaseMessaging;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
-
-@Configuration
-public class FcmConfig {
-
-    @Bean
-    FirebaseMessaging firebaseMessaging() throws IOException {
-        ClassPathResource resource = new ClassPathResource("secret/sample-firebase-test-f3c27-firebase-adminsdk-fbsvc-c15b4b66c6.json");
-        InputStream refreshToken = resource.getInputStream();
-
-        FirebaseApp firebaseApp = null;
-        List<FirebaseApp> firebaseAppList = FirebaseApp.getApps();
-
-        if (firebaseAppList != null && !firebaseAppList.isEmpty()) {
-            for (FirebaseApp app : firebaseAppList) {
-                if (app.getName().equals(FirebaseApp.DEFAULT_APP_NAME)) {
-                    firebaseApp = app;
-                }
-            }
-        } else {
-            FirebaseOptions options = FirebaseOptions.builder()
-                    .setCredentials(GoogleCredentials.fromStream(refreshToken))
-                    .build();
-
-            firebaseApp = FirebaseApp.initializeApp(options);
-        }
-
-        return FirebaseMessaging.getInstance(firebaseApp);
-    }
-}
+//package com.example.moim.external.fcm;
+//
+//import com.google.auth.oauth2.GoogleCredentials;
+//import com.google.firebase.FirebaseApp;
+//import com.google.firebase.FirebaseOptions;
+//import com.google.firebase.messaging.FirebaseMessaging;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.util.List;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.core.io.ClassPathResource;
+//
+//@Configuration
+//public class FcmConfig {
+//
+//    @Bean
+//    FirebaseMessaging firebaseMessaging() throws IOException {
+//        ClassPathResource resource = new ClassPathResource("secret/sample-firebase-test-f3c27-firebase-adminsdk-fbsvc-c15b4b66c6.json");
+//        InputStream refreshToken = resource.getInputStream();
+//
+//        FirebaseApp firebaseApp = null;
+//        List<FirebaseApp> firebaseAppList = FirebaseApp.getApps();
+//
+//        if (firebaseAppList != null && !firebaseAppList.isEmpty()) {
+//            for (FirebaseApp app : firebaseAppList) {
+//                if (app.getName().equals(FirebaseApp.DEFAULT_APP_NAME)) {
+//                    firebaseApp = app;
+//                }
+//            }
+//        } else {
+//            FirebaseOptions options = FirebaseOptions.builder()
+//                    .setCredentials(GoogleCredentials.fromStream(refreshToken))
+//                    .build();
+//
+//            firebaseApp = FirebaseApp.initializeApp(options);
+//        }
+//
+//        return FirebaseMessaging.getInstance(firebaseApp);
+//    }
+//}

src/main/java/com/example/moim/global/exception/ResponseCode.java

@@ -13,14 +13,16 @@
 public enum ResponseCode {
 
     // 정상 code
-    OK(HttpStatus.OK,"2000", "Ok"),
+    OK(HttpStatus.OK,"2000", "OK"),
 
     // Common Error
     _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON000", "서버 에러, 관리자에게 문의 바랍니다."),
     _BAD_REQUEST(HttpStatus.BAD_REQUEST,"COMMON001","잘못된 요청입니다."),
     _UNAUTHORIZED(HttpStatus.UNAUTHORIZED,"COMMON002","권한이 잘못되었습니다"),
     _METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED, "COMMON003", "지원하지 않는 Http Method 입니다."),
     _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON004", "금지된 요청입니다."),
+    _INVALID_FORMAT(HttpStatus.BAD_REQUEST, "COMMON005", "날짜 형식이 잘못되었습니다."),
+    _MISMATCHED_INPUT(HttpStatus.BAD_REQUEST, "COMMON006", "필드 타입이 일치하지 않습니다."),
 
     // Member Error
     MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 없습니다."),
@@ -37,6 +39,7 @@ public enum ResponseCode {
     MATCH_APPLICATION_NOT_FOUND(HttpStatus.BAD_REQUEST, "MATCH4006", "올바른 매치가 아닙니다."),
     MATCH_TIME_OUT(HttpStatus.BAD_REQUEST, "MATCH4007", "매치가 종료된 후 48시간이 지났습니다."),
     MATCH_NOT_CONFIRMED(HttpStatus.BAD_REQUEST, "MATCH4008", "확정된 매치가 아닙니다."),
+    MATCH_SCHEDULE_NOT_FOUND(HttpStatus.BAD_REQUEST, "MATCH4009", "매치 일정이 확정되지 않았거나, 존재하지 않습니다."),
 
     // MatchUser Error
     MATCH_USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MATCH4005", "가입된 모임이 없습니다."),
@@ -60,6 +63,9 @@ public enum ResponseCode {
     CLUB_CHECK_PASSWORD_INCORRECT(HttpStatus.UNAUTHORIZED, "CLUB4005", "모임 확인 비밀번호가 틀렸습니다."),
     CLUB_USER_ALREADY_JOINED(HttpStatus.CONFLICT, "CLUB4006", "해당 사용자는 이미 모임에 가입되어 있습니다."),
 
+    // Schedule Error
+    SCHEDULE_NOT_FOUND(HttpStatus.BAD_REQUEST, "SCHEDULE4001", "존재하지 않는 일정입니다."),
+
     // File Error
     FILE_MAX_SIZE_OVER(HttpStatus.PAYLOAD_TOO_LARGE, "FILE4001", "100MB 이하 파일만 업로드 할 수 있습니다."),
     FILE_CONTENT_TYPE_NOT_IMAGE(HttpStatus.UNSUPPORTED_MEDIA_TYPE, "FILE4002", "이미지 파일만 업로드할 수 있습니다."),
@@ -73,7 +79,9 @@ public enum ResponseCode {
     INVALID_ACTIVITY_AREA(HttpStatus.BAD_REQUEST, "ENUM4005", "유효하지 않은 지역입니다."),
     INVALID_MAIN_FOOT(HttpStatus.BAD_REQUEST, "ENUM4006", "유효하지 않은 주발입니다."),
     INVALID_SPORTS_TYPE(HttpStatus.BAD_REQUEST, "ENUM4007", "유효하지 않은 종목입니다."),
-    INVALID_CLUB_ROLE(HttpStatus.BAD_REQUEST, "ENUM4008", "유효하지 않은 모임 역할입니다.");
+    INVALID_CLUB_ROLE(HttpStatus.BAD_REQUEST, "ENUM4008", "유효하지 않은 모임 역할입니다."),
+    INVALID_SCHEDULE_CATEGORY(HttpStatus.BAD_REQUEST, "ENUM4009", "유효하지 않은 일정 종류입니다."),
+    INVALID_ATTENDANCE_TYPE(HttpStatus.BAD_REQUEST, "ENUM4010", "유효하지 않은 투표입니다.(참석/불참)");
 
     private final HttpStatus httpStatus;
     private final String code;

src/main/java/com/example/moim/global/exception/handler/MasterExceptionHandler.java

@@ -3,11 +3,14 @@
 import com.example.moim.global.exception.BaseResponse;
 import com.example.moim.global.exception.GeneralException;
 import com.example.moim.global.exception.ResponseCode;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -16,6 +19,7 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.context.request.WebRequest;
 
+import java.time.format.DateTimeParseException;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -33,6 +37,18 @@ public ResponseEntity<Object> general(GeneralException e, WebRequest request) {
         return handleExceptionInternal(e, e.getErrorCode(), request);
     }
 
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public ResponseEntity<Object> formatException(HttpMessageNotReadableException e, WebRequest request) {
+        Throwable root = getRootCause(e);
+        if (root instanceof DateTimeParseException) {
+            return handleExceptionInternal(e, ResponseCode._INVALID_FORMAT, request);
+        } else if (root instanceof MismatchedInputException) {
+            return handleExceptionInternal(e, ResponseCode._MISMATCHED_INPUT, request);
+
+        }
+        return handleExceptionInternal(e, ResponseCode._BAD_REQUEST, request);
+    }
+
     @ExceptionHandler(Exception.class)
     public ResponseEntity<Object> exception(Exception e, WebRequest request) {
         e.printStackTrace(); // 클라이언트에게 불필요한 정보를 노출할 수 있으므로 삭제
@@ -87,4 +103,12 @@ private ResponseEntity<Object> handleExceptionInternalFalse(Exception e, Respons
                 .body(body);
     }
 
+    private Throwable getRootCause(Throwable ex) {
+        Throwable result = ex;
+        while (result.getCause() != null) {
+            result = result.getCause();
+        }
+        return result;
+    }
+
 }

src/main/java/com/example/moim/global/util/file/model/FileInfo.java

@@ -11,7 +11,7 @@ public class FileInfo {
     private String fileUrl;
 
     @Builder
-    public FileInfo(String originalFileName, String storedFileName, String fileUrl, String contentType, long size) {
+    public FileInfo(String originalFileName, String storedFileName, String fileUrl) {
         this.originalFileName = originalFileName;
         this.storedFileName = storedFileName;
         this.fileUrl = fileUrl;