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

we don't need the user we already have the subscription

Browse Source
This commit is contained in:
Athou
2024-07-01 13:55:50 +02:00
parent 9b1c6a371e
commit 93acc9ded1
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -201,17 +201,15 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
return statuses; return statuses;
} }
public UnreadCount getUnreadCount(User user, FeedSubscription sub) { public UnreadCount getUnreadCount(FeedSubscription sub) {
JPAQuery<Tuple> query = query().select(entry.count(), entry.updated.max()) JPAQuery<Tuple> query = query().select(entry.count(), entry.updated.max())
.from(entry) .from(entry)
.join(entry.feed, feed) .join(entry.feed, feed)
.join(subscription) .join(subscription)
.on(subscription.feed.eq(feed).and(subscription.user.eq(user))) .on(subscription.feed.eq(feed).and(subscription.eq(sub)))
.leftJoin(status) .leftJoin(status)
.on(status.entry.eq(entry).and(status.subscription.eq(subscription))) .on(status.entry.eq(entry).and(status.subscription.eq(sub)))
.where(subscription.eq(sub)); .where(buildUnreadPredicate());
query.where(buildUnreadPredicate());
Tuple tuple = query.fetchOne(); Tuple tuple = query.fetchOne();
Long count = tuple.get(entry.count()); Long count = tuple.get(entry.count());

6
commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java
View File

@@ -119,14 +119,14 @@ public class FeedSubscriptionService {
} }
public Map<Long, UnreadCount> getUnreadCount(User user) { public Map<Long, UnreadCount> getUnreadCount(User user) {
return feedSubscriptionDAO.findAll(user).stream().collect(Collectors.toMap(FeedSubscription::getId, s -> getUnreadCount(user, s))); return feedSubscriptionDAO.findAll(user).stream().collect(Collectors.toMap(FeedSubscription::getId, this::getUnreadCount));
} }
private UnreadCount getUnreadCount(User user, FeedSubscription sub) { private UnreadCount getUnreadCount(FeedSubscription sub) {
UnreadCount count = cache.getUnreadCount(sub); UnreadCount count = cache.getUnreadCount(sub);
if (count == null) { if (count == null) {
log.debug("unread count cache miss for {}", Models.getId(sub)); log.debug("unread count cache miss for {}", Models.getId(sub));
count = feedEntryStatusDAO.getUnreadCount(user, sub); count = feedEntryStatusDAO.getUnreadCount(sub);
cache.setUnreadCount(sub, count); cache.setUnreadCount(sub, count);
} }
return count; return count;