Merge pull request #63 from WE-ARE-RACCOONS/RAC-219

RAC-129 refactor : 기존 구현 점검 및 수정 사항 적용

src/main/java/com/postgraduate/domain/auth/application/dto/req/CodeRequest.java

@@ -0,0 +1,6 @@
+package com.postgraduate.domain.auth.application.dto.req;
+
+import jakarta.validation.constraints.NotNull;
+
+public record CodeRequest(@NotNull String code) {
+}

src/main/java/com/postgraduate/domain/auth/application/usecase/SignInUseCase.java

@@ -0,0 +1,8 @@
+package com.postgraduate.domain.auth.application.usecase;
+
+import com.postgraduate.domain.auth.application.dto.req.CodeRequest;
+import com.postgraduate.domain.auth.application.dto.res.AuthUserResponse;
+
+public interface SignInUseCase {
+    AuthUserResponse getUser(CodeRequest request);
+}

src/main/java/com/postgraduate/domain/auth/application/usecase/oauth/SelectOauth.java

@@ -0,0 +1,20 @@
+package com.postgraduate.domain.auth.application.usecase.oauth;
+
+import com.postgraduate.domain.auth.application.usecase.SignInUseCase;
+import com.postgraduate.domain.auth.application.usecase.oauth.kakao.KakaoSignInUseCase;
+import com.postgraduate.domain.auth.exception.OauthException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@RequiredArgsConstructor
+@Component
+public class SelectOauth {
+    private final KakaoSignInUseCase kakaoSignInUseCase;
+
+    public SignInUseCase selectStrategy(String provider) {
+        switch (provider) {
+            case "KAKAO" : return kakaoSignInUseCase;
+            default: throw new OauthException();
+        }
+    }
+}

src/main/java/com/postgraduate/domain/auth/application/usecase/kakao/KakaoAccessTokenUseCase.java → src/main/java/com/postgraduate/domain/auth/application/usecase/oauth/kakao/KakaoAccessTokenUseCase.java

@@ -1,6 +1,6 @@
-package com.postgraduate.domain.auth.application.usecase.kakao;
+package com.postgraduate.domain.auth.application.usecase.oauth.kakao;
 
-import com.postgraduate.domain.auth.application.dto.req.KakaoCodeRequest;
+import com.postgraduate.domain.auth.application.dto.req.CodeRequest;
 import com.postgraduate.domain.auth.application.dto.res.KakaoTokenInfoResponse;
 import com.postgraduate.domain.auth.application.dto.res.KakaoUserInfoResponse;
 import com.postgraduate.domain.auth.exception.KakaoCodeException;
