✨feat: 병합 충돌 해결

Author: yoojinche

build.gradle

@@ -38,7 +38,7 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
 
     // 응답 통일
-    implementation 'org.namul:api-payload:0.5.1'
+    implementation 'org.namul:api-payload:0.6.0'
 
     // validation
     implementation 'org.springframework.boot:spring-boot-starter-validation'
@@ -49,6 +49,12 @@ dependencies {
     // redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
+    // WebClient
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
+
+    // Netty
+    implementation 'io.netty:netty-resolver-dns-native-macos:4.1.68.Final:osx-aarch_64'
+
     // Email
     implementation 'org.springframework.boot:spring-boot-starter-mail'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
@@ -58,12 +64,23 @@ dependencies {
     annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+    // OAuth2
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
     // test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testImplementation 'com.h2database:h2'
+
+    // MongoDB
+    implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
+
+    // firebase
+    implementation 'com.google.firebase:firebase-admin:9.1.0'
+
+    // jackson LocalDateTime 직렬화
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 }
 
 tasks.named('test') {

src/main/java/org/withtime/be/withtimebe/WithTimeBeApplication.java

@@ -1,15 +1,35 @@
 package org.withtime.be.withtimebe;
 
+import java.util.TimeZone;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+import jakarta.annotation.PostConstruct;
+
 
+@EnableCaching
+@EnableScheduling
 @EnableJpaAuditing
+@EnableJpaRepositories(
+    basePackages = {"org.withtime.be"},
+    excludeFilters = @ComponentScan.Filter(
+        type = FilterType.REGEX,
+        pattern = "org\\.withtime\\.be\\.withtimebe\\.domain\\.log\\..*"
+    ))
 @SpringBootApplication
 public class WithTimeBeApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(WithTimeBeApplication.class, args);
     }
 
+    @PostConstruct
+    public void init() { TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul")); } // JVM 기본 TimeZone 설정
 }

src/main/java/org/withtime/be/withtimebe/domain/auth/controller/AuthController.java

@@ -24,7 +24,7 @@ public class AuthController {
     private final AuthCommandService authCommandService;
     private final EmailCommandService emailCommandService;
 
-    @Operation(summary = "회원가입 API by 요시", description = "최초 회원가입 시 필요한 정보를 포함하여 회원가입 진행")
+    @Operation(summary = "회원가입 API by 요시", description = "최초 회원가입 시 필요한 정보를 포함하여 회원가입 진행, 소셜 로그인인 경우에만 socialId 포함하고 아닌 경우 제거하거나 null")
     @ApiResponses({
             @ApiResponse(responseCode = "204", description = "회원가입 성공"),
             @ApiResponse(
@@ -33,6 +33,13 @@ public class AuthController {
                             다음과 같은 이유로 실패할 수 있습니다:
                             - AUTH400_1: 이미 존재하는 이메일입니다.
                             """
+            ),
+            @ApiResponse(
+                    responseCode = "404",
+                    description = """
+                            다음과 같은 이유로 실패할 수 있습니다:
+                            - SOCIAL404_1: 소셜을 찾을 수 없습니다.
+                            """
             )
     })
     @PostMapping("/sign-up")
@@ -117,4 +124,36 @@ public DefaultResponse<String> checkVerificationCode(@Valid @RequestBody EmailRe
         emailCommandService.checkEmail(request);
         return DefaultResponse.noContent();
     }
+
+    @Operation(summary = "비밀번호 찾기 API", description = "이메일 인증 이후 이메일과 새로운 비밀번호로 비밀번호 변경")
+    @ApiResponses({
+            @ApiResponse(responseCode = "204", description = "비밀번호 변경 성공"),
+            @ApiResponse(
+                    responseCode = "400",
+                    description = """
+                            다음과 같은 이유로 실패할 수 있습니다:
+                            - AUTH400_2: 소셜 로그인으로 가입된 사용자입니다.
+                            - MEMBER400_1: 이전 비밀번호와 동일합니다.
+                            """
+            ),
+            @ApiResponse(
+                    responseCode = "401",
+                    description = """
+                            다음과 같은 이유로 실패할 수 있습니다:
+                            - EMAIL401_2: 비밀번호 재설정에 이메일 인증을 하지 않았습니다.
+                            """
+            ),
+            @ApiResponse(
+                    responseCode = "404",
+                    description = """
+                            다음과 같은 이유로 실패할 수 있습니다:
+                            - MEMBER404_1: 사용자를 찾지 못했습니다.
+                            """
+            ),
+    })
+    @PostMapping("/passwords")
+    public DefaultResponse<Void> findPassword(@RequestBody AuthRequestDTO.FindPassword request) {
+        authCommandService.findPassword(request);
+        return DefaultResponse.noContent();
+    }
 }

src/main/java/org/withtime/be/withtimebe/domain/auth/controller/OAuth2Controller.java

@@ -0,0 +1,55 @@
+package org.withtime.be.withtimebe.domain.auth.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.namul.api.payload.response.DefaultResponse;
+import org.springframework.web.bind.annotation.*;
+import org.withtime.be.withtimebe.domain.auth.dto.response.OAuth2ResponseDTO;
+import org.withtime.be.withtimebe.domain.auth.service.command.OAuth2CommandService;
+
+@RestController
+@RequestMapping("/api/v1/oauth2")
+@RequiredArgsConstructor
+@Tag(name = "소셜 로그인 API")
+public class OAuth2Controller {
+
+    private final OAuth2CommandService oAuth2CommandService;
+
+    @Operation(summary = "소셜 로그인 API by 요시", description = "/oauth2/authorization/{provider}로 서버에 요청을 보낸 뒤 리다이렉트된 URI의 코드를 사용하여 요청, 리다이렉트되는 URI 의 Endpoint는 해당 API와 동일합니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200",
+                    description = """
+                            소셜 로그인 성공
+                            - isFirst: true 시 최초 회원가입 필요, 이메일은 인증된 상태로 1시간 유효
+                            - isFirst: false 시 최초 회원가입 필요 X, 로그인 처리
+                            """
+            ),
+            @ApiResponse(
+                    responseCode = "400",
+                    description = """
+                            다음과 같은 이유로 실패할 수 있습니다:
+                            - AUTH400_1: 지원하지 않는 소셜 로그인입니다. provider가 잘못되었거나 지원하지 않는 provider입니다.
+                            """
+            ),
+            @ApiResponse(
+                    responseCode = "500",
+                    description = """
+                            다음과 같은 이유로 실패할 수 있습니다:
+                            - AUTH500_1: 사용자 정보를 가져오는데 실패했습니다. 인가코드가 잘못되었거나 OAuth2 인증 서버나 리소스 서버에 보낸 요청이 실패했습니다.
+                            """
+            ),
+
+    })
+    @GetMapping("/callback/{provider}")
+    public DefaultResponse<OAuth2ResponseDTO.Login> loginWithOAuth2(HttpServletRequest request, HttpServletResponse response,
+                                                                    @Parameter(description = "소셜 로그인 플랫폼(대소문자 상관 없음), [kakao, google, naver]", example = "kakao") @PathVariable String provider,
+                                                                    @RequestParam String code) {
+        return DefaultResponse.ok(oAuth2CommandService.login(request, response, provider, code));
+    }
+}

src/main/java/org/withtime/be/withtimebe/domain/auth/converter/OAuth2Converter.java

@@ -0,0 +1,41 @@
+package org.withtime.be.withtimebe.domain.auth.converter;
+
+import org.withtime.be.withtimebe.domain.auth.dto.response.OAuth2ResponseDTO;
+import org.withtime.be.withtimebe.domain.auth.factory.support.dto.GoogleOAuth2ResponseDTO;
+import org.withtime.be.withtimebe.domain.auth.factory.support.dto.KakaoOAuth2ResponseDTO;
+import org.withtime.be.withtimebe.domain.auth.factory.support.dto.NaverOAuth2ResponseDTO;
+import org.withtime.be.withtimebe.domain.member.entity.enums.SocialType;
+
+public class OAuth2Converter {
+    public static OAuth2ResponseDTO.Login toLogin(String email, boolean isFirst, Long socialId) {
+        return OAuth2ResponseDTO.Login.builder()
+                .email(email)
+                .socialId(socialId)
+                .isFirst(isFirst)
+                .build();
+    }
+
+    public static OAuth2ResponseDTO.GetUserInfo toGetUserInfo(KakaoOAuth2ResponseDTO.KakaoProfile kakaoProfile) {
+        return OAuth2ResponseDTO.GetUserInfo.builder()
+                .email(kakaoProfile.kakao_account().email())
+                .providerId(String.valueOf(kakaoProfile.id()))
+                .socialType(SocialType.KAKAO)
+                .build();
+    }
+
+    public static OAuth2ResponseDTO.GetUserInfo toGetUserInfo(NaverOAuth2ResponseDTO.UserInfo.UserInfoData naver) {
+        return OAuth2ResponseDTO.GetUserInfo.builder()
+                .email(naver.email())
+                .providerId(naver.id())
+                .socialType(SocialType.NAVER)
+                .build();
+    }
+
+    public static OAuth2ResponseDTO.GetUserInfo toGetUserInfo(GoogleOAuth2ResponseDTO.UserInfo google) {
+        return OAuth2ResponseDTO.GetUserInfo.builder()
+                .email(google.email())
+                .providerId(google.id())
+                .socialType(SocialType.GOOGLE)
+                .build();
+    }
+}

src/main/java/org/withtime/be/withtimebe/domain/auth/dto/request/AuthRequestDTO.java

@@ -22,7 +22,15 @@ public record SignUp(
             String password,
             Gender gender,
             String phoneNumber,
-            LocalDate birth
+            LocalDate birth,
+            Long socialId
+    ) {
+
+    }
+
+    public record FindPassword(
+            String email,
+            String newPassword
     ) {
 
     }

src/main/java/org/withtime/be/withtimebe/domain/auth/dto/response/OAuth2ResponseDTO.java

@@ -0,0 +1,26 @@
+package org.withtime.be.withtimebe.domain.auth.dto.response;
+
+import lombok.Builder;
+import org.withtime.be.withtimebe.domain.member.entity.enums.SocialType;
+
+public record OAuth2ResponseDTO() {
+
+    @Builder
+    public record Login(
+            String email,
+            Long socialId,
+            boolean isFirst
+    ) {
+
+    }
+
+    @Builder
+    public record GetUserInfo(
+            String email,
+            String providerId,
+            SocialType socialType
+    ) {
+
+    }
+
+}

src/main/java/org/withtime/be/withtimebe/domain/auth/factory/OAuth2UserLoader.java

@@ -0,0 +1,8 @@
+package org.withtime.be.withtimebe.domain.auth.factory;
+
+import org.withtime.be.withtimebe.domain.auth.dto.response.OAuth2ResponseDTO;
+
+public interface OAuth2UserLoader {
+    OAuth2ResponseDTO.GetUserInfo loadUser(String code);
+    String getSocialType();
+}

src/main/java/org/withtime/be/withtimebe/domain/auth/factory/OAuth2UserLoaderFactory.java

@@ -0,0 +1,29 @@
+package org.withtime.be.withtimebe.domain.auth.factory;
+
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class OAuth2UserLoaderFactory {
+
+    private final Map<String, OAuth2UserLoader> oAuth2UserLoaderMap = new ConcurrentHashMap<>();
+
+    public OAuth2UserLoaderFactory(List<OAuth2UserLoader> oAuth2UserLoaders) {
+        oAuth2UserLoaders.forEach(
+                oAuth2UserLoader -> {
+                    String socialType = oAuth2UserLoader.getSocialType().toLowerCase();
+                    if (oAuth2UserLoaderMap.get(socialType) != null) {
+                        throw new IllegalStateException("OAuth2UserLoader social type 중복: " + socialType);
+                    }
+                    oAuth2UserLoaderMap.put(socialType, oAuth2UserLoader);
+                }
+        );
+    }
+
+    public OAuth2UserLoader getUserLoader(String provider) {
+        return oAuth2UserLoaderMap.get(provider.toLowerCase());
+    }
+}