Skip to content

refact: AI 서버 구조 개편에 따른 리팩토링 #108

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
brothergiven merged 4 commits into from
Nov 17, 2025
Merged

refact: AI 서버 구조 개편에 따른 리팩토링 #108

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
149021f
refact: 바뀐 AI서버 API 주소에 따른 수정
brothergiven Sep 21, 2025
6487d84
refact: 바뀐 AI 서버 주소 에 따른 수정
brothergiven Nov 16, 2025
6f71510
refact: 이미지 업로드 코드 삭제
brothergiven Nov 16, 2025
2d4a26b
refact: 불필요 S3 관련 코드 삭제
brothergiven Nov 16, 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
42 changes: 0 additions & 42 deletions gotcha-common/src/main/java/gotcha_common/s3/S3ClientService.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gotcha-socket/src/main/java/socket_server/domain/game/dto/AIGuessImageReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package socket_server.domain.game.dto;

public record AIGuessImageReq(
String imageURL
String image_url
) {
}
2 changes: 1 addition & 1 deletion gotcha-socket/src/main/java/socket_server/domain/game/dto/AIGuessMessageReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package socket_server.domain.game.dto;

public record AIGuessMessageReq(
String imageDescription
String image_description
) {
}
2 changes: 1 addition & 1 deletion gotcha-socket/src/main/java/socket_server/domain/game/dto/AIGuessReactReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package socket_server.domain.game.dto;

