Merge/noti kafak into develop

.github/workflows/ci.yml

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

docker-compose.dev.yml

@@ -37,6 +37,9 @@ 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:

src/main/java/com/catchtable/global/config/SchedulerConfig.java

@@ -1,11 +1,20 @@
 package com.catchtable.global.config;
 
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.annotation.EnableKafka;
+import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.core.*;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.time.Clock;
 import java.time.ZoneId;
+import java.util.HashMap;
+import java.util.Map;
 
 @Configuration
 @EnableScheduling
@@ -20,4 +29,50 @@ public class SchedulerConfig {
     public Clock clock() {
         return Clock.system(ZoneId.of("Asia/Seoul"));
     }
+
+    @EnableKafka
+    @Configuration
+    public static class KafkaConfig {
+
+        private final String bootstrapServers = "localhost:9092";
+
+        @Bean
+        public KafkaTemplate<String, Object> kafkaTemplate() {
+            return new KafkaTemplate<>(producerFactory());
+        }
+
+        @Bean
+        public ProducerFactory<String, Object> producerFactory() {
+            Map<String, Object> config = new HashMap<>();
+            config.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
+            config.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+
+            // 🚨 [수정] 임포트 없이 스프링 제공 문자열 경로로 정확하게 고정합니다.
+            config.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, "org.springframework.kafka.support.serializer.JsonSerializer");
+            return new DefaultKafkaProducerFactory<>(config);
+        }
+
+        @Bean
+        public ConcurrentKafkaListenerContainerFactory<String, Object> kafkaListenerContainerFactory() {
+            ConcurrentKafkaListenerContainerFactory<String, Object> factory = new ConcurrentKafkaListenerContainerFactory<>();
+            factory.setConsumerFactory(consumerFactory());
+            return factory;
+        }
+
+        @Bean
+        public ConsumerFactory<String, Object> consumerFactory() {
+            Map<String, Object> config = new HashMap<>();
+            config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
+            config.put(ConsumerConfig.GROUP_ID_CONFIG, "catchtable-notification-group");
+            config.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+            config.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+
+            config.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.springframework.kafka.support.serializer.JsonDeserializer");
+
+            config.put("spring.json.trusted.packages", "com.catchtable.notification.event,java.lang.String,java.lang.Object");
+            config.put("spring.json.use.type.headers", true);
+
+            return new DefaultKafkaConsumerFactory<>(config);
+        }
+    }
 }

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());
+//    }
+//}