Merge pull request #55 from introproventures/fix-EQ-string-sql-predicate

igdianov · web-flow · commit db3c1efee917 · 2018-11-01T16:14:51.000-07:00
fix: add missing equal criteria expression for string arguments
diff --git a/graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/JpaPredicateBuilder.java b/graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/JpaPredicateBuilder.java
@@ -112,11 +112,13 @@ protected Predicate getStringPredicate(Path<String> root, PredicateFilter filter
                 compareValue = compareValue.toLowerCase();
             }
 
-            if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {
+            if (filter.getCriterias().contains(PredicateFilter.Criteria.EQ)) {
+                return cb.equal(fieldValue, compareValue);
+            } 
+            else if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {
                 return cb.notEqual(fieldValue, compareValue);
             }
-
-            if (filter.getCriterias().contains(PredicateFilter.Criteria.LIKE)) {
+            else if (filter.getCriterias().contains(PredicateFilter.Criteria.LIKE)) {
                 compareValue = "%" + compareValue + "%";
             }
             else if (filter.getCriterias().contains(PredicateFilter.Criteria.ENDS)) {

Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,13 @@ protected Predicate getStringPredicate(Path<String> root, PredicateFilter filter`
`112`	`112`	`compareValue = compareValue.toLowerCase();`
`113`	`113`	`}`
`114`	`114`
`115`		`- if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {`
	`115`	`+ if (filter.getCriterias().contains(PredicateFilter.Criteria.EQ)) {`
	`116`	`+ return cb.equal(fieldValue, compareValue);`
	`117`	`+ }`
	`118`	`+ else if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {`
`116`	`119`	`return cb.notEqual(fieldValue, compareValue);`
`117`	`120`	`}`
`118`		`-`
`119`		`- if (filter.getCriterias().contains(PredicateFilter.Criteria.LIKE)) {`
	`121`	`+ else if (filter.getCriterias().contains(PredicateFilter.Criteria.LIKE)) {`
`120`	`122`	`compareValue = "%" + compareValue + "%";`
`121`	`123`	`}`
`122`	`124`	`else if (filter.getCriterias().contains(PredicateFilter.Criteria.ENDS)) {`