From 8cd1b3297db6d8e83cbd1f46b0d2526c8d96b06d Mon Sep 17 00:00:00 2001 From: YoonBoorue Date: Sun, 31 May 2026 14:13:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor=20:=20domain=20=EA=B5=AC=EC=A1=B0?= =?UTF-8?q?=EB=A1=9C=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/refactoring-migration-map.csv | 128 +++++++ docs/refactoring-migration-map.xlsx | Bin 0 -> 7437 bytes docs/refactoring-proposal.md | 329 ++++++++++++++++++ .../RIKU/server/Config/SecurityConfig.java | 6 +- .../RIKU/server/Config/SwaggerConfig.java | 2 +- .../java/RIKU/server/Security/AuthMember.java | 6 +- .../Security/AuthenticationProviderImpl.java | 6 +- .../Security/JwtAuthenticationFilter.java | 8 +- .../java/RIKU/server/Security/JwtInfo.java | 2 +- .../server/Security/JwtTokenProvider.java | 16 +- .../Security/UserDetailsServiceImpl.java | 10 +- .../admin/controller}/AdminController.java | 22 +- .../dto/request}/AuthorizePacerRequest.java | 2 +- .../dto/request}/UpdateUsersRequest.java | 4 +- .../dto/response}/ReadPacersResponse.java | 4 +- .../dto/response}/ReadUsersResponse.java | 8 +- .../response}/SearchAdminUsersResponse.java | 6 +- .../admin/service}/AdminService.java | 36 +- .../auth/controller}/AuthController.java | 20 +- .../auth/dto/request}/LoginUserRequest.java | 2 +- .../auth/dto/response}/LoginUserResponse.java | 4 +- .../dto/response}/UpdateUserRoleResponse.java | 6 +- .../auth/service}/AuthService.java | 24 +- .../controller}/CalendarController.java | 14 +- .../ListMonthlyScheduleResponse.java | 8 +- .../response}/ReadDailyScheduleResponse.java | 4 +- .../ReadMonthlyScheduleResponse.java | 2 +- .../calendar/service}/CalendarService.java | 28 +- .../controller}/UserPointController.java | 16 +- .../request}/ReadUserEventRankingRequest.java | 4 +- .../dto/response}/ReadPointListResponse.java | 6 +- .../ReadUserParticipationsResponse.java | 6 +- .../dto/response}/ReadUserPointResponse.java | 4 +- .../response}/ReadUserRankingResponse.java | 2 +- .../point/entity}/PointType.java | 2 +- .../point/entity}/UserPoint.java | 8 +- .../repository}/UserPointRepository.java | 10 +- .../point/service}/UserPointService.java | 40 +-- .../controller}/CommentController.java | 10 +- .../dto/request}/CreateCommentRequest.java | 8 +- .../dto/response}/ReadCommentsResponse.java | 8 +- .../run/comment/entity}/Comment.java | 8 +- .../repository}/CommentRepository.java | 6 +- .../run/comment/service}/CommentService.java | 30 +- .../run/home/controller}/HomeController.java | 10 +- .../dto/response}/ReadHomeCardResponse.java | 6 +- .../home/dto/response}/ReadHomeResponse.java | 8 +- .../run/home/service}/HomeService.java | 28 +- .../dto/request}/CreatePacerRequest.java | 8 +- .../dto/request}/UpdatePacerRequest.java | 8 +- .../dto/response}/ReadPaceGroupResponse.java | 4 +- .../dto/response}/ReadPacersListResponse.java | 4 +- .../run/pacer/entity}/Pacer.java | 8 +- .../pacer/repository}/PacerRepository.java | 8 +- .../controller}/ParticipantController.java | 16 +- .../request}/AttendParticipantRequest.java | 2 +- .../ManualAttendParticipantRequest.java | 2 +- .../response}/GroupParticipantResponse.java | 2 +- .../ReadParticipantListResponse.java | 6 +- .../response}/UpdateParticipantResponse.java | 6 +- .../run/participant/entity}/Participant.java | 8 +- .../entity}/ParticipantStatus.java | 2 +- .../exception}/ParticipantException.java | 6 +- .../repository}/ParticipantRepository.java | 10 +- .../service}/ParticipantService.java | 41 ++- .../post/controller}/EventPostController.java | 18 +- .../post/controller}/FlashPostController.java | 16 +- .../run/post/controller}/PostController.java | 18 +- .../controller}/RegularPostController.java | 16 +- .../controller}/TrainingPostController.java | 18 +- .../dto/request}/CreateEventPostRequest.java | 10 +- .../dto/request}/CreateFlashPostRequest.java | 10 +- .../request}/CreateRegularPostRequest.java | 12 +- .../request}/CreateTrainingPostRequest.java | 12 +- .../post/dto/request}/UpdatePostRequest.java | 4 +- .../ReadEventPostDetailResponse.java | 16 +- .../ReadFlashPostDetailResponse.java | 14 +- .../dto/response}/ReadPostListResponse.java | 2 +- .../response}/ReadPostPreviewResponse.java | 6 +- .../ReadRegularPostDetailResponse.java | 16 +- .../ReadTrainingPostDetailResponse.java | 18 +- .../run/post/entity}/Attachment.java | 6 +- .../run/post/entity}/EventPost.java | 2 +- .../run/post/entity}/FlashPost.java | 2 +- .../run/post/entity}/Post.java | 8 +- .../run/post/entity}/PostStatus.java | 2 +- .../run/post/entity}/PostType.java | 2 +- .../run/post/entity}/RegularPost.java | 2 +- .../run/post/entity}/TrainingPost.java | 2 +- .../run/post/exception}/PostException.java | 6 +- .../repository}/AttachmentRepository.java | 6 +- .../post/repository}/EventPostRepository.java | 6 +- .../post/repository}/FlashPostRepository.java | 6 +- .../run/post/repository}/PostRepository.java | 10 +- .../repository}/RegularPostRepository.java | 6 +- .../repository}/TrainingPostRepository.java | 6 +- .../run/post/service}/EventPostService.java | 43 ++- .../run/post/service}/FlashPostService.java | 43 ++- .../run/post/service}/PostService.java | 55 +-- .../run/post/service}/RegularPostService.java | 55 +-- .../post/service}/TrainingPostService.java | 57 +-- .../season}/SeasonProvider.java | 4 +- .../user/controller}/UserController.java | 20 +- .../user/dto/request}/SignUpUserRequest.java | 4 +- .../dto/request}/UpdateProfileRequest.java | 2 +- .../dto/response}/ReadUserInfoResponse.java | 6 +- .../ReadUserProfileDetailResponse.java | 4 +- .../response}/ReadUserProfileResponse.java | 8 +- .../User => domains/user/entity}/User.java | 4 +- .../user/entity}/UserRole.java | 2 +- .../user/exception}/UserException.java | 6 +- .../user/repository}/UserRepository.java | 6 +- .../user/service}/UserService.java | 38 +- .../Base => global/entity}/BaseEntity.java | 2 +- .../Base => global/entity}/BaseStatus.java | 2 +- .../exception}/CustomException.java | 4 +- .../exception}/CustomJwtException.java | 4 +- .../GlobalRestControllerAdvice.java | 10 +- .../response}/BaseResponse.java | 4 +- .../response}/BaseResponseStatus.java | 2 +- .../util}/ConvertCreatedDate.java | 2 +- .../{Util => global/util}/DateTimeUtils.java | 2 +- .../FieldValidationControllerAdvice.java | 16 +- .../validation}/FieldValidationException.java | 2 +- .../validation}/ValidationException.java | 2 +- .../validation/dto}/FieldErrorsDto.java | 2 +- .../validation/dto}/FieldValidationError.java | 2 +- .../storage}/AllowedImageFileExtensions.java | 2 +- .../{Config => infra/storage}/S3Config.java | 2 +- .../storage}/S3Uploader.java | 8 +- 130 files changed, 1143 insertions(+), 628 deletions(-) create mode 100644 docs/refactoring-migration-map.csv create mode 100644 docs/refactoring-migration-map.xlsx create mode 100644 docs/refactoring-proposal.md rename src/main/java/RIKU/server/{Controller => domains/admin/controller}/AdminController.java (88%) rename src/main/java/RIKU/server/{Dto/User/Request => domains/admin/dto/request}/AuthorizePacerRequest.java (79%) rename src/main/java/RIKU/server/{Dto/User/Request => domains/admin/dto/request}/UpdateUsersRequest.java (79%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/admin/dto/response}/ReadPacersResponse.java (79%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/admin/dto/response}/ReadUsersResponse.java (87%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/admin/dto/response}/SearchAdminUsersResponse.java (87%) rename src/main/java/RIKU/server/{Service => domains/admin/service}/AdminService.java (87%) rename src/main/java/RIKU/server/{Controller => domains/auth/controller}/AuthController.java (79%) rename src/main/java/RIKU/server/{Dto/User/Request => domains/auth/dto/request}/LoginUserRequest.java (93%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/auth/dto/response}/LoginUserResponse.java (85%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/auth/dto/response}/UpdateUserRoleResponse.java (80%) rename src/main/java/RIKU/server/{Service => domains/auth/service}/AuthService.java (81%) rename src/main/java/RIKU/server/{Controller => domains/calendar/controller}/CalendarController.java (82%) rename src/main/java/RIKU/server/{Dto/Calendar/Response => domains/calendar/dto/response}/ListMonthlyScheduleResponse.java (84%) rename src/main/java/RIKU/server/{Dto/Calendar/Response => domains/calendar/dto/response}/ReadDailyScheduleResponse.java (89%) rename src/main/java/RIKU/server/{Dto/Calendar/Response => domains/calendar/dto/response}/ReadMonthlyScheduleResponse.java (90%) rename src/main/java/RIKU/server/{Service => domains/calendar/service}/CalendarService.java (78%) rename src/main/java/RIKU/server/{Controller => domains/point/controller}/UserPointController.java (84%) rename src/main/java/RIKU/server/{Dto/User/Request => domains/point/dto/request}/ReadUserEventRankingRequest.java (90%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/point/dto/response}/ReadPointListResponse.java (87%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/point/dto/response}/ReadUserParticipationsResponse.java (89%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/point/dto/response}/ReadUserPointResponse.java (88%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/point/dto/response}/ReadUserRankingResponse.java (93%) rename src/main/java/RIKU/server/{Entity/User => domains/point/entity}/PointType.java (93%) rename src/main/java/RIKU/server/{Entity/User => domains/point/entity}/UserPoint.java (89%) rename src/main/java/RIKU/server/{Repository => domains/point/repository}/UserPointRepository.java (88%) rename src/main/java/RIKU/server/{Service => domains/point/service}/UserPointService.java (87%) rename src/main/java/RIKU/server/{Controller => domains/run/comment/controller}/CommentController.java (87%) rename src/main/java/RIKU/server/{Dto/Post/Request => domains/run/comment/dto/request}/CreateCommentRequest.java (67%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/comment/dto/response}/ReadCommentsResponse.java (83%) rename src/main/java/RIKU/server/{Entity/Board => domains/run/comment/entity}/Comment.java (84%) rename src/main/java/RIKU/server/{Repository => domains/run/comment/repository}/CommentRepository.java (69%) rename src/main/java/RIKU/server/{Service => domains/run/comment/service}/CommentService.java (79%) rename src/main/java/RIKU/server/{Controller => domains/run/home/controller}/HomeController.java (79%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/home/dto/response}/ReadHomeCardResponse.java (82%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/home/dto/response}/ReadHomeResponse.java (87%) rename src/main/java/RIKU/server/{Service => domains/run/home/service}/HomeService.java (68%) rename src/main/java/RIKU/server/{Dto/Post/Request => domains/run/pacer/dto/request}/CreatePacerRequest.java (81%) rename src/main/java/RIKU/server/{Dto/Post/Request => domains/run/pacer/dto/request}/UpdatePacerRequest.java (75%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/pacer/dto/response}/ReadPaceGroupResponse.java (79%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/pacer/dto/response}/ReadPacersListResponse.java (88%) rename src/main/java/RIKU/server/{Entity/Board => domains/run/pacer/entity}/Pacer.java (85%) rename src/main/java/RIKU/server/{Repository => domains/run/pacer/repository}/PacerRepository.java (74%) rename src/main/java/RIKU/server/{Controller => domains/run/participant/controller}/ParticipantController.java (91%) rename src/main/java/RIKU/server/{Dto/Participant/Request => domains/run/participant/dto/request}/AttendParticipantRequest.java (72%) rename src/main/java/RIKU/server/{Dto/Participant/Request => domains/run/participant/dto/request}/ManualAttendParticipantRequest.java (82%) rename src/main/java/RIKU/server/{Dto/Participant/Response => domains/run/participant/dto/response}/GroupParticipantResponse.java (90%) rename src/main/java/RIKU/server/{Dto/Participant/Response => domains/run/participant/dto/response}/ReadParticipantListResponse.java (83%) rename src/main/java/RIKU/server/{Dto/Participant/Response => domains/run/participant/dto/response}/UpdateParticipantResponse.java (82%) rename src/main/java/RIKU/server/{Entity/Participant => domains/run/participant/entity}/Participant.java (91%) rename src/main/java/RIKU/server/{Entity/Participant => domains/run/participant/entity}/ParticipantStatus.java (66%) rename src/main/java/RIKU/server/{Util/Exception/Domain => domains/run/participant/exception}/ParticipantException.java (51%) rename src/main/java/RIKU/server/{Repository => domains/run/participant/repository}/ParticipantRepository.java (84%) rename src/main/java/RIKU/server/{Service => domains/run/participant/service}/ParticipantService.java (93%) rename src/main/java/RIKU/server/{Controller/Post => domains/run/post/controller}/EventPostController.java (80%) rename src/main/java/RIKU/server/{Controller/Post => domains/run/post/controller}/FlashPostController.java (81%) rename src/main/java/RIKU/server/{Controller/Post => domains/run/post/controller}/PostController.java (89%) rename src/main/java/RIKU/server/{Controller/Post => domains/run/post/controller}/RegularPostController.java (83%) rename src/main/java/RIKU/server/{Controller/Post => domains/run/post/controller}/TrainingPostController.java (80%) rename src/main/java/RIKU/server/{Dto/Post/Request => domains/run/post/dto/request}/CreateEventPostRequest.java (87%) rename src/main/java/RIKU/server/{Dto/Post/Request => domains/run/post/dto/request}/CreateFlashPostRequest.java (86%) rename src/main/java/RIKU/server/{Dto/Post/Request => domains/run/post/dto/request}/CreateRegularPostRequest.java (84%) rename src/main/java/RIKU/server/{Dto/Post/Request => domains/run/post/dto/request}/CreateTrainingPostRequest.java (85%) rename src/main/java/RIKU/server/{Dto/Post/Request => domains/run/post/dto/request}/UpdatePostRequest.java (89%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/post/dto/response}/ReadEventPostDetailResponse.java (79%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/post/dto/response}/ReadFlashPostDetailResponse.java (80%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/post/dto/response}/ReadPostListResponse.java (94%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/post/dto/response}/ReadPostPreviewResponse.java (87%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/post/dto/response}/ReadRegularPostDetailResponse.java (80%) rename src/main/java/RIKU/server/{Dto/Post/Response => domains/run/post/dto/response}/ReadTrainingPostDetailResponse.java (79%) rename src/main/java/RIKU/server/{Entity/Board => domains/run/post/entity}/Attachment.java (84%) rename src/main/java/RIKU/server/{Entity/Board/Post => domains/run/post/entity}/EventPost.java (94%) rename src/main/java/RIKU/server/{Entity/Board/Post => domains/run/post/entity}/FlashPost.java (95%) rename src/main/java/RIKU/server/{Entity/Board/Post => domains/run/post/entity}/Post.java (91%) rename src/main/java/RIKU/server/{Entity/Board => domains/run/post/entity}/PostStatus.java (54%) rename src/main/java/RIKU/server/{Entity/Board/Post => domains/run/post/entity}/PostType.java (57%) rename src/main/java/RIKU/server/{Entity/Board/Post => domains/run/post/entity}/RegularPost.java (95%) rename src/main/java/RIKU/server/{Entity/Board/Post => domains/run/post/entity}/TrainingPost.java (96%) rename src/main/java/RIKU/server/{Util/Exception/Domain => domains/run/post/exception}/PostException.java (50%) rename src/main/java/RIKU/server/{Repository => domains/run/post/repository}/AttachmentRepository.java (67%) rename src/main/java/RIKU/server/{Repository => domains/run/post/repository}/EventPostRepository.java (67%) rename src/main/java/RIKU/server/{Repository => domains/run/post/repository}/FlashPostRepository.java (67%) rename src/main/java/RIKU/server/{Repository => domains/run/post/repository}/PostRepository.java (78%) rename src/main/java/RIKU/server/{Repository => domains/run/post/repository}/RegularPostRepository.java (67%) rename src/main/java/RIKU/server/{Repository => domains/run/post/repository}/TrainingPostRepository.java (67%) rename src/main/java/RIKU/server/{Service/Post => domains/run/post/service}/EventPostService.java (81%) rename src/main/java/RIKU/server/{Service/Post => domains/run/post/service}/FlashPostService.java (80%) rename src/main/java/RIKU/server/{Service/Post => domains/run/post/service}/PostService.java (90%) rename src/main/java/RIKU/server/{Service/Post => domains/run/post/service}/RegularPostService.java (84%) rename src/main/java/RIKU/server/{Service/Post => domains/run/post/service}/TrainingPostService.java (84%) rename src/main/java/RIKU/server/{Config => domains/season}/SeasonProvider.java (83%) rename src/main/java/RIKU/server/{Controller => domains/user/controller}/UserController.java (88%) rename src/main/java/RIKU/server/{Dto/User/Request => domains/user/dto/request}/SignUpUserRequest.java (93%) rename src/main/java/RIKU/server/{Dto/User/Request => domains/user/dto/request}/UpdateProfileRequest.java (94%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/user/dto/response}/ReadUserInfoResponse.java (82%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/user/dto/response}/ReadUserProfileDetailResponse.java (91%) rename src/main/java/RIKU/server/{Dto/User/Response => domains/user/dto/response}/ReadUserProfileResponse.java (90%) rename src/main/java/RIKU/server/{Entity/User => domains/user/entity}/User.java (95%) rename src/main/java/RIKU/server/{Entity/User => domains/user/entity}/UserRole.java (91%) rename src/main/java/RIKU/server/{Util/Exception/Domain => domains/user/exception}/UserException.java (50%) rename src/main/java/RIKU/server/{Repository => domains/user/repository}/UserRepository.java (82%) rename src/main/java/RIKU/server/{Service => domains/user/service}/UserService.java (85%) rename src/main/java/RIKU/server/{Entity/Base => global/entity}/BaseEntity.java (96%) rename src/main/java/RIKU/server/{Entity/Base => global/entity}/BaseStatus.java (58%) rename src/main/java/RIKU/server/{Util/Exception/Domain => global/exception}/CustomException.java (81%) rename src/main/java/RIKU/server/{Util/Exception => global/exception}/CustomJwtException.java (76%) rename src/main/java/RIKU/server/{Controller/Advice => global/exception}/GlobalRestControllerAdvice.java (83%) rename src/main/java/RIKU/server/{Util => global/response}/BaseResponse.java (94%) rename src/main/java/RIKU/server/{Util => global/response}/BaseResponseStatus.java (99%) rename src/main/java/RIKU/server/{Util => global/util}/ConvertCreatedDate.java (97%) rename src/main/java/RIKU/server/{Util => global/util}/DateTimeUtils.java (98%) rename src/main/java/RIKU/server/{Controller/Advice => global/validation}/FieldValidationControllerAdvice.java (88%) rename src/main/java/RIKU/server/{Util/Exception/Validation => global/validation}/FieldValidationException.java (82%) rename src/main/java/RIKU/server/{Util/Exception/Validation => global/validation}/ValidationException.java (92%) rename src/main/java/RIKU/server/{Dto/Common => global/validation/dto}/FieldErrorsDto.java (83%) rename src/main/java/RIKU/server/{Dto/Common => global/validation/dto}/FieldValidationError.java (83%) rename src/main/java/RIKU/server/{Util => infra/storage}/AllowedImageFileExtensions.java (96%) rename src/main/java/RIKU/server/{Config => infra/storage}/S3Config.java (96%) rename src/main/java/RIKU/server/{Service => infra/storage}/S3Uploader.java (94%) diff --git a/docs/refactoring-migration-map.csv b/docs/refactoring-migration-map.csv new file mode 100644 index 0000000..20fd7e4 --- /dev/null +++ b/docs/refactoring-migration-map.csv @@ -0,0 +1,128 @@ +현재 위치,추천 변경 위치,도메인,이유,위험도 +Controller/AuthController.java,domains/auth/controller/AuthController.java,auth,로그인/ID 중복 확인/API 인증 흐름,중 +Service/AuthService.java,domains/auth/service/AuthService.java,auth,JWT 발급과 인증 서비스,중 +Dto/User/Request/LoginUserRequest.java,domains/auth/dto/request/LoginUserRequest.java,auth,로그인 전용 DTO,낮음 +Dto/User/Response/LoginUserResponse.java,domains/auth/dto/response/LoginUserResponse.java,auth,로그인 응답 DTO,낮음 +Dto/User/Response/UpdateUserRoleResponse.java,domains/auth/dto/response/UpdateUserRoleResponse.java,auth/admin,현재 AuthService에 있으나 실제로는 권한 변경 API,중 +Security/AuthMember.java,security/AuthMember.java,security,인증 Principal,중 +Security/AuthenticationProviderImpl.java,security/AuthenticationProviderImpl.java,security,로그인 인증 Provider,중 +Security/JwtAuthenticationFilter.java,security/JwtAuthenticationFilter.java,security,JWT 인증 필터,중 +Security/JwtInfo.java,security/JwtInfo.java,security,JWT 응답 값 객체,낮음 +Security/JwtTokenProvider.java,security/JwtTokenProvider.java,security,JWT 생성/검증,중 +Security/UserDetailsServiceImpl.java,security/UserDetailsServiceImpl.java,security,Spring Security 사용자 조회,중 +Config/SecurityConfig.java,config/SecurityConfig.java,config/security,전역 보안 설정,중 +Config/SwaggerConfig.java,config/SwaggerConfig.java,config,Swagger/OpenAPI 설정,낮음 +Controller/UserController.java,domains/user/controller/UserController.java,user,회원가입/프로필/출석 체크 API,중 +Service/UserService.java,domains/user/service/UserService.java,user,사용자 프로필과 일일 출석 처리,중 +Repository/UserRepository.java,domains/user/repository/UserRepository.java,user,사용자 저장소,중 +Entity/User/User.java,domains/user/entity/User.java,user,사용자 엔티티,중 +Entity/User/UserRole.java,domains/user/entity/UserRole.java,user,사용자 권한 enum,중 +Dto/User/Request/SignUpUserRequest.java,domains/user/dto/request/SignUpUserRequest.java,user,회원가입 DTO,낮음 +Dto/User/Request/UpdateProfileRequest.java,domains/user/dto/request/UpdateProfileRequest.java,user,프로필 수정 DTO,낮음 +Dto/User/Response/ReadUserProfileResponse.java,domains/user/dto/response/ReadUserProfileResponse.java,user,프로필 응답 DTO,낮음 +Dto/User/Response/ReadUserProfileDetailResponse.java,domains/user/dto/response/ReadUserProfileDetailResponse.java,user,프로필 상세 응답 DTO,낮음 +Dto/User/Response/ReadUserInfoResponse.java,domains/user/dto/response/ReadUserInfoResponse.java,user,여러 도메인에서 쓰는 사용자 요약 DTO,중 +Controller/AdminController.java,domains/admin/controller/AdminController.java,admin,운영진 API,중 +Service/AdminService.java,domains/admin/service/AdminService.java,admin,운영진 사용자/페이서 관리,중 +Dto/User/Request/AuthorizePacerRequest.java,domains/admin/dto/request/AuthorizePacerRequest.java,admin,운영진 전용 페이서 권한 DTO,낮음 +Dto/User/Request/UpdateUsersRequest.java,domains/admin/dto/request/UpdateUsersRequest.java,admin,운영진 사용자 수정 DTO,낮음 +Dto/User/Response/ReadUsersResponse.java,domains/admin/dto/response/ReadUsersResponse.java,admin,운영진 사용자 목록 응답,낮음 +Dto/User/Response/SearchAdminUsersResponse.java,domains/admin/dto/response/SearchAdminUsersResponse.java,admin,운영진 사용자 검색 응답,낮음 +Dto/User/Response/ReadPacersResponse.java,domains/admin/dto/response/ReadPacersResponse.java,admin/pacer,운영진/작성자용 페이서 목록 응답,낮음 +Controller/Post/PostController.java,domains/run/post/controller/PostController.java,run.post,게시글 공통 API,중 +Controller/Post/RegularPostController.java,domains/run/post/controller/RegularPostController.java,run.post,정규런 게시글 API,중 +Controller/Post/TrainingPostController.java,domains/run/post/controller/TrainingPostController.java,run.post,훈련 게시글 API,중 +Controller/Post/EventPostController.java,domains/run/post/controller/EventPostController.java,run.post,행사 게시글 API,중 +Controller/Post/FlashPostController.java,domains/run/post/controller/FlashPostController.java,run.post,번개 게시글 API,중 +Service/Post/PostService.java,domains/run/post/service/PostService.java,run.post,게시글 목록/수정/삭제/페이서 재배정,중 +Service/Post/RegularPostService.java,domains/run/post/service/RegularPostService.java,run.post,정규런 게시글 생성/상세,중 +Service/Post/TrainingPostService.java,domains/run/post/service/TrainingPostService.java,run.post,훈련 게시글 생성/상세,중 +Service/Post/EventPostService.java,domains/run/post/service/EventPostService.java,run.post,행사 게시글 생성/상세,중 +Service/Post/FlashPostService.java,domains/run/post/service/FlashPostService.java,run.post,번개 게시글 생성/상세,중 +Repository/PostRepository.java,domains/run/post/repository/PostRepository.java,run.post,공통 게시글 저장소,중 +Repository/RegularPostRepository.java,domains/run/post/repository/RegularPostRepository.java,run.post,정규런 저장소,중 +Repository/TrainingPostRepository.java,domains/run/post/repository/TrainingPostRepository.java,run.post,훈련 저장소,중 +Repository/EventPostRepository.java,domains/run/post/repository/EventPostRepository.java,run.post,행사 저장소,중 +Repository/FlashPostRepository.java,domains/run/post/repository/FlashPostRepository.java,run.post,번개 저장소,중 +Repository/AttachmentRepository.java,domains/run/post/repository/AttachmentRepository.java,run.post,게시글 첨부파일 저장소,중 +Entity/Board/Post/Post.java,domains/run/post/entity/Post.java,run.post,공통 게시글 엔티티,중 +Entity/Board/Post/RegularPost.java,domains/run/post/entity/RegularPost.java,run.post,정규런 엔티티,중 +Entity/Board/Post/TrainingPost.java,domains/run/post/entity/TrainingPost.java,run.post,훈련 엔티티,중 +Entity/Board/Post/EventPost.java,domains/run/post/entity/EventPost.java,run.post,행사 엔티티,중 +Entity/Board/Post/FlashPost.java,domains/run/post/entity/FlashPost.java,run.post,번개 엔티티,중 +Entity/Board/Post/PostType.java,domains/run/post/entity/PostType.java,run.post,게시글 타입 enum,중 +Entity/Board/PostStatus.java,domains/run/post/entity/PostStatus.java,run.post,게시글 상태 enum,중 +Entity/Board/Attachment.java,domains/run/post/entity/Attachment.java,run.post,게시글 첨부파일 엔티티,중 +Dto/Post/Request/CreateRegularPostRequest.java,domains/run/post/dto/request/CreateRegularPostRequest.java,run.post,정규런 생성 DTO,낮음 +Dto/Post/Request/CreateTrainingPostRequest.java,domains/run/post/dto/request/CreateTrainingPostRequest.java,run.post,훈련 생성 DTO,낮음 +Dto/Post/Request/CreateEventPostRequest.java,domains/run/post/dto/request/CreateEventPostRequest.java,run.post,행사 생성 DTO,낮음 +Dto/Post/Request/CreateFlashPostRequest.java,domains/run/post/dto/request/CreateFlashPostRequest.java,run.post,번개 생성 DTO,낮음 +Dto/Post/Request/UpdatePostRequest.java,domains/run/post/dto/request/UpdatePostRequest.java,run.post,게시글 수정 DTO,낮음 +Dto/Post/Response/ReadPostListResponse.java,domains/run/post/dto/response/ReadPostListResponse.java,run.post,게시글 목록 응답,낮음 +Dto/Post/Response/ReadPostPreviewResponse.java,domains/run/post/dto/response/ReadPostPreviewResponse.java,run.post,게시글 미리보기 응답,낮음 +Dto/Post/Response/ReadRegularPostDetailResponse.java,domains/run/post/dto/response/ReadRegularPostDetailResponse.java,run.post,정규런 상세 응답,낮음 +Dto/Post/Response/ReadTrainingPostDetailResponse.java,domains/run/post/dto/response/ReadTrainingPostDetailResponse.java,run.post,훈련 상세 응답,낮음 +Dto/Post/Response/ReadEventPostDetailResponse.java,domains/run/post/dto/response/ReadEventPostDetailResponse.java,run.post,행사 상세 응답,낮음 +Dto/Post/Response/ReadFlashPostDetailResponse.java,domains/run/post/dto/response/ReadFlashPostDetailResponse.java,run.post,번개 상세 응답,낮음 +Controller/HomeController.java,domains/run/home/controller/HomeController.java,run.home,런 홈 카드 조회 API,중 +Service/HomeService.java,domains/run/home/service/HomeService.java,run.home,홈 화면용 게시글 조회,중 +Dto/Post/Response/ReadHomeResponse.java,domains/run/home/dto/response/ReadHomeResponse.java,run.home,홈 응답 DTO,낮음 +Dto/Post/Response/ReadHomeCardResponse.java,domains/run/home/dto/response/ReadHomeCardResponse.java,run.home,홈 카드 응답 DTO,낮음 +Controller/ParticipantController.java,domains/run/participant/controller/ParticipantController.java,run.participant,참여/출석 API,중 +Service/ParticipantService.java,domains/run/participant/service/ParticipantService.java,run.participant,참여/출석 비즈니스 로직,중 +Repository/ParticipantRepository.java,domains/run/participant/repository/ParticipantRepository.java,run.participant,참여 저장소,중 +Entity/Participant/Participant.java,domains/run/participant/entity/Participant.java,run.participant,참여 엔티티,중 +Entity/Participant/ParticipantStatus.java,domains/run/participant/entity/ParticipantStatus.java,run.participant,참여 상태 enum,중 +Dto/Participant/Request/AttendParticipantRequest.java,domains/run/participant/dto/request/AttendParticipantRequest.java,run.participant,출석 요청 DTO,낮음 +Dto/Participant/Request/ManualAttendParticipantRequest.java,domains/run/participant/dto/request/ManualAttendParticipantRequest.java,run.participant,수동 출석 요청 DTO,낮음 +Dto/Participant/Response/GroupParticipantResponse.java,domains/run/participant/dto/response/GroupParticipantResponse.java,run.participant,그룹별 참여자 응답,낮음 +Dto/Participant/Response/ReadParticipantListResponse.java,domains/run/participant/dto/response/ReadParticipantListResponse.java,run.participant,참여자 목록 응답,낮음 +Dto/Participant/Response/UpdateParticipantResponse.java,domains/run/participant/dto/response/UpdateParticipantResponse.java,run.participant,참여 상태 변경 응답,낮음 +Controller/CommentController.java,domains/run/comment/controller/CommentController.java,run.comment,댓글 API,중 +Service/CommentService.java,domains/run/comment/service/CommentService.java,run.comment,댓글 생성/삭제,중 +Repository/CommentRepository.java,domains/run/comment/repository/CommentRepository.java,run.comment,댓글 저장소,중 +Entity/Board/Comment.java,domains/run/comment/entity/Comment.java,run.comment,댓글 엔티티,중 +Dto/Post/Request/CreateCommentRequest.java,domains/run/comment/dto/request/CreateCommentRequest.java,run.comment,댓글 생성 DTO,낮음 +Dto/Post/Response/ReadCommentsResponse.java,domains/run/comment/dto/response/ReadCommentsResponse.java,run.comment,댓글 응답 DTO,낮음 +Entity/Board/Pacer.java,domains/run/pacer/entity/Pacer.java,run.pacer,페이서 배정 엔티티,중 +Repository/PacerRepository.java,domains/run/pacer/repository/PacerRepository.java,run.pacer,페이서 저장소,중 +Dto/Post/Request/CreatePacerRequest.java,domains/run/pacer/dto/request/CreatePacerRequest.java,run.pacer,페이서 생성 DTO,낮음 +Dto/Post/Request/UpdatePacerRequest.java,domains/run/pacer/dto/request/UpdatePacerRequest.java,run.pacer,페이서 수정 DTO,낮음 +Dto/Post/Response/ReadPacersListResponse.java,domains/run/pacer/dto/response/ReadPacersListResponse.java,run.pacer,페이서 목록 응답,낮음 +Dto/Post/Response/ReadPaceGroupResponse.java,domains/run/pacer/dto/response/ReadPaceGroupResponse.java,run.pacer,페이스 그룹 응답,낮음 +Controller/CalendarController.java,domains/calendar/controller/CalendarController.java,calendar,일정 API,중 +Service/CalendarService.java,domains/calendar/service/CalendarService.java,calendar,일/월 일정 조회,중 +Dto/Calendar/Response/ListMonthlyScheduleResponse.java,domains/calendar/dto/response/ListMonthlyScheduleResponse.java,calendar,월별 일정 목록 응답,낮음 +Dto/Calendar/Response/ReadDailyScheduleResponse.java,domains/calendar/dto/response/ReadDailyScheduleResponse.java,calendar,일별 일정 응답,낮음 +Dto/Calendar/Response/ReadMonthlyScheduleResponse.java,domains/calendar/dto/response/ReadMonthlyScheduleResponse.java,calendar,월별 일정 응답,낮음 +Controller/UserPointController.java,domains/point/controller/UserPointController.java,point,포인트/랭킹 API,중 +Service/UserPointService.java,domains/point/service/UserPointService.java,point,포인트/랭킹 계산,중 +Repository/UserPointRepository.java,domains/point/repository/UserPointRepository.java,point,포인트 저장소,중 +Entity/User/UserPoint.java,domains/point/entity/UserPoint.java,point,포인트 엔티티,중 +Entity/User/PointType.java,domains/point/entity/PointType.java,point,포인트 타입 enum,중 +Dto/User/Request/ReadUserEventRankingRequest.java,domains/point/dto/request/ReadUserEventRankingRequest.java,point,이벤트 랭킹 요청 DTO,낮음 +Dto/User/Response/ReadPointListResponse.java,domains/point/dto/response/ReadPointListResponse.java,point,포인트 내역 응답,낮음 +Dto/User/Response/ReadUserParticipationsResponse.java,domains/point/dto/response/ReadUserParticipationsResponse.java,point,참여/포인트 응답,낮음 +Dto/User/Response/ReadUserPointResponse.java,domains/point/dto/response/ReadUserPointResponse.java,point,사용자 포인트 응답,낮음 +Dto/User/Response/ReadUserRankingResponse.java,domains/point/dto/response/ReadUserRankingResponse.java,point,랭킹 응답,낮음 +Config/S3Config.java,infra/storage/S3Config.java,storage,S3 client 설정,중 +Service/S3Uploader.java,infra/storage/S3Uploader.java,storage,S3 업로드/삭제 구현,중 +Config/SeasonProvider.java,domains/season/SeasonProvider.java,season,시즌 시작일 비즈니스 설정,낮음 +Controller/Advice/GlobalRestControllerAdvice.java,global/exception/GlobalRestControllerAdvice.java,global,전역 예외 처리,중 +Controller/Advice/FieldValidationControllerAdvice.java,global/validation/FieldValidationControllerAdvice.java,global,전역 validation 처리,중 +Util/BaseResponse.java,global/response/BaseResponse.java,global,공통 응답 포맷,중 +Util/BaseResponseStatus.java,global/response/BaseResponseStatus.java,global,공통 응답 코드,중 +Dto/Common/FieldErrorsDto.java,global/validation/dto/FieldErrorsDto.java,global,validation error DTO,낮음 +Dto/Common/FieldValidationError.java,global/validation/dto/FieldValidationError.java,global,validation error DTO,낮음 +Entity/Base/BaseEntity.java,global/entity/BaseEntity.java,global,모든 엔티티 공통 base,중 +Entity/Base/BaseStatus.java,global/entity/BaseStatus.java,global,공통 상태 enum,중 +Util/Exception/CustomJwtException.java,global/exception/CustomJwtException.java,global/security,JWT 예외,중 +Util/Exception/Domain/CustomException.java,global/exception/CustomException.java,global,도메인 예외 base,중 +Util/Exception/Domain/UserException.java,domains/user/exception/UserException.java,user,사용자 도메인 예외,중 +Util/Exception/Domain/PostException.java,domains/run/post/exception/PostException.java,run.post,게시글 도메인 예외,중 +Util/Exception/Domain/ParticipantException.java,domains/run/participant/exception/ParticipantException.java,run.participant,참여 도메인 예외,중 +Util/Exception/Validation/FieldValidationException.java,global/validation/FieldValidationException.java,global,validation 예외,낮음 +Util/Exception/Validation/ValidationException.java,global/validation/ValidationException.java,global,validation 예외,낮음 +Util/DateTimeUtils.java,global/util/DateTimeUtils.java,global,시간 변환 유틸,낮음 +Util/ConvertCreatedDate.java,global/util/ConvertCreatedDate.java,global,댓글 생성일 변환,낮음 +Util/AllowedImageFileExtensions.java,infra/storage/AllowedImageFileExtensions.java,storage,현재 사용처 확인 필요,낮음 diff --git a/docs/refactoring-migration-map.xlsx b/docs/refactoring-migration-map.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..ab3fbb5c31022d41efda61b6432b4612e70884db GIT binary patch literal 7437 zcmZ{p1yCH@wuZ4m26qAk56(c4;1(PL4DRkuaMuhj!F2+J-~?v~5F8R5!eE12kO09U z_~X3$s?NRVz1LmUyIR)j`q$rk@9O=5RZ!7LkdTltkp^75jFW3z0??6>ka$p#kcgkI z8p*i1dfB*onQ8mG+jyFQ{9K$rr>Ls+@en|2E&YuKTn*^nrF!*D5b39*;*2xZZ%Fzt zrG7{RC~N?Q94x|t%XO59qmJtj2gxm09^!_5J`_rUdM6qB9#Lx7^6fPn6M45AaeT^a zlsqdI16PVcCRusGQkKH|xRmj;)ZnVsBP6v5{8P`6r#_ha3_nt>VvpTPC-Q~ za=AXoZC?k-V9fRHFU@EJWcm9MV?9Fk?0EDPpXqE&ejA@fYEok{u-M^Wh)gn2eGya2 zPG3d-zGM}WT~1}KP5?)pKS(W3sg=OvUcuiudck6N1DgR-)xusWph03L!O7Xxgl8mV zO-A`U6Sk>m`uCnGNB3spTX)MBEa3krn}y636YQy6>`$e`ernA;Y@9v0L4O?+C&cl3 zd2j%0RkAA%K-Aae4&?8qNi$I2P2X$4g_Kd6?5x%ljl&a2Uh)`*Jbbtd5Noug6lgCx z6Mu%h&jg5)*I3Te?QRvR@#zkFUz(YV1I+#*lVZm*&D&4BdNJE*Pr+S?-Sb=cs8~#$ zQC-xvj|ZnCuDc@zUc`#CXb^$&tf3jhoNIy1G6kjLVSKho;TLHo^Vmu(6V2+;?OD}g zN7+nAsv*g5i*|=@!ek=#Xm)*EqeK4PhedtYW|@XWu~p8DmMw>{31fI|+^eJrMjlPD~V{7H=&k&|^8(Ck|z zYV4VWK0k01`KB#HyIH-%;@fY0d-pmTydMF7H7kd2fgQ4YmvLANh^GBd$$?dGYFnSA zay&_<{Fmf^nfmX-|Ht4l;FG}^$9in7?anl^)=+XnpNwmyk`W1aClxKpOJ|xOCbOOm zX==Y?l2plSh}cnbP#_h?Tl$F(0ip&bfVBK#o8aenR?TMB((d3=-ADl@3x+6{6k2;Q zeU1B^DA^Al&LZp{7Xkxces;BLM&h(@HyV)n8#3q=%M1|+?ge>R3~OZ@HjLoj$B`8f zzWEMQg*z=61k((?qh&dEypI+ANTBi42uLKs_|11HwH$>^cwB3uFRWK}g7igO`q_ zO4E2?|4!KQy^kQ}(X(5182Y%XWWr6)@j>eC>}l#Ie!Fz78I zwDnB#vehW6M0?Tm4pW*Y0ek+eEImpi)6g$ozu!D8U<5zvehNCYW|II$BsaQ&F2+Gz zWs)(~ zs>}?2D`6GlQz1!x9{n&Q^v3L{jPRs&Z-v$0XN_r7<8*%|M?OE!=5cbDEZnWQduwNT z%l_bv>9Vl!4eobr63J^z{%Z?CgybxmNtn`=8O!EQZcIFnrC6@Sib@(6x`3wCixOL< z3M_3|o`gPgp5wl6*HAyLklWcVKSA;5uRcvP(J$J@s?Kq@mcIg(WI~~cd zh@%_fqz$JS3I|TQq)`BXNY?$wMAz-QfSresgz&@N)=Zx8h&BI*I}zpIU6bpw%KYO# zv5mMJ-2Kv<0da+I2Oj61OU6+h0jTaRE|pJE-o=xUuU%?h*OfL%4ae}_T%Qv8r0x`N z?ct9@oIhx_GUps}`Md?Q?H!~2c3(qYX7y*p!o6|z ztWU*g5p|HzLH;r~0zUm#?xka-2Em7Wbdhewcj#YDQA~G`x&k>&w@%bT35fOBh!Qvf z0G4u@c*_Rqfgt@$d;aIof4%=`PFc~;>C)SPJgw44h5QbaltBj2!*2f^6`1>WB(OHE zFI4?;RXxen={cIFdEiUEdV|5}^1B)U?d?xH;z(Id4HLE=Wrx_0h55U7w?n%}iD|{6 zdw_}(EZk?oY|7l*49OZFN85I>Lk=!5G=Au%CbEzu9H0R>$_Id}vpx${E<$I%J50X# zQyMO(oQL;a;`tK6Ke8W18r@zRF~L7GG73E-;^fz;5cj*Y z5>XC-inV3k)OjIYC}P9MA+1wUt%FXZ7AvQ(UfsR7iq&ot&_*l%_#)uq09 z01{u5k5NsN5$Ke7nE%bChCp^yxaQgVquMrCo3}S$dhEQ(Swre(NUihwbn95{^k5=! z?>Fo7*CqFXjMx783762O+T4(Uu&7ILdaGs0p+|~nwtBy{*q2xe)&?YDUOf^p;RXa$ z<}9ZIYgEb++zVAx@^?Eul~S1>7jK=CXdP5AK52<8r^Q&WUQJoG99MJ<_te+ZlQL1H z3SdOoiK}z(J}N(aJc1p3&EOczh#&16@Nzai-@2xyVAj+R+fxxvz-N;Vn!HvFO7<4JEc!BDk--{}qHyHAX)fcAE*kWd=|*Ka(`S)d zROrotn9l*MlS4UftlctMG}W;Q7}&wKy8h=&n$O}_I8(x6&5^-jnqdw zO;hOVv6S*}Gs?iLb67)~uv6h+<~TV}Hezn7BXcX|EaWx52qzqZ&ke1V4f!%!U$`@k zX&ZJh+g+TtjQNX~Hz@K|7O@pFZ)3U`4ApQB{XLn=UJrl0{84ZQG`@ASP?c7e~6nKMBq;95AOmXWhVR2?K zLPL*3s1U{%G{)-OZT~{4w7Q(U)u|0~?Z(tQ(chg?dX)m{4Yuv~&CajaE}GLJ2S1mI zme4>AK5e08Uj0qJNy_E>>6?d}(k6nJ=K~<8s*~JD@GNs4M{=6^cutkUoJb!)QB?IB z#(RO-ktHppGz09Z8lkUfw@RE{&WB0bsrLMIW9BZrd*dUj_2V>JCBX9`aSNgM)Kl3W z2fh{DD@r+ZQcShOaD3cM@utv4Zu`vFFfX=kFnu)*bIg5ThWAVoI+o?S+2k&u6c(lx zM-N4w44pjR*_u&@cip{1PXUJ^U=;_8Oqtl^6lN!aKIo?Qak+fuBGb*9nAs6bNpmE$ z&^z7_cNdc>2ZUbjHUpXGC0v#UZ;@}Bc_1^iuGyM9K@~{>9n>h>boIrBdxBTY6J3Jl zt~*jjQ{gZiYWwlK4b@PJJd~a4ay-Apr&`lF^py-f{t-I_1FBxScH9khZCc`eR`y!*Dkc zs8GlN)m}|t*`^-i{Hmi$&b4I}k-FUkX^CMUoS{jy85f2F&nTblPMg#Kmo#q0E`E-N zm2kOi-WLN;8dNsjWrSlEwGE{l;skIiy)rnRSO@Adw;L0$a@ng#@DgptTE~G-S`Nr1 zO0$#1AAYm?&-&zPEKV80Qam+%POO=5d`_e)fID?Hu&@OtdwUK$TTNtDmtWz$IMxoJ z#X&Z<_Zgtkcg^*+I9ys!F367GD(5!;#El$&9yv(QRy|WQf(EOH;<$KXW=DP+n^&T2 zhGsaca3JI_6{SsljF|HiO|0!Rq`J|VtiQ=ky+5S3HWC?p$YUtt(cXp4#IS@**B3B zX6MPt>~UoQBrmXJ@L8hCm<&bn=Tm6vBJ)*AKQG*FivCPgHSd{~)sfNxf^c$^nOGZm zvgtXVn_*mMvm+Y1zUwF6n}%m(kbqOIfr6c6s2Hgg(8hg5yE$oC$#B!b%1bRPH$5Jk z7l3r8oL-lT0ikefN4qVNsX_1e;y--#=Um;0cdRLlgi7EaNdVeRu^;IWR;rRCSG~n~ zxP>T@Isq`e1_shA7vQ2&ulg0XM<>w#S#jOF`x0+$t%lHiwDRG6r+S=a0WNP z8;+SBRgKbQ3ymT^&;={Czxw%Da=Z(+Zu^hX<&*-(%^E211* z36ODAxPjp{)9dt^<`i3WQ&F|D`@xw|nCUBu3$M+SN?kh`n;D@d(F-Y+MKy00c%~D@ zO*7gYh>+9XPp>CUS$p$N{Bg9|KiBh$w-mV9sl zeoIqWHDD@r?4@7hljj*%H_r%vH}P9(=`RO6X3KO_Gx?Bs1q5Q$kB~SXZs0c4S{6o{Uafi(eg(V!DsL;p^KGE_h;=h? zSbyR;Qz<*FR_@Rmg_)7VvM#E8MWo_0N}0y2zFtSt~_uZI%wfFkfI@Np0h}=1a=^ zb8@l?Q$V~n_ z{H^P#?4a`mO^@}?4v`$R(RAMgP33r6kO2)1OEUg8%VW4Ml>+>`zY1!5+=LDn40mL; z!0Brd83WDCIK4R@@vJ+WXSnyJc~sUFGyd-vS7t(KZr_J|3mg%PTnRPGi*1f|eLB)s zb&){!kHB}CPj9f+#Msq26Pctccjrko5t-JpUDrk~3P~)Yy4H}JuHEX%R=OH8kBTn> z*g6*BW5BaZZjEhpHIZ#?>nSU9`)o67EYOL!-2I!R)VR$y-6`9=@~S>9YS*QIpXjfb zJm3nt+;i~DMkY01=giGTppDvU;(XaM%s;#F5){56OmeIa-l;ro!tvU0pJpiM<_Vx9(tXXE)hrZ)I->7g;JkMDxreOxOBx?-OV3 zI0ow9u$YUawRPjRc2TQ8oXrhYrSLfoou0j0%g0S$=V0VIVt4TO&d7lVXg);#AR-^N z)TWM4K(Xboz+Xx-(uJ5@MNm4wo&BV0%IMNiBQ)^ZIdKAa)IvLV;Tmn!4opGOK7TS% zkc=6R>iuU!k-NiotwgRa!$pAa_y<^(OU9SEEWmyf2gP=U z%fvsWS_Ai8%%TYVjI`j1G`Lw4D8}svpeM}r-;bY=*(UrT0jHq?^;EG7(>EbKIN&|M zIhi~{y&H23$dDV|N7orD7EB9YiY3|JiaG?${o<-8llqf(RR}_N zOOfy9r}p0kW1ntSiznF*sf4yian5guVf;w($aEuQ#J6sm8m}G0~gE?zA zV-~Y}$M%P{yC(f&HsbPxFGeMVJh-^DE0T^O51i9$*DA?hOg-(~Z=y~sBxt%2>>T}W z>2lqi{K0?FGM?Sva_1x7FvzV2C>*ynz28S?fdk#v@B=>#MWPlh<@>ix8fGKCd>SG{ zYpNi)&(|LEs=blnv_c6XQw{t{`^Q7?&)DKNTDG?(3&8*@(L(_u|ASaC0Jw+LjnG*UW zJ0_Mu4s_2qf$(|qYFtYp^3lSxJahTJ4)fV4NrwZl3MawJgg*)@)&^R9Iq_%$FI-g0$H^zOh2 z$*;mqcSvu3cdF4mDkf~##US4%^?qo`TeE09gYvwU3|=n8%wI;6D=$!4GnN(Df=qj@_i?15_8rm@uhpZ<)$EaV1D*U16z*Apk5WcTP6 z7mp3-!y!N{acRF*r;$Cp8wa!BOvU7D(!4^sRKwLAXu>0Y&ECO*1b*VZu~sQ?0%5lB z62*jL)ut)r%L10wq`#&u7rXHxbqsh%3Qc*5x)*7|E(1P)7gI1dFeLASG)ZUW3s<9+8i8QI)3B10zjg~%6 z$$Abh9K9KRh&4~%67;B#dQ_TQ9giX<`xT)zr-wq>vr`<@)Z)wSpL*%35V%%9{SL*` zg+q5rzz<{_eh=-G+znpCz3B+L(}@%x)~M?;a9r3XFvbf86uRZ>NIjTZlX5PXReez> zHz?bG8#?K?82{&)Q?&*d^qr8|BO(os3fWm3$8+a~6_!MP8S?GgwOIHp-&SKuXR-xh z=gG;#t|x+|w-&r7o{5Agtb@W-Ll#v7<;3;dOBCmHmWotB^5{lJXZXhhJUG3q!5LEV zO_eUMUtzvVBh9a-0mW%ZJceXajt5BrB0=DjKv3(K^5YC#>!f#u2_#sMkO8SINIQI)<@f)_G%{y2_N*Wh}VIo<{MSujE(Vgz$?Pu0#{9mp-c2CTjGZ?{6C;Vv%jj zv3aO?Y?+$vEk?KEe{4lBTR-}_@|qVTy$~9XYjk4B`&gD=>rcV6O@`{*@JvK$K~dKn z@kUMkSzDdQ>?yySxTA{Toc5A2u|J{sFXzmozaXArko$_}&Gb%P3y|*2F+mHe2Qb`wdpNzh7^BRu`>JJAcYr)9GpU~o|Yt*gXD0r6~cv)Pmrdre*J5;*Dd&YWQB zG%ySH755SP(B1V%=>WgjIlMs18P>07W@zr<*bGEhy^^=%s=vex4FCWD literal 0 HcmV?d00001 diff --git a/docs/refactoring-proposal.md b/docs/refactoring-proposal.md new file mode 100644 index 0000000..5a4d569 --- /dev/null +++ b/docs/refactoring-proposal.md @@ -0,0 +1,329 @@ +# RIKU-BE 리팩터링 제안서 + +작성일: 2026-05-31 + +이 문서는 현재 레포지토리를 기준으로 한 도메인 기반 패키지 재구성 및 코드 개선 제안입니다. 실제 파일 이동이나 코드 변경은 아직 수행하지 않았고, 검토용 제안만 정리했습니다. + +## 1. 현재 구조 요약 + +현재 프로젝트는 대부분 기술 계층 기반 구조입니다. + +```text +RIKU.server + Config + Controller + Dto + Entity + Repository + Security + Service + Util +``` + +특징: + +- `Controller`, `Service`, `Repository`, `Entity`, `Dto`로 나뉜 layer-based 구조입니다. +- `src/main/java/RIKU/server/domains` 아래에 `auth`, `post`, `user` 빈 디렉터리가 있어 도메인 구조 전환 흔적은 있지만 실제 Java 파일은 기존 구조에 남아 있습니다. +- 주요 비즈니스는 사용자, 인증, 런 게시글, 참여/출석, 댓글, 페이서, 일정, 포인트/랭킹, 운영진 관리로 나뉩니다. + +## 2. 도메인 후보 + +실제 코드 기준 도메인 후보: + +- `auth`: 로그인, JWT 발급, 인증 흐름 +- `user`: 회원가입, 프로필, 일일 출석 +- `admin`: 운영진 사용자 관리, 페이서 권한 관리, 임시 비밀번호 발급 +- `run.post`: 정규런/훈련/행사/번개 게시글, 게시글 목록/상세/수정/삭제 +- `run.participant`: 런 참여, 출석 코드, 출석, 마감, 수동 출석 처리 +- `run.comment`: 게시글 댓글/대댓글 +- `run.pacer`: 페이서 배정, 페이스 그룹 +- `run.home`: 홈 화면 카드 조회 +- `calendar`: 일/월 일정 조회 +- `point`: 포인트, 참여 내역, 랭킹 +- `storage`: S3 업로드/삭제 +- `security`: JWT, 인증 필터, 인증 Principal +- `global`: 공통 응답, 공통 예외, validation, base entity, 날짜 유틸 + +레포지토리에서 `chat`, `notification`, `goal`, `badge`, `suggestion`에 해당하는 구현은 확인되지 않았습니다. + +## 3. 추천 패키지 구조 + +```text +RIKU.server + ServerApplication + + config + SecurityConfig + SwaggerConfig + + security + AuthMember + AuthenticationProviderImpl + JwtAuthenticationFilter + JwtInfo + JwtTokenProvider + UserDetailsServiceImpl + + global + response + exception + validation + entity + util + + infra + storage + S3Config + S3Uploader + + domains + auth + controller + service + dto.request + dto.response + + user + controller + service + repository + entity + dto.request + dto.response + + admin + controller + service + dto.request + dto.response + + run + post + controller + service + repository + entity + dto.request + dto.response + participant + controller + service + repository + entity + dto.request + dto.response + comment + controller + service + repository + entity + dto.request + dto.response + pacer + repository + entity + dto.request + dto.response + home + controller + service + dto.response + + calendar + controller + service + dto.response + + point + controller + service + repository + entity + dto.request + dto.response + + season + SeasonProvider +``` + +## 4. 핵심 파일 이동 요약 + +상세 이동표는 `docs/refactoring-migration-map.csv`에 별도로 정리했습니다. + +요약: + +- 인증 관련: `AuthController`, `AuthService`, 로그인 DTO는 `domains/auth`로 이동 +- 사용자 관련: `UserController`, `UserService`, `UserRepository`, `User`, `UserRole`, 프로필 DTO는 `domains/user`로 이동 +- 운영진 관련: `AdminController`, `AdminService`, 운영진 전용 DTO는 `domains/admin`으로 이동 +- 게시글 관련: `Controller/Post`, `Service/Post`, post 관련 repository/entity/dto는 `domains/run/post`로 이동 +- 참여/출석 관련: `ParticipantController`, `ParticipantService`, participant entity/repository/dto는 `domains/run/participant`로 이동 +- 댓글 관련: `CommentController`, `CommentService`, comment entity/repository/dto는 `domains/run/comment`로 이동 +- 페이서 관련: `Pacer`, `PacerRepository`, pacer DTO는 `domains/run/pacer`로 이동 +- 포인트/랭킹 관련: `UserPointController`, `UserPointService`, `UserPointRepository`, `UserPoint`, `PointType`, 랭킹 DTO는 `domains/point`로 이동 +- 공통 인프라: `S3Config`, `S3Uploader`는 `infra/storage`로 이동 +- 공통 코드: `BaseResponse`, `BaseResponseStatus`, advice, validation DTO, base entity, exception, util은 `global`로 이동 + +## 5. 코드 개선 제안 + +### 보안 설정 우선 검토 + +`SecurityConfig`에서 `/user/**`가 `permitAll()`로 열려 있습니다. 현재 이 패턴은 로그인/회원가입뿐 아니라 `/user/profile`, `/user/attend`, `/user/{userId}/role`까지 포함할 수 있습니다. 특히 `AuthController.updateUserRole`은 테스트용 API로 보이며 권한 상승 위험이 있으므로 리팩터링 전에 먼저 확인해야 합니다. + +### 큰 서비스 분리 + +- `ParticipantService`: 참여, 출석 코드, 출석 마감, 포인트 지급, 관리자 출석 보정까지 담당합니다. +- `PostService`: 게시글 목록, 수정, 삭제, 첨부파일 삭제, 페이서 재배정까지 담당합니다. +- `RegularPostService`, `TrainingPostService`, `EventPostService`, `FlashPostService`: 이미지 업로드, 첨부파일 업로드, 댓글 트리 변환 로직이 반복됩니다. + +분리 후보: + +- `AttendanceService` +- `ParticipationService` +- `PointGrantService` +- `PostAttachmentService` +- `CommentTreeReader` +- `PacerAssignmentService` +- `PostQueryService` +- `PostUpdateService` +- `PostDeleteService` + +### 쿼리/성능 개선 후보 + +- `UserPointService`와 `AdminService`는 사용자 목록을 가져온 뒤 사용자별 포인트 합계/참여 횟수를 반복 조회합니다. +- 데이터가 늘면 N+1 조회 문제가 커질 수 있습니다. +- aggregate query 또는 projection 기반 조회로 개선하는 것이 좋습니다. + +### 데이터/동작 위험 후보 + +- `CommentService.deleteComment`는 soft delete로 status만 변경하지만, 댓글 조회 쪽은 status 필터를 확인하지 않습니다. +- 삭제 댓글이 다시 보일 가능성이 있습니다. +- `BaseResponseStatus`에서 `INVALID_POST_TYPE`과 `INVALID_RUN_TYPE`이 같은 `3010` 코드를 사용합니다. +- 파일 크기 메시지는 10MB/20MB라고 되어 있지만 실제 설정은 50MB 기준입니다. +- `UserPointService.EXCLUDED_USER_IDS`는 사용자 ID 하드코딩입니다. +- `JwtAuthenticationFilter`는 debug 로그로 token 값을 출력합니다. +- `AllowedImageFileExtensions`는 현재 사용처가 확인되지 않습니다. + +## 6. 우선순위 + +### High Priority + +1. `/user/**` 보안 설정과 `AuthController.updateUserRole` 운영 필요성 확인 +2. 리팩터링 전 최소 테스트 추가 +3. 동작 변경 없는 package/import 이동부터 진행 + +### Medium Priority + +1. `ParticipantService`, `PostService` 책임 분리 +2. 댓글 soft delete 조회 필터 검토 +3. 포인트/랭킹/관리자 목록 조회 쿼리 최적화 + +### Low Priority + +1. DTO 이름/위치 정리 +2. unused field/import 제거 +3. 응답 message Map을 명시적 DTO로 변경 +4. 인코딩/주석 정리 +5. `AllowedImageFileExtensions` 제거 또는 실제 검증 로직에 적용 + +## 7. 안전한 단계별 진행 계획 + +### Step 1. 현재 기준선 확보 + +- 목표: 빌드/테스트 가능 상태 확인 +- 대상 파일: 없음 +- 검증: `.\gradlew.bat compileJava`, `.\gradlew.bat test` +- 위험도: 낮음 + +### Step 2. 도메인 구조 확정 + +- 목표: 최종 패키지 구조 합의 +- 대상 파일: 없음 +- 검증: 문서 리뷰 +- 위험도: 낮음 + +### Step 3. global/config/security/infra 이동 + +- 목표: 비즈니스 도메인과 공통 인프라 분리 +- 대상 파일: `Config/*`, `Security/*`, `Util/*`, `Controller/Advice/*`, `Dto/Common/*`, `Entity/Base/*`, `S3Uploader` +- 검증: `.\gradlew.bat compileJava`, `.\gradlew.bat test` +- 위험도: 중 + +### Step 4. auth/user 이동 + +- 목표: 인증과 사용자 도메인 분리 +- 대상 파일: `AuthController`, `AuthService`, `UserController`, `UserService`, `UserRepository`, `User`, `UserRole`, 관련 DTO +- 검증: 회원가입, 로그인, 프로필 조회/수정 API smoke test +- 위험도: 중 + +### Step 5. run.post/run.home/run.pacer 이동 + +- 목표: 런 게시글 중심 도메인 분리 +- 대상 파일: `Controller/Post/*`, `Service/Post/*`, `HomeController`, `HomeService`, post/pacer/attachment entity/repository/dto +- 검증: 게시글 목록/상세/생성/수정/삭제 API smoke test +- 위험도: 중~높음 + +### Step 6. run.participant/run.comment 이동 + +- 목표: 참여/출석/댓글 도메인 분리 +- 대상 파일: `ParticipantController`, `ParticipantService`, `CommentController`, `CommentService`, participant/comment entity/repository/dto +- 검증: 참여, 출석 코드 생성, 출석, 마감, 댓글 생성/삭제 API smoke test +- 위험도: 중 + +### Step 7. calendar/point/admin/season 이동 + +- 목표: 나머지 도메인 정리 +- 대상 파일: `Calendar*`, `UserPoint*`, `Admin*`, `SeasonProvider`, 관련 DTO/entity/repository +- 검증: 캘린더, 랭킹, 마이페이지 참여 내역, 관리자 API smoke test +- 위험도: 중 + +### Step 8. 중복 로직 추출 + +- 목표: package 이동 후 서비스 책임 분리 +- 대상 파일: `PostService`, `RegularPostService`, `TrainingPostService`, `EventPostService`, `FlashPostService`, `ParticipantService` +- 검증: 기존 API 응답 비교, 서비스 단위 테스트 +- 위험도: 중~높음 + +## 8. 테스트 및 검증 계획 + +현재 확인된 테스트는 `ServerApplicationTests` 하나뿐입니다. 리팩터링 전 다음 테스트를 우선 추가하는 것이 안전합니다. + +- Auth: 로그인 성공/실패, JWT 발급 +- User: 회원가입 중복 학번, 프로필 조회/수정, 일일 출석 중복 +- Post: 정규/훈련/행사/번개 생성, 상세 조회, 수정, 삭제 +- Participant: 참여/취소, 출석 코드 생성, 출석, 마감 시 포인트 지급 +- Comment: 댓글/대댓글 생성, 삭제 댓글 조회 제외 +- Point: 랭킹 동점 처리, 제외 사용자 처리, 기간별 이벤트 랭킹 +- Security: 인증이 필요한 `/user/profile`, `/user/attend`, `/admin`, `/run/**` 접근 제어 + +실행 명령: + +```powershell +.\gradlew.bat compileJava +.\gradlew.bat test +.\gradlew.bat build +``` + +DB/S3/JWT 환경변수 때문에 테스트 실행이 실패할 수 있습니다. 테스트용 H2/profile/mock S3 구성은 별도 확인이 필요합니다. + +## 9. 리팩터링 전 확인 필요 사항 + +- `/user/{userId}/role` API가 운영에서 필요한지, 테스트용 잔재인지 +- `/user/**` 전체 permitAll이 의도된 설정인지 +- `domains` 빈 디렉터리를 그대로 사용할지 새 구조로 정리할지 +- 도메인 명칭을 `run` 중심으로 할지 `post`, `attendance` 등으로 더 나눌지 +- `AdminService.getPacers()`가 admin 도메인인지 pacer 도메인인지 +- 삭제 댓글을 API 응답에서 숨겨야 하는지 +- 하드코딩된 제외 사용자 ID가 운영 정책인지 임시 코드인지 +- 테스트용 local profile/H2/mock S3 구성을 추가해도 되는지 + +## 10. 최종 권장 진행 순서 + +1. 보안 설정과 테스트용 권한 변경 API를 먼저 리뷰합니다. +2. 최소한의 compile/test 기준선을 확보합니다. +3. 동작 변경 없이 `global`, `security`, `infra`부터 이동합니다. +4. `auth`, `user`를 이동합니다. +5. `run.post`, `run.pacer`, `run.home`을 이동합니다. +6. `run.participant`, `run.comment`를 이동합니다. +7. `calendar`, `point`, `admin`을 이동합니다. +8. package 이동 완료 후 중복 로직 추출과 서비스 분리를 별도 커밋으로 진행합니다. +9. 보안 수정, 댓글 soft delete 필터, 포인트 쿼리 최적화는 패키지 이동과 섞지 않고 별도 변경으로 처리합니다. diff --git a/src/main/java/RIKU/server/Config/SecurityConfig.java b/src/main/java/RIKU/server/Config/SecurityConfig.java index 49a1e43..187ecec 100644 --- a/src/main/java/RIKU/server/Config/SecurityConfig.java +++ b/src/main/java/RIKU/server/Config/SecurityConfig.java @@ -1,7 +1,7 @@ -package RIKU.server.Config; +package RIKU.server.config; -import RIKU.server.Security.JwtAuthenticationFilter; -import RIKU.server.Security.JwtTokenProvider; +import RIKU.server.security.JwtAuthenticationFilter; +import RIKU.server.security.JwtTokenProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; diff --git a/src/main/java/RIKU/server/Config/SwaggerConfig.java b/src/main/java/RIKU/server/Config/SwaggerConfig.java index 5d2f8e7..418a886 100644 --- a/src/main/java/RIKU/server/Config/SwaggerConfig.java +++ b/src/main/java/RIKU/server/Config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package RIKU.server.Config; +package RIKU.server.config; import io.swagger.v3.oas.annotations.OpenAPIDefinition; import io.swagger.v3.oas.annotations.servers.Server; diff --git a/src/main/java/RIKU/server/Security/AuthMember.java b/src/main/java/RIKU/server/Security/AuthMember.java index be16bea..9ecd5e5 100644 --- a/src/main/java/RIKU/server/Security/AuthMember.java +++ b/src/main/java/RIKU/server/Security/AuthMember.java @@ -1,7 +1,7 @@ -package RIKU.server.Security; +package RIKU.server.security; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.User.UserRole; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.user.entity.UserRole; import lombok.Builder; import lombok.Getter; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/RIKU/server/Security/AuthenticationProviderImpl.java b/src/main/java/RIKU/server/Security/AuthenticationProviderImpl.java index 1753bcb..43d3b0f 100644 --- a/src/main/java/RIKU/server/Security/AuthenticationProviderImpl.java +++ b/src/main/java/RIKU/server/Security/AuthenticationProviderImpl.java @@ -1,7 +1,7 @@ -package RIKU.server.Security; +package RIKU.server.security; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.UserException; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.AuthenticationProvider; diff --git a/src/main/java/RIKU/server/Security/JwtAuthenticationFilter.java b/src/main/java/RIKU/server/Security/JwtAuthenticationFilter.java index aa3f06a..311d563 100644 --- a/src/main/java/RIKU/server/Security/JwtAuthenticationFilter.java +++ b/src/main/java/RIKU/server/Security/JwtAuthenticationFilter.java @@ -1,8 +1,8 @@ -package RIKU.server.Security; +package RIKU.server.security; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.CustomJwtException; -import RIKU.server.Util.Exception.Domain.UserException; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.exception.CustomJwtException; +import RIKU.server.domains.user.exception.UserException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/RIKU/server/Security/JwtInfo.java b/src/main/java/RIKU/server/Security/JwtInfo.java index 8693407..897562e 100644 --- a/src/main/java/RIKU/server/Security/JwtInfo.java +++ b/src/main/java/RIKU/server/Security/JwtInfo.java @@ -1,4 +1,4 @@ -package RIKU.server.Security; +package RIKU.server.security; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/RIKU/server/Security/JwtTokenProvider.java b/src/main/java/RIKU/server/Security/JwtTokenProvider.java index 955812f..7768859 100644 --- a/src/main/java/RIKU/server/Security/JwtTokenProvider.java +++ b/src/main/java/RIKU/server/Security/JwtTokenProvider.java @@ -1,11 +1,11 @@ -package RIKU.server.Security; - -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.User.User; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.CustomJwtException; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.security; + +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.global.exception.CustomJwtException; +import RIKU.server.domains.user.exception.UserException; import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; diff --git a/src/main/java/RIKU/server/Security/UserDetailsServiceImpl.java b/src/main/java/RIKU/server/Security/UserDetailsServiceImpl.java index 8b934c3..338d98b 100644 --- a/src/main/java/RIKU/server/Security/UserDetailsServiceImpl.java +++ b/src/main/java/RIKU/server/Security/UserDetailsServiceImpl.java @@ -1,9 +1,9 @@ -package RIKU.server.Security; +package RIKU.server.security; -import RIKU.server.Entity.User.User; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.UserException; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/RIKU/server/Controller/AdminController.java b/src/main/java/RIKU/server/domains/admin/controller/AdminController.java similarity index 88% rename from src/main/java/RIKU/server/Controller/AdminController.java rename to src/main/java/RIKU/server/domains/admin/controller/AdminController.java index 7e1d831..f0bc309 100644 --- a/src/main/java/RIKU/server/Controller/AdminController.java +++ b/src/main/java/RIKU/server/domains/admin/controller/AdminController.java @@ -1,14 +1,14 @@ -package RIKU.server.Controller; - -import RIKU.server.Dto.User.Request.AuthorizePacerRequest; -import RIKU.server.Dto.User.Request.UpdateUsersRequest; -import RIKU.server.Dto.User.Response.ReadPacersResponse; -import RIKU.server.Dto.User.Response.ReadUsersResponse; -import RIKU.server.Dto.User.Response.SearchAdminUsersResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.AdminService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +package RIKU.server.domains.admin.controller; + +import RIKU.server.domains.admin.dto.request.AuthorizePacerRequest; +import RIKU.server.domains.admin.dto.request.UpdateUsersRequest; +import RIKU.server.domains.admin.dto.response.ReadPacersResponse; +import RIKU.server.domains.admin.dto.response.ReadUsersResponse; +import RIKU.server.domains.admin.dto.response.SearchAdminUsersResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.admin.service.AdminService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/User/Request/AuthorizePacerRequest.java b/src/main/java/RIKU/server/domains/admin/dto/request/AuthorizePacerRequest.java similarity index 79% rename from src/main/java/RIKU/server/Dto/User/Request/AuthorizePacerRequest.java rename to src/main/java/RIKU/server/domains/admin/dto/request/AuthorizePacerRequest.java index e598a27..fc1ce53 100644 --- a/src/main/java/RIKU/server/Dto/User/Request/AuthorizePacerRequest.java +++ b/src/main/java/RIKU/server/domains/admin/dto/request/AuthorizePacerRequest.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.User.Request; +package RIKU.server.domains.admin.dto.request; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/User/Request/UpdateUsersRequest.java b/src/main/java/RIKU/server/domains/admin/dto/request/UpdateUsersRequest.java similarity index 79% rename from src/main/java/RIKU/server/Dto/User/Request/UpdateUsersRequest.java rename to src/main/java/RIKU/server/domains/admin/dto/request/UpdateUsersRequest.java index 94f6694..84ffc48 100644 --- a/src/main/java/RIKU/server/Dto/User/Request/UpdateUsersRequest.java +++ b/src/main/java/RIKU/server/domains/admin/dto/request/UpdateUsersRequest.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.User.Request; +package RIKU.server.domains.admin.dto.request; -import RIKU.server.Entity.User.UserRole; +import RIKU.server.domains.user.entity.UserRole; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotBlank; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadPacersResponse.java b/src/main/java/RIKU/server/domains/admin/dto/response/ReadPacersResponse.java similarity index 79% rename from src/main/java/RIKU/server/Dto/User/Response/ReadPacersResponse.java rename to src/main/java/RIKU/server/domains/admin/dto/response/ReadPacersResponse.java index 6b2314f..e452441 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadPacersResponse.java +++ b/src/main/java/RIKU/server/domains/admin/dto/response/ReadPacersResponse.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.admin.dto.response; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.user.entity.User; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadUsersResponse.java b/src/main/java/RIKU/server/domains/admin/dto/response/ReadUsersResponse.java similarity index 87% rename from src/main/java/RIKU/server/Dto/User/Response/ReadUsersResponse.java rename to src/main/java/RIKU/server/domains/admin/dto/response/ReadUsersResponse.java index ebec721..5310fa3 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadUsersResponse.java +++ b/src/main/java/RIKU/server/domains/admin/dto/response/ReadUsersResponse.java @@ -1,8 +1,8 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.admin.dto.response; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/User/Response/SearchAdminUsersResponse.java b/src/main/java/RIKU/server/domains/admin/dto/response/SearchAdminUsersResponse.java similarity index 87% rename from src/main/java/RIKU/server/Dto/User/Response/SearchAdminUsersResponse.java rename to src/main/java/RIKU/server/domains/admin/dto/response/SearchAdminUsersResponse.java index 3c07bbb..6d62e5e 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/SearchAdminUsersResponse.java +++ b/src/main/java/RIKU/server/domains/admin/dto/response/SearchAdminUsersResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.admin.dto.response; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.User.User; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.user.entity.User; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Service/AdminService.java b/src/main/java/RIKU/server/domains/admin/service/AdminService.java similarity index 87% rename from src/main/java/RIKU/server/Service/AdminService.java rename to src/main/java/RIKU/server/domains/admin/service/AdminService.java index 9900095..77d8756 100644 --- a/src/main/java/RIKU/server/Service/AdminService.java +++ b/src/main/java/RIKU/server/domains/admin/service/AdminService.java @@ -1,21 +1,21 @@ -package RIKU.server.Service; - -import RIKU.server.Config.SeasonProvider; -import RIKU.server.Dto.User.Request.AuthorizePacerRequest; -import RIKU.server.Dto.User.Response.ReadPacersResponse; -import RIKU.server.Dto.User.Response.ReadUsersResponse; -import RIKU.server.Dto.User.Response.SearchAdminUsersResponse; -import RIKU.server.Dto.User.Request.UpdateUsersRequest; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.Participant.ParticipantStatus; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; -import RIKU.server.Repository.ParticipantRepository; -import RIKU.server.Repository.UserPointRepository; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Security.AuthMember; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.admin.service; + +import RIKU.server.domains.season.SeasonProvider; +import RIKU.server.domains.admin.dto.request.AuthorizePacerRequest; +import RIKU.server.domains.admin.dto.response.ReadPacersResponse; +import RIKU.server.domains.admin.dto.response.ReadUsersResponse; +import RIKU.server.domains.admin.dto.response.SearchAdminUsersResponse; +import RIKU.server.domains.admin.dto.request.UpdateUsersRequest; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/RIKU/server/Controller/AuthController.java b/src/main/java/RIKU/server/domains/auth/controller/AuthController.java similarity index 79% rename from src/main/java/RIKU/server/Controller/AuthController.java rename to src/main/java/RIKU/server/domains/auth/controller/AuthController.java index 3adeda5..20b7cda 100644 --- a/src/main/java/RIKU/server/Controller/AuthController.java +++ b/src/main/java/RIKU/server/domains/auth/controller/AuthController.java @@ -1,14 +1,14 @@ -package RIKU.server.Controller; +package RIKU.server.domains.auth.controller; -import RIKU.server.Dto.User.Request.LoginUserRequest; -import RIKU.server.Dto.User.Response.LoginUserResponse; -import RIKU.server.Dto.User.Response.UpdateUserRoleResponse; -import RIKU.server.Entity.User.UserRole; -import RIKU.server.Service.AuthService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.UserException; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +import RIKU.server.domains.auth.dto.request.LoginUserRequest; +import RIKU.server.domains.auth.dto.response.LoginUserResponse; +import RIKU.server.domains.auth.dto.response.UpdateUserRoleResponse; +import RIKU.server.domains.user.entity.UserRole; +import RIKU.server.domains.auth.service.AuthService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.user.exception.UserException; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/User/Request/LoginUserRequest.java b/src/main/java/RIKU/server/domains/auth/dto/request/LoginUserRequest.java similarity index 93% rename from src/main/java/RIKU/server/Dto/User/Request/LoginUserRequest.java rename to src/main/java/RIKU/server/domains/auth/dto/request/LoginUserRequest.java index ae1c360..1acf2b4 100644 --- a/src/main/java/RIKU/server/Dto/User/Request/LoginUserRequest.java +++ b/src/main/java/RIKU/server/domains/auth/dto/request/LoginUserRequest.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.User.Request; +package RIKU.server.domains.auth.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/RIKU/server/Dto/User/Response/LoginUserResponse.java b/src/main/java/RIKU/server/domains/auth/dto/response/LoginUserResponse.java similarity index 85% rename from src/main/java/RIKU/server/Dto/User/Response/LoginUserResponse.java rename to src/main/java/RIKU/server/domains/auth/dto/response/LoginUserResponse.java index 46652ba..3e67e26 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/LoginUserResponse.java +++ b/src/main/java/RIKU/server/domains/auth/dto/response/LoginUserResponse.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.auth.dto.response; -import RIKU.server.Security.JwtInfo; +import RIKU.server.security.JwtInfo; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Dto/User/Response/UpdateUserRoleResponse.java b/src/main/java/RIKU/server/domains/auth/dto/response/UpdateUserRoleResponse.java similarity index 80% rename from src/main/java/RIKU/server/Dto/User/Response/UpdateUserRoleResponse.java rename to src/main/java/RIKU/server/domains/auth/dto/response/UpdateUserRoleResponse.java index 99913b4..c166805 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/UpdateUserRoleResponse.java +++ b/src/main/java/RIKU/server/domains/auth/dto/response/UpdateUserRoleResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.auth.dto.response; -import RIKU.server.Entity.User.UserRole; -import RIKU.server.Security.JwtInfo; +import RIKU.server.domains.user.entity.UserRole; +import RIKU.server.security.JwtInfo; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/RIKU/server/Service/AuthService.java b/src/main/java/RIKU/server/domains/auth/service/AuthService.java similarity index 81% rename from src/main/java/RIKU/server/Service/AuthService.java rename to src/main/java/RIKU/server/domains/auth/service/AuthService.java index 603e411..9d7f18c 100644 --- a/src/main/java/RIKU/server/Service/AuthService.java +++ b/src/main/java/RIKU/server/domains/auth/service/AuthService.java @@ -1,16 +1,16 @@ -package RIKU.server.Service; +package RIKU.server.domains.auth.service; -import RIKU.server.Dto.User.Request.LoginUserRequest; -import RIKU.server.Dto.User.Response.LoginUserResponse; -import RIKU.server.Dto.User.Response.UpdateUserRoleResponse; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Security.AuthMember; -import RIKU.server.Security.JwtInfo; -import RIKU.server.Security.JwtTokenProvider; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.UserException; +import RIKU.server.domains.auth.dto.request.LoginUserRequest; +import RIKU.server.domains.auth.dto.response.LoginUserResponse; +import RIKU.server.domains.auth.dto.response.UpdateUserRoleResponse; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.security.JwtInfo; +import RIKU.server.security.JwtTokenProvider; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/RIKU/server/Controller/CalendarController.java b/src/main/java/RIKU/server/domains/calendar/controller/CalendarController.java similarity index 82% rename from src/main/java/RIKU/server/Controller/CalendarController.java rename to src/main/java/RIKU/server/domains/calendar/controller/CalendarController.java index 1279570..cc10b5b 100644 --- a/src/main/java/RIKU/server/Controller/CalendarController.java +++ b/src/main/java/RIKU/server/domains/calendar/controller/CalendarController.java @@ -1,11 +1,11 @@ -package RIKU.server.Controller; +package RIKU.server.domains.calendar.controller; -import RIKU.server.Dto.Calendar.Response.ListMonthlyScheduleResponse; -import RIKU.server.Dto.Calendar.Response.ReadDailyScheduleResponse; -import RIKU.server.Dto.Calendar.Response.ReadMonthlyScheduleResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.CalendarService; -import RIKU.server.Util.BaseResponse; +import RIKU.server.domains.calendar.dto.response.ListMonthlyScheduleResponse; +import RIKU.server.domains.calendar.dto.response.ReadDailyScheduleResponse; +import RIKU.server.domains.calendar.dto.response.ReadMonthlyScheduleResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.calendar.service.CalendarService; +import RIKU.server.global.response.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Calendar/Response/ListMonthlyScheduleResponse.java b/src/main/java/RIKU/server/domains/calendar/dto/response/ListMonthlyScheduleResponse.java similarity index 84% rename from src/main/java/RIKU/server/Dto/Calendar/Response/ListMonthlyScheduleResponse.java rename to src/main/java/RIKU/server/domains/calendar/dto/response/ListMonthlyScheduleResponse.java index 0b117da..d975cd7 100644 --- a/src/main/java/RIKU/server/Dto/Calendar/Response/ListMonthlyScheduleResponse.java +++ b/src/main/java/RIKU/server/domains/calendar/dto/response/ListMonthlyScheduleResponse.java @@ -1,8 +1,8 @@ -package RIKU.server.Dto.Calendar.Response; +package RIKU.server.domains.calendar.dto.response; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; import lombok.Getter; import java.util.List; diff --git a/src/main/java/RIKU/server/Dto/Calendar/Response/ReadDailyScheduleResponse.java b/src/main/java/RIKU/server/domains/calendar/dto/response/ReadDailyScheduleResponse.java similarity index 89% rename from src/main/java/RIKU/server/Dto/Calendar/Response/ReadDailyScheduleResponse.java rename to src/main/java/RIKU/server/domains/calendar/dto/response/ReadDailyScheduleResponse.java index 1655b17..b3ca89d 100644 --- a/src/main/java/RIKU/server/Dto/Calendar/Response/ReadDailyScheduleResponse.java +++ b/src/main/java/RIKU/server/domains/calendar/dto/response/ReadDailyScheduleResponse.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.Calendar.Response; +package RIKU.server.domains.calendar.dto.response; -import RIKU.server.Entity.Board.Post.Post; +import RIKU.server.domains.run.post.entity.Post; import lombok.Getter; import java.time.LocalDateTime; diff --git a/src/main/java/RIKU/server/Dto/Calendar/Response/ReadMonthlyScheduleResponse.java b/src/main/java/RIKU/server/domains/calendar/dto/response/ReadMonthlyScheduleResponse.java similarity index 90% rename from src/main/java/RIKU/server/Dto/Calendar/Response/ReadMonthlyScheduleResponse.java rename to src/main/java/RIKU/server/domains/calendar/dto/response/ReadMonthlyScheduleResponse.java index 27a5bcd..f8c883d 100644 --- a/src/main/java/RIKU/server/Dto/Calendar/Response/ReadMonthlyScheduleResponse.java +++ b/src/main/java/RIKU/server/domains/calendar/dto/response/ReadMonthlyScheduleResponse.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.Calendar.Response; +package RIKU.server.domains.calendar.dto.response; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Service/CalendarService.java b/src/main/java/RIKU/server/domains/calendar/service/CalendarService.java similarity index 78% rename from src/main/java/RIKU/server/Service/CalendarService.java rename to src/main/java/RIKU/server/domains/calendar/service/CalendarService.java index 7727594..3743cef 100644 --- a/src/main/java/RIKU/server/Service/CalendarService.java +++ b/src/main/java/RIKU/server/domains/calendar/service/CalendarService.java @@ -1,16 +1,16 @@ -package RIKU.server.Service; - -import RIKU.server.Dto.Calendar.Response.ListMonthlyScheduleResponse; -import RIKU.server.Dto.Calendar.Response.ReadDailyScheduleResponse; -import RIKU.server.Dto.Calendar.Response.ReadMonthlyScheduleResponse; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.User; -import RIKU.server.Repository.PostRepository; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Security.AuthMember; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.calendar.service; + +import RIKU.server.domains.calendar.dto.response.ListMonthlyScheduleResponse; +import RIKU.server.domains.calendar.dto.response.ReadDailyScheduleResponse; +import RIKU.server.domains.calendar.dto.response.ReadMonthlyScheduleResponse; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.run.post.repository.PostRepository; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static RIKU.server.Util.DateTimeUtils.*; +import static RIKU.server.global.util.DateTimeUtils.*; @Service diff --git a/src/main/java/RIKU/server/Controller/UserPointController.java b/src/main/java/RIKU/server/domains/point/controller/UserPointController.java similarity index 84% rename from src/main/java/RIKU/server/Controller/UserPointController.java rename to src/main/java/RIKU/server/domains/point/controller/UserPointController.java index 0bd93f2..a1a3572 100644 --- a/src/main/java/RIKU/server/Controller/UserPointController.java +++ b/src/main/java/RIKU/server/domains/point/controller/UserPointController.java @@ -1,12 +1,12 @@ -package RIKU.server.Controller; +package RIKU.server.domains.point.controller; -import RIKU.server.Dto.User.Request.ReadUserEventRankingRequest; -import RIKU.server.Dto.User.Response.ReadUserParticipationsResponse; -import RIKU.server.Dto.User.Response.ReadUserRankingResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.UserPointService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +import RIKU.server.domains.point.dto.request.ReadUserEventRankingRequest; +import RIKU.server.domains.point.dto.response.ReadUserParticipationsResponse; +import RIKU.server.domains.point.dto.response.ReadUserRankingResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.point.service.UserPointService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/User/Request/ReadUserEventRankingRequest.java b/src/main/java/RIKU/server/domains/point/dto/request/ReadUserEventRankingRequest.java similarity index 90% rename from src/main/java/RIKU/server/Dto/User/Request/ReadUserEventRankingRequest.java rename to src/main/java/RIKU/server/domains/point/dto/request/ReadUserEventRankingRequest.java index 2fa7b34..635f105 100644 --- a/src/main/java/RIKU/server/Dto/User/Request/ReadUserEventRankingRequest.java +++ b/src/main/java/RIKU/server/domains/point/dto/request/ReadUserEventRankingRequest.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.User.Request; +package RIKU.server.domains.point.dto.request; -import RIKU.server.Entity.User.PointType; +import RIKU.server.domains.point.entity.PointType; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadPointListResponse.java b/src/main/java/RIKU/server/domains/point/dto/response/ReadPointListResponse.java similarity index 87% rename from src/main/java/RIKU/server/Dto/User/Response/ReadPointListResponse.java rename to src/main/java/RIKU/server/domains/point/dto/response/ReadPointListResponse.java index 4caba4a..2bd440e 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadPointListResponse.java +++ b/src/main/java/RIKU/server/domains/point/dto/response/ReadPointListResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.point.dto.response; -import RIKU.server.Entity.User.UserPoint; -import RIKU.server.Util.DateTimeUtils; +import RIKU.server.domains.point.entity.UserPoint; +import RIKU.server.global.util.DateTimeUtils; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadUserParticipationsResponse.java b/src/main/java/RIKU/server/domains/point/dto/response/ReadUserParticipationsResponse.java similarity index 89% rename from src/main/java/RIKU/server/Dto/User/Response/ReadUserParticipationsResponse.java rename to src/main/java/RIKU/server/domains/point/dto/response/ReadUserParticipationsResponse.java index 708238f..b569e74 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadUserParticipationsResponse.java +++ b/src/main/java/RIKU/server/domains/point/dto/response/ReadUserParticipationsResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.point.dto.response; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; import lombok.Getter; import java.util.List; diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadUserPointResponse.java b/src/main/java/RIKU/server/domains/point/dto/response/ReadUserPointResponse.java similarity index 88% rename from src/main/java/RIKU/server/Dto/User/Response/ReadUserPointResponse.java rename to src/main/java/RIKU/server/domains/point/dto/response/ReadUserPointResponse.java index 76c2318..59e6958 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadUserPointResponse.java +++ b/src/main/java/RIKU/server/domains/point/dto/response/ReadUserPointResponse.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.point.dto.response; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.user.entity.User; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadUserRankingResponse.java b/src/main/java/RIKU/server/domains/point/dto/response/ReadUserRankingResponse.java similarity index 93% rename from src/main/java/RIKU/server/Dto/User/Response/ReadUserRankingResponse.java rename to src/main/java/RIKU/server/domains/point/dto/response/ReadUserRankingResponse.java index b1e4bd0..a9488f6 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadUserRankingResponse.java +++ b/src/main/java/RIKU/server/domains/point/dto/response/ReadUserRankingResponse.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.point.dto.response; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Entity/User/PointType.java b/src/main/java/RIKU/server/domains/point/entity/PointType.java similarity index 93% rename from src/main/java/RIKU/server/Entity/User/PointType.java rename to src/main/java/RIKU/server/domains/point/entity/PointType.java index e4683f2..078662c 100644 --- a/src/main/java/RIKU/server/Entity/User/PointType.java +++ b/src/main/java/RIKU/server/domains/point/entity/PointType.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.User; +package RIKU.server.domains.point.entity; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/RIKU/server/Entity/User/UserPoint.java b/src/main/java/RIKU/server/domains/point/entity/UserPoint.java similarity index 89% rename from src/main/java/RIKU/server/Entity/User/UserPoint.java rename to src/main/java/RIKU/server/domains/point/entity/UserPoint.java index 43d33b3..e2d7362 100644 --- a/src/main/java/RIKU/server/Entity/User/UserPoint.java +++ b/src/main/java/RIKU/server/domains/point/entity/UserPoint.java @@ -1,7 +1,9 @@ -package RIKU.server.Entity.User; +package RIKU.server.domains.point.entity; -import RIKU.server.Entity.Base.BaseEntity; -import RIKU.server.Entity.Board.Post.Post; +import RIKU.server.domains.user.entity.User; + +import RIKU.server.global.entity.BaseEntity; +import RIKU.server.domains.run.post.entity.Post; import jakarta.annotation.Nullable; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/RIKU/server/Repository/UserPointRepository.java b/src/main/java/RIKU/server/domains/point/repository/UserPointRepository.java similarity index 88% rename from src/main/java/RIKU/server/Repository/UserPointRepository.java rename to src/main/java/RIKU/server/domains/point/repository/UserPointRepository.java index f0d7760..5ff214a 100644 --- a/src/main/java/RIKU/server/Repository/UserPointRepository.java +++ b/src/main/java/RIKU/server/domains/point/repository/UserPointRepository.java @@ -1,9 +1,9 @@ -package RIKU.server.Repository; +package RIKU.server.domains.point.repository; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.PointType; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserPoint; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.point.entity.PointType; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.point.entity.UserPoint; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/RIKU/server/Service/UserPointService.java b/src/main/java/RIKU/server/domains/point/service/UserPointService.java similarity index 87% rename from src/main/java/RIKU/server/Service/UserPointService.java rename to src/main/java/RIKU/server/domains/point/service/UserPointService.java index 185509d..cba03d6 100644 --- a/src/main/java/RIKU/server/Service/UserPointService.java +++ b/src/main/java/RIKU/server/domains/point/service/UserPointService.java @@ -1,23 +1,23 @@ -package RIKU.server.Service; - -import RIKU.server.Config.SeasonProvider; -import RIKU.server.Dto.User.Request.ReadUserEventRankingRequest; -import RIKU.server.Dto.User.Response.ReadPointListResponse; -import RIKU.server.Dto.User.Response.ReadUserParticipationsResponse; -import RIKU.server.Dto.User.Response.ReadUserPointResponse; -import RIKU.server.Dto.User.Response.ReadUserRankingResponse; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.Participant.ParticipantStatus; -import RIKU.server.Entity.User.PointType; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserPoint; -import RIKU.server.Repository.ParticipantRepository; -import RIKU.server.Repository.UserPointRepository; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Security.AuthMember; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.DateTimeUtils; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.point.service; + +import RIKU.server.domains.season.SeasonProvider; +import RIKU.server.domains.point.dto.request.ReadUserEventRankingRequest; +import RIKU.server.domains.point.dto.response.ReadPointListResponse; +import RIKU.server.domains.point.dto.response.ReadUserParticipationsResponse; +import RIKU.server.domains.point.dto.response.ReadUserPointResponse; +import RIKU.server.domains.point.dto.response.ReadUserRankingResponse; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; +import RIKU.server.domains.point.entity.PointType; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.point.entity.UserPoint; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.global.util.DateTimeUtils; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/RIKU/server/Controller/CommentController.java b/src/main/java/RIKU/server/domains/run/comment/controller/CommentController.java similarity index 87% rename from src/main/java/RIKU/server/Controller/CommentController.java rename to src/main/java/RIKU/server/domains/run/comment/controller/CommentController.java index 1ca3396..491824a 100644 --- a/src/main/java/RIKU/server/Controller/CommentController.java +++ b/src/main/java/RIKU/server/domains/run/comment/controller/CommentController.java @@ -1,9 +1,9 @@ -package RIKU.server.Controller; +package RIKU.server.domains.run.comment.controller; -import RIKU.server.Dto.Post.Request.CreateCommentRequest; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.CommentService; -import RIKU.server.Util.BaseResponse; +import RIKU.server.domains.run.comment.dto.request.CreateCommentRequest; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.run.comment.service.CommentService; +import RIKU.server.global.response.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Post/Request/CreateCommentRequest.java b/src/main/java/RIKU/server/domains/run/comment/dto/request/CreateCommentRequest.java similarity index 67% rename from src/main/java/RIKU/server/Dto/Post/Request/CreateCommentRequest.java rename to src/main/java/RIKU/server/domains/run/comment/dto/request/CreateCommentRequest.java index 105fdf8..7debc77 100644 --- a/src/main/java/RIKU/server/Dto/Post/Request/CreateCommentRequest.java +++ b/src/main/java/RIKU/server/domains/run/comment/dto/request/CreateCommentRequest.java @@ -1,8 +1,8 @@ -package RIKU.server.Dto.Post.Request; +package RIKU.server.domains.run.comment.dto.request; -import RIKU.server.Entity.Board.Comment; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.comment.entity.Comment; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.user.entity.User; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadCommentsResponse.java b/src/main/java/RIKU/server/domains/run/comment/dto/response/ReadCommentsResponse.java similarity index 83% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadCommentsResponse.java rename to src/main/java/RIKU/server/domains/run/comment/dto/response/ReadCommentsResponse.java index 3fdae5b..05d1ac5 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadCommentsResponse.java +++ b/src/main/java/RIKU/server/domains/run/comment/dto/response/ReadCommentsResponse.java @@ -1,8 +1,8 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.comment.dto.response; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.Board.Comment; -import RIKU.server.Util.ConvertCreatedDate; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.run.comment.entity.Comment; +import RIKU.server.global.util.ConvertCreatedDate; import lombok.*; import java.util.List; diff --git a/src/main/java/RIKU/server/Entity/Board/Comment.java b/src/main/java/RIKU/server/domains/run/comment/entity/Comment.java similarity index 84% rename from src/main/java/RIKU/server/Entity/Board/Comment.java rename to src/main/java/RIKU/server/domains/run/comment/entity/Comment.java index 6c9dc3f..c521bf0 100644 --- a/src/main/java/RIKU/server/Entity/Board/Comment.java +++ b/src/main/java/RIKU/server/domains/run/comment/entity/Comment.java @@ -1,8 +1,8 @@ -package RIKU.server.Entity.Board; +package RIKU.server.domains.run.comment.entity; -import RIKU.server.Entity.Base.BaseEntity; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.User; +import RIKU.server.global.entity.BaseEntity; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.user.entity.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Repository/CommentRepository.java b/src/main/java/RIKU/server/domains/run/comment/repository/CommentRepository.java similarity index 69% rename from src/main/java/RIKU/server/Repository/CommentRepository.java rename to src/main/java/RIKU/server/domains/run/comment/repository/CommentRepository.java index 9317dde..30b8352 100644 --- a/src/main/java/RIKU/server/Repository/CommentRepository.java +++ b/src/main/java/RIKU/server/domains/run/comment/repository/CommentRepository.java @@ -1,7 +1,7 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.comment.repository; -import RIKU.server.Entity.Board.Comment; -import RIKU.server.Entity.Board.Post.Post; +import RIKU.server.domains.run.comment.entity.Comment; +import RIKU.server.domains.run.post.entity.Post; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/RIKU/server/Service/CommentService.java b/src/main/java/RIKU/server/domains/run/comment/service/CommentService.java similarity index 79% rename from src/main/java/RIKU/server/Service/CommentService.java rename to src/main/java/RIKU/server/domains/run/comment/service/CommentService.java index 975384c..7e54bb8 100644 --- a/src/main/java/RIKU/server/Service/CommentService.java +++ b/src/main/java/RIKU/server/domains/run/comment/service/CommentService.java @@ -1,18 +1,18 @@ -package RIKU.server.Service; - -import RIKU.server.Dto.Post.Request.CreateCommentRequest; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.Board.Comment; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.PostType; -import RIKU.server.Entity.User.User; -import RIKU.server.Repository.CommentRepository; -import RIKU.server.Repository.PostRepository; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Security.AuthMember; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.PostException; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.run.comment.service; + +import RIKU.server.domains.run.comment.dto.request.CreateCommentRequest; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.run.comment.entity.Comment; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostType; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.run.comment.repository.CommentRepository; +import RIKU.server.domains.run.post.repository.PostRepository; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.run.post.exception.PostException; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/RIKU/server/Controller/HomeController.java b/src/main/java/RIKU/server/domains/run/home/controller/HomeController.java similarity index 79% rename from src/main/java/RIKU/server/Controller/HomeController.java rename to src/main/java/RIKU/server/domains/run/home/controller/HomeController.java index 9a46216..1e32e42 100644 --- a/src/main/java/RIKU/server/Controller/HomeController.java +++ b/src/main/java/RIKU/server/domains/run/home/controller/HomeController.java @@ -1,9 +1,9 @@ -package RIKU.server.Controller; +package RIKU.server.domains.run.home.controller; -import RIKU.server.Dto.Post.Response.ReadHomeResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.HomeService; -import RIKU.server.Util.BaseResponse; +import RIKU.server.domains.run.home.dto.response.ReadHomeResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.run.home.service.HomeService; +import RIKU.server.global.response.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadHomeCardResponse.java b/src/main/java/RIKU/server/domains/run/home/dto/response/ReadHomeCardResponse.java similarity index 82% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadHomeCardResponse.java rename to src/main/java/RIKU/server/domains/run/home/dto/response/ReadHomeCardResponse.java index 64cfa1a..edc7bbe 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadHomeCardResponse.java +++ b/src/main/java/RIKU/server/domains/run/home/dto/response/ReadHomeCardResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.home.dto.response; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.PostStatus; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostStatus; import lombok.Getter; import java.time.LocalDateTime; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadHomeResponse.java b/src/main/java/RIKU/server/domains/run/home/dto/response/ReadHomeResponse.java similarity index 87% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadHomeResponse.java rename to src/main/java/RIKU/server/domains/run/home/dto/response/ReadHomeResponse.java index c800d21..a3e88f9 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadHomeResponse.java +++ b/src/main/java/RIKU/server/domains/run/home/dto/response/ReadHomeResponse.java @@ -1,8 +1,8 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.home.dto.response; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Service/HomeService.java b/src/main/java/RIKU/server/domains/run/home/service/HomeService.java similarity index 68% rename from src/main/java/RIKU/server/Service/HomeService.java rename to src/main/java/RIKU/server/domains/run/home/service/HomeService.java index ac596d5..41c953b 100644 --- a/src/main/java/RIKU/server/Service/HomeService.java +++ b/src/main/java/RIKU/server/domains/run/home/service/HomeService.java @@ -1,17 +1,17 @@ -package RIKU.server.Service; - -import RIKU.server.Dto.Post.Response.ReadHomeCardResponse; -import RIKU.server.Dto.Post.Response.ReadHomeResponse; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.PostType; -import RIKU.server.Entity.Board.PostStatus; -import RIKU.server.Entity.User.User; -import RIKU.server.Repository.PostRepository; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Security.AuthMember; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.run.home.service; + +import RIKU.server.domains.run.home.dto.response.ReadHomeCardResponse; +import RIKU.server.domains.run.home.dto.response.ReadHomeResponse; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostType; +import RIKU.server.domains.run.post.entity.PostStatus; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.run.post.repository.PostRepository; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/RIKU/server/Dto/Post/Request/CreatePacerRequest.java b/src/main/java/RIKU/server/domains/run/pacer/dto/request/CreatePacerRequest.java similarity index 81% rename from src/main/java/RIKU/server/Dto/Post/Request/CreatePacerRequest.java rename to src/main/java/RIKU/server/domains/run/pacer/dto/request/CreatePacerRequest.java index d7db018..050f409 100644 --- a/src/main/java/RIKU/server/Dto/Post/Request/CreatePacerRequest.java +++ b/src/main/java/RIKU/server/domains/run/pacer/dto/request/CreatePacerRequest.java @@ -1,8 +1,8 @@ -package RIKU.server.Dto.Post.Request; +package RIKU.server.domains.run.pacer.dto.request; -import RIKU.server.Entity.Board.Pacer; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.pacer.entity.Pacer; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.user.entity.User; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/Post/Request/UpdatePacerRequest.java b/src/main/java/RIKU/server/domains/run/pacer/dto/request/UpdatePacerRequest.java similarity index 75% rename from src/main/java/RIKU/server/Dto/Post/Request/UpdatePacerRequest.java rename to src/main/java/RIKU/server/domains/run/pacer/dto/request/UpdatePacerRequest.java index 79e4724..6bd06b1 100644 --- a/src/main/java/RIKU/server/Dto/Post/Request/UpdatePacerRequest.java +++ b/src/main/java/RIKU/server/domains/run/pacer/dto/request/UpdatePacerRequest.java @@ -1,8 +1,8 @@ -package RIKU.server.Dto.Post.Request; +package RIKU.server.domains.run.pacer.dto.request; -import RIKU.server.Entity.Board.Pacer; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.pacer.entity.Pacer; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.user.entity.User; import jakarta.annotation.Nullable; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadPaceGroupResponse.java b/src/main/java/RIKU/server/domains/run/pacer/dto/response/ReadPaceGroupResponse.java similarity index 79% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadPaceGroupResponse.java rename to src/main/java/RIKU/server/domains/run/pacer/dto/response/ReadPaceGroupResponse.java index cc02242..0890aae 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadPaceGroupResponse.java +++ b/src/main/java/RIKU/server/domains/run/pacer/dto/response/ReadPaceGroupResponse.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.pacer.dto.response; -import RIKU.server.Entity.Board.Pacer; +import RIKU.server.domains.run.pacer.entity.Pacer; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadPacersListResponse.java b/src/main/java/RIKU/server/domains/run/pacer/dto/response/ReadPacersListResponse.java similarity index 88% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadPacersListResponse.java rename to src/main/java/RIKU/server/domains/run/pacer/dto/response/ReadPacersListResponse.java index c7eb84d..12d6dda 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadPacersListResponse.java +++ b/src/main/java/RIKU/server/domains/run/pacer/dto/response/ReadPacersListResponse.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.pacer.dto.response; -import RIKU.server.Entity.Board.Pacer; +import RIKU.server.domains.run.pacer.entity.Pacer; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Entity/Board/Pacer.java b/src/main/java/RIKU/server/domains/run/pacer/entity/Pacer.java similarity index 85% rename from src/main/java/RIKU/server/Entity/Board/Pacer.java rename to src/main/java/RIKU/server/domains/run/pacer/entity/Pacer.java index 11b1eff..22cdfe2 100644 --- a/src/main/java/RIKU/server/Entity/Board/Pacer.java +++ b/src/main/java/RIKU/server/domains/run/pacer/entity/Pacer.java @@ -1,8 +1,8 @@ -package RIKU.server.Entity.Board; +package RIKU.server.domains.run.pacer.entity; -import RIKU.server.Entity.Base.BaseEntity; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.User; +import RIKU.server.global.entity.BaseEntity; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.user.entity.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Repository/PacerRepository.java b/src/main/java/RIKU/server/domains/run/pacer/repository/PacerRepository.java similarity index 74% rename from src/main/java/RIKU/server/Repository/PacerRepository.java rename to src/main/java/RIKU/server/domains/run/pacer/repository/PacerRepository.java index a61683d..a2ea8fe 100644 --- a/src/main/java/RIKU/server/Repository/PacerRepository.java +++ b/src/main/java/RIKU/server/domains/run/pacer/repository/PacerRepository.java @@ -1,8 +1,8 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.pacer.repository; -import RIKU.server.Entity.Board.Pacer; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.pacer.entity.Pacer; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/RIKU/server/Controller/ParticipantController.java b/src/main/java/RIKU/server/domains/run/participant/controller/ParticipantController.java similarity index 91% rename from src/main/java/RIKU/server/Controller/ParticipantController.java rename to src/main/java/RIKU/server/domains/run/participant/controller/ParticipantController.java index d91366e..7fa99fd 100644 --- a/src/main/java/RIKU/server/Controller/ParticipantController.java +++ b/src/main/java/RIKU/server/domains/run/participant/controller/ParticipantController.java @@ -1,11 +1,11 @@ -package RIKU.server.Controller; - -import RIKU.server.Dto.Participant.Request.AttendParticipantRequest; -import RIKU.server.Dto.Participant.Request.ManualAttendParticipantRequest; -import RIKU.server.Dto.Participant.Response.UpdateParticipantResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.ParticipantService; -import RIKU.server.Util.BaseResponse; +package RIKU.server.domains.run.participant.controller; + +import RIKU.server.domains.run.participant.dto.request.AttendParticipantRequest; +import RIKU.server.domains.run.participant.dto.request.ManualAttendParticipantRequest; +import RIKU.server.domains.run.participant.dto.response.UpdateParticipantResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.run.participant.service.ParticipantService; +import RIKU.server.global.response.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/RIKU/server/Dto/Participant/Request/AttendParticipantRequest.java b/src/main/java/RIKU/server/domains/run/participant/dto/request/AttendParticipantRequest.java similarity index 72% rename from src/main/java/RIKU/server/Dto/Participant/Request/AttendParticipantRequest.java rename to src/main/java/RIKU/server/domains/run/participant/dto/request/AttendParticipantRequest.java index 830b76b..a4fa193 100644 --- a/src/main/java/RIKU/server/Dto/Participant/Request/AttendParticipantRequest.java +++ b/src/main/java/RIKU/server/domains/run/participant/dto/request/AttendParticipantRequest.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.Participant.Request; +package RIKU.server.domains.run.participant.dto.request; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Participant/Request/ManualAttendParticipantRequest.java b/src/main/java/RIKU/server/domains/run/participant/dto/request/ManualAttendParticipantRequest.java similarity index 82% rename from src/main/java/RIKU/server/Dto/Participant/Request/ManualAttendParticipantRequest.java rename to src/main/java/RIKU/server/domains/run/participant/dto/request/ManualAttendParticipantRequest.java index 7091256..abeddb2 100644 --- a/src/main/java/RIKU/server/Dto/Participant/Request/ManualAttendParticipantRequest.java +++ b/src/main/java/RIKU/server/domains/run/participant/dto/request/ManualAttendParticipantRequest.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.Participant.Request; +package RIKU.server.domains.run.participant.dto.request; import jakarta.validation.constraints.NotNull; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/Participant/Response/GroupParticipantResponse.java b/src/main/java/RIKU/server/domains/run/participant/dto/response/GroupParticipantResponse.java similarity index 90% rename from src/main/java/RIKU/server/Dto/Participant/Response/GroupParticipantResponse.java rename to src/main/java/RIKU/server/domains/run/participant/dto/response/GroupParticipantResponse.java index cb32570..9ecc57f 100644 --- a/src/main/java/RIKU/server/Dto/Participant/Response/GroupParticipantResponse.java +++ b/src/main/java/RIKU/server/domains/run/participant/dto/response/GroupParticipantResponse.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.Participant.Response; +package RIKU.server.domains.run.participant.dto.response; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/Participant/Response/ReadParticipantListResponse.java b/src/main/java/RIKU/server/domains/run/participant/dto/response/ReadParticipantListResponse.java similarity index 83% rename from src/main/java/RIKU/server/Dto/Participant/Response/ReadParticipantListResponse.java rename to src/main/java/RIKU/server/domains/run/participant/dto/response/ReadParticipantListResponse.java index 754bdb5..2a8a04a 100644 --- a/src/main/java/RIKU/server/Dto/Participant/Response/ReadParticipantListResponse.java +++ b/src/main/java/RIKU/server/domains/run/participant/dto/response/ReadParticipantListResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.Participant.Response; +package RIKU.server.domains.run.participant.dto.response; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.Participant.ParticipantStatus; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Dto/Participant/Response/UpdateParticipantResponse.java b/src/main/java/RIKU/server/domains/run/participant/dto/response/UpdateParticipantResponse.java similarity index 82% rename from src/main/java/RIKU/server/Dto/Participant/Response/UpdateParticipantResponse.java rename to src/main/java/RIKU/server/domains/run/participant/dto/response/UpdateParticipantResponse.java index 991dbe7..53832aa 100644 --- a/src/main/java/RIKU/server/Dto/Participant/Response/UpdateParticipantResponse.java +++ b/src/main/java/RIKU/server/domains/run/participant/dto/response/UpdateParticipantResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.Participant.Response; +package RIKU.server.domains.run.participant.dto.response; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.Participant.ParticipantStatus; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Entity/Participant/Participant.java b/src/main/java/RIKU/server/domains/run/participant/entity/Participant.java similarity index 91% rename from src/main/java/RIKU/server/Entity/Participant/Participant.java rename to src/main/java/RIKU/server/domains/run/participant/entity/Participant.java index 1890940..d9f5510 100644 --- a/src/main/java/RIKU/server/Entity/Participant/Participant.java +++ b/src/main/java/RIKU/server/domains/run/participant/entity/Participant.java @@ -1,8 +1,8 @@ -package RIKU.server.Entity.Participant; +package RIKU.server.domains.run.participant.entity; -import RIKU.server.Entity.Base.BaseEntity; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.User.User; +import RIKU.server.global.entity.BaseEntity; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.user.entity.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Entity/Participant/ParticipantStatus.java b/src/main/java/RIKU/server/domains/run/participant/entity/ParticipantStatus.java similarity index 66% rename from src/main/java/RIKU/server/Entity/Participant/ParticipantStatus.java rename to src/main/java/RIKU/server/domains/run/participant/entity/ParticipantStatus.java index 3f0b74e..e30a537 100644 --- a/src/main/java/RIKU/server/Entity/Participant/ParticipantStatus.java +++ b/src/main/java/RIKU/server/domains/run/participant/entity/ParticipantStatus.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Participant; +package RIKU.server.domains.run.participant.entity; public enum ParticipantStatus { PENDING, // 참여 diff --git a/src/main/java/RIKU/server/Util/Exception/Domain/ParticipantException.java b/src/main/java/RIKU/server/domains/run/participant/exception/ParticipantException.java similarity index 51% rename from src/main/java/RIKU/server/Util/Exception/Domain/ParticipantException.java rename to src/main/java/RIKU/server/domains/run/participant/exception/ParticipantException.java index b5151ae..29a36c8 100644 --- a/src/main/java/RIKU/server/Util/Exception/Domain/ParticipantException.java +++ b/src/main/java/RIKU/server/domains/run/participant/exception/ParticipantException.java @@ -1,6 +1,8 @@ -package RIKU.server.Util.Exception.Domain; +package RIKU.server.domains.run.participant.exception; -import RIKU.server.Util.BaseResponseStatus; +import RIKU.server.global.exception.CustomException; + +import RIKU.server.global.response.BaseResponseStatus; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Repository/ParticipantRepository.java b/src/main/java/RIKU/server/domains/run/participant/repository/ParticipantRepository.java similarity index 84% rename from src/main/java/RIKU/server/Repository/ParticipantRepository.java rename to src/main/java/RIKU/server/domains/run/participant/repository/ParticipantRepository.java index f11bfb9..03dec80 100644 --- a/src/main/java/RIKU/server/Repository/ParticipantRepository.java +++ b/src/main/java/RIKU/server/domains/run/participant/repository/ParticipantRepository.java @@ -1,9 +1,9 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.participant.repository; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.Participant.ParticipantStatus; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; +import RIKU.server.domains.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/RIKU/server/Service/ParticipantService.java b/src/main/java/RIKU/server/domains/run/participant/service/ParticipantService.java similarity index 93% rename from src/main/java/RIKU/server/Service/ParticipantService.java rename to src/main/java/RIKU/server/domains/run/participant/service/ParticipantService.java index 5fc6f3f..1c61453 100644 --- a/src/main/java/RIKU/server/Service/ParticipantService.java +++ b/src/main/java/RIKU/server/domains/run/participant/service/ParticipantService.java @@ -1,21 +1,26 @@ -package RIKU.server.Service; - -import RIKU.server.Dto.Participant.Request.ManualAttendParticipantRequest; -import RIKU.server.Dto.Participant.Response.UpdateParticipantResponse; -import RIKU.server.Entity.Board.Pacer; -import RIKU.server.Entity.Board.Post.*; -import RIKU.server.Entity.Board.PostStatus; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.Participant.ParticipantStatus; -import RIKU.server.Entity.User.PointType; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserPoint; -import RIKU.server.Repository.*; -import RIKU.server.Security.AuthMember; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.ParticipantException; -import RIKU.server.Util.Exception.Domain.PostException; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.run.participant.service; + +import RIKU.server.domains.run.participant.dto.request.ManualAttendParticipantRequest; +import RIKU.server.domains.run.participant.dto.response.UpdateParticipantResponse; +import RIKU.server.domains.run.pacer.entity.Pacer; +import RIKU.server.domains.run.post.entity.*; +import RIKU.server.domains.run.post.entity.PostStatus; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; +import RIKU.server.domains.point.entity.PointType; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.point.entity.UserPoint; +import RIKU.server.domains.run.post.repository.*; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.run.pacer.repository.PacerRepository; +import RIKU.server.domains.run.comment.repository.CommentRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.run.participant.exception.ParticipantException; +import RIKU.server.domains.run.post.exception.PostException; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/RIKU/server/Controller/Post/EventPostController.java b/src/main/java/RIKU/server/domains/run/post/controller/EventPostController.java similarity index 80% rename from src/main/java/RIKU/server/Controller/Post/EventPostController.java rename to src/main/java/RIKU/server/domains/run/post/controller/EventPostController.java index b11c4f3..26b646f 100644 --- a/src/main/java/RIKU/server/Controller/Post/EventPostController.java +++ b/src/main/java/RIKU/server/domains/run/post/controller/EventPostController.java @@ -1,12 +1,12 @@ -package RIKU.server.Controller.Post; - -import RIKU.server.Dto.Post.Request.CreateEventPostRequest; -import RIKU.server.Dto.Post.Response.ReadEventPostDetailResponse; -import RIKU.server.Dto.Post.Response.ReadFlashPostDetailResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.Post.EventPostService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +package RIKU.server.domains.run.post.controller; + +import RIKU.server.domains.run.post.dto.request.CreateEventPostRequest; +import RIKU.server.domains.run.post.dto.response.ReadEventPostDetailResponse; +import RIKU.server.domains.run.post.dto.response.ReadFlashPostDetailResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.run.post.service.EventPostService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Controller/Post/FlashPostController.java b/src/main/java/RIKU/server/domains/run/post/controller/FlashPostController.java similarity index 81% rename from src/main/java/RIKU/server/Controller/Post/FlashPostController.java rename to src/main/java/RIKU/server/domains/run/post/controller/FlashPostController.java index b886bc3..f443249 100644 --- a/src/main/java/RIKU/server/Controller/Post/FlashPostController.java +++ b/src/main/java/RIKU/server/domains/run/post/controller/FlashPostController.java @@ -1,12 +1,12 @@ -package RIKU.server.Controller.Post; +package RIKU.server.domains.run.post.controller; -import RIKU.server.Dto.Post.Request.CreateFlashPostRequest; -import RIKU.server.Dto.Post.Response.ReadFlashPostDetailResponse; -import RIKU.server.Dto.Post.Response.ReadPostListResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.Post.FlashPostService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +import RIKU.server.domains.run.post.dto.request.CreateFlashPostRequest; +import RIKU.server.domains.run.post.dto.response.ReadFlashPostDetailResponse; +import RIKU.server.domains.run.post.dto.response.ReadPostListResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.run.post.service.FlashPostService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Controller/Post/PostController.java b/src/main/java/RIKU/server/domains/run/post/controller/PostController.java similarity index 89% rename from src/main/java/RIKU/server/Controller/Post/PostController.java rename to src/main/java/RIKU/server/domains/run/post/controller/PostController.java index ebac964..94488d2 100644 --- a/src/main/java/RIKU/server/Controller/Post/PostController.java +++ b/src/main/java/RIKU/server/domains/run/post/controller/PostController.java @@ -1,12 +1,12 @@ -package RIKU.server.Controller.Post; - -import RIKU.server.Dto.Post.Request.UpdatePostRequest; -import RIKU.server.Dto.Post.Response.ReadPaceGroupResponse; -import RIKU.server.Dto.Post.Response.ReadPostListResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.Post.PostService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +package RIKU.server.domains.run.post.controller; + +import RIKU.server.domains.run.post.dto.request.UpdatePostRequest; +import RIKU.server.domains.run.pacer.dto.response.ReadPaceGroupResponse; +import RIKU.server.domains.run.post.dto.response.ReadPostListResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.run.post.service.PostService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Controller/Post/RegularPostController.java b/src/main/java/RIKU/server/domains/run/post/controller/RegularPostController.java similarity index 83% rename from src/main/java/RIKU/server/Controller/Post/RegularPostController.java rename to src/main/java/RIKU/server/domains/run/post/controller/RegularPostController.java index 50f0f50..b003608 100644 --- a/src/main/java/RIKU/server/Controller/Post/RegularPostController.java +++ b/src/main/java/RIKU/server/domains/run/post/controller/RegularPostController.java @@ -1,11 +1,11 @@ -package RIKU.server.Controller.Post; - -import RIKU.server.Dto.Post.Request.CreateRegularPostRequest; -import RIKU.server.Dto.Post.Response.ReadRegularPostDetailResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.Post.RegularPostService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +package RIKU.server.domains.run.post.controller; + +import RIKU.server.domains.run.post.dto.request.CreateRegularPostRequest; +import RIKU.server.domains.run.post.dto.response.ReadRegularPostDetailResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.run.post.service.RegularPostService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Controller/Post/TrainingPostController.java b/src/main/java/RIKU/server/domains/run/post/controller/TrainingPostController.java similarity index 80% rename from src/main/java/RIKU/server/Controller/Post/TrainingPostController.java rename to src/main/java/RIKU/server/domains/run/post/controller/TrainingPostController.java index 9a603e1..6b17991 100644 --- a/src/main/java/RIKU/server/Controller/Post/TrainingPostController.java +++ b/src/main/java/RIKU/server/domains/run/post/controller/TrainingPostController.java @@ -1,12 +1,12 @@ -package RIKU.server.Controller.Post; - -import RIKU.server.Dto.Post.Request.CreateTrainingPostRequest; -import RIKU.server.Dto.Post.Response.ReadRegularPostDetailResponse; -import RIKU.server.Dto.Post.Response.ReadTrainingPostDetailResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.Post.TrainingPostService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +package RIKU.server.domains.run.post.controller; + +import RIKU.server.domains.run.post.dto.request.CreateTrainingPostRequest; +import RIKU.server.domains.run.post.dto.response.ReadRegularPostDetailResponse; +import RIKU.server.domains.run.post.dto.response.ReadTrainingPostDetailResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.run.post.service.TrainingPostService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Post/Request/CreateEventPostRequest.java b/src/main/java/RIKU/server/domains/run/post/dto/request/CreateEventPostRequest.java similarity index 87% rename from src/main/java/RIKU/server/Dto/Post/Request/CreateEventPostRequest.java rename to src/main/java/RIKU/server/domains/run/post/dto/request/CreateEventPostRequest.java index a52299d..e36579d 100644 --- a/src/main/java/RIKU/server/Dto/Post/Request/CreateEventPostRequest.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/request/CreateEventPostRequest.java @@ -1,9 +1,9 @@ -package RIKU.server.Dto.Post.Request; +package RIKU.server.domains.run.post.dto.request; -import RIKU.server.Entity.Board.Post.EventPost; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.PostType; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.post.entity.EventPost; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostType; +import RIKU.server.domains.user.entity.User; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/RIKU/server/Dto/Post/Request/CreateFlashPostRequest.java b/src/main/java/RIKU/server/domains/run/post/dto/request/CreateFlashPostRequest.java similarity index 86% rename from src/main/java/RIKU/server/Dto/Post/Request/CreateFlashPostRequest.java rename to src/main/java/RIKU/server/domains/run/post/dto/request/CreateFlashPostRequest.java index 2141d1d..0ad96b1 100644 --- a/src/main/java/RIKU/server/Dto/Post/Request/CreateFlashPostRequest.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/request/CreateFlashPostRequest.java @@ -1,9 +1,9 @@ -package RIKU.server.Dto.Post.Request; +package RIKU.server.domains.run.post.dto.request; -import RIKU.server.Entity.Board.Post.FlashPost; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.PostType; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.post.entity.FlashPost; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostType; +import RIKU.server.domains.user.entity.User; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/RIKU/server/Dto/Post/Request/CreateRegularPostRequest.java b/src/main/java/RIKU/server/domains/run/post/dto/request/CreateRegularPostRequest.java similarity index 84% rename from src/main/java/RIKU/server/Dto/Post/Request/CreateRegularPostRequest.java rename to src/main/java/RIKU/server/domains/run/post/dto/request/CreateRegularPostRequest.java index a98910d..8c067dc 100644 --- a/src/main/java/RIKU/server/Dto/Post/Request/CreateRegularPostRequest.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/request/CreateRegularPostRequest.java @@ -1,9 +1,11 @@ -package RIKU.server.Dto.Post.Request; +package RIKU.server.domains.run.post.dto.request; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.PostType; -import RIKU.server.Entity.Board.Post.RegularPost; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.pacer.dto.request.CreatePacerRequest; + +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostType; +import RIKU.server.domains.run.post.entity.RegularPost; +import RIKU.server.domains.user.entity.User; import jakarta.annotation.Nullable; import jakarta.validation.constraints.*; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/Post/Request/CreateTrainingPostRequest.java b/src/main/java/RIKU/server/domains/run/post/dto/request/CreateTrainingPostRequest.java similarity index 85% rename from src/main/java/RIKU/server/Dto/Post/Request/CreateTrainingPostRequest.java rename to src/main/java/RIKU/server/domains/run/post/dto/request/CreateTrainingPostRequest.java index 608ac44..baf5fcf 100644 --- a/src/main/java/RIKU/server/Dto/Post/Request/CreateTrainingPostRequest.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/request/CreateTrainingPostRequest.java @@ -1,9 +1,11 @@ -package RIKU.server.Dto.Post.Request; +package RIKU.server.domains.run.post.dto.request; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.PostType; -import RIKU.server.Entity.Board.Post.TrainingPost; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.run.pacer.dto.request.CreatePacerRequest; + +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostType; +import RIKU.server.domains.run.post.entity.TrainingPost; +import RIKU.server.domains.user.entity.User; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/RIKU/server/Dto/Post/Request/UpdatePostRequest.java b/src/main/java/RIKU/server/domains/run/post/dto/request/UpdatePostRequest.java similarity index 89% rename from src/main/java/RIKU/server/Dto/Post/Request/UpdatePostRequest.java rename to src/main/java/RIKU/server/domains/run/post/dto/request/UpdatePostRequest.java index a4c9b57..2423793 100644 --- a/src/main/java/RIKU/server/Dto/Post/Request/UpdatePostRequest.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/request/UpdatePostRequest.java @@ -1,4 +1,6 @@ -package RIKU.server.Dto.Post.Request; +package RIKU.server.domains.run.post.dto.request; + +import RIKU.server.domains.run.pacer.dto.request.UpdatePacerRequest; import jakarta.annotation.Nullable; import jakarta.validation.constraints.Size; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadEventPostDetailResponse.java b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadEventPostDetailResponse.java similarity index 79% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadEventPostDetailResponse.java rename to src/main/java/RIKU/server/domains/run/post/dto/response/ReadEventPostDetailResponse.java index 00352d6..412b730 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadEventPostDetailResponse.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadEventPostDetailResponse.java @@ -1,11 +1,13 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.post.dto.response; -import RIKU.server.Dto.Participant.Response.ReadParticipantListResponse; -import RIKU.server.Dto.User.Response.ReadUserInfoResponse; -import RIKU.server.Entity.Board.Post.EventPost; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.PostStatus; -import RIKU.server.Entity.Participant.ParticipantStatus; +import RIKU.server.domains.run.comment.dto.response.ReadCommentsResponse; + +import RIKU.server.domains.run.participant.dto.response.ReadParticipantListResponse; +import RIKU.server.domains.user.dto.response.ReadUserInfoResponse; +import RIKU.server.domains.run.post.entity.EventPost; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostStatus; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadFlashPostDetailResponse.java b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadFlashPostDetailResponse.java similarity index 80% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadFlashPostDetailResponse.java rename to src/main/java/RIKU/server/domains/run/post/dto/response/ReadFlashPostDetailResponse.java index adaf914..8550e93 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadFlashPostDetailResponse.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadFlashPostDetailResponse.java @@ -1,10 +1,12 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.post.dto.response; -import RIKU.server.Dto.Participant.Response.ReadParticipantListResponse; -import RIKU.server.Dto.User.Response.ReadUserInfoResponse; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.PostStatus; -import RIKU.server.Entity.Participant.ParticipantStatus; +import RIKU.server.domains.run.comment.dto.response.ReadCommentsResponse; + +import RIKU.server.domains.run.participant.dto.response.ReadParticipantListResponse; +import RIKU.server.domains.user.dto.response.ReadUserInfoResponse; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostStatus; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadPostListResponse.java b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadPostListResponse.java similarity index 94% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadPostListResponse.java rename to src/main/java/RIKU/server/domains/run/post/dto/response/ReadPostListResponse.java index a925f85..b8203b3 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadPostListResponse.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadPostListResponse.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.post.dto.response; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadPostPreviewResponse.java b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadPostPreviewResponse.java similarity index 87% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadPostPreviewResponse.java rename to src/main/java/RIKU/server/domains/run/post/dto/response/ReadPostPreviewResponse.java index 192fbd2..13c39c6 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadPostPreviewResponse.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadPostPreviewResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.post.dto.response; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.PostStatus; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostStatus; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadRegularPostDetailResponse.java b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadRegularPostDetailResponse.java similarity index 80% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadRegularPostDetailResponse.java rename to src/main/java/RIKU/server/domains/run/post/dto/response/ReadRegularPostDetailResponse.java index 0194ba5..056d3bc 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadRegularPostDetailResponse.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadRegularPostDetailResponse.java @@ -1,10 +1,14 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.post.dto.response; -import RIKU.server.Dto.Participant.Response.GroupParticipantResponse; -import RIKU.server.Dto.User.Response.ReadUserInfoResponse; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.PostStatus; -import RIKU.server.Entity.Participant.ParticipantStatus; +import RIKU.server.domains.run.pacer.dto.response.ReadPacersListResponse; + +import RIKU.server.domains.run.comment.dto.response.ReadCommentsResponse; + +import RIKU.server.domains.run.participant.dto.response.GroupParticipantResponse; +import RIKU.server.domains.user.dto.response.ReadUserInfoResponse; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostStatus; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/Post/Response/ReadTrainingPostDetailResponse.java b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadTrainingPostDetailResponse.java similarity index 79% rename from src/main/java/RIKU/server/Dto/Post/Response/ReadTrainingPostDetailResponse.java rename to src/main/java/RIKU/server/domains/run/post/dto/response/ReadTrainingPostDetailResponse.java index bd339f1..a74f90c 100644 --- a/src/main/java/RIKU/server/Dto/Post/Response/ReadTrainingPostDetailResponse.java +++ b/src/main/java/RIKU/server/domains/run/post/dto/response/ReadTrainingPostDetailResponse.java @@ -1,11 +1,15 @@ -package RIKU.server.Dto.Post.Response; +package RIKU.server.domains.run.post.dto.response; -import RIKU.server.Dto.Participant.Response.GroupParticipantResponse; -import RIKU.server.Dto.User.Response.ReadUserInfoResponse; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.TrainingPost; -import RIKU.server.Entity.Board.PostStatus; -import RIKU.server.Entity.Participant.ParticipantStatus; +import RIKU.server.domains.run.pacer.dto.response.ReadPacersListResponse; + +import RIKU.server.domains.run.comment.dto.response.ReadCommentsResponse; + +import RIKU.server.domains.run.participant.dto.response.GroupParticipantResponse; +import RIKU.server.domains.user.dto.response.ReadUserInfoResponse; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.TrainingPost; +import RIKU.server.domains.run.post.entity.PostStatus; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Entity/Board/Attachment.java b/src/main/java/RIKU/server/domains/run/post/entity/Attachment.java similarity index 84% rename from src/main/java/RIKU/server/Entity/Board/Attachment.java rename to src/main/java/RIKU/server/domains/run/post/entity/Attachment.java index 6df5e58..14f803e 100644 --- a/src/main/java/RIKU/server/Entity/Board/Attachment.java +++ b/src/main/java/RIKU/server/domains/run/post/entity/Attachment.java @@ -1,7 +1,7 @@ -package RIKU.server.Entity.Board; +package RIKU.server.domains.run.post.entity; -import RIKU.server.Entity.Base.BaseEntity; -import RIKU.server.Entity.Board.Post.Post; +import RIKU.server.global.entity.BaseEntity; +import RIKU.server.domains.run.post.entity.Post; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Entity/Board/Post/EventPost.java b/src/main/java/RIKU/server/domains/run/post/entity/EventPost.java similarity index 94% rename from src/main/java/RIKU/server/Entity/Board/Post/EventPost.java rename to src/main/java/RIKU/server/domains/run/post/entity/EventPost.java index fb058d7..86bdeb5 100644 --- a/src/main/java/RIKU/server/Entity/Board/Post/EventPost.java +++ b/src/main/java/RIKU/server/domains/run/post/entity/EventPost.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Board.Post; +package RIKU.server.domains.run.post.entity; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/RIKU/server/Entity/Board/Post/FlashPost.java b/src/main/java/RIKU/server/domains/run/post/entity/FlashPost.java similarity index 95% rename from src/main/java/RIKU/server/Entity/Board/Post/FlashPost.java rename to src/main/java/RIKU/server/domains/run/post/entity/FlashPost.java index 2e60c52..203665e 100644 --- a/src/main/java/RIKU/server/Entity/Board/Post/FlashPost.java +++ b/src/main/java/RIKU/server/domains/run/post/entity/FlashPost.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Board.Post; +package RIKU.server.domains.run.post.entity; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/RIKU/server/Entity/Board/Post/Post.java b/src/main/java/RIKU/server/domains/run/post/entity/Post.java similarity index 91% rename from src/main/java/RIKU/server/Entity/Board/Post/Post.java rename to src/main/java/RIKU/server/domains/run/post/entity/Post.java index 3ba37d0..6ae7418 100644 --- a/src/main/java/RIKU/server/Entity/Board/Post/Post.java +++ b/src/main/java/RIKU/server/domains/run/post/entity/Post.java @@ -1,8 +1,8 @@ -package RIKU.server.Entity.Board.Post; +package RIKU.server.domains.run.post.entity; -import RIKU.server.Entity.Base.BaseEntity; -import RIKU.server.Entity.Board.PostStatus; -import RIKU.server.Entity.User.User; +import RIKU.server.global.entity.BaseEntity; +import RIKU.server.domains.run.post.entity.PostStatus; +import RIKU.server.domains.user.entity.User; import jakarta.annotation.Nullable; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/RIKU/server/Entity/Board/PostStatus.java b/src/main/java/RIKU/server/domains/run/post/entity/PostStatus.java similarity index 54% rename from src/main/java/RIKU/server/Entity/Board/PostStatus.java rename to src/main/java/RIKU/server/domains/run/post/entity/PostStatus.java index d2d0fa7..35af350 100644 --- a/src/main/java/RIKU/server/Entity/Board/PostStatus.java +++ b/src/main/java/RIKU/server/domains/run/post/entity/PostStatus.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Board; +package RIKU.server.domains.run.post.entity; public enum PostStatus { NOW, CANCELED, CLOSED diff --git a/src/main/java/RIKU/server/Entity/Board/Post/PostType.java b/src/main/java/RIKU/server/domains/run/post/entity/PostType.java similarity index 57% rename from src/main/java/RIKU/server/Entity/Board/Post/PostType.java rename to src/main/java/RIKU/server/domains/run/post/entity/PostType.java index cde9db7..5c4c51a 100644 --- a/src/main/java/RIKU/server/Entity/Board/Post/PostType.java +++ b/src/main/java/RIKU/server/domains/run/post/entity/PostType.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Board.Post; +package RIKU.server.domains.run.post.entity; public enum PostType { REGULAR, FLASH, TRAINING, EVENT diff --git a/src/main/java/RIKU/server/Entity/Board/Post/RegularPost.java b/src/main/java/RIKU/server/domains/run/post/entity/RegularPost.java similarity index 95% rename from src/main/java/RIKU/server/Entity/Board/Post/RegularPost.java rename to src/main/java/RIKU/server/domains/run/post/entity/RegularPost.java index d9b9801..4a1782d 100644 --- a/src/main/java/RIKU/server/Entity/Board/Post/RegularPost.java +++ b/src/main/java/RIKU/server/domains/run/post/entity/RegularPost.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Board.Post; +package RIKU.server.domains.run.post.entity; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/RIKU/server/Entity/Board/Post/TrainingPost.java b/src/main/java/RIKU/server/domains/run/post/entity/TrainingPost.java similarity index 96% rename from src/main/java/RIKU/server/Entity/Board/Post/TrainingPost.java rename to src/main/java/RIKU/server/domains/run/post/entity/TrainingPost.java index f3813cd..1fb773c 100644 --- a/src/main/java/RIKU/server/Entity/Board/Post/TrainingPost.java +++ b/src/main/java/RIKU/server/domains/run/post/entity/TrainingPost.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Board.Post; +package RIKU.server.domains.run.post.entity; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/RIKU/server/Util/Exception/Domain/PostException.java b/src/main/java/RIKU/server/domains/run/post/exception/PostException.java similarity index 50% rename from src/main/java/RIKU/server/Util/Exception/Domain/PostException.java rename to src/main/java/RIKU/server/domains/run/post/exception/PostException.java index e367208..bd2da51 100644 --- a/src/main/java/RIKU/server/Util/Exception/Domain/PostException.java +++ b/src/main/java/RIKU/server/domains/run/post/exception/PostException.java @@ -1,6 +1,8 @@ -package RIKU.server.Util.Exception.Domain; +package RIKU.server.domains.run.post.exception; -import RIKU.server.Util.BaseResponseStatus; +import RIKU.server.global.exception.CustomException; + +import RIKU.server.global.response.BaseResponseStatus; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Repository/AttachmentRepository.java b/src/main/java/RIKU/server/domains/run/post/repository/AttachmentRepository.java similarity index 67% rename from src/main/java/RIKU/server/Repository/AttachmentRepository.java rename to src/main/java/RIKU/server/domains/run/post/repository/AttachmentRepository.java index 47d5855..24a59e1 100644 --- a/src/main/java/RIKU/server/Repository/AttachmentRepository.java +++ b/src/main/java/RIKU/server/domains/run/post/repository/AttachmentRepository.java @@ -1,7 +1,7 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.post.repository; -import RIKU.server.Entity.Board.Attachment; -import RIKU.server.Entity.Board.Post.Post; +import RIKU.server.domains.run.post.entity.Attachment; +import RIKU.server.domains.run.post.entity.Post; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/RIKU/server/Repository/EventPostRepository.java b/src/main/java/RIKU/server/domains/run/post/repository/EventPostRepository.java similarity index 67% rename from src/main/java/RIKU/server/Repository/EventPostRepository.java rename to src/main/java/RIKU/server/domains/run/post/repository/EventPostRepository.java index 19dd20b..54f4606 100644 --- a/src/main/java/RIKU/server/Repository/EventPostRepository.java +++ b/src/main/java/RIKU/server/domains/run/post/repository/EventPostRepository.java @@ -1,7 +1,7 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.post.repository; -import RIKU.server.Entity.Board.Post.EventPost; -import RIKU.server.Entity.Board.Post.Post; +import RIKU.server.domains.run.post.entity.EventPost; +import RIKU.server.domains.run.post.entity.Post; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/RIKU/server/Repository/FlashPostRepository.java b/src/main/java/RIKU/server/domains/run/post/repository/FlashPostRepository.java similarity index 67% rename from src/main/java/RIKU/server/Repository/FlashPostRepository.java rename to src/main/java/RIKU/server/domains/run/post/repository/FlashPostRepository.java index a71e043..3bbf8f6 100644 --- a/src/main/java/RIKU/server/Repository/FlashPostRepository.java +++ b/src/main/java/RIKU/server/domains/run/post/repository/FlashPostRepository.java @@ -1,7 +1,7 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.post.repository; -import RIKU.server.Entity.Board.Post.FlashPost; -import RIKU.server.Entity.Board.Post.Post; +import RIKU.server.domains.run.post.entity.FlashPost; +import RIKU.server.domains.run.post.entity.Post; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.Optional; diff --git a/src/main/java/RIKU/server/Repository/PostRepository.java b/src/main/java/RIKU/server/domains/run/post/repository/PostRepository.java similarity index 78% rename from src/main/java/RIKU/server/Repository/PostRepository.java rename to src/main/java/RIKU/server/domains/run/post/repository/PostRepository.java index f4a5b91..7b0acdb 100644 --- a/src/main/java/RIKU/server/Repository/PostRepository.java +++ b/src/main/java/RIKU/server/domains/run/post/repository/PostRepository.java @@ -1,9 +1,9 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.post.repository; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.PostType; -import RIKU.server.Entity.Board.PostStatus; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostType; +import RIKU.server.domains.run.post.entity.PostStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/RIKU/server/Repository/RegularPostRepository.java b/src/main/java/RIKU/server/domains/run/post/repository/RegularPostRepository.java similarity index 67% rename from src/main/java/RIKU/server/Repository/RegularPostRepository.java rename to src/main/java/RIKU/server/domains/run/post/repository/RegularPostRepository.java index 421693c..7f35c68 100644 --- a/src/main/java/RIKU/server/Repository/RegularPostRepository.java +++ b/src/main/java/RIKU/server/domains/run/post/repository/RegularPostRepository.java @@ -1,7 +1,7 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.post.repository; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.RegularPost; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.RegularPost; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/RIKU/server/Repository/TrainingPostRepository.java b/src/main/java/RIKU/server/domains/run/post/repository/TrainingPostRepository.java similarity index 67% rename from src/main/java/RIKU/server/Repository/TrainingPostRepository.java rename to src/main/java/RIKU/server/domains/run/post/repository/TrainingPostRepository.java index 1073c51..185bd24 100644 --- a/src/main/java/RIKU/server/Repository/TrainingPostRepository.java +++ b/src/main/java/RIKU/server/domains/run/post/repository/TrainingPostRepository.java @@ -1,7 +1,7 @@ -package RIKU.server.Repository; +package RIKU.server.domains.run.post.repository; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.TrainingPost; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.TrainingPost; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/RIKU/server/Service/Post/EventPostService.java b/src/main/java/RIKU/server/domains/run/post/service/EventPostService.java similarity index 81% rename from src/main/java/RIKU/server/Service/Post/EventPostService.java rename to src/main/java/RIKU/server/domains/run/post/service/EventPostService.java index 9c29057..64c6890 100644 --- a/src/main/java/RIKU/server/Service/Post/EventPostService.java +++ b/src/main/java/RIKU/server/domains/run/post/service/EventPostService.java @@ -1,22 +1,27 @@ -package RIKU.server.Service.Post; - -import RIKU.server.Dto.Participant.Response.ReadParticipantListResponse; -import RIKU.server.Dto.Post.Request.CreateEventPostRequest; -import RIKU.server.Dto.Post.Response.ReadCommentsResponse; -import RIKU.server.Dto.Post.Response.ReadEventPostDetailResponse; -import RIKU.server.Dto.User.Response.ReadUserInfoResponse; -import RIKU.server.Entity.Board.Attachment; -import RIKU.server.Entity.Board.Comment; -import RIKU.server.Entity.Board.Post.EventPost; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.User.User; -import RIKU.server.Repository.*; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.S3Uploader; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.PostException; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.run.post.service; + +import RIKU.server.domains.run.participant.dto.response.ReadParticipantListResponse; +import RIKU.server.domains.run.post.dto.request.CreateEventPostRequest; +import RIKU.server.domains.run.comment.dto.response.ReadCommentsResponse; +import RIKU.server.domains.run.post.dto.response.ReadEventPostDetailResponse; +import RIKU.server.domains.user.dto.response.ReadUserInfoResponse; +import RIKU.server.domains.run.post.entity.Attachment; +import RIKU.server.domains.run.comment.entity.Comment; +import RIKU.server.domains.run.post.entity.EventPost; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.run.post.repository.*; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.run.pacer.repository.PacerRepository; +import RIKU.server.domains.run.comment.repository.CommentRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.infra.storage.S3Uploader; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.run.post.exception.PostException; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/RIKU/server/Service/Post/FlashPostService.java b/src/main/java/RIKU/server/domains/run/post/service/FlashPostService.java similarity index 80% rename from src/main/java/RIKU/server/Service/Post/FlashPostService.java rename to src/main/java/RIKU/server/domains/run/post/service/FlashPostService.java index 74761a0..3024d62 100644 --- a/src/main/java/RIKU/server/Service/Post/FlashPostService.java +++ b/src/main/java/RIKU/server/domains/run/post/service/FlashPostService.java @@ -1,22 +1,27 @@ -package RIKU.server.Service.Post; - -import RIKU.server.Dto.Participant.Response.ReadParticipantListResponse; -import RIKU.server.Dto.Post.Request.CreateFlashPostRequest; -import RIKU.server.Dto.Post.Response.ReadCommentsResponse; -import RIKU.server.Dto.Post.Response.ReadFlashPostDetailResponse; -import RIKU.server.Dto.User.Response.ReadUserInfoResponse; -import RIKU.server.Entity.Board.Attachment; -import RIKU.server.Entity.Board.Comment; -import RIKU.server.Entity.Board.Post.FlashPost; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.User.User; -import RIKU.server.Repository.*; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.S3Uploader; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.PostException; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.run.post.service; + +import RIKU.server.domains.run.participant.dto.response.ReadParticipantListResponse; +import RIKU.server.domains.run.post.dto.request.CreateFlashPostRequest; +import RIKU.server.domains.run.comment.dto.response.ReadCommentsResponse; +import RIKU.server.domains.run.post.dto.response.ReadFlashPostDetailResponse; +import RIKU.server.domains.user.dto.response.ReadUserInfoResponse; +import RIKU.server.domains.run.post.entity.Attachment; +import RIKU.server.domains.run.comment.entity.Comment; +import RIKU.server.domains.run.post.entity.FlashPost; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.run.post.repository.*; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.run.pacer.repository.PacerRepository; +import RIKU.server.domains.run.comment.repository.CommentRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.infra.storage.S3Uploader; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.run.post.exception.PostException; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/RIKU/server/Service/Post/PostService.java b/src/main/java/RIKU/server/domains/run/post/service/PostService.java similarity index 90% rename from src/main/java/RIKU/server/Service/Post/PostService.java rename to src/main/java/RIKU/server/domains/run/post/service/PostService.java index f4a118a..5cea768 100644 --- a/src/main/java/RIKU/server/Service/Post/PostService.java +++ b/src/main/java/RIKU/server/domains/run/post/service/PostService.java @@ -1,27 +1,32 @@ -package RIKU.server.Service.Post; - -import RIKU.server.Dto.Post.Request.UpdatePacerRequest; -import RIKU.server.Dto.Post.Request.UpdatePostRequest; -import RIKU.server.Dto.Post.Response.ReadPaceGroupResponse; -import RIKU.server.Dto.Post.Response.ReadPostListResponse; -import RIKU.server.Dto.Post.Response.ReadPostPreviewResponse; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.Board.Attachment; -import RIKU.server.Entity.Board.Pacer; -import RIKU.server.Entity.Board.Post.EventPost; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.PostType; -import RIKU.server.Entity.Board.Post.TrainingPost; -import RIKU.server.Entity.Board.PostStatus; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.User.User; -import RIKU.server.Repository.*; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.S3Uploader; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.DateTimeUtils; -import RIKU.server.Util.Exception.Domain.PostException; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.run.post.service; + +import RIKU.server.domains.run.pacer.dto.request.UpdatePacerRequest; +import RIKU.server.domains.run.post.dto.request.UpdatePostRequest; +import RIKU.server.domains.run.pacer.dto.response.ReadPaceGroupResponse; +import RIKU.server.domains.run.post.dto.response.ReadPostListResponse; +import RIKU.server.domains.run.post.dto.response.ReadPostPreviewResponse; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.run.post.entity.Attachment; +import RIKU.server.domains.run.pacer.entity.Pacer; +import RIKU.server.domains.run.post.entity.EventPost; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.PostType; +import RIKU.server.domains.run.post.entity.TrainingPost; +import RIKU.server.domains.run.post.entity.PostStatus; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.run.post.repository.*; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.run.pacer.repository.PacerRepository; +import RIKU.server.domains.run.comment.repository.CommentRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.infra.storage.S3Uploader; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.global.util.DateTimeUtils; +import RIKU.server.domains.run.post.exception.PostException; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -35,7 +40,7 @@ import java.util.List; import java.util.stream.Collectors; -import static RIKU.server.Util.DateTimeUtils.*; +import static RIKU.server.global.util.DateTimeUtils.*; @Service @Slf4j diff --git a/src/main/java/RIKU/server/Service/Post/RegularPostService.java b/src/main/java/RIKU/server/domains/run/post/service/RegularPostService.java similarity index 84% rename from src/main/java/RIKU/server/Service/Post/RegularPostService.java rename to src/main/java/RIKU/server/domains/run/post/service/RegularPostService.java index 620ba7e..8d1b2ae 100644 --- a/src/main/java/RIKU/server/Service/Post/RegularPostService.java +++ b/src/main/java/RIKU/server/domains/run/post/service/RegularPostService.java @@ -1,28 +1,33 @@ -package RIKU.server.Service.Post; - -import RIKU.server.Dto.Participant.Response.GroupParticipantResponse; -import RIKU.server.Dto.Participant.Response.ReadParticipantListResponse; -import RIKU.server.Dto.Post.Request.CreatePacerRequest; -import RIKU.server.Dto.Post.Request.CreateRegularPostRequest; -import RIKU.server.Dto.Post.Response.ReadCommentsResponse; -import RIKU.server.Dto.Post.Response.ReadPacersListResponse; -import RIKU.server.Dto.Post.Response.ReadRegularPostDetailResponse; -import RIKU.server.Dto.User.Response.ReadUserInfoResponse; -import RIKU.server.Entity.Board.Attachment; -import RIKU.server.Entity.Board.Comment; -import RIKU.server.Entity.Board.Pacer; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.RegularPost; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; -import RIKU.server.Repository.*; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.S3Uploader; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.ParticipantException; -import RIKU.server.Util.Exception.Domain.PostException; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.run.post.service; + +import RIKU.server.domains.run.participant.dto.response.GroupParticipantResponse; +import RIKU.server.domains.run.participant.dto.response.ReadParticipantListResponse; +import RIKU.server.domains.run.pacer.dto.request.CreatePacerRequest; +import RIKU.server.domains.run.post.dto.request.CreateRegularPostRequest; +import RIKU.server.domains.run.comment.dto.response.ReadCommentsResponse; +import RIKU.server.domains.run.pacer.dto.response.ReadPacersListResponse; +import RIKU.server.domains.run.post.dto.response.ReadRegularPostDetailResponse; +import RIKU.server.domains.user.dto.response.ReadUserInfoResponse; +import RIKU.server.domains.run.post.entity.Attachment; +import RIKU.server.domains.run.comment.entity.Comment; +import RIKU.server.domains.run.pacer.entity.Pacer; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.RegularPost; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; +import RIKU.server.domains.run.post.repository.*; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.run.pacer.repository.PacerRepository; +import RIKU.server.domains.run.comment.repository.CommentRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.infra.storage.S3Uploader; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.run.participant.exception.ParticipantException; +import RIKU.server.domains.run.post.exception.PostException; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/RIKU/server/Service/Post/TrainingPostService.java b/src/main/java/RIKU/server/domains/run/post/service/TrainingPostService.java similarity index 84% rename from src/main/java/RIKU/server/Service/Post/TrainingPostService.java rename to src/main/java/RIKU/server/domains/run/post/service/TrainingPostService.java index 32d7d9d..a520092 100644 --- a/src/main/java/RIKU/server/Service/Post/TrainingPostService.java +++ b/src/main/java/RIKU/server/domains/run/post/service/TrainingPostService.java @@ -1,29 +1,34 @@ -package RIKU.server.Service.Post; - -import RIKU.server.Dto.Participant.Response.GroupParticipantResponse; -import RIKU.server.Dto.Participant.Response.ReadParticipantListResponse; -import RIKU.server.Dto.Post.Request.CreatePacerRequest; -import RIKU.server.Dto.Post.Request.CreateTrainingPostRequest; -import RIKU.server.Dto.Post.Response.ReadCommentsResponse; -import RIKU.server.Dto.Post.Response.ReadPacersListResponse; -import RIKU.server.Dto.Post.Response.ReadRegularPostDetailResponse; -import RIKU.server.Dto.Post.Response.ReadTrainingPostDetailResponse; -import RIKU.server.Dto.User.Response.ReadUserInfoResponse; -import RIKU.server.Entity.Board.Attachment; -import RIKU.server.Entity.Board.Comment; -import RIKU.server.Entity.Board.Pacer; -import RIKU.server.Entity.Board.Post.Post; -import RIKU.server.Entity.Board.Post.TrainingPost; -import RIKU.server.Entity.Participant.Participant; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; -import RIKU.server.Repository.*; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.S3Uploader; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.ParticipantException; -import RIKU.server.Util.Exception.Domain.PostException; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.run.post.service; + +import RIKU.server.domains.run.participant.dto.response.GroupParticipantResponse; +import RIKU.server.domains.run.participant.dto.response.ReadParticipantListResponse; +import RIKU.server.domains.run.pacer.dto.request.CreatePacerRequest; +import RIKU.server.domains.run.post.dto.request.CreateTrainingPostRequest; +import RIKU.server.domains.run.comment.dto.response.ReadCommentsResponse; +import RIKU.server.domains.run.pacer.dto.response.ReadPacersListResponse; +import RIKU.server.domains.run.post.dto.response.ReadRegularPostDetailResponse; +import RIKU.server.domains.run.post.dto.response.ReadTrainingPostDetailResponse; +import RIKU.server.domains.user.dto.response.ReadUserInfoResponse; +import RIKU.server.domains.run.post.entity.Attachment; +import RIKU.server.domains.run.comment.entity.Comment; +import RIKU.server.domains.run.pacer.entity.Pacer; +import RIKU.server.domains.run.post.entity.Post; +import RIKU.server.domains.run.post.entity.TrainingPost; +import RIKU.server.domains.run.participant.entity.Participant; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; +import RIKU.server.domains.run.post.repository.*; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.run.pacer.repository.PacerRepository; +import RIKU.server.domains.run.comment.repository.CommentRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.infra.storage.S3Uploader; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.domains.run.participant.exception.ParticipantException; +import RIKU.server.domains.run.post.exception.PostException; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/RIKU/server/Config/SeasonProvider.java b/src/main/java/RIKU/server/domains/season/SeasonProvider.java similarity index 83% rename from src/main/java/RIKU/server/Config/SeasonProvider.java rename to src/main/java/RIKU/server/domains/season/SeasonProvider.java index 09a8b4a..f95f892 100644 --- a/src/main/java/RIKU/server/Config/SeasonProvider.java +++ b/src/main/java/RIKU/server/domains/season/SeasonProvider.java @@ -1,6 +1,6 @@ -package RIKU.server.Config; +package RIKU.server.domains.season; -import RIKU.server.Util.DateTimeUtils; +import RIKU.server.global.util.DateTimeUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/RIKU/server/Controller/UserController.java b/src/main/java/RIKU/server/domains/user/controller/UserController.java similarity index 88% rename from src/main/java/RIKU/server/Controller/UserController.java rename to src/main/java/RIKU/server/domains/user/controller/UserController.java index 1956e55..dbe10c6 100644 --- a/src/main/java/RIKU/server/Controller/UserController.java +++ b/src/main/java/RIKU/server/domains/user/controller/UserController.java @@ -1,13 +1,13 @@ -package RIKU.server.Controller; - -import RIKU.server.Dto.User.Request.UpdateProfileRequest; -import RIKU.server.Dto.User.Request.SignUpUserRequest; -import RIKU.server.Dto.User.Response.ReadUserProfileDetailResponse; -import RIKU.server.Dto.User.Response.ReadUserProfileResponse; -import RIKU.server.Security.AuthMember; -import RIKU.server.Service.UserService; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +package RIKU.server.domains.user.controller; + +import RIKU.server.domains.user.dto.request.UpdateProfileRequest; +import RIKU.server.domains.user.dto.request.SignUpUserRequest; +import RIKU.server.domains.user.dto.response.ReadUserProfileDetailResponse; +import RIKU.server.domains.user.dto.response.ReadUserProfileResponse; +import RIKU.server.security.AuthMember; +import RIKU.server.domains.user.service.UserService; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.validation.FieldValidationException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/RIKU/server/Dto/User/Request/SignUpUserRequest.java b/src/main/java/RIKU/server/domains/user/dto/request/SignUpUserRequest.java similarity index 93% rename from src/main/java/RIKU/server/Dto/User/Request/SignUpUserRequest.java rename to src/main/java/RIKU/server/domains/user/dto/request/SignUpUserRequest.java index caa6b66..ed2dce3 100644 --- a/src/main/java/RIKU/server/Dto/User/Request/SignUpUserRequest.java +++ b/src/main/java/RIKU/server/domains/user/dto/request/SignUpUserRequest.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.User.Request; +package RIKU.server.domains.user.dto.request; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.user.entity.User; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Dto/User/Request/UpdateProfileRequest.java b/src/main/java/RIKU/server/domains/user/dto/request/UpdateProfileRequest.java similarity index 94% rename from src/main/java/RIKU/server/Dto/User/Request/UpdateProfileRequest.java rename to src/main/java/RIKU/server/domains/user/dto/request/UpdateProfileRequest.java index 8e51821..9e5111b 100644 --- a/src/main/java/RIKU/server/Dto/User/Request/UpdateProfileRequest.java +++ b/src/main/java/RIKU/server/domains/user/dto/request/UpdateProfileRequest.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.User.Request; +package RIKU.server.domains.user.dto.request; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadUserInfoResponse.java b/src/main/java/RIKU/server/domains/user/dto/response/ReadUserInfoResponse.java similarity index 82% rename from src/main/java/RIKU/server/Dto/User/Response/ReadUserInfoResponse.java rename to src/main/java/RIKU/server/domains/user/dto/response/ReadUserInfoResponse.java index e082a2a..2be4bda 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadUserInfoResponse.java +++ b/src/main/java/RIKU/server/domains/user/dto/response/ReadUserInfoResponse.java @@ -1,7 +1,7 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.user.dto.response; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadUserProfileDetailResponse.java b/src/main/java/RIKU/server/domains/user/dto/response/ReadUserProfileDetailResponse.java similarity index 91% rename from src/main/java/RIKU/server/Dto/User/Response/ReadUserProfileDetailResponse.java rename to src/main/java/RIKU/server/domains/user/dto/response/ReadUserProfileDetailResponse.java index 41665f4..80394f7 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadUserProfileDetailResponse.java +++ b/src/main/java/RIKU/server/domains/user/dto/response/ReadUserProfileDetailResponse.java @@ -1,6 +1,6 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.user.dto.response; -import RIKU.server.Entity.User.User; +import RIKU.server.domains.user.entity.User; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Dto/User/Response/ReadUserProfileResponse.java b/src/main/java/RIKU/server/domains/user/dto/response/ReadUserProfileResponse.java similarity index 90% rename from src/main/java/RIKU/server/Dto/User/Response/ReadUserProfileResponse.java rename to src/main/java/RIKU/server/domains/user/dto/response/ReadUserProfileResponse.java index 05f4f33..7d30e0b 100644 --- a/src/main/java/RIKU/server/Dto/User/Response/ReadUserProfileResponse.java +++ b/src/main/java/RIKU/server/domains/user/dto/response/ReadUserProfileResponse.java @@ -1,8 +1,8 @@ -package RIKU.server.Dto.User.Response; +package RIKU.server.domains.user.dto.response; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserRole; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.user.entity.UserRole; import lombok.Getter; import java.time.LocalDate; diff --git a/src/main/java/RIKU/server/Entity/User/User.java b/src/main/java/RIKU/server/domains/user/entity/User.java similarity index 95% rename from src/main/java/RIKU/server/Entity/User/User.java rename to src/main/java/RIKU/server/domains/user/entity/User.java index 98ab5b1..8d8b1d9 100644 --- a/src/main/java/RIKU/server/Entity/User/User.java +++ b/src/main/java/RIKU/server/domains/user/entity/User.java @@ -1,6 +1,6 @@ -package RIKU.server.Entity.User; +package RIKU.server.domains.user.entity; -import RIKU.server.Entity.Base.BaseEntity; +import RIKU.server.global.entity.BaseEntity; import jakarta.annotation.Nullable; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/RIKU/server/Entity/User/UserRole.java b/src/main/java/RIKU/server/domains/user/entity/UserRole.java similarity index 91% rename from src/main/java/RIKU/server/Entity/User/UserRole.java rename to src/main/java/RIKU/server/domains/user/entity/UserRole.java index a62809f..b74c067 100644 --- a/src/main/java/RIKU/server/Entity/User/UserRole.java +++ b/src/main/java/RIKU/server/domains/user/entity/UserRole.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.User; +package RIKU.server.domains.user.entity; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Util/Exception/Domain/UserException.java b/src/main/java/RIKU/server/domains/user/exception/UserException.java similarity index 50% rename from src/main/java/RIKU/server/Util/Exception/Domain/UserException.java rename to src/main/java/RIKU/server/domains/user/exception/UserException.java index 1f8beea..e9587f9 100644 --- a/src/main/java/RIKU/server/Util/Exception/Domain/UserException.java +++ b/src/main/java/RIKU/server/domains/user/exception/UserException.java @@ -1,6 +1,8 @@ -package RIKU.server.Util.Exception.Domain; +package RIKU.server.domains.user.exception; -import RIKU.server.Util.BaseResponseStatus; +import RIKU.server.global.exception.CustomException; + +import RIKU.server.global.response.BaseResponseStatus; import lombok.Getter; @Getter diff --git a/src/main/java/RIKU/server/Repository/UserRepository.java b/src/main/java/RIKU/server/domains/user/repository/UserRepository.java similarity index 82% rename from src/main/java/RIKU/server/Repository/UserRepository.java rename to src/main/java/RIKU/server/domains/user/repository/UserRepository.java index 862e8e1..ffd1076 100644 --- a/src/main/java/RIKU/server/Repository/UserRepository.java +++ b/src/main/java/RIKU/server/domains/user/repository/UserRepository.java @@ -1,7 +1,7 @@ -package RIKU.server.Repository; +package RIKU.server.domains.user.repository; -import RIKU.server.Entity.Base.BaseStatus; -import RIKU.server.Entity.User.User; +import RIKU.server.global.entity.BaseStatus; +import RIKU.server.domains.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/RIKU/server/Service/UserService.java b/src/main/java/RIKU/server/domains/user/service/UserService.java similarity index 85% rename from src/main/java/RIKU/server/Service/UserService.java rename to src/main/java/RIKU/server/domains/user/service/UserService.java index 5e2ea7b..76d2dd4 100644 --- a/src/main/java/RIKU/server/Service/UserService.java +++ b/src/main/java/RIKU/server/domains/user/service/UserService.java @@ -1,21 +1,23 @@ -package RIKU.server.Service; - -import RIKU.server.Config.SeasonProvider; -import RIKU.server.Dto.User.Request.UpdateProfileRequest; -import RIKU.server.Dto.User.Request.SignUpUserRequest; -import RIKU.server.Dto.User.Response.ReadUserProfileDetailResponse; -import RIKU.server.Dto.User.Response.ReadUserProfileResponse; -import RIKU.server.Entity.Participant.ParticipantStatus; -import RIKU.server.Entity.User.PointType; -import RIKU.server.Entity.User.User; -import RIKU.server.Entity.User.UserPoint; -import RIKU.server.Repository.ParticipantRepository; -import RIKU.server.Repository.UserPointRepository; -import RIKU.server.Repository.UserRepository; -import RIKU.server.Security.AuthMember; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.DateTimeUtils; -import RIKU.server.Util.Exception.Domain.UserException; +package RIKU.server.domains.user.service; + +import RIKU.server.infra.storage.S3Uploader; + +import RIKU.server.domains.season.SeasonProvider; +import RIKU.server.domains.user.dto.request.UpdateProfileRequest; +import RIKU.server.domains.user.dto.request.SignUpUserRequest; +import RIKU.server.domains.user.dto.response.ReadUserProfileDetailResponse; +import RIKU.server.domains.user.dto.response.ReadUserProfileResponse; +import RIKU.server.domains.run.participant.entity.ParticipantStatus; +import RIKU.server.domains.point.entity.PointType; +import RIKU.server.domains.user.entity.User; +import RIKU.server.domains.point.entity.UserPoint; +import RIKU.server.domains.run.participant.repository.ParticipantRepository; +import RIKU.server.domains.point.repository.UserPointRepository; +import RIKU.server.domains.user.repository.UserRepository; +import RIKU.server.security.AuthMember; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.global.util.DateTimeUtils; +import RIKU.server.domains.user.exception.UserException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/RIKU/server/Entity/Base/BaseEntity.java b/src/main/java/RIKU/server/global/entity/BaseEntity.java similarity index 96% rename from src/main/java/RIKU/server/Entity/Base/BaseEntity.java rename to src/main/java/RIKU/server/global/entity/BaseEntity.java index a7f3bb7..7290c5e 100644 --- a/src/main/java/RIKU/server/Entity/Base/BaseEntity.java +++ b/src/main/java/RIKU/server/global/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Base; +package RIKU.server.global.entity; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/RIKU/server/Entity/Base/BaseStatus.java b/src/main/java/RIKU/server/global/entity/BaseStatus.java similarity index 58% rename from src/main/java/RIKU/server/Entity/Base/BaseStatus.java rename to src/main/java/RIKU/server/global/entity/BaseStatus.java index aa37ee4..68b76f0 100644 --- a/src/main/java/RIKU/server/Entity/Base/BaseStatus.java +++ b/src/main/java/RIKU/server/global/entity/BaseStatus.java @@ -1,4 +1,4 @@ -package RIKU.server.Entity.Base; +package RIKU.server.global.entity; public enum BaseStatus { ACTIVE, INACTIVE diff --git a/src/main/java/RIKU/server/Util/Exception/Domain/CustomException.java b/src/main/java/RIKU/server/global/exception/CustomException.java similarity index 81% rename from src/main/java/RIKU/server/Util/Exception/Domain/CustomException.java rename to src/main/java/RIKU/server/global/exception/CustomException.java index bdecea3..05c594a 100644 --- a/src/main/java/RIKU/server/Util/Exception/Domain/CustomException.java +++ b/src/main/java/RIKU/server/global/exception/CustomException.java @@ -1,6 +1,6 @@ -package RIKU.server.Util.Exception.Domain; +package RIKU.server.global.exception; -import RIKU.server.Util.BaseResponseStatus; +import RIKU.server.global.response.BaseResponseStatus; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/RIKU/server/Util/Exception/CustomJwtException.java b/src/main/java/RIKU/server/global/exception/CustomJwtException.java similarity index 76% rename from src/main/java/RIKU/server/Util/Exception/CustomJwtException.java rename to src/main/java/RIKU/server/global/exception/CustomJwtException.java index 9031724..16ba5c8 100644 --- a/src/main/java/RIKU/server/Util/Exception/CustomJwtException.java +++ b/src/main/java/RIKU/server/global/exception/CustomJwtException.java @@ -1,6 +1,6 @@ -package RIKU.server.Util.Exception; +package RIKU.server.global.exception; -import RIKU.server.Util.BaseResponseStatus; +import RIKU.server.global.response.BaseResponseStatus; import io.jsonwebtoken.JwtException; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Controller/Advice/GlobalRestControllerAdvice.java b/src/main/java/RIKU/server/global/exception/GlobalRestControllerAdvice.java similarity index 83% rename from src/main/java/RIKU/server/Controller/Advice/GlobalRestControllerAdvice.java rename to src/main/java/RIKU/server/global/exception/GlobalRestControllerAdvice.java index b40abab..491377f 100644 --- a/src/main/java/RIKU/server/Controller/Advice/GlobalRestControllerAdvice.java +++ b/src/main/java/RIKU/server/global/exception/GlobalRestControllerAdvice.java @@ -1,9 +1,9 @@ -package RIKU.server.Controller.Advice; +package RIKU.server.global.exception; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.CustomJwtException; -import RIKU.server.Util.Exception.Domain.CustomException; -import RIKU.server.Util.BaseResponse; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.global.exception.CustomJwtException; +import RIKU.server.global.exception.CustomException; +import RIKU.server.global.response.BaseResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/RIKU/server/Util/BaseResponse.java b/src/main/java/RIKU/server/global/response/BaseResponse.java similarity index 94% rename from src/main/java/RIKU/server/Util/BaseResponse.java rename to src/main/java/RIKU/server/global/response/BaseResponse.java index 5037e72..3a3c562 100644 --- a/src/main/java/RIKU/server/Util/BaseResponse.java +++ b/src/main/java/RIKU/server/global/response/BaseResponse.java @@ -1,11 +1,11 @@ -package RIKU.server.Util; +package RIKU.server.global.response; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Getter; -import static RIKU.server.Util.BaseResponseStatus.*; +import static RIKU.server.global.response.BaseResponseStatus.*; @Getter @JsonPropertyOrder({"isSuccess", "responseCode", "responseMessage", "result"}) diff --git a/src/main/java/RIKU/server/Util/BaseResponseStatus.java b/src/main/java/RIKU/server/global/response/BaseResponseStatus.java similarity index 99% rename from src/main/java/RIKU/server/Util/BaseResponseStatus.java rename to src/main/java/RIKU/server/global/response/BaseResponseStatus.java index bfe4a84..0aa90d5 100644 --- a/src/main/java/RIKU/server/Util/BaseResponseStatus.java +++ b/src/main/java/RIKU/server/global/response/BaseResponseStatus.java @@ -1,4 +1,4 @@ -package RIKU.server.Util; +package RIKU.server.global.response; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Util/ConvertCreatedDate.java b/src/main/java/RIKU/server/global/util/ConvertCreatedDate.java similarity index 97% rename from src/main/java/RIKU/server/Util/ConvertCreatedDate.java rename to src/main/java/RIKU/server/global/util/ConvertCreatedDate.java index a9f489f..14a06d1 100644 --- a/src/main/java/RIKU/server/Util/ConvertCreatedDate.java +++ b/src/main/java/RIKU/server/global/util/ConvertCreatedDate.java @@ -1,4 +1,4 @@ -package RIKU.server.Util; +package RIKU.server.global.util; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/RIKU/server/Util/DateTimeUtils.java b/src/main/java/RIKU/server/global/util/DateTimeUtils.java similarity index 98% rename from src/main/java/RIKU/server/Util/DateTimeUtils.java rename to src/main/java/RIKU/server/global/util/DateTimeUtils.java index ef9073b..74e1ecb 100644 --- a/src/main/java/RIKU/server/Util/DateTimeUtils.java +++ b/src/main/java/RIKU/server/global/util/DateTimeUtils.java @@ -1,4 +1,4 @@ -package RIKU.server.Util; +package RIKU.server.global.util; import java.time.*; diff --git a/src/main/java/RIKU/server/Controller/Advice/FieldValidationControllerAdvice.java b/src/main/java/RIKU/server/global/validation/FieldValidationControllerAdvice.java similarity index 88% rename from src/main/java/RIKU/server/Controller/Advice/FieldValidationControllerAdvice.java rename to src/main/java/RIKU/server/global/validation/FieldValidationControllerAdvice.java index 1ce1cd2..03a34cd 100644 --- a/src/main/java/RIKU/server/Controller/Advice/FieldValidationControllerAdvice.java +++ b/src/main/java/RIKU/server/global/validation/FieldValidationControllerAdvice.java @@ -1,10 +1,10 @@ -package RIKU.server.Controller.Advice; +package RIKU.server.global.validation; -import RIKU.server.Dto.Common.FieldErrorsDto; -import RIKU.server.Dto.Common.FieldValidationError; -import RIKU.server.Util.BaseResponse; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Validation.FieldValidationException; +import RIKU.server.global.validation.dto.FieldErrorsDto; +import RIKU.server.global.validation.dto.FieldValidationError; +import RIKU.server.global.response.BaseResponse; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.global.validation.FieldValidationException; import com.fasterxml.jackson.databind.exc.InvalidFormatException; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.List; -import static RIKU.server.Util.BaseResponseStatus.INVALID_FIELD; -import static RIKU.server.Util.BaseResponseStatus.METHOD_ARGUMENT_TYPE_MISMATCH; +import static RIKU.server.global.response.BaseResponseStatus.INVALID_FIELD; +import static RIKU.server.global.response.BaseResponseStatus.METHOD_ARGUMENT_TYPE_MISMATCH; @Slf4j @RestControllerAdvice(annotations = RestController.class) diff --git a/src/main/java/RIKU/server/Util/Exception/Validation/FieldValidationException.java b/src/main/java/RIKU/server/global/validation/FieldValidationException.java similarity index 82% rename from src/main/java/RIKU/server/Util/Exception/Validation/FieldValidationException.java rename to src/main/java/RIKU/server/global/validation/FieldValidationException.java index 4f7182a..5cb0cd4 100644 --- a/src/main/java/RIKU/server/Util/Exception/Validation/FieldValidationException.java +++ b/src/main/java/RIKU/server/global/validation/FieldValidationException.java @@ -1,4 +1,4 @@ -package RIKU.server.Util.Exception.Validation; +package RIKU.server.global.validation; import org.springframework.validation.BindingResult; diff --git a/src/main/java/RIKU/server/Util/Exception/Validation/ValidationException.java b/src/main/java/RIKU/server/global/validation/ValidationException.java similarity index 92% rename from src/main/java/RIKU/server/Util/Exception/Validation/ValidationException.java rename to src/main/java/RIKU/server/global/validation/ValidationException.java index 485b563..485ce5f 100644 --- a/src/main/java/RIKU/server/Util/Exception/Validation/ValidationException.java +++ b/src/main/java/RIKU/server/global/validation/ValidationException.java @@ -1,4 +1,4 @@ -package RIKU.server.Util.Exception.Validation; +package RIKU.server.global.validation; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/RIKU/server/Dto/Common/FieldErrorsDto.java b/src/main/java/RIKU/server/global/validation/dto/FieldErrorsDto.java similarity index 83% rename from src/main/java/RIKU/server/Dto/Common/FieldErrorsDto.java rename to src/main/java/RIKU/server/global/validation/dto/FieldErrorsDto.java index 36aba16..876071f 100644 --- a/src/main/java/RIKU/server/Dto/Common/FieldErrorsDto.java +++ b/src/main/java/RIKU/server/global/validation/dto/FieldErrorsDto.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.Common; +package RIKU.server.global.validation.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/RIKU/server/Dto/Common/FieldValidationError.java b/src/main/java/RIKU/server/global/validation/dto/FieldValidationError.java similarity index 83% rename from src/main/java/RIKU/server/Dto/Common/FieldValidationError.java rename to src/main/java/RIKU/server/global/validation/dto/FieldValidationError.java index 3c2a779..4e48034 100644 --- a/src/main/java/RIKU/server/Dto/Common/FieldValidationError.java +++ b/src/main/java/RIKU/server/global/validation/dto/FieldValidationError.java @@ -1,4 +1,4 @@ -package RIKU.server.Dto.Common; +package RIKU.server.global.validation.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Util/AllowedImageFileExtensions.java b/src/main/java/RIKU/server/infra/storage/AllowedImageFileExtensions.java similarity index 96% rename from src/main/java/RIKU/server/Util/AllowedImageFileExtensions.java rename to src/main/java/RIKU/server/infra/storage/AllowedImageFileExtensions.java index 367fa9e..1e607b7 100644 --- a/src/main/java/RIKU/server/Util/AllowedImageFileExtensions.java +++ b/src/main/java/RIKU/server/infra/storage/AllowedImageFileExtensions.java @@ -1,4 +1,4 @@ -package RIKU.server.Util; +package RIKU.server.infra.storage; import lombok.Getter; diff --git a/src/main/java/RIKU/server/Config/S3Config.java b/src/main/java/RIKU/server/infra/storage/S3Config.java similarity index 96% rename from src/main/java/RIKU/server/Config/S3Config.java rename to src/main/java/RIKU/server/infra/storage/S3Config.java index 32badc4..6b0586a 100644 --- a/src/main/java/RIKU/server/Config/S3Config.java +++ b/src/main/java/RIKU/server/infra/storage/S3Config.java @@ -1,4 +1,4 @@ -package RIKU.server.Config; +package RIKU.server.infra.storage; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSStaticCredentialsProvider; diff --git a/src/main/java/RIKU/server/Service/S3Uploader.java b/src/main/java/RIKU/server/infra/storage/S3Uploader.java similarity index 94% rename from src/main/java/RIKU/server/Service/S3Uploader.java rename to src/main/java/RIKU/server/infra/storage/S3Uploader.java index b5e2230..ea40393 100644 --- a/src/main/java/RIKU/server/Service/S3Uploader.java +++ b/src/main/java/RIKU/server/infra/storage/S3Uploader.java @@ -1,7 +1,7 @@ -package RIKU.server.Service; +package RIKU.server.infra.storage; -import RIKU.server.Util.BaseResponseStatus; -import RIKU.server.Util.Exception.Domain.CustomException; +import RIKU.server.global.response.BaseResponseStatus; +import RIKU.server.global.exception.CustomException; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; @@ -17,7 +17,7 @@ import java.net.URL; import java.util.UUID; -import static RIKU.server.Util.BaseResponseStatus.MULTIPARTFILE_CONVERT_FAIL_IN_MEMORY; +import static RIKU.server.global.response.BaseResponseStatus.MULTIPARTFILE_CONVERT_FAIL_IN_MEMORY; @Slf4j @RequiredArgsConstructor From 1a464ab1385bb0472c81579861e93027e59d29eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=8A=B9=EB=AA=A8?= <102294593+YoonBoorue@users.noreply.github.com> Date: Sun, 31 May 2026 14:25:14 +0900 Subject: [PATCH 2/2] Delete docs/refactoring-proposal.md --- docs/refactoring-proposal.md | 329 ----------------------------------- 1 file changed, 329 deletions(-) delete mode 100644 docs/refactoring-proposal.md diff --git a/docs/refactoring-proposal.md b/docs/refactoring-proposal.md deleted file mode 100644 index 5a4d569..0000000 --- a/docs/refactoring-proposal.md +++ /dev/null @@ -1,329 +0,0 @@ -# RIKU-BE 리팩터링 제안서 - -작성일: 2026-05-31 - -이 문서는 현재 레포지토리를 기준으로 한 도메인 기반 패키지 재구성 및 코드 개선 제안입니다. 실제 파일 이동이나 코드 변경은 아직 수행하지 않았고, 검토용 제안만 정리했습니다. - -## 1. 현재 구조 요약 - -현재 프로젝트는 대부분 기술 계층 기반 구조입니다. - -```text -RIKU.server - Config - Controller - Dto - Entity - Repository - Security - Service - Util -``` - -특징: - -- `Controller`, `Service`, `Repository`, `Entity`, `Dto`로 나뉜 layer-based 구조입니다. -- `src/main/java/RIKU/server/domains` 아래에 `auth`, `post`, `user` 빈 디렉터리가 있어 도메인 구조 전환 흔적은 있지만 실제 Java 파일은 기존 구조에 남아 있습니다. -- 주요 비즈니스는 사용자, 인증, 런 게시글, 참여/출석, 댓글, 페이서, 일정, 포인트/랭킹, 운영진 관리로 나뉩니다. - -## 2. 도메인 후보 - -실제 코드 기준 도메인 후보: - -- `auth`: 로그인, JWT 발급, 인증 흐름 -- `user`: 회원가입, 프로필, 일일 출석 -- `admin`: 운영진 사용자 관리, 페이서 권한 관리, 임시 비밀번호 발급 -- `run.post`: 정규런/훈련/행사/번개 게시글, 게시글 목록/상세/수정/삭제 -- `run.participant`: 런 참여, 출석 코드, 출석, 마감, 수동 출석 처리 -- `run.comment`: 게시글 댓글/대댓글 -- `run.pacer`: 페이서 배정, 페이스 그룹 -- `run.home`: 홈 화면 카드 조회 -- `calendar`: 일/월 일정 조회 -- `point`: 포인트, 참여 내역, 랭킹 -- `storage`: S3 업로드/삭제 -- `security`: JWT, 인증 필터, 인증 Principal -- `global`: 공통 응답, 공통 예외, validation, base entity, 날짜 유틸 - -레포지토리에서 `chat`, `notification`, `goal`, `badge`, `suggestion`에 해당하는 구현은 확인되지 않았습니다. - -## 3. 추천 패키지 구조 - -```text -RIKU.server - ServerApplication - - config - SecurityConfig - SwaggerConfig - - security - AuthMember - AuthenticationProviderImpl - JwtAuthenticationFilter - JwtInfo - JwtTokenProvider - UserDetailsServiceImpl - - global - response - exception - validation - entity - util - - infra - storage - S3Config - S3Uploader - - domains - auth - controller - service - dto.request - dto.response - - user - controller - service - repository - entity - dto.request - dto.response - - admin - controller - service - dto.request - dto.response - - run - post - controller - service - repository - entity - dto.request - dto.response - participant - controller - service - repository - entity - dto.request - dto.response - comment - controller - service - repository - entity - dto.request - dto.response - pacer - repository - entity - dto.request - dto.response - home - controller - service - dto.response - - calendar - controller - service - dto.response - - point - controller - service - repository - entity - dto.request - dto.response - - season - SeasonProvider -``` - -## 4. 핵심 파일 이동 요약 - -상세 이동표는 `docs/refactoring-migration-map.csv`에 별도로 정리했습니다. - -요약: - -- 인증 관련: `AuthController`, `AuthService`, 로그인 DTO는 `domains/auth`로 이동 -- 사용자 관련: `UserController`, `UserService`, `UserRepository`, `User`, `UserRole`, 프로필 DTO는 `domains/user`로 이동 -- 운영진 관련: `AdminController`, `AdminService`, 운영진 전용 DTO는 `domains/admin`으로 이동 -- 게시글 관련: `Controller/Post`, `Service/Post`, post 관련 repository/entity/dto는 `domains/run/post`로 이동 -- 참여/출석 관련: `ParticipantController`, `ParticipantService`, participant entity/repository/dto는 `domains/run/participant`로 이동 -- 댓글 관련: `CommentController`, `CommentService`, comment entity/repository/dto는 `domains/run/comment`로 이동 -- 페이서 관련: `Pacer`, `PacerRepository`, pacer DTO는 `domains/run/pacer`로 이동 -- 포인트/랭킹 관련: `UserPointController`, `UserPointService`, `UserPointRepository`, `UserPoint`, `PointType`, 랭킹 DTO는 `domains/point`로 이동 -- 공통 인프라: `S3Config`, `S3Uploader`는 `infra/storage`로 이동 -- 공통 코드: `BaseResponse`, `BaseResponseStatus`, advice, validation DTO, base entity, exception, util은 `global`로 이동 - -## 5. 코드 개선 제안 - -### 보안 설정 우선 검토 - -`SecurityConfig`에서 `/user/**`가 `permitAll()`로 열려 있습니다. 현재 이 패턴은 로그인/회원가입뿐 아니라 `/user/profile`, `/user/attend`, `/user/{userId}/role`까지 포함할 수 있습니다. 특히 `AuthController.updateUserRole`은 테스트용 API로 보이며 권한 상승 위험이 있으므로 리팩터링 전에 먼저 확인해야 합니다. - -### 큰 서비스 분리 - -- `ParticipantService`: 참여, 출석 코드, 출석 마감, 포인트 지급, 관리자 출석 보정까지 담당합니다. -- `PostService`: 게시글 목록, 수정, 삭제, 첨부파일 삭제, 페이서 재배정까지 담당합니다. -- `RegularPostService`, `TrainingPostService`, `EventPostService`, `FlashPostService`: 이미지 업로드, 첨부파일 업로드, 댓글 트리 변환 로직이 반복됩니다. - -분리 후보: - -- `AttendanceService` -- `ParticipationService` -- `PointGrantService` -- `PostAttachmentService` -- `CommentTreeReader` -- `PacerAssignmentService` -- `PostQueryService` -- `PostUpdateService` -- `PostDeleteService` - -### 쿼리/성능 개선 후보 - -- `UserPointService`와 `AdminService`는 사용자 목록을 가져온 뒤 사용자별 포인트 합계/참여 횟수를 반복 조회합니다. -- 데이터가 늘면 N+1 조회 문제가 커질 수 있습니다. -- aggregate query 또는 projection 기반 조회로 개선하는 것이 좋습니다. - -### 데이터/동작 위험 후보 - -- `CommentService.deleteComment`는 soft delete로 status만 변경하지만, 댓글 조회 쪽은 status 필터를 확인하지 않습니다. -- 삭제 댓글이 다시 보일 가능성이 있습니다. -- `BaseResponseStatus`에서 `INVALID_POST_TYPE`과 `INVALID_RUN_TYPE`이 같은 `3010` 코드를 사용합니다. -- 파일 크기 메시지는 10MB/20MB라고 되어 있지만 실제 설정은 50MB 기준입니다. -- `UserPointService.EXCLUDED_USER_IDS`는 사용자 ID 하드코딩입니다. -- `JwtAuthenticationFilter`는 debug 로그로 token 값을 출력합니다. -- `AllowedImageFileExtensions`는 현재 사용처가 확인되지 않습니다. - -## 6. 우선순위 - -### High Priority - -1. `/user/**` 보안 설정과 `AuthController.updateUserRole` 운영 필요성 확인 -2. 리팩터링 전 최소 테스트 추가 -3. 동작 변경 없는 package/import 이동부터 진행 - -### Medium Priority - -1. `ParticipantService`, `PostService` 책임 분리 -2. 댓글 soft delete 조회 필터 검토 -3. 포인트/랭킹/관리자 목록 조회 쿼리 최적화 - -### Low Priority - -1. DTO 이름/위치 정리 -2. unused field/import 제거 -3. 응답 message Map을 명시적 DTO로 변경 -4. 인코딩/주석 정리 -5. `AllowedImageFileExtensions` 제거 또는 실제 검증 로직에 적용 - -## 7. 안전한 단계별 진행 계획 - -### Step 1. 현재 기준선 확보 - -- 목표: 빌드/테스트 가능 상태 확인 -- 대상 파일: 없음 -- 검증: `.\gradlew.bat compileJava`, `.\gradlew.bat test` -- 위험도: 낮음 - -### Step 2. 도메인 구조 확정 - -- 목표: 최종 패키지 구조 합의 -- 대상 파일: 없음 -- 검증: 문서 리뷰 -- 위험도: 낮음 - -### Step 3. global/config/security/infra 이동 - -- 목표: 비즈니스 도메인과 공통 인프라 분리 -- 대상 파일: `Config/*`, `Security/*`, `Util/*`, `Controller/Advice/*`, `Dto/Common/*`, `Entity/Base/*`, `S3Uploader` -- 검증: `.\gradlew.bat compileJava`, `.\gradlew.bat test` -- 위험도: 중 - -### Step 4. auth/user 이동 - -- 목표: 인증과 사용자 도메인 분리 -- 대상 파일: `AuthController`, `AuthService`, `UserController`, `UserService`, `UserRepository`, `User`, `UserRole`, 관련 DTO -- 검증: 회원가입, 로그인, 프로필 조회/수정 API smoke test -- 위험도: 중 - -### Step 5. run.post/run.home/run.pacer 이동 - -- 목표: 런 게시글 중심 도메인 분리 -- 대상 파일: `Controller/Post/*`, `Service/Post/*`, `HomeController`, `HomeService`, post/pacer/attachment entity/repository/dto -- 검증: 게시글 목록/상세/생성/수정/삭제 API smoke test -- 위험도: 중~높음 - -### Step 6. run.participant/run.comment 이동 - -- 목표: 참여/출석/댓글 도메인 분리 -- 대상 파일: `ParticipantController`, `ParticipantService`, `CommentController`, `CommentService`, participant/comment entity/repository/dto -- 검증: 참여, 출석 코드 생성, 출석, 마감, 댓글 생성/삭제 API smoke test -- 위험도: 중 - -### Step 7. calendar/point/admin/season 이동 - -- 목표: 나머지 도메인 정리 -- 대상 파일: `Calendar*`, `UserPoint*`, `Admin*`, `SeasonProvider`, 관련 DTO/entity/repository -- 검증: 캘린더, 랭킹, 마이페이지 참여 내역, 관리자 API smoke test -- 위험도: 중 - -### Step 8. 중복 로직 추출 - -- 목표: package 이동 후 서비스 책임 분리 -- 대상 파일: `PostService`, `RegularPostService`, `TrainingPostService`, `EventPostService`, `FlashPostService`, `ParticipantService` -- 검증: 기존 API 응답 비교, 서비스 단위 테스트 -- 위험도: 중~높음 - -## 8. 테스트 및 검증 계획 - -현재 확인된 테스트는 `ServerApplicationTests` 하나뿐입니다. 리팩터링 전 다음 테스트를 우선 추가하는 것이 안전합니다. - -- Auth: 로그인 성공/실패, JWT 발급 -- User: 회원가입 중복 학번, 프로필 조회/수정, 일일 출석 중복 -- Post: 정규/훈련/행사/번개 생성, 상세 조회, 수정, 삭제 -- Participant: 참여/취소, 출석 코드 생성, 출석, 마감 시 포인트 지급 -- Comment: 댓글/대댓글 생성, 삭제 댓글 조회 제외 -- Point: 랭킹 동점 처리, 제외 사용자 처리, 기간별 이벤트 랭킹 -- Security: 인증이 필요한 `/user/profile`, `/user/attend`, `/admin`, `/run/**` 접근 제어 - -실행 명령: - -```powershell -.\gradlew.bat compileJava -.\gradlew.bat test -.\gradlew.bat build -``` - -DB/S3/JWT 환경변수 때문에 테스트 실행이 실패할 수 있습니다. 테스트용 H2/profile/mock S3 구성은 별도 확인이 필요합니다. - -## 9. 리팩터링 전 확인 필요 사항 - -- `/user/{userId}/role` API가 운영에서 필요한지, 테스트용 잔재인지 -- `/user/**` 전체 permitAll이 의도된 설정인지 -- `domains` 빈 디렉터리를 그대로 사용할지 새 구조로 정리할지 -- 도메인 명칭을 `run` 중심으로 할지 `post`, `attendance` 등으로 더 나눌지 -- `AdminService.getPacers()`가 admin 도메인인지 pacer 도메인인지 -- 삭제 댓글을 API 응답에서 숨겨야 하는지 -- 하드코딩된 제외 사용자 ID가 운영 정책인지 임시 코드인지 -- 테스트용 local profile/H2/mock S3 구성을 추가해도 되는지 - -## 10. 최종 권장 진행 순서 - -1. 보안 설정과 테스트용 권한 변경 API를 먼저 리뷰합니다. -2. 최소한의 compile/test 기준선을 확보합니다. -3. 동작 변경 없이 `global`, `security`, `infra`부터 이동합니다. -4. `auth`, `user`를 이동합니다. -5. `run.post`, `run.pacer`, `run.home`을 이동합니다. -6. `run.participant`, `run.comment`를 이동합니다. -7. `calendar`, `point`, `admin`을 이동합니다. -8. package 이동 완료 후 중복 로직 추출과 서비스 분리를 별도 커밋으로 진행합니다. -9. 보안 수정, 댓글 soft delete 필터, 포인트 쿼리 최적화는 패키지 이동과 섞지 않고 별도 변경으로 처리합니다.