refactor: 전체적인 리팩토링 진행

Space-Club · Apr 23, 2024 · b6efef0 · b6efef0
1 parent 3b73769
commit b6efef0
Show file tree

Hide file tree

Showing 171 changed files with 720 additions and 731 deletions.
diff --git a/src/main/java/com/spaceclub/board/controller/CommentController.java b/src/main/java/com/spaceclub/board/controller/CommentController.java
@@ -1,12 +1,12 @@
 package com.spaceclub.board.controller;
 
-import com.spaceclub.board.controller.dto.CommentRequest;
-import com.spaceclub.board.controller.dto.CommentResponse;
+import com.spaceclub.board.controller.request.CommentRequest;
+import com.spaceclub.board.controller.response.CommentResponse;
 import com.spaceclub.board.service.CommentService;
 import com.spaceclub.board.service.vo.CommentInfo;
-import com.spaceclub.global.Authenticated;
-import com.spaceclub.global.dto.PageResponse;
-import com.spaceclub.global.jwt.vo.JwtUser;
+import com.spaceclub.global.annotation.login.Authenticated;
+import com.spaceclub.global.response.PageResponse;
+import com.spaceclub.oauth.jwt.vo.JwtUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;

diff --git a/src/main/java/com/spaceclub/board/controller/PostController.java b/src/main/java/com/spaceclub/board/controller/PostController.java
@@ -1,15 +1,15 @@
 package com.spaceclub.board.controller;
 
-import com.spaceclub.board.controller.dto.PostRequest;
-import com.spaceclub.board.controller.dto.PostResponse;
-import com.spaceclub.board.controller.dto.PostUpdateRequest;
+import com.spaceclub.board.controller.request.PostRequest;
+import com.spaceclub.board.controller.request.PostUpdateRequest;
+import com.spaceclub.board.controller.response.PostResponse;
 import com.spaceclub.board.service.PostService;
 import com.spaceclub.board.service.vo.PostInfo;
-import com.spaceclub.global.Authenticated;
-import com.spaceclub.global.dto.PageResponse;
-import com.spaceclub.global.jwt.vo.JwtUser;
-import com.spaceclub.global.s3.S3Folder;
-import com.spaceclub.global.s3.S3ImageUploader;
+import com.spaceclub.global.annotation.login.Authenticated;
+import com.spaceclub.global.aws.s3.S3Folder;
+import com.spaceclub.global.aws.s3.S3ImageUploader;
+import com.spaceclub.global.response.PageResponse;
+import com.spaceclub.oauth.jwt.vo.JwtUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;

diff --git a/src/main/java/com/spaceclub/board/controller/dto/CommentRequest.java b/src/main/java/com/spaceclub/board/controller/dto/CommentRequest.java
diff --git a/src/main/java/com/spaceclub/board/controller/request/CommentRequest.java b/src/main/java/com/spaceclub/board/controller/request/CommentRequest.java
@@ -0,0 +1,10 @@
+package com.spaceclub.board.controller.request;
+
+import com.spaceclub.global.annotation.profanity.ProfanityCheck;
+
+public record CommentRequest(
+        @ProfanityCheck String content,
+        boolean isPrivate
+) {
+
+}
diff --git a/...lub/board/controller/dto/PostRequest.java → ...board/controller/request/PostRequest.java b/...lub/board/controller/dto/PostRequest.java → ...board/controller/request/PostRequest.java
@@ -1,6 +1,6 @@
-package com.spaceclub.board.controller.dto;
+package com.spaceclub.board.controller.request;
 
