refactor: 디렉토리 구조 변경 - 리포지토리, dto 분리

src/main/java/capstone/facefriend/auth/controller/AuthController.java

@@ -1,12 +1,12 @@
 package capstone.facefriend.auth.controller;
 
 
-import capstone.facefriend.auth.controller.dto.LoginUriResponse;
-import capstone.facefriend.auth.controller.dto.TokenResponse;
-import capstone.facefriend.auth.domain.OAuthMember;
+import capstone.facefriend.auth.dto.LoginUriResponse;
+import capstone.facefriend.auth.dto.TokenResponse;
+import capstone.facefriend.auth.domain.oauth.OAuthMember;
 import capstone.facefriend.auth.service.AuthService;
 import capstone.facefriend.auth.service.OAuthRequester;
-import capstone.facefriend.auth.service.dto.OAuthLoginRequest;
+import capstone.facefriend.auth.dto.OAuthLoginRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

src/main/java/capstone/facefriend/auth/controller/interceptor/LoginInterceptor.java

@@ -2,7 +2,7 @@
 
 import capstone.facefriend.auth.controller.support.AuthenticationContext;
 import capstone.facefriend.auth.controller.support.AuthenticationExtractor;
-import capstone.facefriend.auth.domain.TokenProvider;
+import capstone.facefriend.auth.domain.token.TokenProvider;
 import capstone.facefriend.auth.exception.AuthException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

src/main/java/capstone/facefriend/auth/controller/interceptor/TokenReissueInterceptor.java

@@ -2,7 +2,7 @@
 
 import capstone.facefriend.auth.controller.support.AuthenticationContext;
 import capstone.facefriend.auth.controller.support.AuthenticationExtractor;
-import capstone.facefriend.auth.domain.TokenProvider;
+import capstone.facefriend.auth.domain.token.TokenProvider;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;

src/main/java/capstone/facefriend/auth/domain/GoogleMember.java → src/main/java/capstone/facefriend/auth/domain/oauth/GoogleMember.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.auth.domain;
+package capstone.facefriend.auth.domain.oauth;
 
 import java.util.Map;
 

