Skip to content

Remove unnecessary fuzzy predicate #35

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.

Sign up for GitHub

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

Merged
slominskir merged 1 commit into from
Dec 1, 2025
Merged

Remove unnecessary fuzzy predicate #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions src/main/java/org/jlab/srm/business/session/GroupResponsibilityFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,17 +501,15 @@ public List<GroupResponsibility> filterList(
if (checklistMissing) {
Predicate p1 = cb.equal(root.get("checklistRequiredStr"), "Y");
Predicate p2 = cb.isNull(root.get("checklist"));
Predicate p3 = cb.equal(cb.length(root.get("checklist")), 0);
Predicate p4 = cb.equal(root.get("publishedStr"), "N");
filters.add(cb.and(p1, cb.or(p2, p3, p4)));
filters.add(cb.and(p1, cb.or(p2, p4)));
} else {
Predicate p1 = cb.equal(root.get("checklistRequiredStr"), "N");
Predicate p2 = cb.equal(root.get("checklistRequiredStr"), "Y");
Predicate p3 = cb.isNotNull(root.get("checklist"));
Predicate p4 = cb.gt(cb.length(root.get("checklist")), 0);
Predicate p5 = cb.equal(root.get("publishedStr"), "Y");

filters.add(cb.or(p1, cb.and(p2, p3, p4, p5)));
filters.add(cb.or(p1, cb.and(p2, p3, p5)));
}
}
if (!filters.isEmpty()) {
Expand Down Expand Up @@ -584,17 +582,15 @@ public Long countFilterList(
if (checklistMissing) {
Predicate p1 = cb.equal(root.get("checklistRequiredStr"), "Y");
Predicate p2 = cb.isNull(root.get("checklist"));
Predicate p3 = cb.equal(cb.length(root.get("checklist")), 0);
Predicate p4 = cb.equal(root.get("publishedStr"), "N");
filters.add(cb.and(p1, cb.or(p2, p3, p4)));
filters.add(cb.and(p1, cb.or(p2, p4)));
} else {
Predicate p1 = cb.equal(root.get("checklistRequiredStr"), "N");
Predicate p2 = cb.equal(root.get("checklistRequiredStr"), "Y");
Predicate p3 = cb.isNotNull(root.get("checklist"));
Predicate p4 = cb.gt(cb.length(root.get("checklist")), 0);
Predicate p5 = cb.equal(root.get("publishedStr"), "Y");

filters.add(cb.or(p1, cb.and(p2, p3, p4, p5)));
filters.add(cb.or(p1, cb.and(p2, p3, p5)));
}
}
if (!filters.isEmpty()) {
Expand Down
Loading