Merge pull request #22 from studio-recoding/feat-chat-ai

[🚀feat] FastAPI를 통한 Chat 생성 기능

Author: JeonHaeseung

src/main/java/Ness/Backend/domain/auth/AuthController.java

@@ -3,8 +3,8 @@
 import Ness.Backend.domain.auth.dto.LoginRequestDto;
 import Ness.Backend.domain.auth.dto.RegisterRequestDto;
 import Ness.Backend.domain.member.entity.Member;
-import Ness.Backend.global.common.response.CommonResponse;
 import Ness.Backend.global.auth.AuthUser;
+import Ness.Backend.global.common.response.CommonResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

src/main/java/Ness/Backend/domain/auth/AuthService.java

@@ -2,11 +2,10 @@
 
 import Ness.Backend.domain.auth.dto.LoginRequestDto;
 import Ness.Backend.domain.auth.dto.RegisterRequestDto;
-import Ness.Backend.domain.auth.jwt.JwtTokenProvider;
 import Ness.Backend.domain.auth.security.AuthDetails;
 import Ness.Backend.domain.member.MemberRepository;
-import Ness.Backend.global.common.response.CommonResponse;
 import Ness.Backend.domain.member.entity.Member;
+import Ness.Backend.global.common.response.CommonResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.http.HttpStatus;

src/main/java/Ness/Backend/domain/auth/jwt/JwtTokenProvider.java

@@ -1,13 +1,10 @@
 package Ness.Backend.domain.auth.jwt;
 
 import Ness.Backend.domain.auth.jwt.entity.JwtToken;
-import Ness.Backend.domain.member.entity.Member;
 import Ness.Backend.domain.member.MemberRepository;
-import Ness.Backend.global.error.ErrorCode;
-import Ness.Backend.global.error.exception.UnauthorizedException;
+import Ness.Backend.domain.member.entity.Member;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
-
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/Ness/Backend/domain/auth/oAuth/OAuth2Controller.java

@@ -1,29 +1,17 @@
 package Ness.Backend.domain.auth.oAuth;
 
-import Ness.Backend.domain.auth.jwt.entity.JwtToken;
 import Ness.Backend.domain.member.entity.Member;
 import Ness.Backend.global.auth.AuthUser;
