Merge pull request #175 from KUIT-Space/refactor/#174/v1-디렉토리-정리

Refactor/#174: v1 디렉토리 정리
KUIT-Space · Jan 16, 2025 · 1d63d86 · 1d63d86
2 parents 8e59e7b + d3a2628
commit 1d63d86
Show file tree

Hide file tree

Showing 158 changed files with 516 additions and 552 deletions.
diff --git a/src/main/java/space/space_spring/dao/PostLikeDao.java b/src/main/java/space/space_spring/dao/PostLikeDao.java
diff --git a/src/main/java/space/space_spring/domain/authorization/auth/controller/AuthController.java b/src/main/java/space/space_spring/domain/authorization/auth/controller/AuthController.java
@@ -10,11 +10,11 @@
 import org.springframework.web.bind.annotation.RestController;
 import space.space_spring.domain.authorization.auth.service.AuthService;
 import space.space_spring.domain.user.model.PostLoginDto;
-import space.space_spring.exception.CustomException;
-import space.space_spring.response.BaseResponse;
+import space.space_spring.global.exception.CustomException;
+import space.space_spring.global.common.response.BaseResponse;
 
-import static space.space_spring.response.status.BaseExceptionResponseStatus.INVALID_USER_LOGIN;
-import static space.space_spring.util.bindingResult.BindingResultUtils.getErrorMessage;
+import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.INVALID_USER_LOGIN;
+import static space.space_spring.global.util.bindingResult.BindingResultUtils.getErrorMessage;
 
 @RestController
 @RequiredArgsConstructor

diff --git a/src/main/java/space/space_spring/domain/authorization/auth/service/AuthService.java b/src/main/java/space/space_spring/domain/authorization/auth/service/AuthService.java
@@ -11,12 +11,12 @@
 import space.space_spring.domain.user.model.PostLoginDto;
 import space.space_spring.domain.authorization.jwt.model.entity.RefreshTokenStorage;
 import space.space_spring.domain.user.model.entity.User;
-import space.space_spring.exception.CustomException;
+import space.space_spring.global.exception.CustomException;
 import space.space_spring.domain.authorization.jwt.model.JwtLoginProvider;
-import space.space_spring.util.user.UserUtils;
+import space.space_spring.global.util.user.UserUtils;
 
-import static space.space_spring.entity.enumStatus.UserSignupType.LOCAL;
-import static space.space_spring.response.status.BaseExceptionResponseStatus.PASSWORD_NO_MATCH;
+import static space.space_spring.global.common.enumStatus.UserSignupType.LOCAL;
+import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.PASSWORD_NO_MATCH;
 
 @Service
 @RequiredArgsConstructor

diff --git a/src/main/java/space/space_spring/domain/authorization/jwt/controller/JwtController.java b/src/main/java/space/space_spring/domain/authorization/jwt/controller/JwtController.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import space.space_spring.domain.authorization.jwt.service.JwtService;
 import space.space_spring.domain.authorization.jwt.model.TokenPairDTO;
-import space.space_spring.response.BaseResponse;
+import space.space_spring.global.common.response.BaseResponse;
 
 import java.io.IOException;
 

diff --git a/src/main/java/space/space_spring/domain/authorization/jwt/model/JwtLoginProvider.java b/src/main/java/space/space_spring/domain/authorization/jwt/model/JwtLoginProvider.java
@@ -4,19 +4,17 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import space.space_spring.exception.CustomException;
-import space.space_spring.exception.jwt.bad_request.JwtUnsupportedTokenException;
-import space.space_spring.exception.jwt.unauthorized.JwtInvalidTokenException;
-import space.space_spring.exception.jwt.unauthorized.JwtMalformedTokenException;
+import space.space_spring.global.exception.CustomException;
+import space.space_spring.global.exception.jwt.bad_request.JwtUnsupportedTokenException;
+import space.space_spring.global.exception.jwt.unauthorized.JwtInvalidTokenException;
+import space.space_spring.global.exception.jwt.unauthorized.JwtMalformedTokenException;
+import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.*;
 
 import java.util.Date;
 
-import static space.space_spring.response.status.BaseExceptionResponseStatus.*;
-
 @Slf4j
 @Component
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

diff --git a/src/main/java/space/space_spring/domain/authorization/jwt/model/JwtLoginTokenResolver.java b/src/main/java/space/space_spring/domain/authorization/jwt/model/JwtLoginTokenResolver.java
@@ -5,11 +5,11 @@
 import lombok.NoArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
-import space.space_spring.exception.jwt.bad_request.JwtNoTokenException;
-import space.space_spring.exception.jwt.bad_request.JwtUnsupportedTokenException;
+import space.space_spring.global.exception.jwt.bad_request.JwtNoTokenException;
+import space.space_spring.global.exception.jwt.bad_request.JwtUnsupportedTokenException;
 
