From d734cf4a0f79db4c87c0bbb07ca318ef781e3910 Mon Sep 17 00:00:00 2001 From: parkje0927 Date: Fri, 21 Jul 2023 23:22:59 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=94=84=EB=9E=9C=EC=B0=A8=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20ID,=20=EC=9D=8C=EB=A3=8C=20=EC=B9=B4=ED=85=8C?= =?UTF-8?q?=EA=B3=A0=EB=A6=AC,=20=EC=A0=95=EB=A0=AC=20=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EC=9D=8C=EB=A3=8C=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EA=B0=80=EC=9E=A5?= =?UTF-8?q?=20=EC=9E=91=EC=9D=80=20=EC=82=AC=EC=9D=B4=EC=A6=88=EA=B0=80=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=9D=8C=EB=A3=8C=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EC=9D=98=20=EA=B2=BD=EC=9A=B0=EB=8A=94=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oversweet/search/service/DrinkSearchService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/oversweet-api/src/main/java/com/depromeet/oversweet/search/service/DrinkSearchService.java b/oversweet-api/src/main/java/com/depromeet/oversweet/search/service/DrinkSearchService.java index 38de441..f94615b 100644 --- a/oversweet-api/src/main/java/com/depromeet/oversweet/search/service/DrinkSearchService.java +++ b/oversweet-api/src/main/java/com/depromeet/oversweet/search/service/DrinkSearchService.java @@ -15,6 +15,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.Optional; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.toMap; @@ -66,11 +67,13 @@ public List getDrinksByFranchiseAndCategoryAndDirection(Lo //프랜차이즈별 && 음료명별 안에서 가장 작은 사이즈의 음료와 그 음료가 가지는 사이즈 list 를 찾아서 넣어준다. List drinkEntities = innerEntry.getValue(); - DrinkEntity minimumDrinkEntity = drinkEntities.stream().filter(DrinkEntity::getIsMinimum).findFirst().get(); - List sizes = drinkEntities.stream().map(DrinkEntity::getSize).sorted().toList(); + Optional minimumDrinkEntityOptional = drinkEntities.stream().filter(DrinkEntity::getIsMinimum).findFirst(); + if (minimumDrinkEntityOptional.isPresent()) { + List sizes = drinkEntities.stream().map(DrinkEntity::getSize).sorted().toList(); - DrinkAllInfoResponse drinkAllInfoResponse = DrinkAllInfoResponse.of(minimumDrinkEntity, sizes); - drinkAllInfoResponses.add(drinkAllInfoResponse); + DrinkAllInfoResponse drinkAllInfoResponse = DrinkAllInfoResponse.of(minimumDrinkEntityOptional.get(), sizes); + drinkAllInfoResponses.add(drinkAllInfoResponse); + } }); });