-import Ness.Backend.global.common.response.CommonResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.UnsupportedEncodingException;
-
 @RestController
 @RequiredArgsConstructor
 public class OAuth2Controller {
     private final OAuth2Service oAuth2Service;
-    @GetMapping("/dev/login/oauth/{registration}")
-    @Operation(summary = "OAuth 로그인 요청", description = "개발 테스트용 API 입니다. 클라이언트에게 공개되지 않습니다.")
-    public CommonResponse<?> devSocialLogin(@RequestParam String code, @PathVariable String registration) {
-        String loginMessage = oAuth2Service.devSocialLogin(code, registration);
-        return CommonResponse.postResponse(HttpStatus.OK.value(), loginMessage);
-    }
 
     @PostMapping("/login/oauth/{registration}")
     @Operation(summary = "OAuth 로그인 요청", description = "구글 계정으로 로그인하는 API 입니다.")

src/main/java/Ness/Backend/domain/auth/oAuth/OAuth2Service.java

@@ -2,33 +2,27 @@
 
 import Ness.Backend.domain.auth.dto.ResourceDto;
 import Ness.Backend.domain.auth.inmemory.RefreshTokenRepository;
+import Ness.Backend.domain.auth.jwt.JwtTokenProvider;
 import Ness.Backend.domain.auth.jwt.entity.JwtToken;
 import Ness.Backend.domain.auth.oAuth.google.dto.GoogleResourceDto;
-import Ness.Backend.domain.auth.jwt.JwtTokenProvider;
 import Ness.Backend.domain.auth.oAuth.kakao.dto.KakaoResourceDto;
 import Ness.Backend.domain.auth.oAuth.naver.dto.NaverResourceDto;
-import Ness.Backend.domain.auth.security.AuthDetails;
+import Ness.Backend.domain.member.MemberRepository;
 import Ness.Backend.domain.member.MemberService;
 import Ness.Backend.domain.member.entity.Member;
-import Ness.Backend.domain.member.MemberRepository;
 import Ness.Backend.global.auth.oAuth.google.GoogleOAuthApi;
 import Ness.Backend.global.auth.oAuth.google.GoogleResourceApi;
 import Ness.Backend.global.auth.oAuth.kakao.KakaoOAuthApi;
 import Ness.Backend.global.auth.oAuth.kakao.KakaoResourceApi;
 import Ness.Backend.global.auth.oAuth.naver.NaverOAuthApi;
 import Ness.Backend.global.auth.oAuth.naver.NaverResourceApi;
-import Ness.Backend.global.common.response.CommonResponse;
 import Ness.Backend.global.error.ErrorCode;
 import Ness.Backend.global.error.exception.UnauthorizedException;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -186,7 +180,7 @@ private ResourceDto getUserResource(String accessToken, String registration) {
                         .nickname(kakaoResourceDto.getKakaoAccount().getKakaoProfile().getNickname())
                         .name(kakaoResourceDto.getKakaoAccount().getKakaoProfile().getNickname())
                         .build();
-                log.info("email: "+resourceDto.getEmail());
+                log.info("email: "+ resourceDto.getEmail());
                 break;
             case "naver":
                 NaverResourceDto naverResourceDto =
@@ -198,7 +192,7 @@ private ResourceDto getUserResource(String accessToken, String registration) {
                         .nickname(naverResourceDto.getNaverResponse().getNickname())
                         .name(naverResourceDto.getNaverResponse().getName())
                         .build();
-                log.info("email: "+resourceDto.getEmail());
+                log.info("email: "+ resourceDto.getEmail());
                 break;
         }
         return resourceDto;

src/main/java/Ness/Backend/domain/auth/oAuth/google/dto/GoogleResourceDto.java

@@ -1,8 +1,10 @@
 package Ness.Backend.domain.auth.oAuth.google.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
 @EqualsAndHashCode

src/main/java/Ness/Backend/domain/auth/oAuth/kakao/dto/KakaoResourceDto.java

@@ -1,7 +1,6 @@
 package Ness.Backend.domain.auth.oAuth.kakao.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/Ness/Backend/domain/auth/security/AuthDetailService.java

@@ -1,7 +1,7 @@
 package Ness.Backend.domain.auth.security;
 
-import Ness.Backend.domain.member.entity.Member;
 import Ness.Backend.domain.member.MemberRepository;
+import Ness.Backend.domain.member.entity.Member;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;

src/main/java/Ness/Backend/domain/auth/security/SecurityConfig.java

@@ -1,6 +1,5 @@
 package Ness.Backend.domain.auth.security;
 
-import Ness.Backend.domain.auth.inmemory.RefreshTokenRepository;
 import Ness.Backend.domain.auth.inmemory.RefreshTokenService;
 import Ness.Backend.domain.auth.jwt.JwtAuthenticationFilter;
 import Ness.Backend.domain.auth.jwt.JwtAuthorizationFilter;

src/main/java/Ness/Backend/domain/chat/ChatController.java

@@ -1,7 +1,9 @@
 package Ness.Backend.domain.chat;
 
-import Ness.Backend.domain.chat.dto.ChatCreateRequestDto;
-import Ness.Backend.domain.chat.dto.ChatListResponseDto;
+import Ness.Backend.domain.chat.dto.request.PostUserChatDto;
+import Ness.Backend.domain.chat.dto.response.GetAiChatDto;
+import Ness.Backend.domain.chat.dto.response.GetChatListDto;
+import Ness.Backend.domain.chat.dto.response.PostFastApiAiChatDto;
 import Ness.Backend.domain.member.entity.Member;
 import Ness.Backend.global.auth.AuthUser;
 import io.swagger.v3.oas.annotations.Operation;
@@ -14,27 +16,35 @@
 @RestController
 @RequiredArgsConstructor
 @Tag(name = "Chat API", description = "사용자의 채팅 내역 관련 API")
+@RequestMapping("/chat")
 public class ChatController {
     private final ChatService chatService;
-    @GetMapping("/chat/dev")
-    @Operation(summary = "모든 사용자의 채팅 내역", description = "모든 사용자의 채팅 내역을 반환하는 API 입니다.")
-    public ResponseEntity<ChatListResponseDto> getAllUserChat(){
-        ChatListResponseDto allUserChats = chatService.findAllUserChat();
-        return new ResponseEntity<>(allUserChats, HttpStatusCode.valueOf(200));
-    }
 
-    @GetMapping("/chat")
-    @Operation(summary = "한 사용자의 채팅 내역", description = "한 사용자의 모든 채팅 내역을 반환하는 API 입니다.")
-    public ResponseEntity<ChatListResponseDto> getOneUserChat(@AuthUser Member member){
-        ChatListResponseDto oneUserChats = chatService.findOneUserChat(member.getId());
+    @GetMapping("/dev")
+    @Operation(summary = "개발 테스트용 한 사용자의 채팅 내역", description = "한 사용자의 일주일치 채팅 내역을 반환하는 API 입니다.")
+    public ResponseEntity<GetChatListDto> getUserChat(){
+        GetChatListDto oneUserChats = chatService.getOneWeekUserChat(1L);
         return new ResponseEntity<>(oneUserChats, HttpStatusCode.valueOf(200));
     }
 
-    @PutMapping("/chat/new")
-    @Operation(summary = "새로운 채팅 내역", description = "새로운 채팅 내역 저장하는 API 입니다.")
-    public ResponseEntity<Long> createChat(@AuthUser Member member, @RequestBody ChatCreateRequestDto chatCreateRequestDto){
-        Long userId  = chatService.createNewChat(member.getId(), chatCreateRequestDto);
-        return new ResponseEntity<>(userId, HttpStatusCode.valueOf(200));
+    @PostMapping("/dev")
+    @Operation(summary = "새로운 채팅으로 AI와 통신", description = "새로운 채팅 내역을 저장하고, AI의 응답을 받는 API 입니다.")
+    public ResponseEntity<GetAiChatDto> postAiChat(@RequestBody PostUserChatDto postUserChatDto){
+        GetAiChatDto answer = chatService.postNewUserChat(1L, postUserChatDto);
+        return new ResponseEntity<>(answer, HttpStatusCode.valueOf(200));
     }
 
+    @GetMapping("")
+    @Operation(summary = "한 사용자의 채팅 내역", description = "한 사용자의 일주일치 채팅 내역을 반환하는 API 입니다.")
+    public ResponseEntity<GetChatListDto> getUserChat(@AuthUser Member member){
+        GetChatListDto oneUserChats = chatService.getOneWeekUserChat(member.getId());
+        return new ResponseEntity<>(oneUserChats, HttpStatusCode.valueOf(200));
+    }
+
+    @PostMapping("")
+    @Operation(summary = "새로운 채팅으로 AI와 통신", description = "새로운 채팅 내역을 저장하고, AI의 응답을 받는 API 입니다.")
+    public ResponseEntity<GetAiChatDto> postAiChat(@AuthUser Member member, @RequestBody PostUserChatDto postUserChatDto){
+        GetAiChatDto answer = chatService.postNewUserChat(member.getId(), postUserChatDto);
+        return new ResponseEntity<>(answer, HttpStatusCode.valueOf(200));
+    }
 }