Merge pull request #151 from DevKor-github/develop

#115 ~ #150 반영해 운영 서버 배포

Author: soonduck-dreams

.github/workflows/deploy-to-dev-ec2.yml

@@ -75,10 +75,12 @@ jobs:
             APPLE_KEY_ID="${{ secrets.APPLE_KEY_ID }}" \
             APPLE_PRIVATE_KEY="${{ secrets.APPLE_PRIVATE_KEY }}" \
             JWT_SECRET="${{ secrets.JWT_SECRET }}" \
+            KAKAO_ADMIN_KEY="${{ secrets.KAKAO_ADMIN_KEY }}" \
             KAKAO_CLIENT_ID="${{ secrets.KAKAO_CLIENT_ID }}" \
             KAKAO_REDIRECT_URI="${{ secrets.KAKAO_REDIRECT_URI }}" \
             KAKAO_CLIENT_SECRET="${{ secrets.KAKAO_CLIENT_SECRET }}" \
             KMS_KEY_ID="${{ secrets.KMS_KEY_ID }}" \
+            FIREBASE_ADMIN_KEY="${{ secrets.FIREBASE_ADMIN_KEY }}" \
             nohup java -Duser.timezone=Asia/Seoul -jar $JAR_NAME --spring.profiles.active=dev > app.log 2>&1 &
             
             echo "✅ 배포 완료"

.github/workflows/deploy-to-prod-ec2.yml

@@ -75,10 +75,12 @@ jobs:
             APPLE_KEY_ID="${{ secrets.APPLE_KEY_ID }}" \
             APPLE_PRIVATE_KEY="${{ secrets.APPLE_PRIVATE_KEY }}" \
             JWT_SECRET="${{ secrets.JWT_SECRET }}" \
+            KAKAO_ADMIN_KEY="${{ secrets.KAKAO_ADMIN_KEY }}" \
             KAKAO_CLIENT_ID="${{ secrets.KAKAO_CLIENT_ID }}" \
             KAKAO_REDIRECT_URI="${{ secrets.KAKAO_REDIRECT_URI }}" \
             KAKAO_CLIENT_SECRET="${{ secrets.KAKAO_CLIENT_SECRET }}" \
             KMS_KEY_ID="${{ secrets.KMS_KEY_ID }}" \
+            FIREBASE_ADMIN_KEY="${{ secrets.FIREBASE_ADMIN_KEY }}" \   
             nohup java -Duser.timezone=Asia/Seoul -jar $JAR_NAME --spring.profiles.active=prod > app.log 2>&1 &
             
             echo "✅ 배포 완료"

.gitignore

@@ -40,4 +40,7 @@ out/
 .env
 
 # node js 관련
-node_modules
+node_modules
+
+# Firebase Admin Key
+src/main/resources/config/firebase-admin-key.json

build.gradle

