From 393ef2d04c8888be1174df2f4f0fef25a70055a0 Mon Sep 17 00:00:00 2001 From: chahyunsoo Date: Fri, 7 Jun 2024 14:08:21 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20:=20=EC=A1=B0=EA=B1=B4=20=ED=8C=90?= =?UTF-8?q?=EB=8B=A8=20=EB=A1=9C=EC=A7=81=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/apply/application/ConditionManager.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/backend/univfit/domain/apply/application/ConditionManager.java b/src/main/java/backend/univfit/domain/apply/application/ConditionManager.java index cb43476..a456e73 100644 --- a/src/main/java/backend/univfit/domain/apply/application/ConditionManager.java +++ b/src/main/java/backend/univfit/domain/apply/application/ConditionManager.java @@ -71,9 +71,15 @@ private List evaluateConditions(MemberPrivateInfo member // 학교지역 평가 if (announcementConditionEntity.getSchoolRegion() != null) { - String result = (memberInfo.getSchoolLocation() != null && memberInfo.getSchoolLocation().contains(announcementConditionEntity.getSchoolRegion()) ? "초록불" : "빨간불"); + List allowedRegions = Arrays.asList(announcementConditionEntity.getSchoolRegion().split(",")); + String result; + if (memberInfo.getSchoolLocation() != null) { + boolean isRegionMatched = allowedRegions.stream().anyMatch(region -> memberInfo.getSchoolLocation().contains(region)); + result = isRegionMatched ? "초록불" : "빨간불"; + } else { + result = "회색불"; + } responses.add(new ConditionCheckResponse(announcementConditionEntity.getSchoolRegion() + " 소제 대학", memberInfo.getSchoolLocation() != null ? result : "회색불")); - // compareExcept.add(announcementConditionEntity.getIncomeQuality() + "분위 이내"); }