#50 feat: chat 로직 원상복구

ChwitKey · Aug 13, 2023 · 4d043e7 · 4d043e7
1 parent 17d1a6d
commit 4d043e7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/main/java/com/example/cherrypickserver/chat/application/ChatService.java b/src/main/java/com/example/cherrypickserver/chat/application/ChatService.java
@@ -1,12 +1,11 @@
 package com.example.cherrypickserver.chat.application;
 
-import com.example.cherrypickserver.chat.dto.request.ChatRequest;
 import com.example.cherrypickserver.chat.dto.response.GptResponse;
 import com.example.cherrypickserver.chat.dto.request.QuestionRequest;
 import com.example.cherrypickserver.chat.dto.response.ChatResponse;
 
 public interface ChatService {
-    ChatResponse createChatAndContent(ChatRequest chatRequest);
+    ChatResponse createChatAndContent(Long memberId, Long articleId);
 
     GptResponse chatQuestion(QuestionRequest questionRequest);
 

diff --git a/src/main/java/com/example/cherrypickserver/chat/application/ChatServiceImpl.java b/src/main/java/com/example/cherrypickserver/chat/application/ChatServiceImpl.java
@@ -4,7 +4,6 @@
 import com.example.cherrypickserver.article.domain.ArticleRepository;
 import com.example.cherrypickserver.article.exception.ArticleNotFoundException;
 import com.example.cherrypickserver.chat.domain.*;
-import com.example.cherrypickserver.chat.dto.request.ChatRequest;
 import com.example.cherrypickserver.chat.dto.response.GptResponse;
 import com.example.cherrypickserver.chat.dto.request.QuestionRequest;
 import com.example.cherrypickserver.chat.dto.response.ChatResponse;
@@ -43,11 +42,11 @@ public class ChatServiceImpl implements ChatService {
     private final OpenAiService openAiService;
 
     @Override
-    public ChatResponse createChatAndContent(ChatRequest chatRequest) {
+    public ChatResponse createChatAndContent(Long memberId, Long articleId) {
 
-        Member member = memberRepository.findByMemberNumberAndIsEnable(chatRequest.getMemberNumber(), true)
+        Member member = memberRepository.findByIdAndIsEnable(memberId, true)
                 .orElseThrow(MemberNotFoundException::new);
-        Article article = articleRepository.findByIdAndIsEnable(chatRequest.getArticleId(), true)
+        Article article = articleRepository.findByIdAndIsEnable(articleId, true)
                 .orElseThrow(ArticleNotFoundException::new);
 
         Chat chat = chatRepository.save(chatMapper.toEntity(member, article));

diff --git a/src/main/java/com/example/cherrypickserver/chat/dto/request/ChatRequest.java b/src/main/java/com/example/cherrypickserver/chat/dto/request/ChatRequest.java
@@ -8,7 +8,7 @@
 public class ChatRequest {
 
     @Schema(description = "회원 아이디")
-    private String memberNumber;
+    private Long memberId;
 
     @Schema(description = "기사 아이디")
     private Long articleId;

diff --git a/src/main/java/com/example/cherrypickserver/chat/presentation/ChatController.java b/src/main/java/com/example/cherrypickserver/chat/presentation/ChatController.java
@@ -1,11 +1,12 @@
 package com.example.cherrypickserver.chat.presentation;
 
 import com.example.cherrypickserver.chat.application.ChatService;
-import com.example.cherrypickserver.chat.dto.request.ChatRequest;
 import com.example.cherrypickserver.chat.dto.response.GptResponse;
 import com.example.cherrypickserver.chat.dto.request.QuestionRequest;
 import com.example.cherrypickserver.chat.dto.response.ChatResponse;
 import com.example.cherrypickserver.global.dto.ResponseCustom;
+import com.example.cherrypickserver.global.resolver.IsLogin;
+import com.example.cherrypickserver.global.resolver.LoginStatus;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -30,12 +31,12 @@ public class ChatController {
             @ApiResponse(responseCode = "404", description = "존재하지 않는 기사")
     })
     @Parameters({
-            @Parameter(name = "member", description = "멤버 아이디"),
+            @Parameter(name = "loginStatus", description = "멤버 아이디"),
             @Parameter(name = "articleId", description = "기사 아이디")
     })
-    @PostMapping("/new")
-    public ResponseCustom<ChatResponse> createChatAndContent(@RequestBody ChatRequest chatRequest) {
-        return ResponseCustom.OK(chatService.createChatAndContent(chatRequest));
+    @PostMapping("/new/{articleId}")
+    public ResponseCustom<ChatResponse> createChatAndContent(@IsLogin LoginStatus loginStatus, @PathVariable Long articleId) {
+        return ResponseCustom.OK(chatService.createChatAndContent(loginStatus.getMemberId(), articleId));
     }
 
     @Operation(summary = "질문 기능", description = "질문에 대한 답변을 요청합니다.")