@@ -75,6 +75,9 @@ dependencies {
 
 	// 금칙어 필터링 라이브러리 의존성 추가
 	implementation 'io.github.vaneproject:badwordfiltering:1.0.0'
+
+	// FCM admin SDK 추가
+	implementation 'com.google.firebase:firebase-admin:9.5.0'
 }
 
 tasks.named('test') {

src/main/java/org/devkor/apu/saerok_server/domain/auth/api/LocalAuthController.java

@@ -7,9 +7,8 @@
 import org.devkor.apu.saerok_server.domain.auth.api.dto.response.LocalAccessTokenResponse;
 import org.devkor.apu.saerok_server.domain.auth.application.LocalAuthService;
 import org.springframework.context.annotation.Profile;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
 
 @Profile("local")
 @RestController
@@ -29,4 +28,15 @@ public class LocalAuthController {
     public LocalAccessTokenResponse issueLocalDummyUserToken() {
         return localAuthService.issueLocalDummyUserToken();
     }
+
+    @Operation(
+            summary = "탈퇴한 더미 유저 재가입 처리",
+            description = "탈퇴 처리된 더미 유저를 재가입시킵니다."
+    )
+    @PostMapping("/rejoin-dummy-user")
+    @PermitAll
+    @ResponseStatus(HttpStatus.CREATED)
+    public void rejoinDummyUser() {
+        localAuthService.rejoinDummyUser();
+    }
 }

src/main/java/org/devkor/apu/saerok_server/domain/auth/application/AbstractSocialAuthService.java

@@ -6,12 +6,13 @@
 import org.devkor.apu.saerok_server.domain.auth.api.dto.response.AccessTokenResponse;
 import org.devkor.apu.saerok_server.domain.auth.application.facade.AuthTokenFacade;
 import org.devkor.apu.saerok_server.domain.auth.application.facade.AuthTokenFacade.AuthBundle;
+import org.devkor.apu.saerok_server.domain.auth.core.dto.SocialUserInfo;
 import org.devkor.apu.saerok_server.domain.auth.core.entity.SocialAuth;
 import org.devkor.apu.saerok_server.domain.auth.core.entity.SocialProviderType;
 import org.devkor.apu.saerok_server.domain.auth.core.repository.SocialAuthRepository;
 import org.devkor.apu.saerok_server.domain.auth.core.service.UserProvisioningService;
 import org.devkor.apu.saerok_server.domain.auth.infra.SocialAuthClient;
-import org.devkor.apu.saerok_server.domain.auth.core.dto.SocialUserInfo;
+import org.devkor.apu.saerok_server.domain.user.core.entity.SignupStatusType;
 import org.devkor.apu.saerok_server.global.security.crypto.DataCryptoService;
 import org.devkor.apu.saerok_server.global.security.crypto.EncryptedPayload;
 import org.devkor.apu.saerok_server.global.shared.util.dto.ClientInfo;
@@ -40,6 +41,13 @@ public ResponseEntity<AccessTokenResponse> authenticate(String authorizationCode
 
         SocialAuth socialAuth = socialAuthRepository
                 .findByProviderAndProviderUserId(provider, userInfo.sub())
+                .map(link -> {
+                    // 탈퇴했던 유저면 재프로비저닝
+                    if (link.getUser().getSignupStatus() == SignupStatusType.WITHDRAWN) {
+                        userProvisioningService.provisionRejoinedUser(link.getUser(), userInfo.email());
+                    }
+                    return link;
+                })
                 .orElseGet(() -> userProvisioningService.provisionNewUser(provider, userInfo));
 
         if (userInfo.refreshToken() != null) {

src/main/java/org/devkor/apu/saerok_server/domain/auth/application/LocalAuthService.java

@@ -2,23 +2,26 @@
 
 import lombok.RequiredArgsConstructor;
 import org.devkor.apu.saerok_server.domain.auth.api.dto.response.LocalAccessTokenResponse;
+import org.devkor.apu.saerok_server.domain.auth.core.service.UserProvisioningService;
 import org.devkor.apu.saerok_server.domain.user.core.entity.User;
 import org.devkor.apu.saerok_server.domain.user.core.repository.UserRepository;
 import org.devkor.apu.saerok_server.domain.user.core.repository.UserRoleRepository;
 import org.devkor.apu.saerok_server.global.security.token.AccessTokenProvider;
+import org.devkor.apu.saerok_server.global.shared.exception.NotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @Service
-@Transactional(readOnly = true)
+@Transactional
 @RequiredArgsConstructor
 public class LocalAuthService {
 
     private final AccessTokenProvider accessTokenProvider;
     private final UserRepository userRepository;
     private final UserRoleRepository userRoleRepository;
+    private final UserProvisioningService userProvisioningService;
 
     public LocalAccessTokenResponse issueLocalDummyUserToken() {
 
@@ -34,4 +37,10 @@ public LocalAccessTokenResponse issueLocalDummyUserToken() {
 
         return new LocalAccessTokenResponse(token, user.getSignupStatus().name());
     }
+
+    public void rejoinDummyUser() {
+
+        User user = userRepository.findDeletedUserById(99999L).orElseThrow(() -> new NotFoundException("탈퇴한 로컬 더미 유저가 존재하지 않습니다"));
+        userProvisioningService.provisionRejoinedUser(user, "fake-email@saerok.com");
+    }
 }

src/main/java/org/devkor/apu/saerok_server/domain/auth/core/repository/SocialAuthRepository.java

@@ -6,6 +6,7 @@
 import org.devkor.apu.saerok_server.domain.auth.core.entity.SocialProviderType;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
@@ -27,4 +28,11 @@ public SocialAuth save(SocialAuth socialAuth) {
         em.persist(socialAuth);
         return socialAuth;
     }
+
+    public List<SocialAuth> findByUserId(Long userId) {
+        return em.createQuery(
+                "SELECT s FROM SocialAuth s WHERE s.user.id = :userId", SocialAuth.class)
+                .setParameter("userId", userId)
+                .getResultList();
+    }
 }

src/main/java/org/devkor/apu/saerok_server/domain/auth/core/repository/UserRefreshTokenRepository.java

@@ -23,4 +23,10 @@ public Optional<UserRefreshToken> findByRefreshTokenHash(String refreshTokenHash
                 .getResultStream()
                 .findFirst();
     }
+
+    public int deleteByUserId(Long userId) {
+        return em.createQuery("DELETE FROM UserRefreshToken rt WHERE rt.user.id = :userId")
+                .setParameter("userId", userId)
+                .executeUpdate();
+    }
 }

src/main/java/org/devkor/apu/saerok_server/domain/auth/core/service/UserProvisioningService.java

@@ -11,13 +11,10 @@
 import org.devkor.apu.saerok_server.domain.user.core.entity.UserRoleType;
 import org.devkor.apu.saerok_server.domain.user.core.repository.UserRepository;
 import org.devkor.apu.saerok_server.domain.user.core.repository.UserRoleRepository;
+import org.devkor.apu.saerok_server.domain.user.core.service.ProfileImageDefaultService;
 import org.devkor.apu.saerok_server.global.shared.exception.SocialAuthAlreadyExistsException;
 import org.springframework.stereotype.Service;
 
-/**
- * 새로운 유저에 대한 프로비저닝(Provisioning: 사용자가 요청한 IT 자원을 사용할 수 있는 상태로 준비하는 것)을 담당하는 도메인 서비스
- * 사용자 관점에서는 "회원가입", 시스템 관점에서는 "프로비저닝".
- */
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -26,9 +23,10 @@ public class UserProvisioningService {
     private final UserRepository userRepository;
     private final UserRoleRepository userRoleRepository;
     private final SocialAuthRepository socialAuthRepository;
+    private final ProfileImageDefaultService profileImageDefaultService;
 
     /**
-     * 새로운 사용자에게 필요한 자원(User, UserRole, SocialAuth)을 할당한다.
+     * 새로운 사용자에게 필요한 자원을 할당한다.
      * @param provider 소셜 공급자 (ex. Apple, Kakao)
      * @param userInfo 소셜 공급자로부터 받은 사용자 정보 (sub, email)
      * @return 해당 사용자에게 생성된 SocialAuth 엔티티
@@ -40,10 +38,39 @@ public SocialAuth provisionNewUser(SocialProviderType provider, SocialUserInfo u
         }
 
         User user = userRepository.save(User.createUser(userInfo.email()));
+        profileImageDefaultService.setRandomVariant(user);
+
         userRoleRepository.save(UserRole.createUserRole(user, UserRoleType.USER));
 
         return socialAuthRepository.save(
                 SocialAuth.createSocialAuth(user, provider, userInfo.sub())
         );
     }
+
+    /**
+     * 탈퇴했던 사용자가 재가입할 때 필요한 자원을 다시 준비한다.
+     * 기존 users 레코드를 그대로 사용하고, 다음을 수행한다:
+     *  - signupStatus → PROFILE_REQUIRED
+     *  - deleted_at → null
+     *  - joined_at → 현재 시각
+     *  - 이메일이 비어 있으면 소셜에서 받은 이메일로 복구
+     *  - USER 롤이 없으면 다시 부여
+     *  - 기본 프로필 이미지가 비어 있으면 랜덤 배정
+     */
+    public void provisionRejoinedUser(User user, String email) {
+
+        user.restoreForRejoin();
+
+        if (user.getEmail() == null && email != null) {
+            user.setEmail(email);
+        }
+
+        if (userRoleRepository.findByUser(user).isEmpty()) {
+            userRoleRepository.save(UserRole.createUserRole(user, UserRoleType.USER));
+        }
+
+        if (user.getDefaultProfileImageVariant() == null) {
+            profileImageDefaultService.setRandomVariant(user);
+        }
+    }
 }