Develop

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, develop]
 
 jobs:
   test:

.github/workflows/deploy.yml

@@ -108,16 +108,17 @@ jobs:
             # 6. app만 교체 (nginx/certbot은 그대로 유지 — 무중단 가까움)
             sudo docker compose -f "$COMPOSE" up -d --no-deps app
 
-            # 7. 헬스체크 (Docker healthcheck 상태 polling, 최대 90초)
+            # 7. 헬스체크 (Docker healthcheck 상태 polling, 최대 180초)
+            # OTel Agent + JPA 16개 repo + Tomcat 등으로 부팅에 약 90초 소요됨
             echo "Waiting for app to become healthy..."
-            for i in $(seq 1 18); do
+            for i in $(seq 1 36); do
               STATUS=$(sudo docker inspect --format='{{.State.Health.Status}}' catchtable-app 2>/dev/null || echo "starting")
               if [ "$STATUS" = "healthy" ]; then
                 echo "✅ App is healthy"
                 sudo docker image prune -f
                 exit 0
               fi
-              echo "  ($i/18) status=$STATUS"
+              echo "  ($i/36) status=$STATUS"
               sleep 5
             done
 

docker-compose.dev.yml

@@ -37,20 +37,25 @@ services:
       KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
 
       KAFKA_CONTROLLER_QUORUM_VOTERS: '1@127.0.0.1:9093'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+
     volumes:
       - kafka-data-dev:/tmp/kafka-logs
     networks:
       - catchtable-dev-net
 
-networks:
-  catchtable-dev-net:
-    driver: bridge
-
   redis:
     image: redis:7-alpine
     container_name: catchtable-redis
     ports:
       - "${REDIS_PORT:-6379}:6379"
+    networks:
+      - catchtable-dev-net
+
+networks:
+  catchtable-dev-net:
+    driver: bridge
 
 volumes:
   catchtable-data:

nginx/nginx.conf