public record AIGuessReactReq(
boolean isCorrect,
boolean is_correct,
String answer,
String guesser
) {
Expand Down
4 changes: 2 additions & 2 deletions gotcha-socket/src/main/java/socket_server/domain/game/dto/AIGuessStartReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* 추측 시작 시(GUESS_REQUEST) AI서버로 보낼 DTO
*/
public record AIGuessStartReq(
int roundNum,
int totalRounds,
int round_num,
int total_rounds,
String drawer,
String guesser
) {
Expand Down
4 changes: 2 additions & 2 deletions gotcha-socket/src/main/java/socket_server/domain/game/dto/AIRoundStartReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 라운드 시작 시 AI 서버에 보낼 DTO
*/
public record AIRoundStartReq(
int roundNum,
int totalRounds
int round_num,
int total_rounds
) {
}
16 changes: 8 additions & 8 deletions gotcha-socket/src/main/java/socket_server/domain/game/service/AIClientService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class AIClientService {
public String getGameStartMessage(String roomId, AIGameStartReq request){
try {
return webClient.post()
.uri(AI_SERVER_BASE_URL + "chat/" + roomId + "/start")
.uri(AI_SERVER_BASE_URL + "myomyo/" + roomId + "/start")
.bodyValue(request)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError()
Expand All @@ -48,7 +48,7 @@ public String getGameStartMessage(String roomId, AIGameStartReq request){
public String getRoundStartMessage(String roomId, AIRoundStartReq request){
try {
return webClient.post()
.uri(AI_SERVER_BASE_URL + "chat/" + roomId + "/round/start")
.uri(AI_SERVER_BASE_URL + "myomyo/" + roomId + "/round/start")
.bodyValue(request)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError()
Expand All @@ -66,7 +66,7 @@ public String getRoundStartMessage(String roomId, AIRoundStartReq request){
public String getGuessStartMessage(String roomId, AIGuessStartReq request){
try {
return webClient.post()
.uri(AI_SERVER_BASE_URL + "chat/" + roomId + "/guess/start")
.uri(AI_SERVER_BASE_URL + "myomyo/" + roomId + "/guess/start")
.bodyValue(request)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError(),
Expand All @@ -84,7 +84,7 @@ public String getGuessStartMessage(String roomId, AIGuessStartReq request){
public AIGuessImageRes getGuessImage(AIGuessImageReq request){
try {
return webClient.post()
.uri(AI_SERVER_BASE_URL + "image/classify")
.uri(AI_SERVER_BASE_URL + "classify")
.bodyValue(request)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError()
Expand All @@ -101,7 +101,7 @@ public AIGuessImageRes getGuessImage(AIGuessImageReq request){
public String getGuessMessage(String roomId, AIGuessMessageReq request){
try {
return webClient.post()
.uri(AI_SERVER_BASE_URL + "chat/" + roomId + "/guess")
.uri(AI_SERVER_BASE_URL + "myomyo/" + roomId + "/guess")
.bodyValue(request)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError()
Expand All @@ -119,7 +119,7 @@ public String getGuessMessage(String roomId, AIGuessMessageReq request){
public String getGuessReactMessage(String roomId, AIGuessReactReq request){
try {
return webClient.post()
.uri(AI_SERVER_BASE_URL + "chat/" + roomId + "/guess/react")
.uri(AI_SERVER_BASE_URL + "myomyo/" + roomId + "/guess/react")
.bodyValue(request)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError()
Expand All @@ -137,7 +137,7 @@ public String getGuessReactMessage(String roomId, AIGuessReactReq request){
public String getRoundEndMessage(String roomId, AIRoundEndReq request){
try {
return webClient.post()
.uri(AI_SERVER_BASE_URL + "chat/" + roomId + "/round/end")
.uri(AI_SERVER_BASE_URL + "myomyo/" + roomId + "/round/end")
.bodyValue(request)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError()
Expand All @@ -155,7 +155,7 @@ public String getRoundEndMessage(String roomId, AIRoundEndReq request){
public String getGameEndMessage(String roomId, AIGameEndReq request) {
try {
return webClient.post()
.uri(AI_SERVER_BASE_URL + "chat/" + roomId + "/end")
.uri(AI_SERVER_BASE_URL + "myomyo/" + roomId + "/end")
.bodyValue(request)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError()
Expand Down
1 change: 1 addition & 0 deletions gotcha-socket/src/main/java/socket_server/domain/game/service/GameEndService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public void updateScore(Game game){
}

public void flushGame(GameMeta gameMeta) {
log.info("Flushing game data for roomId: {}", gameMeta.getRoomId());
//1. roomId 기반 삭제
gameRepository.deleteGameMeta(gameMeta.getRoomId());

Expand Down
45 changes: 0 additions & 45 deletions gotcha/src/main/java/Gotcha/domain/image/api/ImageApi.java
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions gotcha/src/main/java/Gotcha/domain/image/controller/ImageController.java
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions gotcha/src/main/java/Gotcha/domain/image/exception/ImageExceptionCode.java
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions gotcha/src/main/java/Gotcha/domain/image/service/ImageService.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gotcha/src/main/java/Gotcha/domain/lulu/service/LuLuAIClientService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private TaskEvalRes requestEvaluate(String gameId, String imageCaption){
public String getImageCaption(String imageUrl){
Map<String, String> body = Map.of("imageURL", imageUrl);
return webClient.post()
.uri(AI_SERVER_BASE_URL + "image/caption")
.uri(AI_SERVER_BASE_URL + "caption")
.bodyValue(body)
.retrieve()
.onStatus(httpStatusCode -> httpStatusCode.is4xxClientError() || httpStatusCode.is5xxServerError(
Expand Down
11 changes: 1 addition & 10 deletions gotcha/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,7 @@ spring:
timeout: 5000
starttls:
enable: true
cloud:
aws:
credentials:
access-key: ${AWS_S3_ACCESS_KEY}
secret-key: ${AWS_S3_SECRET_KEY}
s3:
bucket-name: ${AWS_S3_BUCKET_NAME}

region:
static: ${AWS_S3_REGION}
data:
redis:
host: ${REDIS_HOST:localhost}
Expand Down Expand Up @@ -68,4 +59,4 @@ server:
address: 0.0.0.0

ai-server:
url: ${AI_SERVER_API}
url: ${AI_SERVER_API:http://localhost:8000/api/v1/}
Loading