Merge remote-tracking branch 'origin/dev' into feat/mission

parkjioh · parkjioh · commit 2ca7165a4ad1 · 2025-09-26T10:59:08.000+09:00
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -50,6 +50,8 @@ dependencies {
     runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.6")
 
     implementation("org.springframework.boot:spring-boot-starter-websocket")
+
+    implementation ("org.springframework.kafka:spring-kafka")
 }
 
 tasks.withType<Test> {
diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
@@ -0,0 +1,68 @@
+version: "3.7"
+name: redpanda-quickstart-one-broker
+networks:
+  redpanda_network:
+    driver: bridge
+volumes:
+  redpanda-0: null
+services:
+  redpanda-0:
+    command:
+      - redpanda
+      - start
+      - --kafka-addr internal://0.0.0.0:9092,external://0.0.0.0:19092
+      # Address the broker advertises to clients that connect to the Kafka API.
+      # Use the internal addresses to connect to the Redpanda brokers'
+      # from inside the same Docker network.
+      # Use the external addresses to connect to the Redpanda brokers'
+      # from outside the Docker network.
+      - --advertise-kafka-addr internal://redpanda-0:9092,external://localhost:19092
+      - --pandaproxy-addr internal://0.0.0.0:8082,external://0.0.0.0:18082
+      # Address the broker advertises to clients that connect to the HTTP Proxy.
+      - --advertise-pandaproxy-addr internal://redpanda-0:8082,external://localhost:18082
+      - --schema-registry-addr internal://0.0.0.0:8081,external://0.0.0.0:18081
+      # Redpanda brokers use the RPC API to communicate with each other internally.
+      - --rpc-addr redpanda-0:33145
+      - --advertise-rpc-addr redpanda-0:33145
+      # Tells Seastar (the framework Redpanda uses under the hood) to use 1 core on the system.
+      - --smp 1
+      # The amount of memory to make available to Redpanda.
+      - --memory 1G
+      # Mode dev-container uses well-known configuration properties for development in containers.
+      - --mode dev-container
+      # Enable logs for debugging.
+      - --default-log-level=debug
+    image: docker.redpanda.com/redpandadata/redpanda:v23.3.6
+    container_name: redpanda-0
+    volumes:
+      - redpanda-0:/var/lib/redpanda/data
+    networks:
+      - redpanda_network
+    ports:
+      - 18081:18081
+      - 18082:18082
+      - 19092:19092
+      - 19644:9644
+  console:
+    container_name: redpanda-console
+    image: docker.redpanda.com/redpandadata/console:v2.4.3
+    networks:
+      - redpanda_network
+    entrypoint: /bin/sh
+    command: -c 'echo "$$CONSOLE_CONFIG_FILE" > /tmp/config.yml; /app/console'
+    environment:
+      CONFIG_FILEPATH: /tmp/config.yml
+      CONSOLE_CONFIG_FILE: |
+        kafka:
+          brokers: ["redpanda-0:9092"]
+          schemaRegistry:
+            enabled: true
+            urls: ["http://redpanda-0:8081"]
+        redpanda:
+          adminApi:
+            enabled: true
+            urls: ["http://redpanda-0:9644"]
+    ports:
+      - 8070:8080
+    depends_on:
+      - redpanda-0
diff --git a/backend/src/main/java/com/back/BackApplication.java b/backend/src/main/java/com/back/BackApplication.java
@@ -4,10 +4,12 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableCaching
+@EnableAsync
 public class BackApplication {
     public static void main(String[] args) {
         SpringApplication.run(BackApplication.class, args);
diff --git a/backend/src/main/java/com/back/domain/member/controller/ApiV1MemberController.java b/backend/src/main/java/com/back/domain/member/controller/ApiV1MemberController.java
@@ -65,13 +65,9 @@ public ResponseEntity<ApiResponse<LoginResDto>> login(
     @DeleteMapping("/logout")
     @Operation(summary = "로그아웃", description = "로그아웃")
     public ResponseEntity<ApiResponse<Void>> logout() {
-        Member actor = rq.getActorFromDb();
-
         rq.deleteCookie("apiKey");
         rq.deleteCookie("accessToken");
-        if(actor.getSocialAccessToken() != null) {
-            memberService.social_logout(actor);
-        }
+        rq.deleteCookie("JSESSIONID");
 
         return ResponseEntity
                 .status(HttpStatus.OK)
diff --git a/backend/src/main/java/com/back/domain/member/entity/Member.java b/backend/src/main/java/com/back/domain/member/entity/Member.java
@@ -46,7 +46,6 @@ public class Member extends BaseEntity {
     // *** 개발자용 정보 ***
     private MemberRole role = MemberRole.USER;
     private String apiKey = null;
-    private String socialAccessToken = null;
 
     //생성자(회원 가입)
     public Member(String email, String password, String name) {
diff --git a/backend/src/main/java/com/back/domain/member/service/AuthService.java b/backend/src/main/java/com/back/domain/member/service/AuthService.java
@@ -5,10 +5,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
 import java.util.Map;
 
 @Service
@@ -19,36 +15,6 @@ public class AuthService {
     @Value("${custom.accessToken.expirationSeconds}")
     private int accessTokenExpirationSeconds;
 
-    private final String kakaoURL = "https://kapi.kakao.com/v1/user/logout";
-
-    void social_logout(String provider, String accessToken){
-        HttpClient client= HttpClient.newHttpClient();
-        try {
-            switch (provider) {
-                case "KAKAO" -> {
-                    HttpRequest request = HttpRequest.newBuilder()
-                            .uri(URI.create(kakaoURL))
-                            .header("Authorization", "Bearer " + accessToken)
-                            .POST(HttpRequest.BodyPublishers.noBody())
-                            .build();
-
-                    HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-
-                    System.out.println("responseCode : " + response.statusCode());
-                    System.out.println("responseBody : " + response.body());
-                }
-                case "GOOGLE" -> {
-
-                }
-                case "NAVER" -> {
-
-                }
-            }
-        } catch (Exception e) {
-
-        }
-    }
-
     String genAccessToken(Member member) {
         long id = member.getId();
         String email = member.getEmail();
diff --git a/backend/src/main/java/com/back/domain/member/service/MemberService.java b/backend/src/main/java/com/back/domain/member/service/MemberService.java
@@ -52,27 +52,17 @@ public Member login(String email, String password) {
     }
 
     //로그인 (소셜 계정)
-    public Member social_login(String email, String name, String socialAccessToken) {
+    public Member social_login(String email, String name) {
         Member member = findByEmail(email).orElse(null);
 
         //최초 로그인일 경우 가입 처리
         if(member == null) {
             member = signup(email, "", name);
         }
 
-        member.setSocialAccessToken(socialAccessToken);
-
         return member;
     }
 
-    //로그아웃 (소셜 계정)
-    public void social_logout(Member member) {
-        String provider = member.getEmail().substring(1, member.getEmail().indexOf("]"));
-
-        //authService.social_logout(provider, member.getSocialAccessToken());
-        member.setSocialAccessToken(null);
-    }
-
     //식별코드 생성
     public void genCode(Member member) {
         final String CHAR_POOL = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
diff --git a/backend/src/main/java/com/back/domain/party/paryChat/config/KafkaConfig.java b/backend/src/main/java/com/back/domain/party/paryChat/config/KafkaConfig.java
@@ -0,0 +1,60 @@
+package com.back.domain.party.paryChat.config;
+
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.listener.ConsumerRecordRecoverer;
+import org.springframework.kafka.listener.DefaultErrorHandler;
+import org.springframework.util.backoff.FixedBackOff;
+
+@Configuration
+public class KafkaConfig {
+
+    private static final Logger log = LoggerFactory.getLogger(KafkaConfig.class);
+
+    private final KafkaTemplate<String, String> kafkaTemplate;
+
+    @Value("${spring.kafka.dlq.topic:chat-messages-dlq}")
+    private String dlqTopic;
+
+    public KafkaConfig(KafkaTemplate<String, String> kafkaTemplate) {
+        this.kafkaTemplate = kafkaTemplate;
+    }
+
+    private static final long INTERVAL_MS = 1000L;
+    private static final long MAX_ATTEMPTS = 3L;
+
+    @Bean
+    @SuppressWarnings("unchecked")
+    public DefaultErrorHandler errorHandler() {
+        FixedBackOff fixedBackOff = new FixedBackOff(INTERVAL_MS, MAX_ATTEMPTS - 1);
+
+        ConsumerRecordRecoverer recoverer = (record, exception) -> {
+            ConsumerRecord<String, String> consumerRecord = (ConsumerRecord<String, String>) record;
+
+            log.error(
+                    "--- FINAL FAILURE --- Message moved to DLQ. Topic: {}, Partition: {}, Offset: {}, Key: {}, Exception: {}",
+                    consumerRecord.topic(),
+                    consumerRecord.partition(),
+                    consumerRecord.offset(),
+                    consumerRecord.key(),
+                    exception.getMessage(),
+                    exception // 예외 객체를 마지막 인자로 전달하여 스택 트레이스를 로그에 포함시킵니다.
+            );
+
+            try {
+                // DLQ로 메시지 발행
+                kafkaTemplate.send(dlqTopic, consumerRecord.key(), consumerRecord.value()).get();
+            } catch (Exception e) {
+                // DLQ 전송 실패 시, 심각한 오류 로그 기록
+                log.error("CRITICAL FAILURE: Failed to send message to DLQ! Data loss imminent. Original message: {}", consumerRecord.value(), e);
+            }
+        };
+
+        return new DefaultErrorHandler(recoverer, fixedBackOff);
+    }
+}
diff --git a/backend/src/main/java/com/back/domain/party/paryChat/config/WebSocketConfig.java b/backend/src/main/java/com/back/domain/party/paryChat/config/WebSocketConfig.java
@@ -5,6 +5,7 @@
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration;
 
 @Configuration
 @EnableWebSocketMessageBroker
@@ -23,4 +24,9 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
         // 웹소켓 연결을 위한 STOMP 엔드포인트 설정
         registry.addEndpoint("/ws/chat").withSockJS();
     }
+
+    @Override
+    public void configureWebSocketTransport(WebSocketTransportRegistration registration) {
+        registration.setMessageSizeLimit(1024 * 1024); // 예: 1MB로 메시지 크기 제한
+    }
 }
diff --git a/backend/src/main/java/com/back/domain/party/paryChat/controller/WebSocketController.java b/backend/src/main/java/com/back/domain/party/paryChat/controller/WebSocketController.java
@@ -3,12 +3,16 @@
 import com.back.domain.party.paryChat.dto.ChatMessageDto;
 import com.back.domain.party.paryChat.entity.ChatMessage;
 import com.back.domain.party.paryChat.service.ChatMessageService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
@@ -21,17 +25,34 @@
 @RequiredArgsConstructor
 public class WebSocketController {
 
+    private static final Logger log = LoggerFactory.getLogger(WebSocketController.class);
+
     private final SimpMessageSendingOperations messagingTemplate;
     private final ChatMessageService chatMessageService;
+    private final KafkaTemplate<String, String> kafkaTemplate;
+    private final ObjectMapper objectMapper;
+
+    private static final String CHAT_TOPIC = "chat-messages";
 
     @MessageMapping("/chat.sendMessage") // 클라이언트가 메시지를 보내는 경로 (예: /app/chat.sendMessage)
     public void sendMessage(@Payload ChatMessageDto chatMessageDto, @AuthenticationPrincipal User user) {
-        // 1. 메시지를 데이터베이스에 저장
-        chatMessageDto.setSenderEmail(user.getUsername()); // 인증된 사용자 이메일로 설정
-        chatMessageService.saveMessage(chatMessageDto);
+        // 1. 메시지 발신자 설정
+        chatMessageDto.setSenderEmail(user.getUsername());
 
-        // 2. 메시지를 해당 파티의 채팅방으로 전송
+        // 2. 메시지를 해당 파티의 채팅방으로 즉시 전송 (실시간성 확보)
         messagingTemplate.convertAndSend("/topic/party/" + chatMessageDto.getPartyId(), chatMessageDto);
+
+        // 3. 메시지 저장 작업을 Kafka로 오프로드 (비동기 및 안정성 확보)
+        try {
+            String messageJson = objectMapper.writeValueAsString(chatMessageDto);
+            // 파티 ID를 키로 사용하여 같은 파티 메시지가 같은 파티션에 저장되도록 보장 (메시지 순서 보장)
+            kafkaTemplate.send(CHAT_TOPIC, chatMessageDto.getPartyId().toString(), messageJson);
+        } catch (Exception e) {
+            // Kafka Producer 실패는 (일반적으로 일시적이지만) 심각하므로 ERROR 레벨로 기록합니다.
+            log.error("Failed to send chat message to Kafka. Message: {}, Exception: {}", chatMessageDto, e.getMessage(), e);
+            // Kafka 전송 실패는 데이터베이스에 기록을 남기지 못할 위험이 있지만,
+            // 실시간 채팅 자체는 이미 클라이언트에 전달되었으므로 시스템을 중단하지 않고 로그만 남깁니다.
+        }
     }
 
     @MessageMapping("/chat.updateMessage")
@@ -66,7 +87,7 @@ public void deleteMessage(@Payload ChatMessageDto chatMessageDto, @Authenticatio
     // HTTP API를 통해 채팅 기록을 가져오는 엔드포인트 추가
     @GetMapping("/history")
     @Operation(summary = "채팅 기록 조회", description = "특정 파티의 채팅 기록을 조회합니다.")
-    public Page<ChatMessage> getChatHistory(
+    public Page<ChatMessageDto> getChatHistory(
             @PathVariable Integer partyId,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int size
diff --git a/backend/src/main/java/com/back/domain/party/paryChat/dto/ChatMessageDto.java b/backend/src/main/java/com/back/domain/party/paryChat/dto/ChatMessageDto.java
@@ -1,6 +1,7 @@
 package com.back.domain.party.paryChat.dto;
 
 import com.back.domain.party.paryChat.entity.ChatMessage;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -11,6 +12,7 @@
 public class ChatMessageDto {
     private Integer id;
     private String senderEmail;
+    @Size(max = 1000, message = "메시지 내용은 1000자를 초과할 수 없습니다.")
     private String content;
     private Integer partyId;
 
diff --git a/backend/src/main/java/com/back/domain/party/paryChat/kafka/ChatMessageKafkaConsumer.java b/backend/src/main/java/com/back/domain/party/paryChat/kafka/ChatMessageKafkaConsumer.java
@@ -0,0 +1,32 @@
+package com.back.domain.party.paryChat.kafka;
+
+import com.back.domain.party.paryChat.dto.ChatMessageDto;
+import com.back.domain.party.paryChat.service.ChatMessageService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Component
+@RequiredArgsConstructor
+public class ChatMessageKafkaConsumer {
+
+    private final ChatMessageService chatMessageService;
+    private final ObjectMapper objectMapper;
+
+    @KafkaListener(topics = "chat-messages", groupId = "chat-db-saver-group")
+    @Transactional
+    public void consumeChatMessage(String message) throws Exception { // throws Exception 추가
+        // 1. JSON 문자열을 ChatMessageDto 객체로 변환
+        // 메시지 직렬화/역직렬화 오류는 Kafka 설정의 Deserializer가 처리합니다.
+        ChatMessageDto chatMessageDto = objectMapper.readValue(message, ChatMessageDto.class);
+
+        // 2. ChatMessageService를 사용하여 DB에 저장
+        // 이 saveMessage 메서드 내에서 데이터베이스 오류(CustomException)가 발생하면,
+        // 예외가 외부로 던져져 DefaultErrorHandler가 메시지 재처리(Retry)를 시작합니다.
+        chatMessageService.saveMessage(chatMessageDto);
+
+        // 메시지 처리가 성공하면 트랜잭션이 커밋되고 Kafka 오프셋이 업데이트됩니다.
+    }
+}
diff --git a/backend/src/main/java/com/back/domain/party/paryChat/service/ChatMessageService.java b/backend/src/main/java/com/back/domain/party/paryChat/service/ChatMessageService.java
diff --git a/backend/src/main/java/com/back/global/security/CustomOAuth2UserService.java b/backend/src/main/java/com/back/global/security/CustomOAuth2UserService.java
diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
diff --git a/backend/src/test/java/com/back/domain/party/partyChat/controller/WebSocketControllerTest.java b/backend/src/test/java/com/back/domain/party/partyChat/controller/WebSocketControllerTest.java

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ dependencies {`
`50`	`50`	`runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.6")`
`51`	`51`
`52`	`52`	`implementation("org.springframework.boot:spring-boot-starter-websocket")`
	`53`	`+`
	`54`	`+ implementation ("org.springframework.kafka:spring-kafka")`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`tasks.withType<Test> {`