-import com.spaceclub.global.bad_word_filter.ProfanityCheck;
+import com.spaceclub.global.annotation.profanity.ProfanityCheck;
 
 public record PostRequest(
         @ProfanityCheck String title,

diff --git a/...ard/controller/dto/PostUpdateRequest.java → ...controller/request/PostUpdateRequest.java b/...ard/controller/dto/PostUpdateRequest.java → ...controller/request/PostUpdateRequest.java
@@ -1,6 +1,6 @@
-package com.spaceclub.board.controller.dto;
+package com.spaceclub.board.controller.request;
 
-import com.spaceclub.global.bad_word_filter.ProfanityCheck;
+import com.spaceclub.global.annotation.profanity.ProfanityCheck;
 
 public record PostUpdateRequest(
         @ProfanityCheck String title,

diff --git a/...board/controller/dto/CommentResponse.java → .../controller/response/CommentResponse.java b/...board/controller/dto/CommentResponse.java → .../controller/response/CommentResponse.java
@@ -1,4 +1,4 @@
-package com.spaceclub.board.controller.dto;
+package com.spaceclub.board.controller.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.spaceclub.board.service.vo.CommentInfo;

diff --git a/...ub/board/controller/dto/PostResponse.java → ...ard/controller/response/PostResponse.java b/...ub/board/controller/dto/PostResponse.java → ...ard/controller/response/PostResponse.java
@@ -1,4 +1,4 @@
-package com.spaceclub.board.controller.dto;
+package com.spaceclub.board.controller.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.spaceclub.board.service.vo.PostInfo;

diff --git a/...club/board/controller/domain/Comment.java → ...a/com/spaceclub/board/domain/Comment.java b/...club/board/controller/domain/Comment.java → ...a/com/spaceclub/board/domain/Comment.java
@@ -1,4 +1,4 @@
-package com.spaceclub.board.controller.domain;
+package com.spaceclub.board.domain;
 
 import com.spaceclub.global.BaseTimeEntity;
 import jakarta.persistence.Column;

diff --git a/...aceclub/board/controller/domain/Post.java → ...java/com/spaceclub/board/domain/Post.java b/...aceclub/board/controller/domain/Post.java → ...java/com/spaceclub/board/domain/Post.java
@@ -1,4 +1,4 @@
-package com.spaceclub.board.controller.domain;
+package com.spaceclub.board.domain;
 
 import com.spaceclub.global.BaseTimeEntity;
 import jakarta.persistence.Column;
@@ -46,8 +46,7 @@ private Post(
             Long authorId,
             Long clubId,
             LocalDateTime createdAt,
-            LocalDateTime lastModifiedAt)
-    {
+            LocalDateTime lastModifiedAt) {
         this.id = id;
         this.title = title;
         this.content = content;

diff --git a/...b/board/repository/CommentRepository.java → .../domain/repository/CommentRepository.java b/...b/board/repository/CommentRepository.java → .../domain/repository/CommentRepository.java
@@ -1,6 +1,6 @@
-package com.spaceclub.board.repository;
+package com.spaceclub.board.domain.repository;
 
-import com.spaceclub.board.controller.domain.Comment;
+import com.spaceclub.board.domain.Comment;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/...club/board/repository/PostRepository.java → ...ard/domain/repository/PostRepository.java b/...club/board/repository/PostRepository.java → ...ard/domain/repository/PostRepository.java
@@ -1,6 +1,6 @@
-package com.spaceclub.board.repository;
+package com.spaceclub.board.domain.repository;
 
-import com.spaceclub.board.controller.domain.Post;
+import com.spaceclub.board.domain.Post;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/src/main/java/com/spaceclub/board/service/CommentService.java b/src/main/java/com/spaceclub/board/service/CommentService.java
@@ -1,8 +1,8 @@
 package com.spaceclub.board.service;
 
-import com.spaceclub.board.controller.domain.Comment;
-import com.spaceclub.board.controller.dto.CommentRequest;
-import com.spaceclub.board.repository.CommentRepository;
+import com.spaceclub.board.controller.request.CommentRequest;
+import com.spaceclub.board.domain.Comment;
+import com.spaceclub.board.domain.repository.CommentRepository;
 import com.spaceclub.board.service.vo.CommentInfo;
 import com.spaceclub.user.service.UserProvider;
 import lombok.RequiredArgsConstructor;

diff --git a/src/main/java/com/spaceclub/board/service/PostService.java b/src/main/java/com/spaceclub/board/service/PostService.java
@@ -1,9 +1,9 @@
 package com.spaceclub.board.service;
 
-import com.spaceclub.board.controller.domain.Post;
-import com.spaceclub.board.controller.dto.PostRequest;
-import com.spaceclub.board.controller.dto.PostUpdateRequest;
-import com.spaceclub.board.repository.PostRepository;
+import com.spaceclub.board.controller.request.PostRequest;
+import com.spaceclub.board.controller.request.PostUpdateRequest;
+import com.spaceclub.board.domain.Post;
+import com.spaceclub.board.domain.repository.PostRepository;
 import com.spaceclub.board.service.vo.PostInfo;
 import com.spaceclub.board.service.vo.PostUpdateCommand;
 import com.spaceclub.user.service.UserProvider;

diff --git a/src/main/java/com/spaceclub/board/service/vo/CommentInfo.java b/src/main/java/com/spaceclub/board/service/vo/CommentInfo.java
@@ -1,6 +1,6 @@
 package com.spaceclub.board.service.vo;
 
-import com.spaceclub.board.controller.domain.Comment;
+import com.spaceclub.board.domain.Comment;
 import com.spaceclub.user.service.vo.UserProfile;
 
 import java.time.LocalDateTime;

diff --git a/src/main/java/com/spaceclub/board/service/vo/PostInfo.java b/src/main/java/com/spaceclub/board/service/vo/PostInfo.java
@@ -1,6 +1,6 @@
 package com.spaceclub.board.service.vo;
 
-import com.spaceclub.board.controller.domain.Post;
+import com.spaceclub.board.domain.Post;
 import com.spaceclub.user.service.vo.UserProfile;
 
 import java.time.LocalDateTime;

diff --git a/src/main/java/com/spaceclub/club/controller/ClubController.java b/src/main/java/com/spaceclub/club/controller/ClubController.java
@@ -1,13 +1,13 @@
 package com.spaceclub.club.controller;
 
-import com.spaceclub.club.controller.dto.ClubCreateRequest;
-import com.spaceclub.club.controller.dto.ClubGetResponse;
-import com.spaceclub.club.controller.dto.ClubUpdateRequest;
+import com.spaceclub.club.controller.request.ClubCreateRequest;
+import com.spaceclub.club.controller.request.ClubUpdateRequest;
+import com.spaceclub.club.controller.response.ClubGetResponse;
 import com.spaceclub.club.domain.Club;
 import com.spaceclub.club.service.ClubService;
-import com.spaceclub.global.Authenticated;
-import com.spaceclub.global.config.aws.S3Properties;
-import com.spaceclub.global.jwt.vo.JwtUser;
+import com.spaceclub.global.annotation.login.Authenticated;
+import com.spaceclub.global.aws.S3Properties;
+import com.spaceclub.oauth.jwt.vo.JwtUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;

diff --git a/src/main/java/com/spaceclub/club/controller/ClubEventController.java b/src/main/java/com/spaceclub/club/controller/ClubEventController.java
@@ -1,11 +1,11 @@
 package com.spaceclub.club.controller;
 
-import com.spaceclub.club.controller.dto.ClubEventOverviewGetResponse;
+import com.spaceclub.club.controller.response.ClubEventOverviewGetResponse;
 import com.spaceclub.club.service.ClubEventService;
 import com.spaceclub.event.service.vo.ClubEventOverviewGetInfo;
-import com.spaceclub.global.Authenticated;
-import com.spaceclub.global.dto.PageResponse;
-import com.spaceclub.global.jwt.vo.JwtUser;
+import com.spaceclub.global.annotation.login.Authenticated;
+import com.spaceclub.global.response.PageResponse;
+import com.spaceclub.oauth.jwt.vo.JwtUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

diff --git a/src/main/java/com/spaceclub/club/controller/ClubNoticeController.java b/src/main/java/com/spaceclub/club/controller/ClubNoticeController.java
@@ -1,14 +1,14 @@
 package com.spaceclub.club.controller;
 
-import com.spaceclub.club.controller.dto.ClubNoticeCreateRequest;
-import com.spaceclub.club.controller.dto.ClubNoticeGetResponse;
-import com.spaceclub.club.controller.dto.ClubNoticeUpdateRequest;
+import com.spaceclub.club.controller.request.ClubNoticeCreateRequest;
+import com.spaceclub.club.controller.request.ClubNoticeUpdateRequest;
+import com.spaceclub.club.controller.response.ClubNoticeGetResponse;
 import com.spaceclub.club.domain.ClubNotice;
 import com.spaceclub.club.service.ClubNoticeService;
 import com.spaceclub.club.service.vo.ClubNoticeDelete;
 import com.spaceclub.club.service.vo.ClubNoticeUpdate;
-import com.spaceclub.global.Authenticated;
-import com.spaceclub.global.jwt.vo.JwtUser;
+import com.spaceclub.global.annotation.login.Authenticated;
+import com.spaceclub.oauth.jwt.vo.JwtUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;

diff --git a/src/main/java/com/spaceclub/club/controller/ClubUserController.java b/src/main/java/com/spaceclub/club/controller/ClubUserController.java
@@ -1,12 +1,12 @@
 package com.spaceclub.club.controller;
 
-import com.spaceclub.club.controller.dto.ClubUserRoleResponse;
-import com.spaceclub.club.controller.dto.ClubUserUpdateRequest;
+import com.spaceclub.club.controller.request.ClubUserUpdateRequest;
+import com.spaceclub.club.controller.response.ClubUserRoleResponse;
 import com.spaceclub.club.service.ClubMemberManagerService;
 import com.spaceclub.club.service.vo.ClubUserUpdate;
 import com.spaceclub.club.service.vo.MemberGetInfo;
-import com.spaceclub.global.Authenticated;
-import com.spaceclub.global.jwt.vo.JwtUser;
+import com.spaceclub.global.annotation.login.Authenticated;
+import com.spaceclub.oauth.jwt.vo.JwtUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;

diff --git a/src/main/java/com/spaceclub/club/controller/dto/ClubNoticeCreateRequest.java b/src/main/java/com/spaceclub/club/controller/dto/ClubNoticeCreateRequest.java
diff --git a/src/main/java/com/spaceclub/club/controller/dto/ClubNoticeUpdateRequest.java b/src/main/java/com/spaceclub/club/controller/dto/ClubNoticeUpdateRequest.java
diff --git a/...lub/controller/dto/ClubCreateRequest.java → ...controller/request/ClubCreateRequest.java b/...lub/controller/dto/ClubCreateRequest.java → ...controller/request/ClubCreateRequest.java
@@ -1,7 +1,7 @@
-package com.spaceclub.club.controller.dto;
+package com.spaceclub.club.controller.request;
 
 import com.spaceclub.club.domain.Club;
-import com.spaceclub.global.bad_word_filter.ProfanityCheck;
+import com.spaceclub.global.annotation.profanity.ProfanityCheck;
 
 public record ClubCreateRequest(
         @ProfanityCheck String name,

diff --git a/src/main/java/com/spaceclub/club/controller/request/ClubNoticeCreateRequest.java b/src/main/java/com/spaceclub/club/controller/request/ClubNoticeCreateRequest.java
@@ -0,0 +1,9 @@
+package com.spaceclub.club.controller.request;
+
+import com.spaceclub.global.annotation.profanity.ProfanityCheck;
+
+public record ClubNoticeCreateRequest(
+        @ProfanityCheck String notice
+) {
+
+}
diff --git a/src/main/java/com/spaceclub/club/controller/request/ClubNoticeUpdateRequest.java b/src/main/java/com/spaceclub/club/controller/request/ClubNoticeUpdateRequest.java
@@ -0,0 +1,7 @@
+package com.spaceclub.club.controller.request;
+
+import com.spaceclub.global.annotation.profanity.ProfanityCheck;
+
+public record ClubNoticeUpdateRequest(@ProfanityCheck String notice) {
+
+}
diff --git a/...lub/controller/dto/ClubUpdateRequest.java → ...controller/request/ClubUpdateRequest.java b/...lub/controller/dto/ClubUpdateRequest.java → ...controller/request/ClubUpdateRequest.java
@@ -1,7 +1,7 @@
-package com.spaceclub.club.controller.dto;
+package com.spaceclub.club.controller.request;
 
 import com.spaceclub.club.domain.Club;
-import com.spaceclub.global.bad_word_filter.ProfanityCheck;
+import com.spaceclub.global.annotation.profanity.ProfanityCheck;
 
 public record ClubUpdateRequest(
         @ProfanityCheck String name,

diff --git a/...controller/dto/ClubUserUpdateRequest.java → ...roller/request/ClubUserUpdateRequest.java b/...controller/dto/ClubUserUpdateRequest.java → ...roller/request/ClubUserUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.spaceclub.club.controller.dto;
+package com.spaceclub.club.controller.request;
 
 import com.spaceclub.club.domain.ClubUserRole;
 

diff --git a/...ler/dto/ClubEventOverviewGetResponse.java → ...esponse/ClubEventOverviewGetResponse.java b/...ler/dto/ClubEventOverviewGetResponse.java → ...esponse/ClubEventOverviewGetResponse.java
@@ -1,4 +1,4 @@
-package com.spaceclub.club.controller.dto;
+package com.spaceclub.club.controller.response;
 
 import com.spaceclub.event.service.vo.ClubEventOverviewGetInfo;
 import lombok.Builder;

diff --git a/.../club/controller/dto/ClubGetResponse.java → .../controller/response/ClubGetResponse.java b/.../club/controller/dto/ClubGetResponse.java → .../controller/response/ClubGetResponse.java
@@ -1,4 +1,4 @@
-package com.spaceclub.club.controller.dto;
+package com.spaceclub.club.controller.response;
 
 import com.spaceclub.club.domain.Club;
 import lombok.Builder;

diff --git a/...controller/dto/ClubNoticeGetResponse.java → ...oller/response/ClubNoticeGetResponse.java b/...controller/dto/ClubNoticeGetResponse.java → ...oller/response/ClubNoticeGetResponse.java
@@ -1,4 +1,4 @@
-package com.spaceclub.club.controller.dto;
+package com.spaceclub.club.controller.response;
 
 import com.spaceclub.club.domain.ClubNotice;
 

diff --git a/.../controller/dto/ClubUserRoleResponse.java → ...roller/response/ClubUserRoleResponse.java b/.../controller/dto/ClubUserRoleResponse.java → ...roller/response/ClubUserRoleResponse.java
@@ -1,4 +1,4 @@
-package com.spaceclub.club.controller.dto;
+package com.spaceclub.club.controller.response;
 
 public record ClubUserRoleResponse(String role) {
 

diff --git a/...club/repository/ClubNoticeRepository.java → ...main/repository/ClubNoticeRepository.java b/...club/repository/ClubNoticeRepository.java → ...main/repository/ClubNoticeRepository.java
@@ -1,4 +1,4 @@
-package com.spaceclub.club.repository;
+package com.spaceclub.club.domain.repository;
 
 import com.spaceclub.club.domain.ClubNotice;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/...eclub/club/repository/ClubRepository.java → ...lub/domain/repository/ClubRepository.java b/...eclub/club/repository/ClubRepository.java → ...lub/domain/repository/ClubRepository.java
@@ -1,4 +1,4 @@
-package com.spaceclub.club.repository;
+package com.spaceclub.club.domain.repository;
 
 import com.spaceclub.club.domain.Club;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/...b/club/repository/ClubUserRepository.java → ...domain/repository/ClubUserRepository.java b/...b/club/repository/ClubUserRepository.java → ...domain/repository/ClubUserRepository.java
@@ -1,4 +1,4 @@
-package com.spaceclub.club.repository;
+package com.spaceclub.club.domain.repository;
 
 import com.spaceclub.club.domain.Club;
 import com.spaceclub.club.domain.ClubUser;

diff --git a/src/main/java/com/spaceclub/club/service/ClubEventService.java b/src/main/java/com/spaceclub/club/service/ClubEventService.java
@@ -1,6 +1,6 @@
 package com.spaceclub.club.service;
 
-import com.spaceclub.club.repository.ClubUserRepository;
+import com.spaceclub.club.domain.repository.ClubUserRepository;
 import com.spaceclub.event.service.EventProvider;
 import com.spaceclub.event.service.vo.ClubEventOverviewGetInfo;
 import lombok.RequiredArgsConstructor;

diff --git a/src/main/java/com/spaceclub/club/service/ClubMemberManagerService.java b/src/main/java/com/spaceclub/club/service/ClubMemberManagerService.java
@@ -2,7 +2,7 @@
 
 import com.spaceclub.club.domain.Club;
 import com.spaceclub.club.domain.ClubUser;
-import com.spaceclub.club.repository.ClubUserRepository;
+import com.spaceclub.club.domain.repository.ClubUserRepository;
 import com.spaceclub.club.service.vo.ClubUserUpdate;
 import com.spaceclub.club.service.vo.MemberGetInfo;
 import com.spaceclub.user.service.UserService;

diff --git a/src/main/java/com/spaceclub/club/service/ClubNoticeService.java b/src/main/java/com/spaceclub/club/service/ClubNoticeService.java
@@ -3,9 +3,9 @@
 import com.spaceclub.club.domain.Club;
 import com.spaceclub.club.domain.ClubNotice;
 import com.spaceclub.club.domain.ClubUser;
-import com.spaceclub.club.repository.ClubNoticeRepository;
-import com.spaceclub.club.repository.ClubRepository;
-import com.spaceclub.club.repository.ClubUserRepository;
+import com.spaceclub.club.domain.repository.ClubNoticeRepository;
+import com.spaceclub.club.domain.repository.ClubRepository;
+import com.spaceclub.club.domain.repository.ClubUserRepository;
 import com.spaceclub.club.service.vo.ClubNoticeDelete;
 import com.spaceclub.club.service.vo.ClubNoticeUpdate;
 import lombok.RequiredArgsConstructor;