src/main/java/capstone/facefriend/auth/domain/OAuthMember.java → src/main/java/capstone/facefriend/auth/domain/oauth/OAuthMember.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.auth.domain;
+package capstone.facefriend.auth.domain.oauth;
 
 public interface OAuthMember {
 

src/main/java/capstone/facefriend/auth/domain/oauth/Provider.java

@@ -0,0 +1,35 @@
+package capstone.facefriend.auth.domain.oauth;
+
+import capstone.facefriend.auth.exception.AuthException;
+import capstone.facefriend.auth.exception.AuthExceptionType;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+
+public enum Provider {
+
+    GOOGLE("google", GoogleMember::new),
+    ;
+
+    private final String providerName;
+    private final Function<Map<String, Object>, OAuthMember> function;
+
+    Provider(String providerName, Function<Map<String, Object>, OAuthMember> function) {
+        this.providerName = providerName;
+        this.function = function;
+    }
+
+    public static Provider from(String name) {
+        return Arrays.stream(values())
+                .filter(it -> it.providerName.equals(name))
+                .findFirst()
+                .orElseThrow(() -> new AuthException(AuthExceptionType.INVALID_AUTH_PROVIDER));
+    }
+
+    public OAuthMember getOAuthMember(Map<String, Object> body) {
+        return function.apply(body);
+        // function 은 GoogleMember 의 생성자를 의미
+        // GoogleMember 생성자의 파라미터에 request body (=Map<String, Object>) 넣어서 OAuthMember 객체 반환
+    }
+}

src/main/java/capstone/facefriend/auth/domain/token/TokenProvider.java

@@ -1,6 +1,6 @@
 package capstone.facefriend.auth.domain.token;
 
-import capstone.facefriend.auth.controller.dto.TokenResponse;
+import capstone.facefriend.auth.dto.TokenResponse;
 
 public interface TokenProvider {
 

src/main/java/capstone/facefriend/auth/controller/dto/LoginUriResponse.java → src/main/java/capstone/facefriend/auth/dto/LoginUriResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.auth.controller.dto;
+package capstone.facefriend.auth.dto;
 
 public record LoginUriResponse(
         String loginUri

src/main/java/capstone/facefriend/auth/service/dto/OAuthLoginRequest.java → src/main/java/capstone/facefriend/auth/dto/OAuthLoginRequest.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.auth.service.dto;
+package capstone.facefriend.auth.dto;
 
 public record OAuthLoginRequest(
         String redirectUri,

src/main/java/capstone/facefriend/auth/service/dto/OAuthUriRequest.java → src/main/java/capstone/facefriend/auth/dto/OAuthUriRequest.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.auth.service.dto;
+package capstone.facefriend.auth.dto;
 
 public record OAuthUriRequest(
         String redirectUri

src/main/java/capstone/facefriend/auth/dto/TokenResponse.java

@@ -0,0 +1,11 @@
+package capstone.facefriend.auth.dto;
+
+import capstone.facefriend.auth.domain.token.AccessToken;
+import capstone.facefriend.auth.domain.token.RefreshToken;
+
+public record TokenResponse(
+        AccessToken accessToken,
+        RefreshToken refreshToken,
+        Long memberId
+) {
+}

src/main/java/capstone/facefriend/auth/infrastructure/JwtProvider.java

@@ -1,7 +1,7 @@
 package capstone.facefriend.auth.infrastructure;
 
 
-import capstone.facefriend.auth.controller.dto.TokenResponse;
+import capstone.facefriend.auth.dto.TokenResponse;
 import capstone.facefriend.auth.domain.token.AccessToken;
 import capstone.facefriend.auth.domain.token.RefreshToken;
 import capstone.facefriend.auth.domain.token.TokenProvider;

src/main/java/capstone/facefriend/auth/infrastructure/RestTemplateOAuthRequester.java

@@ -1,14 +1,14 @@
 package capstone.facefriend.auth.infrastructure;
 
-import capstone.facefriend.auth.domain.OAuthMember;
-import capstone.facefriend.auth.domain.Provider;
+import capstone.facefriend.auth.domain.oauth.OAuthMember;
+import capstone.facefriend.auth.domain.oauth.Provider;
 import capstone.facefriend.auth.exception.AuthException;
 import capstone.facefriend.auth.exception.AuthExceptionType;
 import capstone.facefriend.auth.infrastructure.dto.OAuthTokenResponse;
 import capstone.facefriend.auth.service.OAuthProviderProperties;
 import capstone.facefriend.auth.service.OAuthProviderProperties.OAuthProviderProperty;
 import capstone.facefriend.auth.service.OAuthRequester;
-import capstone.facefriend.auth.service.dto.OAuthLoginRequest;
+import capstone.facefriend.auth.dto.OAuthLoginRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;

src/main/java/capstone/facefriend/auth/service/AuthService.java

@@ -1,12 +1,14 @@
 package capstone.facefriend.auth.service;
 
 
-import capstone.facefriend.auth.controller.dto.TokenResponse;
-import capstone.facefriend.auth.domain.OAuthMember;
-import capstone.facefriend.auth.domain.Provider;
-import capstone.facefriend.auth.domain.TokenProvider;
+import capstone.facefriend.auth.dto.TokenResponse;
+import capstone.facefriend.auth.domain.oauth.OAuthMember;
+import capstone.facefriend.auth.domain.oauth.Provider;
+import capstone.facefriend.auth.domain.token.AccessToken;
+import capstone.facefriend.auth.domain.token.RefreshToken;
+import capstone.facefriend.auth.domain.token.TokenProvider;
 import capstone.facefriend.member.domain.member.Member;
-import capstone.facefriend.member.domain.member.MemberRepository;
+import capstone.facefriend.member.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,15 +41,19 @@ public TokenResponse generateTokens(OAuthMember oAuthMember) {
                 .orElseGet(() -> memberRepository.save(newMember));
 
         Long memberId = member.getId();
-        return new TokenResponse(getAccessToken(memberId), getRefreshToken(memberId), memberId);
+
+        AccessToken accessToken = AccessToken.from(createAccessToken(memberId));
+        RefreshToken refreshToken = RefreshToken.from(createRefreshToken(memberId));
+
+        return new TokenResponse(accessToken, refreshToken, memberId);
     }
 
-    private String getAccessToken(Long memberId) {
+    private String createAccessToken(Long memberId) {
         String accessToken = tokenProvider.createAccessToken(memberId);
         return accessToken;
     }
 
-    private String getRefreshToken(Long memberId) {
+    private String createRefreshToken(Long memberId) {
         String refreshToken = tokenProvider.createRefreshToken(memberId);
         return refreshToken;
     }

src/main/java/capstone/facefriend/auth/service/OAuthProviderProperties.java

@@ -1,6 +1,6 @@
 package capstone.facefriend.auth.service;
 
-import capstone.facefriend.auth.domain.Provider;
+import capstone.facefriend.auth.domain.oauth.Provider;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/capstone/facefriend/auth/service/OAuthRequester.java

@@ -1,8 +1,8 @@
 package capstone.facefriend.auth.service;
 
-import capstone.facefriend.auth.domain.OAuthMember;
-import capstone.facefriend.auth.domain.Provider;
-import capstone.facefriend.auth.service.dto.OAuthLoginRequest;
+import capstone.facefriend.auth.domain.oauth.OAuthMember;
+import capstone.facefriend.auth.domain.oauth.Provider;
+import capstone.facefriend.auth.dto.OAuthLoginRequest;
 
 public interface OAuthRequester {
 

src/main/java/capstone/facefriend/bucket/BucketService.java

@@ -4,12 +4,11 @@
 import capstone.facefriend.chat.domain.ChatRoom;
 import capstone.facefriend.chat.domain.ChatRoomMember;
 import capstone.facefriend.chat.exception.ChatException;
-import capstone.facefriend.chat.exception.ChatExceptionType;
 import capstone.facefriend.chat.repository.ChatMessageRepository;
 import capstone.facefriend.chat.repository.ChatRoomMemberRepository;
 import capstone.facefriend.chat.repository.ChatRoomRepository;
 import capstone.facefriend.member.domain.member.Member;
-import capstone.facefriend.member.domain.member.MemberRepository;
+import capstone.facefriend.member.repository.MemberRepository;
 import capstone.facefriend.member.exception.member.MemberException;
 import capstone.facefriend.member.exception.member.MemberExceptionType;
 import capstone.facefriend.member.multipartFile.ByteArrayMultipartFile;
@@ -42,7 +41,7 @@ public class BucketService {
     @Value("${spring.cloud.aws.s3.bucket}")
     private String BUCKET_NAME;
 
-    @Value("${spring.cloud.aws.s3.default-faceInfo-s3url}")
+    @Value("${spring.cloud.aws.s3.default-profile}")
     private String DEFAULT_FACE_INFO_S3_URL;
     @Value("${spring.cloud.aws.s3.origin-postfix}")
     private String ORIGIN_POSTFIX;

src/main/java/capstone/facefriend/chat/aop/ChatAop.java

@@ -8,7 +8,7 @@
 import capstone.facefriend.chat.repository.ChatRoomMemberRepository;
 import capstone.facefriend.member.domain.faceInfo.FaceInfoByLevel;
 import capstone.facefriend.member.domain.member.Member;
-import capstone.facefriend.member.domain.member.MemberRepository;
+import capstone.facefriend.member.repository.MemberRepository;
 import capstone.facefriend.member.exception.member.MemberException;
 import capstone.facefriend.member.multipartFile.ByteArrayMultipartFile;
 import capstone.facefriend.member.service.FaceInfoService;

src/main/java/capstone/facefriend/chat/controller/ChatRoomController.java

@@ -2,8 +2,6 @@
 
 import capstone.facefriend.auth.controller.support.AuthMember;
 import capstone.facefriend.chat.service.ChatRoomService;
-import capstone.facefriend.chat.service.dto.chatroom.ChatRoomEnterResponse;
-import capstone.facefriend.chat.service.dto.chatroom.ChatRoomExitResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

src/main/java/capstone/facefriend/chat/controller/MessageController.java

@@ -3,11 +3,11 @@
 import capstone.facefriend.auth.controller.support.AuthMember;
 import capstone.facefriend.auth.infrastructure.JwtProvider;
 import capstone.facefriend.chat.service.MessageService;
-import capstone.facefriend.chat.service.dto.heart.HeartReplyRequest;
-import capstone.facefriend.chat.service.dto.heart.SendHeartRequest;
-import capstone.facefriend.chat.service.dto.message.MessageListRequest;
-import capstone.facefriend.chat.service.dto.message.MessageListResponse;
-import capstone.facefriend.chat.service.dto.message.MessageRequest;
+import capstone.facefriend.chat.dto.heart.HeartReplyRequest;
+import capstone.facefriend.chat.dto.heart.SendHeartRequest;
+import capstone.facefriend.chat.dto.message.MessageListRequest;
+import capstone.facefriend.chat.dto.message.MessageListResponse;
+import capstone.facefriend.chat.dto.message.MessageRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomCloseResponse.java → src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomCloseResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.chatroom;
+package capstone.facefriend.chat.dto.chatroom;
 
 import capstone.facefriend.chat.domain.ChatRoom;
 import capstone.facefriend.member.domain.member.Member;

src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomEmptyResponse.java → src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomEmptyResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.chatroom;
+package capstone.facefriend.chat.dto.chatroom;
 
 public record ChatRoomEmptyResponse(
         Boolean isEmpty,

src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomEnterResponse.java → src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomEnterResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.chatroom;
+package capstone.facefriend.chat.dto.chatroom;
 
 import capstone.facefriend.chat.domain.ChatRoomInfo;
 

src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomExitResponse.java → src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomExitResponse.java

@@ -1,6 +1,4 @@
-package capstone.facefriend.chat.service.dto.chatroom;
-
-import capstone.facefriend.chat.domain.ChatRoomInfo;
+package capstone.facefriend.chat.dto.chatroom;
 
 import java.time.LocalDateTime;
 

src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomHeartResponse.java → src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomHeartResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.chatroom;
+package capstone.facefriend.chat.dto.chatroom;
 
 import capstone.facefriend.chat.domain.ChatRoom;
 import capstone.facefriend.member.domain.member.Member;

src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomLeftResponse.java → src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomLeftResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.chatroom;
+package capstone.facefriend.chat.dto.chatroom;
 
 import capstone.facefriend.member.domain.member.Member;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomMessageResponse.java → src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomMessageResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.chatroom;
+package capstone.facefriend.chat.dto.chatroom;
 
 import capstone.facefriend.chat.domain.ChatMessage;
 import capstone.facefriend.chat.domain.ChatRoom;

src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomOpenResponse.java → src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomOpenResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.chatroom;
+package capstone.facefriend.chat.dto.chatroom;
 
 import capstone.facefriend.chat.domain.ChatRoom;
 import capstone.facefriend.member.domain.member.Member;

src/main/java/capstone/facefriend/chat/service/dto/heart/GetSendHeartResponse.java → src/main/java/capstone/facefriend/chat/dto/heart/GetSendHeartResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.heart;
+package capstone.facefriend.chat.dto.heart;
 
 import capstone.facefriend.chat.domain.ChatRoom;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/capstone/facefriend/chat/service/dto/heart/HeartReplyRequest.java → src/main/java/capstone/facefriend/chat/dto/heart/HeartReplyRequest.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.heart;
+package capstone.facefriend.chat.dto.heart;
 
 public record HeartReplyRequest(
         Long senderId,

src/main/java/capstone/facefriend/chat/service/dto/heart/HeartReplyResponse.java → src/main/java/capstone/facefriend/chat/dto/heart/HeartReplyResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.heart;
+package capstone.facefriend.chat.dto.heart;
 
 public record HeartReplyResponse(
         String method,

src/main/java/capstone/facefriend/chat/service/dto/heart/SendHeartRequest.java → src/main/java/capstone/facefriend/chat/dto/heart/SendHeartRequest.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.heart;
+package capstone.facefriend.chat.dto.heart;
 
 import lombok.Data;
 import lombok.Getter;

src/main/java/capstone/facefriend/chat/service/dto/heart/SendHeartResponse.java → src/main/java/capstone/facefriend/chat/dto/heart/SendHeartResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.heart;
+package capstone.facefriend.chat.dto.heart;
 
 import capstone.facefriend.chat.domain.ChatRoom;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/capstone/facefriend/chat/service/dto/message/GetMessageResponse.java → src/main/java/capstone/facefriend/chat/dto/message/GetMessageResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.message;
+package capstone.facefriend.chat.dto.message;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/capstone/facefriend/chat/service/dto/message/MessageListRequest.java → src/main/java/capstone/facefriend/chat/dto/message/MessageListRequest.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.message;
+package capstone.facefriend.chat.dto.message;
 
 import org.springframework.format.annotation.DateTimeFormat;
 

src/main/java/capstone/facefriend/chat/service/dto/message/MessageListResponse.java → src/main/java/capstone/facefriend/chat/dto/message/MessageListResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.message;
+package capstone.facefriend.chat.dto.message;
 
 import capstone.facefriend.chat.domain.ChatMessage;
 

src/main/java/capstone/facefriend/chat/service/dto/message/MessageRequest.java → src/main/java/capstone/facefriend/chat/dto/message/MessageRequest.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.message;
+package capstone.facefriend.chat.dto.message;
 
 import lombok.Data;
 import lombok.Getter;

src/main/java/capstone/facefriend/chat/service/dto/message/MessageResponse.java → src/main/java/capstone/facefriend/chat/dto/message/MessageResponse.java

@@ -1,4 +1,4 @@
-package capstone.facefriend.chat.service.dto.message;
+package capstone.facefriend.chat.dto.message;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;