Merge pull request #170 from KUIT-Space/refactor/#169/정산-홈-view-api

Refactor/#169/정산 홈 view api

.gitignore

@@ -40,4 +40,7 @@ out/
 src/main/resource/application-local.yml
 /**/application-local.yml
 src/main/resource/application-dev.yml
-/**/application-dev.yml
+/**/application-dev.yml
+
+### test yml file ###
+src/test/resources/application-test.yml

src/main/java/space/space_spring/argumentResolver/userSpace/UserSpaceAuthHandlerArgumentResolver.java

@@ -8,8 +8,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
-import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
-import space.space_spring.dao.UserSpaceDao;
+import space.space_spring.domain.userSpace.repository.UserSpaceDao;
 
 @Component
 @RequiredArgsConstructor

src/main/java/space/space_spring/controller/PostController.java

@@ -7,14 +7,13 @@
 import org.springframework.web.bind.annotation.*;
 
 import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
-import org.springframework.web.multipart.MultipartFile;
 
 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.entity.UserSpace;
+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;

src/main/java/space/space_spring/controller/VoiceRoomController.java

@@ -9,7 +9,7 @@
 import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
 import space.space_spring.argumentResolver.userSpace.UserSpaceAuth;
 import space.space_spring.argumentResolver.userSpace.UserSpaceId;
-import space.space_spring.dao.UserSpaceDao;
+import space.space_spring.domain.userSpace.repository.UserSpaceDao;
 import space.space_spring.dao.VoiceRoomRepository;
 import space.space_spring.dto.VoiceRoom.*;
 
@@ -21,9 +21,7 @@
 import space.space_spring.util.user.UserUtils;
 import space.space_spring.util.userSpace.UserSpaceUtils;
 
-import javax.print.DocFlavor;
 import java.util.List;
-import java.util.Optional;
 
 import static space.space_spring.entity.enumStatus.UserSpaceAuth.MANAGER;
 import static space.space_spring.response.status.BaseExceptionResponseStatus.*;

src/main/java/space/space_spring/dao/CommentLikeDao.java

@@ -4,7 +4,7 @@
 import org.springframework.stereotype.Repository;
 import space.space_spring.entity.Comment;
 import space.space_spring.entity.CommentLike;
-import space.space_spring.entity.User;
+import space.space_spring.domain.user.model.entity.User;
 
 import java.util.Optional;
 

src/main/java/space/space_spring/dao/PostDao.java

@@ -6,7 +6,7 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import space.space_spring.entity.Post;
-import space.space_spring.entity.Space;
+import space.space_spring.domain.space.model.entity.Space;
 
 import java.util.List;
 

src/main/java/space/space_spring/dao/PostLikeDao.java

@@ -1,6 +1,7 @@
 package space.space_spring.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import space.space_spring.domain.user.model.entity.User;
 import space.space_spring.entity.*;
 
 import java.util.Optional;

src/main/java/space/space_spring/dao/VoiceRoomDao.java

@@ -3,14 +3,10 @@
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.transaction.Transactional;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import space.space_spring.entity.Space;
+import space.space_spring.domain.space.model.entity.Space;
 import space.space_spring.entity.VoiceRoom;
 
-import java.util.List;
-import java.util.Optional;
-
 @Repository
 public class VoiceRoomDao  {
     @PersistenceContext

src/main/java/space/space_spring/dao/VoiceRoomRepository.java

@@ -4,7 +4,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import space.space_spring.entity.Space;
+import space.space_spring.domain.space.model.entity.Space;
 import space.space_spring.entity.VoiceRoom;
 
 import java.util.List;

src/main/java/space/space_spring/dao/chat/UserChatRoomRepository.java

@@ -2,7 +2,7 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import space.space_spring.entity.ChatRoom;
-import space.space_spring.entity.User;
+import space.space_spring.domain.user.model.entity.User;
 import space.space_spring.entity.UserChatRoom;
 import space.space_spring.entity.enumStatus.BaseStatusType;
 

src/main/java/space/space_spring/dao/chat/custom/ChatRoomRepositoryCustom.java

@@ -1,8 +1,8 @@
 package space.space_spring.dao.chat.custom;
 
 import space.space_spring.entity.ChatRoom;
-import space.space_spring.entity.Space;
-import space.space_spring.entity.User;
+import space.space_spring.domain.space.model.entity.Space;
+import space.space_spring.domain.user.model.entity.User;
 
 import java.util.List;
 

src/main/java/space/space_spring/dao/chat/custom/ChatRoomRepositoryImpl.java

@@ -3,8 +3,8 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import space.space_spring.entity.ChatRoom;
-import space.space_spring.entity.Space;
-import space.space_spring.entity.User;
+import space.space_spring.domain.space.model.entity.Space;
+import space.space_spring.domain.user.model.entity.User;
 
 import java.util.List;
 import space.space_spring.entity.enumStatus.BaseStatusType;

src/main/java/space/space_spring/domain/authorization/OAuth/controller/OAuthController.java

@@ -9,7 +9,7 @@
 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.entity.User;
+import space.space_spring.domain.user.model.entity.User;
 import space.space_spring.domain.authorization.OAuth.service.OAuthService;
 
 import java.io.IOException;

src/main/java/space/space_spring/domain/authorization/OAuth/service/OAuthService.java

@@ -15,7 +15,7 @@
 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.entity.User;
+import space.space_spring.domain.user.model.entity.User;
 import space.space_spring.util.user.UserUtils;
 
 import static space.space_spring.entity.enumStatus.UserSignupType.KAKAO;

src/main/java/space/space_spring/domain/authorization/auth/service/AuthService.java

@@ -9,8 +9,8 @@
 import space.space_spring.domain.authorization.jwt.model.TokenType;
 import space.space_spring.domain.authorization.jwt.repository.JwtRepository;
 import space.space_spring.domain.user.model.PostLoginDto;
-import space.space_spring.entity.RefreshTokenStorage;
-import space.space_spring.entity.User;
+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.domain.authorization.jwt.model.JwtLoginProvider;
 import space.space_spring.util.user.UserUtils;

src/main/java/space/space_spring/domain/authorization/jwt/controller/JwtController.java

@@ -8,7 +8,6 @@
 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.entity.User;
 import space.space_spring.response.BaseResponse;
 
 import java.io.IOException;