From 89088891e5a81fe2affe885060ed003e64697028 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 18 Nov 2024 23:36:44 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix(AiRecipeRecommendClient)=20:=20?= =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=A0=88=EC=8B=9C=ED=94=BC=EB=A5=BC=20?= =?UTF-8?q?=EC=B6=94=EC=B2=9C=20=EB=B0=9B=EB=8A=94=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 재료 추가/삭제시, 전체 카테고리 기준으로 레시피를 추천 받습니다. - 카테고리를 특정하여 레시피를 추천받는 ai측 api와 카테고리를 지정하지 않고 레시피를 추천 받는 api가 다름에 따라, 메서드를 분리하였습니다. --- .../application/AiRecipeRecommendClient.java | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/ai/application/AiRecipeRecommendClient.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/ai/application/AiRecipeRecommendClient.java index 0acdccb..9e8bc41 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/ai/application/AiRecipeRecommendClient.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/ai/application/AiRecipeRecommendClient.java @@ -5,14 +5,14 @@ import com.sundaegukbap.banchango.ingredient.domain.Ingredient; import com.sundaegukbap.banchango.recipe.domain.RecipeCategory; import jakarta.transaction.Transactional; +import java.util.List; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; -import java.util.List; - @Component public class AiRecipeRecommendClient { + @Value("${api.aiBaseUrl}") private String aiBaseUrl; private final RestTemplate restTemplate; @@ -22,10 +22,30 @@ public AiRecipeRecommendClient(RestTemplate restTemplate) { } @Transactional - public List getRecommendedRecipesFromAI(RecipeCategory category, List ingredientList) { + public List getRecommendedRecipesFromAI(RecipeCategory category, + List ingredientList) { AiRecipeRecommendRequest request = AiRecipeRecommendRequest.of(category, ingredientList); - AiRecipeRecommendResponse response = restTemplate.postForObject(aiBaseUrl + "/category_recommend", request, AiRecipeRecommendResponse.class); + + AiRecipeRecommendResponse response; + if (category == RecipeCategory.전체) { + response = getRecipesOfAllCategories(request); + } else { + response = getRecipesOfSpecificCategories(request); + } return response.recommended_recipes(); } + + private AiRecipeRecommendResponse getRecipesOfSpecificCategories( + AiRecipeRecommendRequest request) { + AiRecipeRecommendResponse response = restTemplate.postForObject( + aiBaseUrl + "/category_recommend", request, AiRecipeRecommendResponse.class); + return response; + } + + private AiRecipeRecommendResponse getRecipesOfAllCategories(AiRecipeRecommendRequest request) { + AiRecipeRecommendResponse response = restTemplate.postForObject( + aiBaseUrl + "/recommend", request, AiRecipeRecommendResponse.class); + return response; + } } From e1088528845d882cdc865c54d0c523aa7975c901 Mon Sep 17 00:00:00 2001 From: FhRh Date: Sun, 24 Nov 2024 14:26:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix(RecipeCategory)=20:=20=EC=B9=B4?= =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20AI=EC=97=90=20=EB=A7=9E=EA=B2=8C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../banchango/recipe/domain/RecipeCategory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/domain/RecipeCategory.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/domain/RecipeCategory.java index ceb51e4..9160817 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/domain/RecipeCategory.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/recipe/domain/RecipeCategory.java @@ -15,8 +15,8 @@ public enum RecipeCategory { 양식(1, "양식"), 샐러드(1, "샐러드"), 스프(1, "스프"), - 빵_과자(1, "빵/과자"), - 과자_간식(1, "과자/간식"), + 빵(1, "빵"), + 과자(1, "과자"), 차_음료_술(1, "차/음료/술"), 일상(2, "일상"), 초스피드(2, "초스피드"), @@ -29,7 +29,7 @@ public enum RecipeCategory { 야식(2, "야식"), 푸드스타일링(2, "푸드스타일링"), 해장(2, "해장"), - 명절음식(2, "명절음식"), + 명절(2, "명절"), 이유식(2, "이유식"), 기타(2, "기타");