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

move method around

Browse Source
This commit is contained in:
Athou
2013-07-23 16:32:20 +02:00
parent d95e1522d8
commit 08693e16f0
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -41,7 +41,6 @@ import com.commafeed.backend.model.Models;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserSettings.ReadingOrder; import com.commafeed.backend.model.UserSettings.ReadingOrder;
import com.commafeed.backend.services.ApplicationSettingsService; import com.commafeed.backend.services.ApplicationSettingsService;
import com.google.api.client.util.Maps;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@@ -278,17 +277,6 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
return count; return count;
} }
/**
* Map between subscriptionId and unread count
*/
public Map<Long, Long> getUnreadCount(List<FeedSubscription> subscriptions) {
Map<Long, Long> map = Maps.newHashMap();
for (FeedSubscription sub : subscriptions) {
map.put(sub.getId(), getUnreadCount(sub));
}
return map;
}
private List<FeedEntryStatus> lazyLoadContent(boolean includeContent, private List<FeedEntryStatus> lazyLoadContent(boolean includeContent,
List<FeedEntryStatus> results) { List<FeedEntryStatus> results) {
if (includeContent) { if (includeContent) {

9
src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java
View File

@@ -24,6 +24,7 @@ import com.commafeed.backend.model.FeedSubscription;
import com.commafeed.backend.model.Models; import com.commafeed.backend.model.Models;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
import com.google.api.client.util.Lists; import com.google.api.client.util.Lists;
import com.google.api.client.util.Maps;
public class FeedSubscriptionService { public class FeedSubscriptionService {
@@ -93,7 +94,8 @@ public class FeedSubscriptionService {
List<FeedEntry> allEntries = feedEntryDAO.findByFeed(feed, 0, List<FeedEntry> allEntries = feedEntryDAO.findByFeed(feed, 0,
10); 10);
for (FeedEntry entry : allEntries) { for (FeedEntry entry : allEntries) {
FeedEntryStatus status = new FeedEntryStatus(user, sub, entry); FeedEntryStatus status = new FeedEntryStatus(user, sub,
entry);
status.setRead(false); status.setRead(false);
status.setSubscription(sub); status.setSubscription(sub);
statuses.add(status); statuses.add(status);
@@ -114,7 +116,10 @@ public class FeedSubscriptionService {
if (map == null) { if (map == null) {
log.debug("unread count cache miss for {}", Models.getId(user)); log.debug("unread count cache miss for {}", Models.getId(user));
List<FeedSubscription> subs = feedSubscriptionDAO.findAll(user); List<FeedSubscription> subs = feedSubscriptionDAO.findAll(user);
map = feedEntryStatusDAO.getUnreadCount(subs); map = Maps.newHashMap();
for (FeedSubscription sub : subs) {
map.put(sub.getId(), feedEntryStatusDAO.getUnreadCount(sub));
}
cache.setUnreadCounts(user, map); cache.setUnreadCounts(user, map);
} }
return map; return map;