[RELEASE] 1.4.6

.github/workflows/CD-develop.yml

@@ -30,6 +30,13 @@ jobs:
         shell: bash
 
       - name: Build with Gradle
+        env:
+          DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }}
+          DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }}
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
         run: ./gradlew build -x test -Dspring.profiles.active=dev
         shell: bash
 
@@ -54,10 +61,18 @@ jobs:
     steps:
       - name: Run Docker container
         uses: appleboy/ssh-action@master
+        env:
+          DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }}
+          DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }}
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
         with:
           host: ${{ secrets.DEVELOP_SERVER_IP }}
           username: ${{ secrets.DEVELOP_SERVER_USER }}
           key: ${{ secrets.DEVELOP_SERVER_KEY }}
+          envs: DEV_DB_NAME,DEV_DB_PWD,APPLE_TEAM_ID,DEV_APPLE_KEY_NAME,S3_ACCESS_KEY,S3_SECRET_KEY
           script: |
             cd ~
             ./deploy.sh

.github/workflows/CD.yml

@@ -30,6 +30,13 @@ jobs:
       shell: bash
 
     - name: Build with Gradle
+      env:
+        PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }}
+        PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }}
+        APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }}
+        S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+        S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
       run: ./gradlew build -x test -Dspring.profiles.active=prod
       shell: bash
 
@@ -54,10 +61,18 @@ jobs:
     steps:
     - name: Run Docker container
       uses: appleboy/ssh-action@master
+      env:
+        PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }}
+        PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }}
+        APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }}
+        S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+        S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
       with:
         host: ${{ secrets.RELEASE_SERVER_IP }}
         username: ${{ secrets.RELEASE_SERVER_USER }}
         key: ${{ secrets.RELEASE_SERVER_KEY }}
+        envs: PROD_DB_NAME,PROD_DB_PWD,APPLE_TEAM_ID,PROD_APPLE_KEY_NAME,S3_ACCESS_KEY,S3_SECRET_KEY
         script: |
           cd ~
           ./deploy.sh

.github/workflows/CI-develop.yml

@@ -30,5 +30,12 @@ jobs:
         shell: bash
 
       - name: Build with Gradle
+        env:
+          DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }}
+          DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }}
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
         run: ./gradlew build -x test
         shell: bash

.github/workflows/CI.yml

@@ -30,5 +30,12 @@ jobs:
       shell: bash
 
     - name: Build with Gradle
+      env:
+        PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }}
+        PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }}
+        APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }}
+        S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+        S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
       run: ./gradlew build -x test
-      shell: bash
+      shell: bash

Dockerfile

@@ -3,7 +3,10 @@ FROM amd64/amazoncorretto:17
 WORKDIR /app
 
 COPY config-repo/ /app/config-repo/
+RUN test -f /app/config-repo/application-dev.yml \
+   && test -f /app/config-repo/application-prod.yml \
+   && test -f /app/config-repo/application-common.yml
 
 COPY ./build/libs/WSS-Server-0.0.1-SNAPSHOT.jar /app/websoso.jar
 
-ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "websoso.jar"]
+ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "websoso.jar"]

src/main/java/org/websoso/WSSServer/application/AccountApplication.java

@@ -3,19 +3,21 @@
 import static org.websoso.WSSServer.infrastructure.discord.DiscordWebhookMessageType.WITHDRAW;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.websoso.WSSServer.infrastructure.discord.DiscordMessageClient;
 import org.websoso.WSSServer.infrastructure.discord.DiscordWebhookMessage;
 import org.websoso.WSSServer.dto.user.WithdrawalRequest;
-import org.websoso.WSSServer.feed.repository.CommentRepository;
-import org.websoso.WSSServer.feed.repository.FeedRepository;
+import org.websoso.WSSServer.feed.comment.repository.CommentRepository;
+import org.websoso.WSSServer.feed.feed.repository.FeedRepository;
 import org.websoso.WSSServer.oauth2.service.AppleService;
 import org.websoso.WSSServer.oauth2.service.KakaoService;
 import org.websoso.WSSServer.oauth2.repository.RefreshTokenRepository;
 import org.websoso.WSSServer.notification.service.MessageFormatter;
 import org.websoso.WSSServer.user.domain.User;
 import org.websoso.WSSServer.user.domain.WithdrawalReason;
+import org.websoso.WSSServer.user.event.WithdrawUserEvent;
 import org.websoso.WSSServer.user.repository.UserRepository;
 import org.websoso.WSSServer.user.repository.WithdrawalReasonRepository;
 
@@ -35,6 +37,8 @@ public class AccountApplication {
     private final RefreshTokenRepository refreshTokenRepository;
     private final KakaoService kakaoService;
 
+    private final ApplicationEventPublisher eventPublisher;
+
     public void withdrawUser(User user, WithdrawalRequest withdrawalRequest) {
         unlinkSocialAccount(user);
 
@@ -47,6 +51,10 @@ public void withdrawUser(User user, WithdrawalRequest withdrawalRequest) {
                 DiscordWebhookMessage.of(messageContent, WITHDRAW));
 
         withdrawalReasonRepository.save(WithdrawalReason.create(withdrawalRequest.reason()));
+
+        eventPublisher.publishEvent(
+                WithdrawUserEvent.of(user.getUserId())
+        );
     }
 
     private void unlinkSocialAccount(User user) {
@@ -59,7 +67,6 @@ private void unlinkSocialAccount(User user) {
 
     private void cleanupUserData(Long userId) {
         refreshTokenRepository.deleteAll(refreshTokenRepository.findAllByUserId(userId));
-        feedRepository.updateUserToUnknown(userId);
         commentRepository.updateUserToUnknown(userId);
         userRepository.deleteById(userId);
     }