Skip to content

chore: 배포 #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dudxo merged 4 commits into from
Jun 21, 2025
Merged

chore: 배포 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4e3601
chore: 모니터링 시스템 (#115)
dudxo Jun 21, 2025
c5e9565
feat: RestTemplate + Async 추가 (#119)
dudxo Jun 21, 2025
0e66a42
Fix: Async Return 타입 일치 (#123)
dudxo Jun 21, 2025
07cdf89
Merge branch 'prod' into develop
dudxo Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/com/ureca/ufit/domain/chatbot/controller/ChatBotController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.ureca.ufit.domain.chatbot.controller;

import java.util.concurrent.CompletableFuture;

import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -50,12 +52,14 @@ public ResponseEntity<CreateChatBotReviewResponse> createChatBotReview(CreateCha
}

@Override
public ResponseEntity<CreateChatBotMessageResponse> createChatBotMessage(CustomUserDetails userDetails,
public ResponseEntity<CompletableFuture<CreateChatBotMessageResponse>> createChatBotMessage(
CustomUserDetails userDetails,
CreateChatBotMessageRequest request) {

Long userId = (userDetails != null) ? userDetails.userId() : nonUserId;

CreateChatBotMessageResponse response = chatBotMessageService.createChatBotMessage(request, userId);
CompletableFuture<CreateChatBotMessageResponse> response = chatBotMessageService.createChatBotMessage(request,
userId);
return ResponseEntity.status(HttpStatus.CREATED).body(response);
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/ureca/ufit/domain/chatbot/controller/ChatBotControllerApiSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.ureca.ufit.domain.chatbot.controller;

import java.util.concurrent.CompletableFuture;

import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -107,7 +109,7 @@ public ResponseEntity<CreateChatBotReviewResponse> createChatBotReview(
content = @Content(schema = @Schema(implementation = CreateChatBotMessageResponse.class))
))
@PostMapping("/message")
public ResponseEntity<CreateChatBotMessageResponse> createChatBotMessage(
public ResponseEntity<CompletableFuture<CreateChatBotMessageResponse>> createChatBotMessage(
@Parameter(hidden = true)
@AuthenticationPrincipal CustomUserDetails userDetails,
@RequestBody @Valid CreateChatBotMessageRequest request
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/ureca/ufit/domain/chatbot/service/ChatBotMessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static com.ureca.ufit.global.profanity.BanwordFilterPolicy.*;

import java.util.Set;
import java.util.concurrent.CompletableFuture;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Pageable;
Expand Down Expand Up @@ -45,7 +46,8 @@ public CursorPageResponse<ChatMessageDto> getChatMessages(Long chatRoomId, Pagea
}

@Async
public CreateChatBotMessageResponse createChatBotMessage(CreateChatBotMessageRequest request, Long userId) {
public CompletableFuture<CreateChatBotMessageResponse> createChatBotMessage(CreateChatBotMessageRequest request,
Long userId) {

Set<BanwordFilterPolicy> policies = Set.of(NUMBERS, WHITESPACES);

Expand All @@ -58,11 +60,12 @@ public CreateChatBotMessageResponse createChatBotMessage(CreateChatBotMessageReq
CreateAIAnswerRequest createAIAnswerRequest = ChatMessageMapper.toCreateAIAnswerRequest(request, userId);

try {
return restTemplate.postForObject(
CreateChatBotMessageResponse response = restTemplate.postForObject(
fastApiUrl,
createAIAnswerRequest,
CreateChatBotMessageResponse.class
);
return CompletableFuture.completedFuture(response);

} catch (Exception e) {
throw new RestApiException(ChatBotErrorCode.LLM_TIMEOUT);
Expand Down