-import static space.space_spring.response.status.BaseExceptionResponseStatus.TOKEN_NOT_FOUND;
-import static space.space_spring.response.status.BaseExceptionResponseStatus.UNSUPPORTED_TOKEN_TYPE;
+import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.TOKEN_NOT_FOUND;
+import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.UNSUPPORTED_TOKEN_TYPE;
 
 @Component
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

diff --git a/src/main/java/space/space_spring/domain/authorization/jwt/service/JwtService.java b/src/main/java/space/space_spring/domain/authorization/jwt/service/JwtService.java
@@ -10,11 +10,10 @@
 import space.space_spring.domain.user.repository.UserRepository;
 import space.space_spring.domain.authorization.jwt.model.entity.RefreshTokenStorage;
 import space.space_spring.domain.user.model.entity.User;
-import space.space_spring.exception.CustomException;
-import space.space_spring.exception.jwt.unauthorized.JwtExpiredTokenException;
-import space.space_spring.exception.jwt.unauthorized.JwtUnauthorizedTokenException;
-
-import static space.space_spring.response.status.BaseExceptionResponseStatus.*;
+import space.space_spring.global.exception.CustomException;
+import space.space_spring.global.exception.jwt.unauthorized.JwtExpiredTokenException;
+import space.space_spring.global.exception.jwt.unauthorized.JwtUnauthorizedTokenException;
+import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.*;
 
 @Service
 @RequiredArgsConstructor

diff --git a/...ion/OAuth/controller/OAuthController.java → ...ion/oauth/controller/OAuthController.java b/...ion/OAuth/controller/OAuthController.java → ...ion/oauth/controller/OAuthController.java
@@ -1,4 +1,4 @@
-package space.space_spring.domain.authorization.OAuth.controller;
+package space.space_spring.domain.authorization.oauth.controller;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import jakarta.servlet.http.HttpServletResponse;
@@ -8,9 +8,9 @@
 import org.springframework.web.bind.annotation.*;
 import space.space_spring.domain.authorization.jwt.service.JwtService;
 import space.space_spring.domain.authorization.jwt.model.TokenPairDTO;
-import space.space_spring.dto.oAuth.KakaoInfo;
+import space.space_spring.domain.authorization.oauth.dto.KakaoInfo;
 import space.space_spring.domain.user.model.entity.User;
-import space.space_spring.domain.authorization.OAuth.service.OAuthService;
+import space.space_spring.domain.authorization.oauth.service.OAuthService;
 
 import java.io.IOException;
 

diff --git a/...ace/space_spring/dto/oAuth/KakaoInfo.java → ...in/authorization/oauth/dto/KakaoInfo.java b/...ace/space_spring/dto/oAuth/KakaoInfo.java → ...in/authorization/oauth/dto/KakaoInfo.java
@@ -1,4 +1,4 @@
-package space.space_spring.dto.oAuth;
+package space.space_spring.domain.authorization.oauth.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...orization/OAuth/service/OAuthService.java → ...orization/oauth/service/OAuthService.java b/...orization/OAuth/service/OAuthService.java → ...orization/oauth/service/OAuthService.java
@@ -1,4 +1,4 @@
-package space.space_spring.domain.authorization.OAuth.service;
+package space.space_spring.domain.authorization.oauth.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -14,11 +14,11 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 import space.space_spring.domain.user.repository.UserDao;
-import space.space_spring.dto.oAuth.KakaoInfo;
+import space.space_spring.domain.authorization.oauth.dto.KakaoInfo;
 import space.space_spring.domain.user.model.entity.User;
-import space.space_spring.util.user.UserUtils;
+import space.space_spring.global.util.user.UserUtils;
 
-import static space.space_spring.entity.enumStatus.UserSignupType.KAKAO;
+import static space.space_spring.global.common.enumStatus.UserSignupType.KAKAO;
 
 @Service
 @RequiredArgsConstructor

diff --git a/..._spring/controller/CommentController.java → ...n/board/controller/CommentController.java b/..._spring/controller/CommentController.java → ...n/board/controller/CommentController.java
@@ -1,15 +1,15 @@
-package space.space_spring.controller;
+package space.space_spring.domain.board.controller;
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
-import space.space_spring.argumentResolver.userSpace.CheckUserSpace;
-import space.space_spring.dto.comment.request.CreateCommentRequest;
-import space.space_spring.dto.comment.response.ReadCommentsResponse;
-import space.space_spring.response.BaseResponse;
-import space.space_spring.service.CommentService;
+import space.space_spring.global.argumentResolver.jwtLogin.JwtLoginAuth;
+import space.space_spring.global.argumentResolver.userSpace.CheckUserSpace;
+import space.space_spring.domain.board.model.request.CreateCommentRequest;
+import space.space_spring.domain.board.model.response.ReadCommentsResponse;
+import space.space_spring.global.common.response.BaseResponse;
+import space.space_spring.domain.board.service.CommentService;
 
 import java.util.List;
 

