feat : 채팅 내역 실시간 저장 확인 및 DLQ 구현 시도

Author: MoonJongHyeon1095

Dockerfile

@@ -0,0 +1,14 @@
+FROM adoptopenjdk/openjdk11 AS builder
+
+COPY gradlew .
+COPY gradle gradle
+COPY build.gradle .
+COPY settings.gradle .
+COPY src src
+RUN chmod +x ./gradlew	#gradlew 실행 권한 부여
+RUN ./gradlew bootJar	#gradlew를 통해 실행 가능한 jar파일 생성
+
+FROM adoptopenjdk/openjdk11
+COPY --from=builder build/libs/*.jar app.jar
+ENTRYPOINT ["java", "-jar", "/app.jar"]
+VOLUME /tmp

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.7.15'
-    id 'io.spring.dependency-management' version '1.0.15.RELEASE'
+    id 'org.springframework.boot' version '2.7.14'
+    id 'io.spring.dependency-management' version '1.1.3'
 }
 
 group = 'com.github'

docker-compose.yml

@@ -0,0 +1,21 @@
+version: '3'
+services:
+  commerce:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: always
+    ports:
+      - "8080:8080"
+    env_file:
+      - .env
+
+#version: '3'
+#services:
+#  commerce:
+#    image: zin354/commerce-consumer:latest
+#    restart: always
+#    ports:
+#      - "8080:8080"
+#    env_file:
+#      - .env

src/main/java/com/github/messageconsumer/advice/GlobalExceptionHandler.java

@@ -0,0 +1,60 @@
+package com.github.messageconsumer.advice;
+
+
+import com.github.messageconsumer.advice.exception.ErrorResponse;
+import com.github.messageconsumer.advice.exception.type.ErrorCode;
+import com.github.messageconsumer.service.cart.exception.CartErrorResponse;
+import com.github.messageconsumer.service.cart.exception.CartException;
+import com.github.messageconsumer.service.order.exception.OrderErrorResponse;
+import com.github.messageconsumer.service.order.exception.OrderException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationException(
+            MethodArgumentNotValidException e
+    ){
+        ErrorResponse errorResponse = new ErrorResponse(ErrorCode.BAD_REQUEST,
+                e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+        return ResponseEntity.badRequest().body(errorResponse);
+    }
+
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public ResponseEntity<?> handleHttpMessageNotReadableException(
+            HttpMessageNotReadableException e
+    ){
+        ErrorResponse errorResponse = new ErrorResponse(ErrorCode.BAD_REQUEST,
+                "Request Body가 비어 있습니다");
+        return ResponseEntity.badRequest().body(errorResponse);
+    }
+
+    @ExceptionHandler(CartException.class)
+    public ResponseEntity<?> handleCartException(CartException e){
+
+        return ResponseEntity.status(e.getErrorCode().getHttpStatus())
+                .body(CartErrorResponse.builder()
+                        .errorCode(e.getErrorCode())
+                        .errorMessage(e.getErrorMessage())
+                        .build());
+
+    }
+
+    @ExceptionHandler(OrderException.class)
+    public ResponseEntity<?> handleOrderException(OrderException e){
+        return ResponseEntity.status(e.getErrorCode().getHttpStatus())
+                .body(OrderErrorResponse.builder()
+                        .errorCode(e.getErrorCode())
+                        .errorMessage(e.getErrorMessage())
+                        .build());
+    }
+
+
+}

src/main/java/com/github/messageconsumer/advice/LoggingAspect.java

@@ -0,0 +1,34 @@
+package com.github.messageconsumer.advice;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Aspect
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoggingAspect {
+
+    private final HttpServletRequest request;
+
+    @Before("execution(* com.github.commerce..*Controller.*(..))")
+    public void beforeAdvice() {
+        String endpoint = request.getRequestURI(); // 현재 요청의 엔드포인트 경로를 얻어옴
+
+        log.info("\u001B[34mAPI 호출! - " + endpoint + "\u001B[0m");
+    }
+
+//    @AfterReturning(pointcut = "execution(* com.github.commerce..*Controller.*(..))", returning = "returnValue")
+//    public void afterAdvice(JoinPoint joinPoint, Object returnValue) {
+//        String endpoint = request.getRequestURI(); // 현재 요청의 엔드포인트 경로를 얻어옴
+//
+//        log.info("\u001B[32mAPI 호출 완료! - " + endpoint + " : "
+//                + ((ResponseEntity<?>) returnValue).getBody() + "\u001B[0m");
+//    }
+
+}

src/main/java/com/github/messageconsumer/advice/exception/ErrorResponse.java

@@ -0,0 +1,18 @@
+package com.github.messageconsumer.advice.exception;
+
+
+import com.github.messageconsumer.advice.exception.type.ErrorCode;
+import lombok.*;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ErrorResponse {
+
+    private ErrorCode errorCode;
+    private String errorMessage;
+
+
+}

src/main/java/com/github/messageconsumer/advice/exception/type/ErrorCode.java

@@ -0,0 +1,12 @@
+package com.github.messageconsumer.advice.exception.type;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ErrorCode {
+
+    BAD_REQUEST("입력 값을 확인해 주세요.");
+    private final String description;
+}

src/main/java/com/github/messageconsumer/config/RabbitMQConfig.java

@@ -5,13 +5,11 @@
 import org.springframework.amqp.core.BindingBuilder;
 import org.springframework.amqp.core.DirectExchange;
 import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.core.TopicExchange;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
-import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/github/messageconsumer/entity/FailedLog.java

@@ -0,0 +1,27 @@
+package com.github.messageconsumer.entity;
+
+import lombok.*;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity
+@Table(name = "failed_logs")
+public class FailedLog {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Long id;
+
+    @Column
+    private String messageBody;
+
+    @Column
+    private LocalDateTime createdAt;
+
+}

src/main/java/com/github/messageconsumer/entity/Order.java

@@ -40,7 +40,7 @@ public class Order {
     private Integer quantity;
 
     @Column(name= "total_price")
-    private Integer total_price;
+    private Integer totalPrice;
 
     @Column(name="created_at")
     LocalDateTime createdAt;

src/main/java/com/github/messageconsumer/entity/Product.java

@@ -6,6 +6,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.time.Instant;
+import java.time.LocalDateTime;
 
 @Getter
 @Setter
@@ -30,12 +31,10 @@ public class Product {
     @Column(name = "name", nullable = false)
     private String name;
 
-    @Lob
     @Column(name = "content")
     private String content;
 
     @Size(max = 255)
-    @NotNull
     @Column(name = "thumbnail_url", nullable = false)
     private String thumbnailUrl;
 
@@ -48,25 +47,21 @@ public class Product {
 
     @NotNull
     @Column(name = "created_at", nullable = false)
-    private Instant createdAt;
+    private LocalDateTime createdAt;
 
     @Column(name = "updated_at")
-    private Instant updatedAt;
+    private LocalDateTime updatedAt;
 
     @NotNull
     @Column(name = "is_deleted", nullable = false, columnDefinition = "tinyint default 0")
-    private Boolean isDeleted;
+    private Boolean isDeleted ;
 
-    @Lob
     @Column(name = "product_category")
     private String productCategory;
 
-    @Lob
     @Column(name = "gender_category")
     private String genderCategory;
 
-    @Lob
     @Column(name = "age_category")
     private String ageCategory;
-
 }

src/main/java/com/github/messageconsumer/repository/FailedLogRepository.java

@@ -0,0 +1,7 @@
+package com.github.messageconsumer.repository;
+
+import com.github.messageconsumer.entity.FailedLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface FailedLogRepository extends JpaRepository<FailedLog, Long> {
+}

src/main/java/com/github/messageconsumer/service/cart/CartConsumerService.java

@@ -6,6 +6,7 @@
 import com.github.messageconsumer.entity.User;
 import com.github.messageconsumer.repository.CartRepository;
 import com.github.messageconsumer.service.cart.util.ValidatCartMethod;
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -58,6 +59,10 @@ public void postCartQueue(CartRmqDto cartRmqDto, Message message, Channel channe
                 // 최대 재시도 횟수를 초과하면 메시지를 버립니다.
                 channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
                 log.error("Max retries exceeded. Discarding message.");
+
+                String dlqExchange = "dlqExchange"; // DLQ로 메시지를 보낼 Exchange 이름
+                String dlqRoutingKey = "dlq.postCart"; // DLQ로 메시지를 보낼 Routing Key
+                channel.basicPublish(dlqExchange, dlqRoutingKey, null, message.getBody());
             }
         }
     }
@@ -92,6 +97,9 @@ public void putCartQueue(CartRmqDto cartRmqDto, Message message, Channel channel
                 // 최대 재시도 횟수를 초과하면 메시지를 버립니다.
                 channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
                 log.error("Max retries exceeded. Discarding message.");
+                String dlqExchange = "dlqExchange"; // DLQ로 메시지를 보낼 Exchange 이름
+                String dlqRoutingKey = "dlq.putCart"; // DLQ로 메시지를 보낼 Routing Key
+                channel.basicPublish(dlqExchange, dlqRoutingKey, null, message.getBody());
             }
         }
     }

src/main/java/com/github/messageconsumer/service/cart/FailedCartService.java

@@ -0,0 +1,44 @@
+package com.github.messageconsumer.service.cart;
+
+
+import com.github.messageconsumer.entity.FailedLog;
+import com.github.messageconsumer.repository.FailedLogRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FailedCartService {
+
+    private final RabbitTemplate rabbitTemplate;
+    private final FailedLogRepository failedLogRepository;
+
+    @RabbitListener(queues = "dlqCart", containerFactory = "rabbitListenerContainerFactory")
+    public void getDlqCart(@Payload Message message){
+        try {
+            String messageBody = new String(message.getBody(), "UTF-8");
+
+            // 실패한 메시지를 데이터베이스에 저장
+            FailedLog failedLog = new FailedLog();
+            failedLog.setMessageBody(messageBody);
+            failedLog.setCreatedAt(LocalDateTime.now());
+            failedLogRepository.save(failedLog);
+
+            log.info("Failed Cart message saved to the database.");
+        } catch (IOException e) {
+            log.error("Error processing failed cart message: " + e.getMessage(), e);
+        }
+
+
+    }
+
+}

src/main/java/com/github/messageconsumer/service/chat/ChatConsumerService.java

@@ -31,11 +31,21 @@ public class ChatConsumerService {
     @RabbitListener(queues = "postRoom", containerFactory = "rabbitListenerContainerFactory")
     public void postRoom(RoomRmqDto roomRmqDto, Message message, Channel channel) throws IOException {
         try {
-            Optional<Chat> chat = chatRepository.findByCustomRoomId(roomRmqDto.getCustomRoomId());
-            if (chat.isPresent()) {
-                // 이미 존재하는 경우 아무것도 하지 않고 성공 처리
-                log.info("Chat already exists for customRoomId: " + roomRmqDto.getCustomRoomId());
+            System.out.println("postRoom11111111111");
+            Optional<Chat> chatOptional = chatRepository.findByCustomRoomId(roomRmqDto.getCustomRoomId());
+            if (chatOptional.isPresent()) {
+                Chat chat = chatOptional.get();
+                // Chat 객체 업데이트
+                chat.setSellerId(roomRmqDto.getSellerId());
+                chat.setShopName(roomRmqDto.getShopName());
+                chat.setUserId(roomRmqDto.getUserId());
+                chat.setUserName(roomRmqDto.getUserName());
+                chat.setProductId(roomRmqDto.getProductId());
+
+                chatRepository.save(chat); // Chat 업데이트 후 저장
+
             } else {
+                System.out.println("postRoom222222222");
                 // 존재하지 않는 경우 새로운 Chat 객체 생성 및 저장
                 Chat newChat = Chat.builder()
                         .customRoomId(roomRmqDto.getCustomRoomId())