garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

restore predicate

Browse Source
This commit is contained in:
Athou
2013-07-05 10:44:53 +02:00
parent c388e726fe
commit fa3860f81a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -28,6 +28,9 @@ public class FeedDAO extends GenericDAO<Feed> {
private List<Predicate> getUpdatablePredicates(Root<Feed> root, private List<Predicate> getUpdatablePredicates(Root<Feed> root,
Date threshold) { Date threshold) {
Predicate hasSubscriptions = builder.isNotEmpty(root
.get(Feed_.subscriptions));
Predicate neverUpdated = builder.isNull(root.get(Feed_.lastUpdated)); Predicate neverUpdated = builder.isNull(root.get(Feed_.lastUpdated));
Predicate updatedBeforeThreshold = builder.lessThan( Predicate updatedBeforeThreshold = builder.lessThan(
root.get(Feed_.lastUpdated), threshold); root.get(Feed_.lastUpdated), threshold);
@@ -37,7 +40,7 @@ public class FeedDAO extends GenericDAO<Feed> {
Predicate disabledDateIsInPast = builder.lessThan( Predicate disabledDateIsInPast = builder.lessThan(
root.get(Feed_.disabledUntil), new Date()); root.get(Feed_.disabledUntil), new Date());
return Lists.newArrayList( return Lists.newArrayList(hasSubscriptions,
builder.or(neverUpdated, updatedBeforeThreshold), builder.or(neverUpdated, updatedBeforeThreshold),
builder.or(disabledDateIsNull, disabledDateIsInPast)); builder.or(disabledDateIsNull, disabledDateIsInPast));
} }