Skip to content

Add IN and NOT_IN as Criteria Operator #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,6 @@ Desktop.ini
######################
.eslintcache

*/target/**
**/target/**

/nexts/
4 changes: 3 additions & 1 deletion src/main/java/com/beyt/jdq/dto/enums/CriteriaOperator.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ public enum CriteriaOperator implements Serializable {
LESS_THAN(10, "Küçüktür"),
LESS_THAN_OR_EQUAL(11, "Küçüktür veya eşittir"),
OR(12, "Veya (Konulduğu yeri 2 ye Böler) (key ve values önemsizdir)"),
PARENTHES(13, "Sub Criteria");
PARENTHES(13, "Sub Criteria"),
IN(14, "Birden fazla OR değeri"),
NOT_IN(15, "Birden fazla NOT OR değeri");

private int value = -1;
private String meaning;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/beyt/jdq/query/DynamicQueryManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public class DynamicQueryManager {
specificationRuleMap.put(CriteriaOperator.LESS_THAN_OR_EQUAL, new SpecificationFilterLessThanOrEqualToRule());
specificationRuleMap.put(CriteriaOperator.OR, null);
specificationRuleMap.put(CriteriaOperator.PARENTHES, null);
specificationRuleMap.put(CriteriaOperator.IN, new SpecificationFilterInRule());
specificationRuleMap.put(CriteriaOperator.NOT_IN, new SpecificationFilterNotInRule());
}

public static <Entity> List<Entity> findAll(JpaSpecificationExecutor<Entity> repositoryExecutor,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.beyt.jdq.query.rule.specification;

import com.beyt.jdq.dto.Criteria;
import com.beyt.jdq.util.SpecificationUtil;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
import lombok.extern.slf4j.Slf4j;

/**
* Created by chezard at 02-Nov-24
*/
@Slf4j
public class SpecificationFilterInRule implements ISpecificationFilterRule {

@Override
public Predicate generatePredicate(Path<?> root, CriteriaBuilder builder, Criteria criteria) {
SpecificationUtil.checkHasFirstValue(criteria);
var predicate = root.get(criteria.getKey()).in(criteria.getValues());
return builder.or(predicate);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.beyt.jdq.query.rule.specification;

import com.beyt.jdq.dto.Criteria;
import com.beyt.jdq.util.SpecificationUtil;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
import lombok.extern.slf4j.Slf4j;

/**
* Created by chezard at 02-Nov-24
*/
@Slf4j
public class SpecificationFilterNotInRule implements ISpecificationFilterRule {

@Override
public Predicate generatePredicate(Path<?> root, CriteriaBuilder builder, Criteria criteria) {
SpecificationUtil.checkHasFirstValue(criteria);
var predicate = root.get(criteria.getKey()).in(criteria.getValues()).not();
return builder.or(predicate);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,23 @@ public void notEqualDate() {
List<Course> courseList = courseRepository.findAll(criteriaList);
PresentationUtil.prettyPrint(courseList);
}

@Test
public void in() {
var criteriaList = CriteriaList.of(Criteria.of(Course.Fields.name, CriteriaOperator.IN, "Calculus I", "Calculus II"));
PresentationUtil.prettyPrint(criteriaList);
List<Course> courseList = courseRepository.findAll(criteriaList);
PresentationUtil.prettyPrint(courseList);//2,3
assertEquals(List.of(course2, course3), courseList);
}

@Test
public void notIn() {
var criteriaList = CriteriaList.of(Criteria.of(Course.Fields.name, CriteriaOperator.NOT_IN, "Calculus I", "Calculus II"));
PresentationUtil.prettyPrint(criteriaList);
List<Course> courseList = courseRepository.findAll(criteriaList);
PresentationUtil.prettyPrint(courseList);//1,4,5,6,7,8,9,10
assertEquals(Arrays.asList(course1, course4, course5, course6, course7, course8, course9, course10), courseList);
}

}