@@ -31,8 +31,8 @@ public class KakaoAccessTokenUseCase {
     private static final String KAKAO_TOKEN_URI = "https://kauth.kakao.com/oauth/token";
     private static final String USER_INFO_URI = "https://kapi.kakao.com/v2/user/me";
 
-    public KakaoUserInfoResponse getKakaoToken(KakaoCodeRequest codeRequest) {
-        MultiValueMap<String, String> requestBody = getRequestBody(codeRequest.getCode());
+    public KakaoUserInfoResponse getAccessToken (CodeRequest codeRequest) {
+        MultiValueMap<String, String> requestBody = getRequestBody(codeRequest.code());
         try {
             KakaoTokenInfoResponse tokenInfoResponse = webClient.post()
                     .uri(KAKAO_TOKEN_URI)

src/main/java/com/postgraduate/domain/auth/application/usecase/kakao/KakaoSignInUseCase.java → src/main/java/com/postgraduate/domain/auth/application/usecase/oauth/kakao/KakaoSignInUseCase.java

@@ -1,9 +1,10 @@
-package com.postgraduate.domain.auth.application.usecase.kakao;
+package com.postgraduate.domain.auth.application.usecase.oauth.kakao;
 
-import com.postgraduate.domain.auth.application.dto.req.KakaoCodeRequest;
+import com.postgraduate.domain.auth.application.dto.req.CodeRequest;
 import com.postgraduate.domain.auth.application.dto.res.AuthUserResponse;
 import com.postgraduate.domain.auth.application.dto.res.KakaoUserInfoResponse;
 import com.postgraduate.domain.auth.application.mapper.AuthMapper;
+import com.postgraduate.domain.auth.application.usecase.SignInUseCase;
 import com.postgraduate.domain.user.domain.entity.User;
 import com.postgraduate.domain.user.domain.service.UserGetService;
 import lombok.RequiredArgsConstructor;
@@ -15,12 +16,13 @@
 @Service
 @RequiredArgsConstructor
 @Transactional
-public class KakaoSignInUseCase {
+public class KakaoSignInUseCase implements SignInUseCase {
     private final KakaoAccessTokenUseCase kakaoTokenUseCase;
     private final UserGetService userGetService;
 
-    public AuthUserResponse getUser(KakaoCodeRequest codeRequest) {
-        KakaoUserInfoResponse userInfo = kakaoTokenUseCase.getKakaoToken(codeRequest);
+    @Override
+    public AuthUserResponse getUser(CodeRequest codeRequest) {
+        KakaoUserInfoResponse userInfo = kakaoTokenUseCase.getAccessToken(codeRequest);
         Long socialId = userInfo.getId();
         Optional<User> user = userGetService.bySocialId(socialId);
         return AuthMapper.mapToAuthUser(user, socialId);

src/main/java/com/postgraduate/domain/auth/exception/OauthException.java

@@ -0,0 +1,10 @@
+package com.postgraduate.domain.auth.exception;
+
+import static com.postgraduate.domain.auth.presentation.contant.AuthResponseCode.NONE_PROVIDER;
+import static com.postgraduate.domain.auth.presentation.contant.AuthResponseMessage.PROVIDER_NONE;
+
+public class OauthException extends AuthException{
+    public OauthException() {
+        super(PROVIDER_NONE.getMessage(), NONE_PROVIDER.getCode());
+    }
+}

src/main/java/com/postgraduate/domain/auth/presentation/AuthController.java

@@ -1,14 +1,15 @@
 package com.postgraduate.domain.auth.presentation;
 
-import com.postgraduate.domain.auth.application.dto.req.KakaoCodeRequest;
+import com.postgraduate.domain.auth.application.dto.req.CodeRequest;
 import com.postgraduate.domain.auth.application.dto.req.SeniorChangeRequest;
 import com.postgraduate.domain.auth.application.dto.req.SeniorSignUpRequest;
 import com.postgraduate.domain.auth.application.dto.req.SignUpRequest;
 import com.postgraduate.domain.auth.application.dto.res.AuthUserResponse;
 import com.postgraduate.domain.auth.application.dto.res.JwtTokenResponse;
+import com.postgraduate.domain.auth.application.usecase.oauth.SelectOauth;
 import com.postgraduate.domain.auth.application.usecase.SignUpUseCase;
 import com.postgraduate.domain.auth.application.usecase.jwt.JwtUseCase;
-import com.postgraduate.domain.auth.application.usecase.kakao.KakaoSignInUseCase;
+import com.postgraduate.domain.auth.application.usecase.SignInUseCase;
 import com.postgraduate.domain.user.domain.entity.User;
 import com.postgraduate.global.dto.ResponseDto;
 import io.swagger.v3.oas.annotations.Operation;
@@ -28,20 +29,27 @@
 @RequestMapping("/auth")
 @Tag(name = "AUTH Controller")
 public class AuthController {
-    private final KakaoSignInUseCase kakaoSignInUseCase;
+    private final SelectOauth selectOauth;
     private final SignUpUseCase signUpUseCase;
     private final JwtUseCase jwtUseCase;
 
-    @PostMapping("/login")
-    @Operation(summary = "카카오 로그인", description = "회원인 경우 JWT를, 회원이 아닌 경우 socialId를 반환합니다(회원가입은 진행하지 않습니다).")
-    public ResponseDto<?> authLogin(@RequestBody KakaoCodeRequest request) {
-        AuthUserResponse authUser = kakaoSignInUseCase.getUser(request);
+    @PostMapping("/login/{provider}")
+    @Operation(summary = "소셜 로그인", description = "회원인 경우 JWT를, 회원이 아닌 경우 socialId를 반환합니다(회원가입은 진행하지 않습니다).")
+    public ResponseDto<?> authLogin(@RequestBody CodeRequest request, @PathVariable String provider) {
+        SignInUseCase signInUseCase = selectOauth.selectStrategy(provider);
+        AuthUserResponse authUser = signInUseCase.getUser(request);
         if (authUser.getUser().isEmpty())
             return ResponseDto.create(AUTH_NONE.getCode(), NOT_REGISTERED_USER.getMessage(), authUser);
         JwtTokenResponse jwtToken = jwtUseCase.signIn(authUser.getUser().get());
         return ResponseDto.create(AUTH_ALREADY.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
     }
 
+//    @PostMapping("/logout")
+//    @Operation(summary = "로그아웃", description = "토큰 같이 보내주세요")
+//    public ResponseDto logout() {
+//        return ResponseDto.create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage());
+//    }
+
     @PostMapping("/user/signup")
     @Operation(summary = "대학생 회원가입", description = "로그인 API에서 반환한 socialId, 닉네임, 번호, 마케팅 수신여부, 희망 학과, 희망 분야, 매칭 희망 여부")
     public ResponseDto<JwtTokenResponse> signUpUser(@RequestBody SignUpRequest request) {

src/main/java/com/postgraduate/domain/auth/presentation/contant/AuthResponseCode.java

@@ -16,6 +16,7 @@ public enum AuthResponseCode {
     AUTH_DENIED("EX900"),
     AUTH_INVALID_KAKAO("EX901"),
     AUTH_KAKAO_CODE("EX902"),
-    AUTH_FAILED("EX903");
+    AUTH_FAILED("EX903"),
+    NONE_PROVIDER("EX904");
     private final String code;
 }

src/main/java/com/postgraduate/domain/auth/presentation/contant/AuthResponseMessage.java

@@ -13,6 +13,7 @@ public enum AuthResponseMessage {
     PERMISSION_DENIED("권한이 없습니다."),
     KAKAO_INVALID("카카오 정보가 유효하지 않습니다."),
     KAKAO_CODE("카카오 코드가 유효하지 않습니다."),
-    FAILED_AUTH("사용자 인증에 실패했습니다.");
+    FAILED_AUTH("사용자 인증에 실패했습니다."),
+    PROVIDER_NONE("PROVIDER가 없습니다.");
     private final String message;
 }

src/main/java/com/postgraduate/domain/mentoring/application/dto/DoneMentoringInfo.java

@@ -1,21 +1,5 @@
 package com.postgraduate.domain.mentoring.application.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-
-
-@Getter
-@Builder
-@AllArgsConstructor
-public class DoneMentoringInfo {
-    private Long mentoringId;
-    private Long seniorId;
-    private String profile;
-    private String nickName;
-    private String postgradu;
-    private String major;
-    private String lab;
-    private String date;
-    private int term;
+public record DoneMentoringInfo(Long mentoringId, Long seniorId, String profile, String nickName, String postgradu,
+                                String major, String lab, String date, int term) {
 }

src/main/java/com/postgraduate/domain/mentoring/application/dto/DoneSeniorMentoringInfo.java

@@ -1,20 +1,7 @@
 package com.postgraduate.domain.mentoring.application.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-
 import java.time.LocalDate;
 
-@Getter
-@Builder
-@AllArgsConstructor
-public class DoneSeniorMentoringInfo {
-    private Long mentoringId;
-    private String profile;
-    private String nickname;
-    private int term;
-    private String date;
-    private LocalDate salaryDate;
-    private Boolean status;
+public record DoneSeniorMentoringInfo(Long mentoringId, String profile, String nickName, int term, String date,
+                                      LocalDate salaryDate, Boolean status) {
 }

src/main/java/com/postgraduate/domain/mentoring/application/dto/ExpectedMentoringInfo.java

@@ -1,22 +1,5 @@
 package com.postgraduate.domain.mentoring.application.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-
-
-@Getter
-@Builder
-@AllArgsConstructor
-public class ExpectedMentoringInfo {
-    private Long mentoringId;
-    private Long seniorId;
-    private String profile;
-    private String nickName;
-    private String postgradu;
-    private String major;
-    private String lab;
-    private String date;
-    private int term;
-    private String chatLink;
+public record ExpectedMentoringInfo(Long mentoringId, Long seniorId, String profile, String nickName, String postgradu,
+                                    String major, String lab, String date, int term, String chatLink) {
 }

src/main/java/com/postgraduate/domain/mentoring/application/dto/ExpectedSeniorMentoringInfo.java

@@ -1,16 +1,4 @@
 package com.postgraduate.domain.mentoring.application.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-
-@Getter
-@Builder
-@AllArgsConstructor
-public class ExpectedSeniorMentoringInfo {
-    private Long mentoringId;
-    private String profile;
-    private String nickname;
-    private int term;
-    private String date;
+public record ExpectedSeniorMentoringInfo(Long mentoringId, String profile, String nickName, int term, String date) {
 }

src/main/java/com/postgraduate/domain/mentoring/application/dto/WaitingMentoringInfo.java

@@ -1,20 +1,5 @@
 package com.postgraduate.domain.mentoring.application.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-
-
-@Getter
-@Builder
-@AllArgsConstructor
-public class WaitingMentoringInfo {
-    private Long mentoringId;
-    private Long seniorId;
-    private String profile;
-    private String nickName;
-    private String postgradu;
-    private String major;
-    private String lab;
-    private int term;
+public record WaitingMentoringInfo(Long mentoringId, Long seniorId, String profile, String nickName, String postgradu,
+                                   String major, String lab, int term) {
 }

src/main/java/com/postgraduate/domain/mentoring/application/dto/WaitingSeniorMentoringInfo.java

@@ -1,16 +1,4 @@
 package com.postgraduate.domain.mentoring.application.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-
-@Getter
-@Builder
-@AllArgsConstructor
-public class WaitingSeniorMentoringInfo {
-    private Long mentoringId;
-    private String profile;
-    private String nickname;
-    private int term;
-    private long remainTime;
+public record WaitingSeniorMentoringInfo(Long mentoringId, String profile, String nickName, int term, long remainTime) {
 }

src/main/java/com/postgraduate/domain/mentoring/application/dto/res/SeniorMentoringDetailResponse.java

@@ -1,17 +1,5 @@
 package com.postgraduate.domain.mentoring.application.dto.res;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-
-@Builder
-@AllArgsConstructor
-@Getter
-public class SeniorMentoringDetailResponse {
-    private String profile;
-    private String nickName;
-    private String topic;
-    private String question;
-    private String[] dates;
-    private int term;
+public record SeniorMentoringDetailResponse(String profile, String nickName, String topic, String question,
+                                            String[] dates, int term) {
 }