AYS-629 | Country Code Filter Removed From The User Listing Service (#…

…438)
afet-yonetim-sistemi · Jan 29, 2025 · d5937ae · d5937ae
1 parent e0207f3
commit d5937ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/main/java/org/ays/auth/model/AysUserFilter.java b/src/main/java/org/ays/auth/model/AysUserFilter.java
@@ -8,7 +8,6 @@
 import org.ays.auth.model.entity.AysUserEntity;
 import org.ays.auth.model.enums.AysUserStatus;
 import org.ays.common.model.AysFilter;
-import org.ays.common.model.AysPhoneNumber;
 import org.ays.common.util.validation.Name;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.util.StringUtils;
@@ -46,7 +45,7 @@ public class AysUserFilter implements AysFilter {
     @Size(min = 1, max = 254)
     private String emailAddress;
 
-    private AysPhoneNumber phoneNumber;
+    private PhoneNumber phoneNumber;
 
     private Set<AysUserStatus> statuses;
 
@@ -56,6 +55,15 @@ public class AysUserFilter implements AysFilter {
 
     private String institutionId;
 
+    /**
+     * Nested class for filtering by phone line number.
+     */
+    @Getter
+    @Setter
+    public static class PhoneNumber {
+        private String lineNumber;
+    }
+
 
     /**
      * Converts the current filter criteria into a {@link Specification} for querying users.
@@ -102,11 +110,6 @@ public Specification<AysUserEntity> toSpecification() {
                     criteriaBuilder.like(criteriaBuilder.upper(root.get("emailAddress")), "%" + this.emailAddress.toUpperCase() + "%"));
         }
 
-        if (this.phoneNumber != null && StringUtils.hasText(this.phoneNumber.getCountryCode())) {
-            specification = specification.and((root, query, criteriaBuilder) ->
-                    criteriaBuilder.like(root.get("countryCode"), "%" + this.phoneNumber.getCountryCode() + "%"));
-        }
-
         if (this.phoneNumber != null && StringUtils.hasText(this.phoneNumber.getLineNumber())) {
             specification = specification.and((root, query, criteriaBuilder) ->
                     criteriaBuilder.like(root.get("lineNumber"), "%" + this.phoneNumber.getLineNumber() + "%"));

diff --git a/src/test/java/org/ays/auth/model/AysUserFilterBuilder.java b/src/test/java/org/ays/auth/model/AysUserFilterBuilder.java
@@ -1,7 +1,6 @@
 package org.ays.auth.model;
 
 import org.ays.auth.model.enums.AysUserStatus;
-import org.ays.common.model.AysPhoneNumber;
 import org.ays.common.model.TestDataBuilder;
 import org.ays.common.util.AysRandomUtil;
 
@@ -40,7 +39,7 @@ public AysUserFilterBuilder withStatuses(Set<AysUserStatus> statuses) {
         return this;
     }
 
-    public AysUserFilterBuilder withPhoneNumber(AysPhoneNumber phoneNumber) {
+    public AysUserFilterBuilder withPhoneNumber(AysUserFilter.PhoneNumber phoneNumber) {
         data.setPhoneNumber(phoneNumber);
         return this;
     }

diff --git a/src/test/java/org/ays/auth/model/request/AysUserListRequestBuilder.java b/src/test/java/org/ays/auth/model/request/AysUserListRequestBuilder.java
@@ -4,7 +4,6 @@
 import org.ays.auth.model.enums.AysUserStatus;
 import org.ays.common.model.AysPageable;
 import org.ays.common.model.AysPageableBuilder;
-import org.ays.common.model.AysPhoneNumber;
 import org.ays.common.model.AysSort;
 import org.ays.common.model.TestDataBuilder;
 
@@ -65,7 +64,7 @@ public AysUserListRequestBuilder withEmailAddress(String emailAddress) {
         return this;
     }
 
-    public AysUserListRequestBuilder withPhoneNumber(AysPhoneNumber phoneNumber) {
+    public AysUserListRequestBuilder withPhoneNumber(AysUserFilter.PhoneNumber phoneNumber) {
         data.getFilter().setPhoneNumber(phoneNumber);
         return this;
     }