#143 [fix] preferRegion 값 Validation 함수 작성

TEAM-MODDY · Jan 16, 2024 · c4546e3 · c4546e3
1 parent 301a6e0
commit c4546e3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/com/moddy/server/common/validation/prefer_regions/PreferRegionsValidator.java b/src/main/java/com/moddy/server/common/validation/prefer_regions/PreferRegionsValidator.java
@@ -3,6 +3,7 @@
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
+import java.util.HashSet;
 import java.util.List;
 
 public class PreferRegionsValidator implements ConstraintValidator<ValidPreferRegions, List<Long>> {
@@ -14,9 +15,11 @@ public void initialize(ValidPreferRegions constraintAnnotation) {
     @Override
     public boolean isValid(List<Long> preferRegions, ConstraintValidatorContext context) {
 
-        if(preferRegions.size() > 3) return false;
-        if(preferRegions.stream().filter(p -> p == 0).count() > 1) return false;
-        if(!preferRegions.stream().allMatch(p -> p >= 0 && p <= 25)) return false;
+        if (preferRegions.size() != new HashSet<>(preferRegions).size()) return false;
+        if (preferRegions.stream().filter(p -> p == 0).count() <= 1 && preferRegions.stream().anyMatch(p -> p != 0)) return false;
+        if (!preferRegions.stream().allMatch(p -> p >= 0 && p <= 25)) return false;
+        if (preferRegions.size() > 3 ) return false;
+
         return true;
 
     }