subquery for retrieving feeds to refresh was not connected to main query

Athou · Jan 30, 2021 · 015a60f · 015a60f
1 parent caba43b
commit 015a60f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/src/main/java/com/commafeed/backend/dao/FeedDAO.java
@@ -21,7 +21,7 @@
 @Singleton
 public class FeedDAO extends GenericDAO<Feed> {
 
-	private QFeed feed = QFeed.feed;
+	private final QFeed feed = QFeed.feed;
 
 	@Inject
 	public FeedDAO(SessionFactory sessionFactory) {
@@ -36,9 +36,7 @@ public List<Feed> findNextUpdatable(int count, Date lastLoginThreshold) {
 			QFeedSubscription subs = QFeedSubscription.feedSubscription;
 			QUser user = QUser.user;
 
-			JPQLQuery<Integer> subQuery = JPAExpressions.selectOne().from(subs);
-			subQuery.join(subs.user, user).where(user.lastLogin.gt(lastLoginThreshold));
-			query.where(subQuery.exists());
+			query.join(feed.subscriptions, subs).join(subs.user, user).where(user.lastLogin.gt(lastLoginThreshold));
 		}
 
 		return query.orderBy(feed.disabledUntil.asc()).limit(count).distinct().fetch();

diff --git a/src/main/java/com/commafeed/backend/model/Feed.java b/src/main/java/com/commafeed/backend/model/Feed.java
@@ -1,9 +1,11 @@
 package com.commafeed.backend.model;
 
 import java.util.Date;
+import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -121,4 +123,7 @@ public class Feed extends AbstractModel {
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date pushLastPing;
 
+	@OneToMany(mappedBy = "feed")
+	private Set<FeedSubscription> subscriptions;
+
 }