Merge branch 'dev' into feat#59

Author: seungwookc97

.github/workflows/deploy.yml

@@ -5,7 +5,7 @@ name: deploy
 # =========================
 env:
   IMAGE_REPOSITORY: backend # GHCR 이미지 리포지토리명(소유자 포함 X)
-  CONTAINER_1_NAME: backend_1
+  CONTAINER_1_NAME: backend
   EC2_INSTANCE_TAG_NAME: team2-ec2-1 # 배포 대상 EC2 Name 태그
   DOCKER_NETWORK: common # 도커 네트워크
   BACKEND_DIR: . # Dockerfile 위치

.gitignore

@@ -50,3 +50,8 @@ terraform.tfstate
 terraform.tfstate.backup
 .terraform.tfstate.lock.info
 terraform/secrets.tf
+
+
+### Claude AI ###
+CLAUDE.md
+.claude/

build.gradle.kts

@@ -28,6 +28,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("io.github.cdimascio:java-dotenv:5.2.2")
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")

src/main/java/com/back/BackApplication.java

@@ -3,10 +3,12 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
+@EnableCaching
 public class BackApplication {
 
     public static void main(String[] args) {

src/main/java/com/back/domain/chatbot/controller/ChatbotController.java

@@ -0,0 +1,61 @@
+package com.back.domain.chatbot.controller;
+
+import com.back.domain.chatbot.dto.ChatRequestDto;
+import com.back.domain.chatbot.dto.ChatResponseDto;
+import com.back.domain.chatbot.entity.ChatConversation;
+import com.back.domain.chatbot.service.ChatbotService;
+import com.back.global.rsData.RsData;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/chatbot")
+@RequiredArgsConstructor
+@Slf4j
+public class ChatbotController {
+
+    private final ChatbotService chatbotService;
+
+    @PostMapping("/chat")
+    public ResponseEntity<RsData<ChatResponseDto>> sendMessage(@Valid @RequestBody ChatRequestDto requestDto) {
+        try {
+            ChatResponseDto response = chatbotService.sendMessage(requestDto);
+            return ResponseEntity.ok(RsData.successOf(response));
+        } catch (Exception e) {
+            log.error("채팅 메시지 처리 중 오류 발생: ", e);
+            return ResponseEntity.internalServerError()
+                    .body(RsData.failOf("서버 오류가 발생했습니다."));
+        }
+    }
+
+    @GetMapping("/history/{sessionId}")
+    public ResponseEntity<RsData<List<ChatConversation>>> getChatHistory(@PathVariable String sessionId) {
+        try {
+            List<ChatConversation> history = chatbotService.getChatHistory(sessionId);
+            return ResponseEntity.ok(RsData.successOf(history));
+        } catch (Exception e) {
+            log.error("채팅 기록 조회 중 오류 발생: ", e);
+            return ResponseEntity.internalServerError()
+                    .body(RsData.failOf("서버 오류가 발생했습니다."));
+        }
+    }
+
+    @GetMapping("/history/user/{userId}/session/{sessionId}")
+    public ResponseEntity<RsData<List<ChatConversation>>> getUserChatHistory(
+            @PathVariable Long userId,
+            @PathVariable String sessionId) {
+        try {
+            List<ChatConversation> history = chatbotService.getUserChatHistory(userId, sessionId);
+            return ResponseEntity.ok(RsData.successOf(history));
+        } catch (Exception e) {
+            log.error("사용자 채팅 기록 조회 중 오류 발생: ", e);
+            return ResponseEntity.internalServerError()
+                    .body(RsData.failOf("서버 오류가 발생했습니다."));
+        }
+    }
+}

src/main/java/com/back/domain/chatbot/dto/ChatRequestDto.java

@@ -0,0 +1,19 @@
+package com.back.domain.chatbot.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class ChatRequestDto {
+
+    @NotBlank(message = "메시지는 필수입니다.")
+    private String message;
+
+    private String sessionId;
+
+    private Long userId;
+}

src/main/java/com/back/domain/chatbot/dto/ChatResponseDto.java

@@ -0,0 +1,25 @@
+package com.back.domain.chatbot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatResponseDto {
+
+    private String response;
+    private String sessionId;
+    private LocalDateTime timestamp;
+
+    public ChatResponseDto(String response, String sessionId) {
+        this.response = response;
+        this.sessionId = sessionId;
+        this.timestamp = LocalDateTime.now();
+    }
+}

src/main/java/com/back/domain/chatbot/dto/GeminiRequestDto.java

@@ -0,0 +1,37 @@
+package com.back.domain.chatbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class GeminiRequestDto {
+
+    private List<Content> contents;
+
+    @Getter
+    @Setter
+    public static class Content {
+        private List<Part> parts;
+
+        public Content(String text) {
+            this.parts = List.of(new Part(text));
+        }
+    }
+
+    @Getter
+    @Setter
+    public static class Part {
+        private String text;
+
+        public Part(String text) {
+            this.text = text;
+        }
+    }
+
+    public GeminiRequestDto(String message) {
+        this.contents = List.of(new Content(message));
+    }
+}

src/main/java/com/back/domain/chatbot/dto/GeminiResponseDto.java

@@ -0,0 +1,41 @@
+package com.back.domain.chatbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class GeminiResponseDto {
+
+    private List<Candidate> candidates;
+
+    @Getter
+    @Setter
+    public static class Candidate {
+        private Content content;
+    }
+
+    @Getter
+    @Setter
+    public static class Content {
+        private List<Part> parts;
+    }
+
+    @Getter
+    @Setter
+    public static class Part {
+        private String text;
+    }
+
+    public String getGeneratedText() {
+        if (candidates != null && !candidates.isEmpty() &&
+            candidates.get(0).content != null &&
+            candidates.get(0).content.parts != null &&
+            !candidates.get(0).content.parts.isEmpty()) {
+            return candidates.get(0).content.parts.get(0).text;
+        }
+        return "응답을 생성할 수 없습니다.";
+    }
+}

src/main/java/com/back/domain/chatbot/entity/ChatConversation.java

@@ -0,0 +1,38 @@
+package com.back.domain.chatbot.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+import static jakarta.persistence.GenerationType.IDENTITY;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ToString
+@Entity
+public class ChatConversation {
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Long id;
+
+    private Long userId;
+
+    @Column(columnDefinition = "TEXT")
+    private String userMessage;
+
+    @Column(columnDefinition = "TEXT")
+    private String botResponse;
+
+    private String sessionId;
+
+    private LocalDateTime createdAt;
+
+    @PrePersist
+    protected void onCreate() {
+        createdAt = LocalDateTime.now();
+    }
+}