Skip to content

Commit cf7abb4

Browse files
committed
Remove unnecessary fuzzy predicate
Fixes #34
1 parent 149d52e commit cf7abb4

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/main/java/org/jlab/srm/business/session/GroupResponsibilityFacade.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -501,17 +501,15 @@ public List<GroupResponsibility> filterList(
501501
if (checklistMissing) {
502502
Predicate p1 = cb.equal(root.get("checklistRequiredStr"), "Y");
503503
Predicate p2 = cb.isNull(root.get("checklist"));
504-
Predicate p3 = cb.equal(cb.length(root.get("checklist")), 0);
505504
Predicate p4 = cb.equal(root.get("publishedStr"), "N");
506-
filters.add(cb.and(p1, cb.or(p2, p3, p4)));
505+
filters.add(cb.and(p1, cb.or(p2, p4)));
507506
} else {
508507
Predicate p1 = cb.equal(root.get("checklistRequiredStr"), "N");
509508
Predicate p2 = cb.equal(root.get("checklistRequiredStr"), "Y");
510509
Predicate p3 = cb.isNotNull(root.get("checklist"));
511-
Predicate p4 = cb.gt(cb.length(root.get("checklist")), 0);
512510
Predicate p5 = cb.equal(root.get("publishedStr"), "Y");
513511

514-
filters.add(cb.or(p1, cb.and(p2, p3, p4, p5)));
512+
filters.add(cb.or(p1, cb.and(p2, p3, p5)));
515513
}
516514
}
517515
if (!filters.isEmpty()) {
@@ -584,17 +582,15 @@ public Long countFilterList(
584582
if (checklistMissing) {
585583
Predicate p1 = cb.equal(root.get("checklistRequiredStr"), "Y");
586584
Predicate p2 = cb.isNull(root.get("checklist"));
587-
Predicate p3 = cb.equal(cb.length(root.get("checklist")), 0);
588585
Predicate p4 = cb.equal(root.get("publishedStr"), "N");
589-
filters.add(cb.and(p1, cb.or(p2, p3, p4)));
586+
filters.add(cb.and(p1, cb.or(p2, p4)));
590587
} else {
591588
Predicate p1 = cb.equal(root.get("checklistRequiredStr"), "N");
592589
Predicate p2 = cb.equal(root.get("checklistRequiredStr"), "Y");
593590
Predicate p3 = cb.isNotNull(root.get("checklist"));
594-
Predicate p4 = cb.gt(cb.length(root.get("checklist")), 0);
595591
Predicate p5 = cb.equal(root.get("publishedStr"), "Y");
596592

597-
filters.add(cb.or(p1, cb.and(p2, p3, p4, p5)));
593+
filters.add(cb.or(p1, cb.and(p2, p3, p5)));
598594
}
599595
}
600596
if (!filters.isEmpty()) {

0 commit comments

Comments
 (0)