diff --git a/...ace_spring/controller/LikeController.java → ...main/board/controller/LikeController.java b/...ace_spring/controller/LikeController.java → ...main/board/controller/LikeController.java
@@ -1,12 +1,12 @@
-package space.space_spring.controller;
+package space.space_spring.domain.board.controller;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
-import space.space_spring.argumentResolver.userSpace.CheckUserSpace;
-import space.space_spring.response.BaseResponse;
-import space.space_spring.service.LikeService;
+import space.space_spring.global.argumentResolver.jwtLogin.JwtLoginAuth;
+import space.space_spring.global.argumentResolver.userSpace.CheckUserSpace;
+import space.space_spring.global.common.response.BaseResponse;
+import space.space_spring.domain.board.service.LikeService;
 
 @RestController
 @RequiredArgsConstructor

diff --git a/...ace_spring/controller/PostController.java → ...main/board/controller/PostController.java b/...ace_spring/controller/PostController.java → ...main/board/controller/PostController.java
@@ -1,27 +1,27 @@
-package space.space_spring.controller;
+package space.space_spring.domain.board.controller;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
+import space.space_spring.global.argumentResolver.jwtLogin.JwtLoginAuth;
 
-import space.space_spring.argumentResolver.userSpace.CheckUserSpace;
-import space.space_spring.dto.post.request.CreatePostRequest;
-import space.space_spring.dto.post.response.ReadPostDetailResponse;
-import space.space_spring.dto.post.response.ReadPostsResponse;
+import space.space_spring.global.argumentResolver.userSpace.CheckUserSpace;
+import space.space_spring.domain.board.model.request.CreatePostRequest;
+import space.space_spring.domain.board.model.response.ReadPostDetailResponse;
+import space.space_spring.domain.board.model.response.ReadPostsResponse;
 
 import space.space_spring.domain.userSpace.model.entity.UserSpace;
-import space.space_spring.exception.CustomException;
-import space.space_spring.response.BaseResponse;
-import space.space_spring.service.PostService;
-import space.space_spring.util.userSpace.UserSpaceUtils;
+import space.space_spring.global.exception.CustomException;
+import space.space_spring.global.common.response.BaseResponse;
+import space.space_spring.domain.board.service.PostService;
+import space.space_spring.global.util.userSpace.UserSpaceUtils;
 import java.util.List;
 import java.util.Optional;
 
-import static space.space_spring.response.status.BaseExceptionResponseStatus.INVALID_POST_CREATE;
+import static space.space_spring.global.common.response.status.BaseExceptionResponseStatus.INVALID_POST_CREATE;
 
 @RestController
 @RequiredArgsConstructor

diff --git a/...va/space/space_spring/entity/Comment.java → ...ng/domain/board/model/entity/Comment.java b/...va/space/space_spring/entity/Comment.java → ...ng/domain/board/model/entity/Comment.java
@@ -1,16 +1,17 @@
-package space.space_spring.entity;
+package space.space_spring.domain.board.model.entity;
 
 import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import space.space_spring.domain.user.model.entity.User;
+import space.space_spring.global.common.entity.BaseEntity;
 
 @Entity
 @Table(name = "Post_Comment")
 @Getter
 @NoArgsConstructor
-public class Comment extends BaseEntity{
+public class Comment extends BaseEntity {
     @Id
     @GeneratedValue
     @Column(name = "comment_id")

diff --git a/...pace/space_spring/entity/CommentLike.java → ...omain/board/model/entity/CommentLike.java b/...pace/space_spring/entity/CommentLike.java → ...omain/board/model/entity/CommentLike.java
@@ -1,17 +1,18 @@
-package space.space_spring.entity;
+package space.space_spring.domain.board.model.entity;
 
 import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import space.space_spring.domain.user.model.entity.User;
+import space.space_spring.global.common.entity.BaseEntity;
 
 @Entity
 @Table(name = "Comment_Like",
         uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "post_comment_id"})})
 @Getter
 @NoArgsConstructor
