Develop

.github/workflows/admin-ci-cd.yml

@@ -11,10 +11,6 @@ on:
       - 'env/**'
       - '.env'
 
-concurrency:
-  group: ${{ github.ref_name }}
-  cancel-in-progress: false
-
 jobs:
   admin-ci-cd:
     runs-on: ubuntu-latest
@@ -58,19 +54,32 @@ jobs:
           flags: 'g'
 
 
-      - name: Deploy to Local Server
+      - name: Wait for deploy lock and deploy admin
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.LOCAL_SERVER_HOST }}
           username: ${{ secrets.LOCAL_SERVER_USER }}
           password: ${{ secrets.LOCAL_SERVER_SSH_PASSWORD }}
           script: |
+            set -e
             branchName=${{ github.ref_name }}
-            echo ${branchName}
-            echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S chmod +x /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
-            echo "chmod Clear"
-            echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
-            echo "Process Clear"
+            lockFile="/tmp/sluv-${branchName}-deploy.lock"
+
+            (
+              echo "[deploy-lock] admin deploy is waiting for lock: ${lockFile}"
+              if ! flock -w 1800 200; then
+                echo "[deploy-lock] admin deploy failed to acquire lock after 1800 seconds"
+                exit 1
+              fi
+
+              echo "[deploy-lock] admin deploy acquired lock"
+              echo "[deploy] admin deploy started for branch: ${branchName}"
+              echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S chmod +x /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
+              echo "[deploy] chmod clear"
+              echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
+              echo "[deploy] admin deploy finished"
+              echo "[deploy-lock] admin deploy releasing lock"
+            ) 200>${lockFile}
 
   current-time:
     needs: admin-ci-cd
@@ -96,4 +105,4 @@ jobs:
         uses: tsickert/discord-webhook@v5.3.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          content: "Dev ${{ github.ref_name }} Admin-Module Deploy ${{ job.status }}"
+          content: "Dev ${{ github.ref_name }} Admin-Module Deploy ${{ job.status }}"

.github/workflows/api-ci-cd.yml

@@ -11,10 +11,6 @@ on:
       - 'env/**'
       - '.env'
 
-concurrency:
-  group: ${{ github.ref_name }}
-  cancel-in-progress: false
-
 jobs:
   api-ci-cd:
     runs-on: ubuntu-latest
@@ -58,19 +54,32 @@ jobs:
           flags: 'g'
 
 
-      - name: Deploy to Local Server
+      - name: Wait for deploy lock and deploy api
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.LOCAL_SERVER_HOST }}
           username: ${{ secrets.LOCAL_SERVER_USER }}
           password: ${{ secrets.LOCAL_SERVER_SSH_PASSWORD }}
           script: |
+            set -e
             branchName=${{ github.ref_name }}
-            echo ${branchName}
-            echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S chmod +x /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
-            echo "chmod Clear"
-            echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
-            echo "Process Clear"
+            lockFile="/tmp/sluv-${branchName}-deploy.lock"
+
+            (
+              echo "[deploy-lock] api deploy is waiting for lock: ${lockFile}"
+              if ! flock -w 1800 200; then
+                echo "[deploy-lock] api deploy failed to acquire lock after 1800 seconds"
+                exit 1
+              fi
+
+              echo "[deploy-lock] api deploy acquired lock"
+              echo "[deploy] api deploy started for branch: ${branchName}"
+              echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S chmod +x /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
+              echo "[deploy] chmod clear"
+              echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
+              echo "[deploy] api deploy finished"
+              echo "[deploy-lock] api deploy releasing lock"
+            ) 200>${lockFile}
 
   current-time:
     needs: api-ci-cd
@@ -96,4 +105,4 @@ jobs:
         uses: tsickert/discord-webhook@v5.3.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          content: "Dev ${{ github.ref_name }} Api-Module Deploy ${{ job.status }}"
+          content: "Dev ${{ github.ref_name }} Api-Module Deploy ${{ job.status }}"

.github/workflows/batch-ci-cd.yml

@@ -11,10 +11,6 @@ on:
       - 'env/**'
       - '.env'
 
-concurrency:
-  group: ${{ github.ref_name }}
-  cancel-in-progress: false
-
 jobs:
   batch-ci-cd:
     runs-on: ubuntu-latest
@@ -58,19 +54,32 @@ jobs:
           flags: 'g'
 
 
-      - name: Deploy to Local Server
+      - name: Wait for deploy lock and deploy batch
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.LOCAL_SERVER_HOST }}
           username: ${{ secrets.LOCAL_SERVER_USER }}
           password: ${{ secrets.LOCAL_SERVER_SSH_PASSWORD }}
           script: |
+            set -e
             branchName=${{ github.ref_name }}
