[fix] : 조건 판단 로직 버그 수정

KUSITMS-29th-TEAM-F · Jun 7, 2024 · 393ef2d · 393ef2d
1 parent 599eb5c
commit 393ef2d
Showing 1 changed file with 8 additions and 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
@@ -71,9 +71,15 @@ private List<ConditionCheckResponse> evaluateConditions(MemberPrivateInfo member
 
         // 학교지역 평가
         if (announcementConditionEntity.getSchoolRegion() != null) {
-            String result = (memberInfo.getSchoolLocation() != null && memberInfo.getSchoolLocation().contains(announcementConditionEntity.getSchoolRegion()) ? "초록불" : "빨간불");
+            List<String> 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() + "분위 이내");
         }