From 1807629b93a6dfba691183ad0185e19f981727ee Mon Sep 17 00:00:00 2001
From: Yuriy M <95305560+yuremm@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:43:42 +0300
Subject: [PATCH] feat: allow to use like with lower together (#2944)

Co-authored-by: Yuriy Movchan <Yuriy.Movchan@gmail.com>
---
 .../jans/orm/couchbase/CouchbaseSample.java   | 16 ++++++++++++
 .../impl/CouchbaseFilterConverter.java        |  2 +-
 .../io/jans/orm/search/filter/Filter.java     | 25 ++++++++++++++++---
 .../orm/search/filter/FilterProcessor.java    |  6 ++---
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/jans-orm/couchbase-sample/src/main/java/io/jans/orm/couchbase/CouchbaseSample.java b/jans-orm/couchbase-sample/src/main/java/io/jans/orm/couchbase/CouchbaseSample.java
index f0fd71fff0f..f03fde4692a 100644
--- a/jans-orm/couchbase-sample/src/main/java/io/jans/orm/couchbase/CouchbaseSample.java
+++ b/jans-orm/couchbase-sample/src/main/java/io/jans/orm/couchbase/CouchbaseSample.java
@@ -49,6 +49,22 @@ public static void main(String[] args) {
         newUser.getCustomAttributes().add(new CustomObjectAttribute("test", "test_value"));
         couchbaseEntryManager.persist(newUser);
 
+        // Find all with lower and or filters
+        Filter orFilterWithLower = Filter.createORFilter(Filter.createEqualityFilter(Filter.createLowercaseFilter("description"), "test1"),
+        		Filter.createEqualityFilter(Filter.createLowercaseFilter("description"), "test2"));
+        List<SimpleUser> usersWithOrFilter = couchbaseEntryManager.findEntries("ou=sessions,o=gluu", SimpleUser.class, orFilterWithLower);
+        for (SimpleUser user : usersWithOrFilter) {
+            LOG.info("User with uid: '{}' with DN: '{}'", user.getUserId(), user.getDn());
+        }
+
+        // Find all with lower and or filters
+        Filter orFilterWithLower2 = Filter.createORFilter(Filter.createSubstringFilter(Filter.createLowercaseFilter("description"), null, new String[] { "test1" }, null),
+        		Filter.createSubstringFilter(Filter.createLowercaseFilter("displayName"), null, new String[] { "test1" }, null));
+        List<SimpleUser> usersWithOrFilter2 = couchbaseEntryManager.findEntries("ou=sessions,o=gluu", SimpleUser.class, orFilterWithLower2);
+        for (SimpleUser user : usersWithOrFilter2) {
+            LOG.info("User with uid: '{}' with DN: '{}'", user.getUserId(), user.getDn());
+        }
+
         // Find all users which have specified object classes defined in SimpleUser
         List<SimpleUser> users = couchbaseEntryManager.findEntries("ou=people,o=jans", SimpleUser.class, null);
         for (SimpleUser user : users) {
diff --git a/jans-orm/couchbase/src/main/java/io/jans/orm/couchbase/impl/CouchbaseFilterConverter.java b/jans-orm/couchbase/src/main/java/io/jans/orm/couchbase/impl/CouchbaseFilterConverter.java
index 8e81fe82603..a202f427df5 100644
--- a/jans-orm/couchbase/src/main/java/io/jans/orm/couchbase/impl/CouchbaseFilterConverter.java
+++ b/jans-orm/couchbase/src/main/java/io/jans/orm/couchbase/impl/CouchbaseFilterConverter.java
@@ -102,7 +102,7 @@ public ConvertedExpression convertToCouchbaseFilter(Filter genericFilter, Map<St
                     	canJoinOrFilters = false;
                     	continue;
                     }
-                	
+
                 	if (tmpFilter.getMultiValued() != null) {
                 		canJoinOrFilters = false;
                     	continue;
diff --git a/jans-orm/filter/src/main/java/io/jans/orm/search/filter/Filter.java b/jans-orm/filter/src/main/java/io/jans/orm/search/filter/Filter.java
index 53372502655..ed1c3fe70cc 100644
--- a/jans-orm/filter/src/main/java/io/jans/orm/search/filter/Filter.java
+++ b/jans-orm/filter/src/main/java/io/jans/orm/search/filter/Filter.java
@@ -9,6 +9,7 @@
 import java.util.List;
 
 import io.jans.orm.util.ArrayHelper;
+import io.jans.orm.util.StringHelper;
 
 /**
  * Simple filter without dependency to specific persistence filter mechanism
@@ -205,6 +206,10 @@ public final void setSubFinal(String subFinal) {
         this.subFinal = subFinal;
     }
 
+	protected void setMultiValued(Boolean multiValued) {
+		this.multiValued = multiValued;
+	}
+
     public final Boolean getMultiValued() {
         return multiValued;
     }
@@ -271,22 +276,22 @@ public String toString() {
         		return sb.append(this.filters[0].toString()).append(this.type.getSign()).append(this.assertionValue).append(')')
                 .toString();
         	} else {
-	            return sb.append(this.attributeName).append(this.type.getSign()).append(this.assertionValue).append(')')
+	            return sb.append(toStringAttributeName()).append(this.type.getSign()).append(this.assertionValue).append(')')
 	                    .toString();
         	}
         }
 
         if (FilterType.PRESENCE == this.type) {
-            return sb.append(this.attributeName).append("=").append(this.type.getSign()).append(')').toString();
+            return sb.append(toStringAttributeName()).append("=").append(this.type.getSign()).append(')').toString();
         }
 
         if (FilterType.APPROXIMATE_MATCH == this.type) {
-            return sb.append(this.attributeName).append(this.type.getSign()).append("=").append(this.assertionValue)
+            return sb.append(toStringAttributeName()).append(this.type.getSign()).append("=").append(this.assertionValue)
                     .append(')').toString();
         }
 
         if (FilterType.SUBSTRING == this.type) {
-            sb.append(this.attributeName).append(this.type.getSign());
+            sb.append(toStringAttributeName()).append(this.type.getSign());
             if (this.subInitial != null) {
                 sb.append(this.subInitial);
                 sb.append('*');
@@ -314,4 +319,16 @@ public String toString() {
         return super.toString();
     }
 
+	private String toStringAttributeName() {
+		if (StringHelper.isNotEmpty(this.attributeName)) {
+			return this.attributeName;
+		}
+		
+		if (ArrayHelper.isNotEmpty(this.filters)) {
+			return this.filters[0].toString();
+		}
+
+		return ""; 
+	}
+
 }
diff --git a/jans-orm/filter/src/main/java/io/jans/orm/search/filter/FilterProcessor.java b/jans-orm/filter/src/main/java/io/jans/orm/search/filter/FilterProcessor.java
index 1c6d8a9b752..7dbae0facea 100644
--- a/jans-orm/filter/src/main/java/io/jans/orm/search/filter/FilterProcessor.java
+++ b/jans-orm/filter/src/main/java/io/jans/orm/search/filter/FilterProcessor.java
@@ -43,9 +43,9 @@ public Filter excludeFilter(Filter genericFilter, Filter... excludeFilters) {
 				return null;
 			}
 
-			Filter resultFilter = new Filter(type, resultFilters.toArray(new Filter[0]));
-			resultFilter.setAssertionValue(genericFilter.getAssertionValue());
-
+			Filter resultFilter = genericFilter.clone();
+			resultFilter.setFilters(resultFilters.toArray(new Filter[0]));
+			
 			return resultFilter;
 		}