fix: 보유금액이 선결제 금액보다 작을 경우 상태값 변경(200->400)

.github/workflows/deploy.yml

@@ -65,18 +65,46 @@ jobs:
     runs-on: self-hosted
 
     steps:
-      # 1. 최신 이미지를 풀받습니다
-      - name: docker pull
-        run: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/jangburich2
+      - uses: actions/checkout@v3
+
+      - name: Setup SSH key
+        uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.EC2_SSH_KEY }}
+
+      - name: Add EC2 to known_hosts
+        run: |
+          ssh-keyscan -H ip-172-31-3-107 >> ~/.ssh/known_hosts
 
-      # 2. 기존의 컨테이너를 중지시킵니다
-      - name: docker stop container
-        run: sudo docker stop $(sudo docker ps -q) 2>/dev/null || true
+      - name: Copy docker-compose.yml to EC2
+        run: |
+          scp docker-compose.yml ubuntu@ip-172-31-3-107:/home/ubuntu/
 
-      # 3. 최신 이미지를 컨테이너화하여 실행시킵니다
-      - name: docker run new container
-        run: sudo docker run --name jangburich2 --rm -d -p 8080:8080 ${{ secrets.DOCKERHUB_USERNAME }}/jangburich2
+      - name: Login to Docker Hub on EC2
+        run: |
+          ssh ubuntu@ip-172-31-3-107 '
+            echo "${{ secrets.DOCKERHUB_PASSWORD }}" | sudo docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
+          '
 
-      # 4. 미사용 이미지를 정리합니다
-      - name: delete old docker image
-        run: sudo docker system prune -f
+      - name: Stop existing Redis process
+        run: |
+          if pgrep redis-server; then
+            sudo systemctl stop redis || echo "Redis service not managed by systemctl"
+            pkill redis-server || echo "No Redis process to kill"
+          fi
+
+        # 0. 최신 이미지를 풀받습니다
+      - name: docker pull
+        run: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/jangburich2
+
+        # 1. docker-compose 종료
+      - name: docker-compose down
+        run: sudo docker-compose down
+
+        # 2. docker-compose 실행
+      - name: docker-compose up
+        run: sudo docker-compose up -d
+
+        # 3. 안쓰는 이미지 제거
+      - name: Remove unused Docker images
+        run: sudo docker image prune -f

compose-prod.yml → docker-compose.yml

@@ -1,8 +1,6 @@
 services:
-  api-server:
-    build:
-      context: .
-      dockerfile: ./Dockerfile
+  app:
+    image: rookie97/jangburich2:latest
     ports:
       - 8080:8080
     depends_on:
@@ -15,4 +13,4 @@ services:
     healthcheck:
       test: [ "CMD", "redis-cli", "ping" ]
       interval: 5s
-      retries: 10
+      retries: 10

src/main/java/com/jangburich/domain/store/service/PrepayService.java

@@ -42,17 +42,9 @@ public Message prepay(String userId, PrepayRequest prepayRequest) {
         Store store = storeRepository.findById(prepayRequest.storeId())
                 .orElseThrow(() -> new IllegalArgumentException("유효하지 않은 가게 id 입니다."));
 
-        if (!team.getTeamLeader().getUser_id().equals(user.getUserId())) {
-            return Message.builder()
-                    .message("팀의 리더가 아닌 사람은 선결제를 할 수 없습니다.")
-                    .build();
-        }
+        team.validateIsTeamLeader(team.getTeamLeader().getUser_id(), user.getUserId());
 
-        if (prepayRequest.prepayAmount() > user.getPoint()) {
-            return Message.builder()
-                    .message("보유하고 있는 금액이 선결제 하려는 금액보다 적습니다.")
-                    .build();
-        }
+        user.validateHasPointWithPrepayAmount(prepayRequest.prepayAmount(), user.getPoint());
 
         user.usePoint(prepayRequest.prepayAmount());
         PointTransaction pointTransaction = PointTransaction

src/main/java/com/jangburich/domain/team/domain/Team.java

@@ -66,4 +66,10 @@ public Team(String name, String description, String secretCode, TeamLeader teamL
         this.point = point;
         this.teamType = teamType;
     }
+
+    public void validateIsTeamLeader(Long userId, Long userId1) {
+        if (!userId.equals(userId1)) {
+            throw new IllegalArgumentException("팀의 리더가 아닌 사람은 선결제를 할 수 없습니다.");
+        }
+    }
 }

src/main/java/com/jangburich/domain/user/domain/User.java

@@ -80,4 +80,10 @@ public static User create(String userId, String nickname, String email, String i
 		newUser.setPoint(0);
 		return newUser;
 	}
+
+	public void validateHasPointWithPrepayAmount(int prepayAmount, Integer point) {
+		if (prepayAmount > point) {
+			throw new IllegalArgumentException("보유하고 있는 금액이 선결제 하려는 금액보다 적습니다.");
+		}
+	}
 }