-public class CommentLike extends BaseEntity{
+public class CommentLike extends BaseEntity {
     @Id
     @GeneratedValue
     @Column(name = "comment_like_id")

diff --git a/.../java/space/space_spring/entity/Post.java → ...pring/domain/board/model/entity/Post.java b/.../java/space/space_spring/entity/Post.java → ...pring/domain/board/model/entity/Post.java
@@ -1,4 +1,4 @@
-package space.space_spring.entity;
+package space.space_spring.domain.board.model.entity;
 
 import jakarta.persistence.*;
 import lombok.Builder;
@@ -8,6 +8,7 @@
 import space.space_spring.domain.user.model.entity.User;
 
 import java.util.List;
+import space.space_spring.global.common.entity.BaseEntity;
 
 @Entity
 @Table(name = "Posts")

diff --git a/.../space/space_spring/entity/PostImage.java → .../domain/board/model/entity/PostImage.java b/.../space/space_spring/entity/PostImage.java → .../domain/board/model/entity/PostImage.java
@@ -1,16 +1,17 @@
-package space.space_spring.entity;
+package space.space_spring.domain.board.model.entity;
 
 import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import space.space_spring.global.common.entity.BaseEntity;
 
 @Entity
 @Table(name = "Post_Image")
 @Getter
 @NoArgsConstructor
-public class PostImage extends BaseEntity{
+public class PostImage extends BaseEntity {
     @Id
     @GeneratedValue
     @Column(name = "post_image_id")

diff --git a/...a/space/space_spring/entity/PostLike.java → ...g/domain/board/model/entity/PostLike.java b/...a/space/space_spring/entity/PostLike.java → ...g/domain/board/model/entity/PostLike.java
@@ -1,16 +1,17 @@
-package space.space_spring.entity;
+package space.space_spring.domain.board.model.entity;
 
 import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import space.space_spring.domain.user.model.entity.User;
+import space.space_spring.global.common.entity.BaseEntity;
 
 @Entity
 @Table(name = "Post_Like")
 @Getter
 @NoArgsConstructor
-public class PostLike extends BaseEntity{
+public class PostLike extends BaseEntity {
     @Id
     @GeneratedValue
     @Column(name = "post_like_id")

diff --git a/...comment/request/CreateCommentRequest.java → ...d/model/request/CreateCommentRequest.java b/...comment/request/CreateCommentRequest.java → ...d/model/request/CreateCommentRequest.java
@@ -1,9 +1,9 @@
-package space.space_spring.dto.comment.request;
+package space.space_spring.domain.board.model.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
-import space.space_spring.entity.Comment;
-import space.space_spring.entity.Post;
+import space.space_spring.domain.board.model.entity.Comment;
+import space.space_spring.domain.board.model.entity.Post;
 import space.space_spring.domain.user.model.entity.User;
 
 

diff --git a/...g/dto/post/request/CreatePostRequest.java → ...oard/model/request/CreatePostRequest.java b/...g/dto/post/request/CreatePostRequest.java → ...oard/model/request/CreatePostRequest.java
@@ -1,10 +1,10 @@
-package space.space_spring.dto.post.request;
+package space.space_spring.domain.board.model.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
 import org.springframework.web.multipart.MultipartFile;
-import space.space_spring.entity.Post;
-import space.space_spring.entity.PostImage;
+import space.space_spring.domain.board.model.entity.Post;
+import space.space_spring.domain.board.model.entity.PostImage;
 import space.space_spring.domain.space.model.entity.Space;
 import space.space_spring.domain.user.model.entity.User;
 

diff --git a/...omment/response/ReadCommentsResponse.java → .../model/response/ReadCommentsResponse.java b/...omment/response/ReadCommentsResponse.java → .../model/response/ReadCommentsResponse.java
@@ -1,9 +1,9 @@
-package space.space_spring.dto.comment.response;
+package space.space_spring.domain.board.model.response;
 
 import lombok.*;
-import space.space_spring.entity.Comment;
+import space.space_spring.domain.board.model.entity.Comment;
 import space.space_spring.domain.userSpace.model.entity.UserSpace;
-import space.space_spring.util.post.ConvertCreatedDate;
+import space.space_spring.global.util.post.ConvertCreatedDate;
 
 @Builder
 @Getter

diff --git a/...post/response/ReadPostDetailResponse.java → ...odel/response/ReadPostDetailResponse.java b/...post/response/ReadPostDetailResponse.java → ...odel/response/ReadPostDetailResponse.java
@@ -1,11 +1,10 @@
-package space.space_spring.dto.post.response;
+package space.space_spring.domain.board.model.response;
 
 import lombok.*;
-import space.space_spring.dto.comment.response.ReadCommentsResponse;
-import space.space_spring.entity.Post;
-import space.space_spring.entity.PostImage;
+import space.space_spring.domain.board.model.entity.Post;
+import space.space_spring.domain.board.model.entity.PostImage;
 import space.space_spring.domain.userSpace.model.entity.UserSpace;
-import space.space_spring.util.post.ConvertCreatedDate;
+import space.space_spring.global.util.post.ConvertCreatedDate;
 
 import java.util.List;