-            echo ${branchName}
-            echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S chmod +x /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
-            echo "chmod Clear"
-            echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
-            echo "Process Clear"
+            lockFile="/tmp/sluv-${branchName}-deploy.lock"
+
+            (
+              echo "[deploy-lock] batch deploy is waiting for lock: ${lockFile}"
+              if ! flock -w 1800 200; then
+                echo "[deploy-lock] batch deploy failed to acquire lock after 1800 seconds"
+                exit 1
+              fi
+
+              echo "[deploy-lock] batch deploy acquired lock"
+              echo "[deploy] batch deploy started for branch: ${branchName}"
+              echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S chmod +x /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
+              echo "[deploy] chmod clear"
+              echo ${{ secrets.LOCAL_SERVER_SUDO_PASSWORD }} | sudo -S /home/sluv/${branchName}-server/${branchName}-deploy-script.sh
+              echo "[deploy] batch deploy finished"
+              echo "[deploy-lock] batch deploy releasing lock"
+            ) 200>${lockFile}
 
   current-time:
     needs: batch-ci-cd
@@ -96,4 +105,4 @@ jobs:
         uses: tsickert/discord-webhook@v5.3.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          content: "Dev ${{ github.ref_name }} Batch-Module Deploy ${{ job.status }}"
+          content: "Dev ${{ github.ref_name }} Batch-Module Deploy ${{ job.status }}"

sluv-admin/src/main/java/com/sluv/admin/celeb/dto/CelebSelfPostRequest.java

@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.springframework.lang.Nullable;
+import jakarta.annotation.Nullable;
 
 @Getter
 @ToString

sluv-admin/src/main/java/com/sluv/admin/celeb/dto/NewCelebSelfPostRequest.java

@@ -2,7 +2,7 @@
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.springframework.lang.Nullable;
+import jakarta.annotation.Nullable;
 
 @Getter
 @NoArgsConstructor

sluv-admin/src/main/java/com/sluv/admin/item/controller/ItemDashBoardController.java

@@ -8,7 +8,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
-import org.springframework.lang.Nullable;
+import jakarta.annotation.Nullable;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

sluv-admin/src/main/java/com/sluv/admin/router/brand/BrandRouter.java

@@ -3,7 +3,7 @@
 import com.sluv.admin.brand.dto.BrandPageResponse;
 import com.sluv.admin.brand.service.BrandService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.lang.Nullable;
+import jakarta.annotation.Nullable;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;

sluv-admin/src/main/java/com/sluv/admin/router/celeb/CelebRouter.java

@@ -5,7 +5,7 @@
 import com.sluv.admin.celeb.service.CelebCategoryService;
 import com.sluv.admin.celeb.service.CelebService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.lang.Nullable;
+import jakarta.annotation.Nullable;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;

sluv-api/src/main/java/com/sluv/api/auth/controller/AuthController.java

@@ -17,7 +17,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.lang.Nullable;
+import jakarta.annotation.Nullable;
 import org.springframework.web.bind.annotation.*;
 
 @RestController

sluv-api/src/main/java/com/sluv/api/auth/dto/request/AuthRequest.java

@@ -3,7 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.springframework.lang.Nullable;
+import jakarta.annotation.Nullable;
 
 @Getter
 @NoArgsConstructor

sluv-api/src/main/java/com/sluv/api/closet/controller/ClosetController.java

@@ -10,7 +10,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.lang.Nullable;
+import jakarta.annotation.Nullable;
 import org.springframework.web.bind.annotation.*;
 
 @RestController

sluv-api/src/main/java/com/sluv/api/moderation/service/QuestionModerationService.java

@@ -0,0 +1,24 @@
+package com.sluv.api.moderation.service;
+
+import com.sluv.domain.featureflag.enums.FeatureFlagKey;
+import com.sluv.domain.featureflag.service.FeatureFlagDomainService;
+import com.sluv.domain.moderation.service.ModerationJobDomainService;
+import com.sluv.domain.question.entity.Question;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class QuestionModerationService {
+
+    private final FeatureFlagDomainService featureFlagDomainService;
+    private final ModerationJobDomainService moderationJobDomainService;
+
+    public void createQuestionJobIfEnabled(Question question) {
+        if (!featureFlagDomainService.isEnabled(FeatureFlagKey.MODERATION_JOB_CREATION)) {
+            return;
+        }
+
+        moderationJobDomainService.createQuestionJobIfAbsent(question.getId(), question.getUser().getId());
+    }
+}

sluv-api/src/main/java/com/sluv/api/moderation/service/QuestionModerationStatusService.java

@@ -0,0 +1,30 @@
+package com.sluv.api.moderation.service;
+
+import com.sluv.domain.featureflag.enums.FeatureFlagKey;
+import com.sluv.domain.featureflag.service.FeatureFlagDomainService;
+import com.sluv.domain.question.enums.QuestionStatus;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class QuestionModerationStatusService {
+
+    private final FeatureFlagDomainService featureFlagDomainService;
+
+    public QuestionStatus getInitialQuestionStatus() {
+        if (featureFlagDomainService.isEnabled(FeatureFlagKey.MODERATION_QUESTION_CREATE_PENDING)) {
+            return QuestionStatus.PENDING;
+        }
+
+        return QuestionStatus.ACTIVE;
+    }
+
+    public QuestionStatus getUpdateQuestionStatus() {
+        if (featureFlagDomainService.isEnabled(FeatureFlagKey.MODERATION_QUESTION_UPDATE_PENDING)) {
+            return QuestionStatus.PENDING;
+        }
+
+        return QuestionStatus.ACTIVE;
+    }
+}