[🔀 merge] [4차] 코드 리펙토링 사항 메인 서버에 적용

.gitignore

@@ -190,6 +190,7 @@ Temporary Items
 # application.yml
 src/main/resources/application.yml
 src/main/resources/application-dev.yml
+src/test/resources/application-test.yml
 
 # Q-Class
 src/main/generated

README.md

@@ -37,7 +37,7 @@
 
 ##  Back-end (Spring 🌱)
 
-| <img src="https://github.com/user-attachments/assets/8e71a4f2-70e7-4a80-b658-de0eea90b0e0" width=300px alt="서버/정정교"/>  | <img src="https://github.com/user-attachments/assets/7cdc140f-5281-45b5-88ac-a952cc327247" width=300px alt="서버/신정윤"/>  | <img src="https://github.com/user-attachments/assets/4f3006b2-4869-408e-b12b-d954a5b79d9d" width=300px alt="서버/권장순"/>
+| <img src="https://github.com/user-attachments/assets/8e71a4f2-70e7-4a80-b658-de0eea90b0e0" width=300px alt="서버/정정교"/>  | <img src="https://github.com/user-attachments/assets/7cdc140f-5281-45b5-88ac-a952cc327247" width=300px alt="서버/신정윤"/>  | <img src="https://github.com/user-attachments/assets/54c89379-08b8-4737-8da0-5bfad27e49fe" width=300px alt="서버/권장순"/>
 | :-----: | :-----: | :-----: |
 | [정정교/Junggyo1020](https://github.com/junggyo1020) | [신정윤/JungYoonShin](https://github.com/JungYoonShin) | [권장순/jsoonworld](https://github.com/jsoonworld) |
 

build.gradle

@@ -37,6 +37,7 @@ dependencies {
 	// 테스트 의존성
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	testRuntimeOnly 'com.h2database:h2'
 
 	// PostgreSQL
 	implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3'
@@ -58,6 +59,17 @@ dependencies {
 
 	// Gson
 	implementation 'com.google.code.gson:gson:2.8.6'
+
+	// Spring WebFlux
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+
+	// Resilience4j
+	implementation 'io.github.resilience4j:resilience4j-spring-boot3:2.1.0'
+	implementation 'io.github.resilience4j:resilience4j-reactor:2.1.0'
+
+	// Spring Batch
+	implementation 'org.springframework.boot:spring-boot-starter-batch'
+
 }
 
 //QueryDSL 초기 설정

src/main/java/org/terning/terningserver/TerningserverApplication.java

@@ -3,9 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableJpaAuditing
 @SpringBootApplication
+@EnableScheduling
 public class TerningserverApplication {
 
 	public static void main(String[] args) {

src/main/java/org/terning/terningserver/controller/AuthController.java → src/main/java/org/terning/terningserver/auth/api/AuthController.java

@@ -1,23 +1,25 @@
-package org.terning.terningserver.controller;
+package org.terning.terningserver.auth.api;
 
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
-import org.terning.terningserver.controller.swagger.AuthSwagger;
-import org.terning.terningserver.domain.Filter;
-import org.terning.terningserver.dto.auth.request.SignInRequestDto;
-import org.terning.terningserver.dto.auth.request.SignUpFilterRequestDto;
-import org.terning.terningserver.dto.auth.request.SignUpRequestDto;
-import org.terning.terningserver.dto.auth.response.AccessTokenGetResponseDto;
-import org.terning.terningserver.dto.auth.response.SignInResponseDto;
-import org.terning.terningserver.dto.auth.response.SignUpFilterResponseDto;
-import org.terning.terningserver.dto.auth.response.SignUpResponseDto;
-import org.terning.terningserver.exception.dto.SuccessResponse;
-import org.terning.terningserver.service.AuthService;
-
-import static org.terning.terningserver.exception.enums.SuccessMessage.*;
+import org.terning.terningserver.auth.application.AuthService;
+import org.terning.terningserver.auth.dto.request.SignInRequest;
+import org.terning.terningserver.auth.dto.request.SignUpFilterRequestDto;
+import org.terning.terningserver.auth.dto.request.SignUpRequestDto;
+import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
+import org.terning.terningserver.auth.dto.response.SignInResponse;
+import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
+import org.terning.terningserver.common.exception.dto.SuccessResponse;
+
+import static org.terning.terningserver.auth.common.success.AuthSuccessCode.SUCCESS_SIGN_IN;
+import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_REISSUE_TOKEN;
+import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_OUT;
+import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_UP;
+import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_SIGN_UP_FILTER;
+import static org.terning.terningserver.common.exception.enums.SuccessMessage.SUCCESS_WITHDRAW;
 
 
 @RestController
@@ -28,13 +30,11 @@ public class AuthController implements AuthSwagger {
     private final AuthService authService;
 
     @PostMapping("/sign-in")
-    public ResponseEntity<SuccessResponse<SignInResponseDto>> signIn(
+    public ResponseEntity<SuccessResponse<SignInResponse>> signIn(
             @RequestHeader("Authorization") String authAccessToken,
-            @RequestBody SignInRequestDto request
+            @RequestBody SignInRequest request
     ) {
-        val signInResponse = authService.signIn(authAccessToken, request);
-
-        return ResponseEntity.ok(SuccessResponse.of(SUCCESS_SIGN_IN, signInResponse));
+        return ResponseEntity.ok(SuccessResponse.of(SUCCESS_SIGN_IN, authService.signIn(authAccessToken, request)));
     }
 
     @PostMapping("/token-reissue")
@@ -51,20 +51,16 @@ public ResponseEntity<SuccessResponse<SignUpResponseDto>> signUp(
             @RequestHeader("Authorization") String authId,
             @RequestBody SignUpRequestDto request
     ) {
-
         SignUpResponseDto signUpResponseDto = authService.signUp(authId, request);
         return ResponseEntity.ok(SuccessResponse.of(SUCCESS_SIGN_UP, signUpResponseDto));
     }
 
     @PostMapping("/sign-up/filter")
-    public ResponseEntity<SuccessResponse<SignUpFilterResponseDto>> filter(
+    public ResponseEntity<SuccessResponse> registerUserFilter(
             @RequestHeader("User-Id") Long userId,
             @RequestBody SignUpFilterRequestDto request
     ) {
-        Filter newFilter = authService.createAndSaveFilter(request);
-
-        authService.connectFilterToUser(userId, newFilter.getId());
-
+        authService.registerFilterWithUser(userId, request);
         return ResponseEntity.ok(SuccessResponse.of(SUCCESS_SIGN_UP_FILTER));
     }
 

src/main/java/org/terning/terningserver/controller/swagger/AuthSwagger.java → src/main/java/org/terning/terningserver/auth/api/AuthSwagger.java

@@ -1,4 +1,4 @@
-package org.terning.terningserver.controller.swagger;
+package org.terning.terningserver.auth.api;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -7,23 +7,22 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
-import org.terning.terningserver.dto.auth.request.SignInRequestDto;
-import org.terning.terningserver.dto.auth.request.SignUpFilterRequestDto;
-import org.terning.terningserver.dto.auth.request.SignUpRequestDto;
-import org.terning.terningserver.dto.auth.response.AccessTokenGetResponseDto;
-import org.terning.terningserver.dto.auth.response.SignInResponseDto;
-import org.terning.terningserver.dto.auth.response.SignUpFilterResponseDto;
-import org.terning.terningserver.dto.auth.response.SignUpResponseDto;
-import org.terning.terningserver.exception.dto.SuccessResponse;
+import org.terning.terningserver.auth.dto.request.SignInRequest;
+import org.terning.terningserver.auth.dto.request.SignUpFilterRequestDto;
+import org.terning.terningserver.auth.dto.request.SignUpRequestDto;
+import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
+import org.terning.terningserver.auth.dto.response.SignInResponse;
+import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
+import org.terning.terningserver.common.exception.dto.SuccessResponse;
 
 @Tag(name = "Auth", description = "소셜 로그인 및 회원가입 API")
 public interface AuthSwagger {
 
     @Operation(summary = "소셜 로그인", description = "AuthType에 맞는 소셜 로그인 API")
-    ResponseEntity<SuccessResponse<SignInResponseDto>> signIn(
+    ResponseEntity<SuccessResponse<SignInResponse>> signIn(
             @Parameter(name = "Authorization", description = "", example = "authAccessToken")
             @RequestHeader("Authorization") String authAccessToken,
-            @RequestBody SignInRequestDto request
+            @RequestBody SignInRequest request
     );
 
     @Operation(summary = "토큰 재발급", description = "토큰 재발급 API")
@@ -33,7 +32,7 @@ ResponseEntity<SuccessResponse<AccessTokenGetResponseDto>> reissueToken(
     );
 
     @Operation(summary = "사용자 필터링 정보 생성", description = "사용자 필터링 정보 생성 API")
-    ResponseEntity<SuccessResponse<SignUpFilterResponseDto>> filter(
+    ResponseEntity<SuccessResponse> registerUserFilter(
             @Parameter(name = "User-Id", description = "", example = "userId")
             @RequestHeader("User-Id") Long userId,
             @RequestBody SignUpFilterRequestDto request
@@ -53,6 +52,4 @@ ResponseEntity<SuccessResponse> signOut(
     @Operation(summary = "계정탈퇴", description = "계정탈퇴 API")
     ResponseEntity<SuccessResponse> withdraw(
             @AuthenticationPrincipal Long userId);
-
-
 }

src/main/java/org/terning/terningserver/auth/application/AuthService.java

@@ -0,0 +1,61 @@
+package org.terning.terningserver.auth.application;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.terning.terningserver.auth.application.reissue.AuthReissueService;
+import org.terning.terningserver.auth.application.signin.AuthSignInService;
+import org.terning.terningserver.auth.application.signout.AuthSignOutService;
+import org.terning.terningserver.auth.application.signup.AuthSignUpService;
+import org.terning.terningserver.auth.application.withdraw.AuthWithdrawService;
+import org.terning.terningserver.auth.dto.request.SignInRequest;
+import org.terning.terningserver.auth.dto.request.SignUpFilterRequestDto;
+import org.terning.terningserver.auth.dto.request.SignUpRequestDto;
+import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
+import org.terning.terningserver.auth.dto.response.SignInResponse;
+import org.terning.terningserver.auth.dto.response.SignUpResponseDto;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class AuthService {
+
+    private final AuthSignInService authSignInService;
+    private final AuthSignUpService authSignUpService;
+    private final AuthSignOutService authSignOutService;
+    private final AuthWithdrawService authWithdrawService;
+    private final AuthReissueService authReissueService;
+
+    @Transactional
+    public SignInResponse signIn(String authAccessToken, SignInRequest request) {
+        SignInResponse signInResponse = authSignInService.signIn(authAccessToken, request);
+        return signInResponse;
+    }
+
+    @Transactional
+    public SignUpResponseDto signUp(String authId, SignUpRequestDto request) {
+        SignUpResponseDto signUpResponseDto = authSignUpService.signUp(authId, request);
+        return signUpResponseDto;
+    }
+
+    @Transactional
+    public void registerFilterWithUser(Long userId, SignUpFilterRequestDto request) {
+        authSignUpService.registerFilterWithUser(userId, request);
+    }
+
+    @Transactional
+    public void signOut(long userId) {
+        authSignOutService.signOut(userId);
+    }
+
+    @Transactional
+    public void withdraw(long userId) {
+        authWithdrawService.withdraw(userId);
+    }
+
+    @Transactional
+    public AccessTokenGetResponseDto reissueToken(String refreshToken) {
+        AccessTokenGetResponseDto accessTokenGetResponseDto = authReissueService.reissueToken(refreshToken);
+        return accessTokenGetResponseDto;
+    }
+}

src/main/java/org/terning/terningserver/auth/application/reissue/AuthReissueService.java

@@ -0,0 +1,7 @@
+package org.terning.terningserver.auth.application.reissue;
+
+import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
+
+public interface AuthReissueService {
+    AccessTokenGetResponseDto reissueToken(String refreshToken);
+}

src/main/java/org/terning/terningserver/auth/application/reissue/AuthReissueServiceImpl.java

@@ -0,0 +1,35 @@
+package org.terning.terningserver.auth.application.reissue;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.terning.terningserver.common.security.jwt.application.JwtTokenManager;
+import org.terning.terningserver.user.domain.Token;
+import org.terning.terningserver.user.domain.User;
+import org.terning.terningserver.auth.dto.response.AccessTokenGetResponseDto;
+import org.terning.terningserver.common.exception.CustomException;
+import org.terning.terningserver.common.security.jwt.auth.TokenExtractor;
+import org.terning.terningserver.user.repository.UserRepository;
+
+import static org.terning.terningserver.common.exception.enums.ErrorMessage.FAILED_TOKEN_REISSUE;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class AuthReissueServiceImpl implements AuthReissueService {
+
+    private final JwtTokenManager jwtTokenManager;
+    private final UserRepository userRepository;
+
+    @Override
+    public AccessTokenGetResponseDto reissueToken(String refreshToken) {
+        User user = findUserByRefreshToken(refreshToken);
+        Token accessToken = jwtTokenManager.issueAccessToken(user);
+        return AccessTokenGetResponseDto.of(accessToken);
+    }
+
+    private User findUserByRefreshToken(String refreshToken) {
+        return userRepository.findByRefreshToken(TokenExtractor.extractToken(refreshToken))
+                .orElseThrow(() -> new CustomException(FAILED_TOKEN_REISSUE));
+    }
+}

src/main/java/org/terning/terningserver/auth/application/signin/AuthSignInService.java

@@ -0,0 +1,8 @@
+package org.terning.terningserver.auth.application.signin;
+
+import org.terning.terningserver.auth.dto.response.SignInResponse;
+import org.terning.terningserver.auth.dto.request.SignInRequest;
+
+public interface AuthSignInService {
+    SignInResponse signIn(String authAccessToken, SignInRequest request);
+}

src/main/java/org/terning/terningserver/auth/application/signin/AuthSignInServiceImpl.java

@@ -0,0 +1,60 @@
+package org.terning.terningserver.auth.application.signin;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.terning.terningserver.auth.application.social.SocialAuthProvider;
+import org.terning.terningserver.auth.application.social.SocialAuthServiceManager;
+import org.terning.terningserver.external.pushNotification.notification.NotificationUserClient;
+import org.terning.terningserver.common.security.jwt.application.JwtTokenManager;
+import org.terning.terningserver.user.domain.Token;
+import org.terning.terningserver.user.domain.User;
+import org.terning.terningserver.user.domain.AuthType;
+import org.terning.terningserver.auth.dto.request.SignInRequest;
+import org.terning.terningserver.auth.dto.response.SignInResponse;
+import org.terning.terningserver.user.repository.UserRepository;
+
+@Service
+@RequiredArgsConstructor
+public class AuthSignInServiceImpl implements AuthSignInService {
+
+    private final SocialAuthServiceManager socialAuthServiceManager;
+    private final JwtTokenManager jwtTokenManager;
+    private final UserRepository userRepository;
+    private final NotificationUserClient notificationUserClient;
+//    private final FcmTokenValidationClient fcmTokenValidationClient;
+
+    @Transactional
+    @Override
+    public SignInResponse signIn(String authAccessToken, SignInRequest request) {
+        String authId = getAuthId(request.authType(), authAccessToken);
+        User user = findUserByAuthIdAndType(authId, request.authType());
+
+        if (user == null) {
+//            return SignInResponse.of(null, authId, request.authType(), null, false);
+            return SignInResponse.of(null, authId, request.authType(), null);
+        }
+
+        Token token = jwtTokenManager.generateToken(user);
+        user.updateRefreshToken(token.getRefreshToken());
+
+//        boolean fcmReissueRequired = fcmTokenValidationClient.requestFcmTokenValidation(user.getId());
+
+        if (request.fcmToken() != null && !request.fcmToken().trim().isEmpty()) {
+            notificationUserClient.createOrUpdateUser(user, request.fcmToken());
+        }
+
+//        return SignInResponse.of(token, authId, request.authType(), user.getId(), fcmReissueRequired);
+        return SignInResponse.of(token, authId, request.authType(), user.getId());
+    }
+
+
+    private String getAuthId(AuthType authType, String authAccessToken) {
+        SocialAuthProvider provider = socialAuthServiceManager.getAuthService(authType);
+        return provider.getAuthId(authAccessToken);
+    }
+
+    private User findUserByAuthIdAndType(String authId, AuthType authType) {
+        return userRepository.findByAuthIdAndAuthType(authId, authType).orElse(null);
+    }
+}

src/main/java/org/terning/terningserver/auth/application/signout/AuthSignOutService.java

@@ -0,0 +1,5 @@
+package org.terning.terningserver.auth.application.signout;
+
+public interface AuthSignOutService {
+    void signOut(long userId);
+}