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

smarter findAll query

Browse Source
This commit is contained in:
Athou
2013-06-20 16:49:18 +02:00
parent 9b3b43f042
commit a203246e04
3 changed files with 95 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
View File

@@ -41,7 +41,7 @@ public class NextUnreadRedirectPage extends WebPage {
List<FeedEntryStatus> statuses = null;
if (StringUtils.isBlank(categoryId)
|| CategoryREST.ALL.equals(categoryId)) {
statuses = feedEntryStatusDAO.findAll(user, true, null, 0, 1,
statuses = feedEntryStatusDAO.findAllUnread(user, null, 0, 1,
ReadingOrder.desc, true);
} else {
FeedCategory category = feedCategoryDAO.findById(user,

15
src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
View File

@@ -79,16 +79,21 @@ public class CategoryREST extends AbstractResourceREST {
if (StringUtils.isBlank(id)) {
id = ALL;
}
Date newerThanDate = newerThan == null ? null : new Date(
Long.valueOf(newerThan));
if (ALL.equals(id)) {
entries.setName("All");
List<FeedEntryStatus> unreadEntries = feedEntryStatusDAO.findAll(
getUser(), unreadOnly, newerThanDate, offset, limit + 1, order,
true);
for (FeedEntryStatus status : unreadEntries) {
List<FeedEntryStatus> list = null;
if (unreadOnly) {
list = feedEntryStatusDAO.findAllUnread(getUser(),
newerThanDate, offset, limit + 1, order, true);
} else {
list = feedEntryStatusDAO.findAll(getUser(), newerThanDate,
offset, limit + 1, order, true);
}
for (FeedEntryStatus status : list) {
entries.getEntries().add(
Entry.build(status, applicationSettingsService.get()
.getPublicUrl()));