mirror of
https://github.com/Athou/commafeed.git
synced 2026-03-21 21:37:29 +00:00
materialize the manytomany relationship to have better control over queries
This commit is contained in:
@@ -18,7 +18,8 @@ import org.slf4j.LoggerFactory;
|
||||
import com.commafeed.backend.model.Feed;
|
||||
import com.commafeed.backend.model.FeedEntry;
|
||||
import com.commafeed.backend.model.FeedEntry_;
|
||||
import com.commafeed.backend.model.Feed_;
|
||||
import com.commafeed.backend.model.FeedFeedEntry;
|
||||
import com.commafeed.backend.model.FeedFeedEntry_;
|
||||
import com.commafeed.backend.services.ApplicationSettingsService;
|
||||
import com.google.common.collect.Iterables;
|
||||
|
||||
@@ -33,11 +34,11 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
|
||||
|
||||
public static class EntryWithFeed {
|
||||
public FeedEntry entry;
|
||||
public Feed feed;
|
||||
public FeedFeedEntry ffe;
|
||||
|
||||
public EntryWithFeed(FeedEntry entry, Feed feed) {
|
||||
public EntryWithFeed(FeedEntry entry, FeedFeedEntry ffe) {
|
||||
this.entry = entry;
|
||||
this.feed = feed;
|
||||
this.ffe = ffe;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +53,7 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
|
||||
EntryWithFeed result = null;
|
||||
List<EntryWithFeed> list = q.getResultList();
|
||||
for (EntryWithFeed ewf : list) {
|
||||
if (ewf.entry != null && ewf.feed != null) {
|
||||
if (ewf.entry != null && ewf.ffe != null) {
|
||||
result = ewf;
|
||||
break;
|
||||
}
|
||||
@@ -66,9 +67,9 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
|
||||
public List<FeedEntry> findByFeed(Feed feed, int offset, int limit) {
|
||||
CriteriaQuery<FeedEntry> query = builder.createQuery(getType());
|
||||
Root<FeedEntry> root = query.from(getType());
|
||||
SetJoin<FeedEntry, Feed> feedsJoin = root.join(FeedEntry_.feeds);
|
||||
SetJoin<FeedEntry, FeedFeedEntry> feedsJoin = root.join(FeedEntry_.feedRelationships);
|
||||
|
||||
query.where(builder.equal(feedsJoin.get(Feed_.id), feed.getId()));
|
||||
query.where(builder.equal(feedsJoin.get(FeedFeedEntry_.feed), feed));
|
||||
query.orderBy(builder.desc(root.get(FeedEntry_.updated)));
|
||||
TypedQuery<FeedEntry> q = em.createQuery(query);
|
||||
limit(q, offset, limit);
|
||||
@@ -94,9 +95,9 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
|
||||
CriteriaQuery<FeedEntry> query = builder.createQuery(getType());
|
||||
Root<FeedEntry> root = query.from(getType());
|
||||
|
||||
SetJoin<FeedEntry, Feed> join = root.join(FeedEntry_.feeds,
|
||||
SetJoin<FeedEntry, FeedFeedEntry> join = root.join(FeedEntry_.feedRelationships,
|
||||
JoinType.LEFT);
|
||||
query.where(builder.isNull(join.get(Feed_.id)));
|
||||
query.where(builder.isNull(join.get(FeedFeedEntry_.feed)));
|
||||
TypedQuery<FeedEntry> q = em.createQuery(query);
|
||||
q.setMaxResults(max);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user