Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

queries tweaking

Browse Source
This commit is contained in:
Jeremie Panzer
2013-03-27 11:32:22 +01:00
parent d603eb1773
commit 6ab93ed9d5
4 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
View File

@@ -61,13 +61,15 @@ public class EntriesREST extends AbstractREST {
} else {
FeedCategory feedCategory = null;
if (!ALL.equals(id)) {
feedCategory = feedCategoryService.findById(getUser(), Long.valueOf(id));
feedCategory = feedCategoryService.findById(getUser(),
Long.valueOf(id));
}
List<FeedCategory> childrenCategories = feedCategoryService
.findAllChildrenCategories(getUser(), feedCategory);
Map<Long, FeedSubscription> subMapping = Maps.uniqueIndex(
feedSubscriptionService.findAll(getUser()),
List<FeedSubscription> subs = feedSubscriptionService
.findAll(getUser());
Map<Long, FeedSubscription> subMapping = Maps.uniqueIndex(subs,
new Function<FeedSubscription, Long>() {
public Long apply(FeedSubscription sub) {
return sub.getFeed().getId();
@@ -104,8 +106,8 @@ public class EntriesREST extends AbstractREST {
List<FeedEntryWithStatus> unreadEntries = feedEntryService.getEntries(
categories, getUser(), unreadOnly, offset, limit);
for (FeedEntryWithStatus feedEntry : unreadEntries) {
entries.add(populateEntry(buildEntry(feedEntry),
subMapping.get(feedEntry.getEntry().getFeed().getId())));
Long id = feedEntry.getEntry().getFeed().getId();
entries.add(populateEntry(buildEntry(feedEntry), subMapping.get(id)));
}
return entries;