@@ -13,6 +13,9 @@ http {
     keepalive_timeout 65;
     client_max_body_size 10m;
 
+    # Docker 내장 DNS — app 컨테이너 재생성 시 nginx 재시작 없이 새 IP 자동 인식
+    resolver 127.0.0.11 valid=10s ipv6=off;
+
     # ── HTTP (80) ─────────────────────────────────────────
     # Let's Encrypt 인증 + HTTPS 리다이렉트
     server {
@@ -59,7 +62,9 @@ http {
         }
 
         location / {
-            proxy_pass http://app:8080;
+            # 변수 사용 시 nginx가 매 요청마다 resolver로 DNS 재해석
+            set $backend_app "app:8080";
+            proxy_pass http://$backend_app;
             proxy_http_version 1.1;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;

src/main/java/com/catchtable/global/exception/ErrorCode.java

@@ -68,6 +68,7 @@ public enum ErrorCode implements ResponseCode {
     REMAIN_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 예약 시간대입니다."),
     REMAIN_EXHAUSTED(HttpStatus.BAD_REQUEST, "해당 시간대의 예약이 마감되었습니다."),
     OPTIMISTIC_LOCK_CONFLICT(HttpStatus.CONFLICT, "이미 다른 사용자가 예약하여 마감되었습니다. 다시 시도해주세요."),
+    LOCK_TIMEOUT(HttpStatus.CONFLICT, "예약 요청이 많아 처리하지 못했습니다. 잠시 후 다시 시도해주세요."),
 
     // Review
     REVIEW_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 리뷰입니다."),

src/main/java/com/catchtable/global/lock/DistributedLockExecutor.java

@@ -0,0 +1,48 @@
+package com.catchtable.global.lock;
+
+import com.catchtable.global.exception.CustomException;
+import com.catchtable.global.exception.ErrorCode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class DistributedLockExecutor {
+
+    private final RedissonClient redissonClient;
+
+    /**
+     * 분산 락을 잡은 뒤 task를 실행하고, 끝나면 락을 해제한다.
+     *
+     * @param lockKey      락 키. 같은 키끼리만 직렬화된다.
+     * @param waitSeconds  락을 잡으려고 기다리는 최대 시간(초).
+     * @param leaseSeconds 락을 잡은 뒤 자동으로 풀리는 시간(초). 작업이 죽어도 이 시간 후 해제된다.
+     * @param task         락 안에서 실행할 작업.
+     */
+    public <T> T executeWithLock(String lockKey, long waitSeconds, long leaseSeconds, Supplier<T> task) {
+        RLock lock = redissonClient.getLock(lockKey);
+        boolean acquired = false;
+        try {
+            acquired = lock.tryLock(waitSeconds, leaseSeconds, TimeUnit.SECONDS);
+            if (!acquired) {
+                log.warn("분산 락 획득 실패 (대기 {}초 초과): {}", waitSeconds, lockKey);
+                throw new CustomException(ErrorCode.LOCK_TIMEOUT);
+            }
+            return task.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new CustomException(ErrorCode.LOCK_TIMEOUT);
+        } finally {
+            if (acquired && lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+    }
+}

src/main/java/com/catchtable/notification/event/ReservationCanceledEvent.java

@@ -1,14 +1,16 @@
 package com.catchtable.notification.event;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.NoArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
 public class ReservationCanceledEvent {
-    private final Long reservationId;
-    private final Long userId;
-    private final String storeName;
-    private final String remainDate;
-    private final String remainTime;
+    private Long reservationId;
+    private Long userId;
+    private String storeName;
+    private String remainDate;
+    private String remainTime;
 }

src/main/java/com/catchtable/notification/event/ReservationChangedEvent.java

@@ -1,16 +1,18 @@
 package com.catchtable.notification.event;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.NoArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
 public class ReservationChangedEvent {
-    private final Long newReservationId;
-    private final Long userId;
-    private final String storeName;
-    private final String oldRemainDate;
-    private final String oldRemainTime;
-    private final String newRemainDate;
-    private final String newRemainTime;
+    private Long newReservationId;
+    private Long userId;
+    private String storeName;
+    private String oldRemainDate;
+    private String oldRemainTime;
+    private String newRemainDate;
+    private String newRemainTime;
 }

src/main/java/com/catchtable/notification/event/ReservationConfirmedEvent.java

@@ -1,14 +1,16 @@
 package com.catchtable.notification.event;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.NoArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
 public class ReservationConfirmedEvent {
-    private final Long reservationId;
-    private final Long userId;
-    private final String storeName;
-    private final String remainDate;
-    private final String remainTime;
+    private Long reservationId;
+    private Long userId;
+    private String storeName;
+    private String remainDate;
+    private String remainTime;
 }

src/main/java/com/catchtable/notification/event/ReservationReminderEvent.java

@@ -1,14 +1,16 @@
 package com.catchtable.notification.event;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.NoArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
 public class ReservationReminderEvent {
-    private final Long reservationId;
-    private final Long userId;
-    private final String storeName;
-    private final String remainDate;
-    private final String remainTime;
+    private Long reservationId;
+    private Long userId;
+    private String storeName;
+    private String remainDate;
+    private String remainTime;
 }

src/main/java/com/catchtable/notification/event/ReservationVisitedEvent.java

@@ -1,14 +1,16 @@
 package com.catchtable.notification.event;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.NoArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
 public class ReservationVisitedEvent {
-    private final Long reservationId;
-    private final Long userId;
-    private final String storeName;
-    private final String remainDate;
-    private final String remainTime;
+    private Long reservationId;
+    private Long userId;
+    private String storeName;
+    private String remainDate;
+    private String remainTime;
 }

src/main/java/com/catchtable/notification/event/VacancyEvent.java

@@ -1,10 +1,12 @@
 package com.catchtable.notification.event;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.NoArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
 public class VacancyEvent {
-    private final Long remainId;
-}
+    private Long remainId;
+}

src/main/java/com/catchtable/notification/listener/ReservationCanceledNotificationListener.java

@@ -1,50 +1,50 @@
-package com.catchtable.notification.listener;
-
-import com.catchtable.global.exception.CustomException;
-import com.catchtable.global.exception.ErrorCode;
-import com.catchtable.notification.entity.NotificationType;
-import com.catchtable.notification.event.ReservationCanceledEvent;
-import com.catchtable.notification.service.NotificationService;
-import com.catchtable.user.entity.User;
-import com.catchtable.user.repository.UserRepository;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.event.TransactionPhase;
-import org.springframework.transaction.event.TransactionalEventListener;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class ReservationCanceledNotificationListener {
-
-    private final NotificationService notificationService;
-    private final UserRepository userRepository;
-
-    @Async
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public void handleReservationCanceledEvent(ReservationCanceledEvent event) {
-        User user = userRepository.findById(event.getUserId())
-                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
-
-        String title = "예약이 취소되었습니다.";
-        String content = String.format("'%s' 매장 %s %s 예약이 취소되었습니다.",
-                event.getStoreName(),
-                event.getRemainDate(),
-                event.getRemainTime());
-
-        notificationService.createNotification(
-                user,
-                NotificationType.RESERVATION_CANCELED,
-                title,
-                content,
-                event.getReservationId()
-        );
-
-        log.info("[예약 취소 알림] userId: {}, reservationId: {} 알림 생성 완료", event.getUserId(), event.getReservationId());
-    }
-}
+//package com.catchtable.notification.listener;
+//
+//import com.catchtable.global.exception.CustomException;
+//import com.catchtable.global.exception.ErrorCode;
+//import com.catchtable.notification.entity.NotificationType;
+//import com.catchtable.notification.event.ReservationCanceledEvent;
+//import com.catchtable.notification.service.NotificationService;
+//import com.catchtable.user.entity.User;
+//import com.catchtable.user.repository.UserRepository;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.stereotype.Component;
+//import org.springframework.transaction.annotation.Propagation;
+//import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.transaction.event.TransactionPhase;
+//import org.springframework.transaction.event.TransactionalEventListener;
+//
+//@Slf4j
+//@Component
+//@RequiredArgsConstructor
+//public class ReservationCanceledNotificationListener {
+//
+//    private final NotificationService notificationService;
+//    private final UserRepository userRepository;
+//
+//    @Async
+//    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+//    @Transactional(propagation = Propagation.REQUIRES_NEW)
+//    public void handleReservationCanceledEvent(ReservationCanceledEvent event) {
+//        User user = userRepository.findById(event.getUserId())
+//                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+//
+//        String title = "예약이 취소되었습니다.";
+//        String content = String.format("'%s' 매장 %s %s 예약이 취소되었습니다.",
+//                event.getStoreName(),
+//                event.getRemainDate(),
+//                event.getRemainTime());
+//
+//        notificationService.createNotification(
+//                user,
+//                NotificationType.RESERVATION_CANCELED,
+//                title,
+//                content,
+//                event.getReservationId()
+//        );
+//
+//        log.info("[예약 취소 알림] userId: {}, reservationId: {} 알림 생성 완료", event.getUserId(), event.getReservationId());
+//    }
+//}