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

optional query parameter to filter out old entries from results

Browse Source
This commit is contained in:
Athou
2013-06-08 14:09:46 +02:00
parent 84db458fd1
commit feda8ca834
8 changed files with 94 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,11 +96,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
public List<FeedEntryStatus> findStarred(User user, ReadingOrder order,
boolean includeContent) {
return findStarred(user, -1, -1, order, includeContent);
return findStarred(user, null, -1, -1, order, includeContent);
}
public List<FeedEntryStatus> findStarred(User user, int offset, int limit,
ReadingOrder order, boolean includeContent) {
public List<FeedEntryStatus> findStarred(User user, Date newerThan,
int offset, int limit, ReadingOrder order, boolean includeContent) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
@@ -118,6 +118,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.equal(root.get(FeedEntryStatus_.starred), true));
query.where(predicates.toArray(new Predicate[0]));
if (newerThan != null) {
predicates.add(builder.greaterThanOrEqualTo(
entryJoin.get(FeedEntry_.inserted), newerThan));
}
orderBy(query, entryJoin, order);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
@@ -127,11 +132,12 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
public List<FeedEntryStatus> findAll(User user, boolean unreadOnly,
ReadingOrder order, boolean includeContent) {
return findAll(user, unreadOnly, -1, -1, order, includeContent);
return findAll(user, unreadOnly, null, -1, -1, order, includeContent);
}
public List<FeedEntryStatus> findAll(User user, boolean unreadOnly,
int offset, int limit, ReadingOrder order, boolean includeContent) {
Date newerThan, int offset, int limit, ReadingOrder order,
boolean includeContent) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
@@ -148,6 +154,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read)));
}
if (newerThan != null) {
predicates.add(builder.greaterThanOrEqualTo(
entryJoin.get(FeedEntry_.inserted), newerThan));
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, entryJoin, order);
@@ -158,12 +169,13 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
public List<FeedEntryStatus> findByFeed(Feed feed, User user,
boolean unreadOnly, ReadingOrder order, boolean includeContent) {
return findByFeed(feed, user, unreadOnly, -1, -1, order, includeContent);
return findByFeed(feed, user, unreadOnly, null, -1, -1, order,
includeContent);
}
public List<FeedEntryStatus> findByFeed(Feed feed, User user,
boolean unreadOnly, int offset, int limit, ReadingOrder order,
boolean includeContent) {
boolean unreadOnly, Date newerThan, int offset, int limit,
ReadingOrder order, boolean includeContent) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
@@ -183,6 +195,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read)));
}
if (newerThan != null) {
predicates.add(builder.greaterThanOrEqualTo(
entryJoin.get(FeedEntry_.inserted), newerThan));
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, entryJoin, order);
@@ -195,13 +212,14 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
public List<FeedEntryStatus> findByCategories(
List<FeedCategory> categories, User user, boolean unreadOnly,
ReadingOrder order, boolean includeContent) {
return findByCategories(categories, user, unreadOnly, -1, -1, order,
includeContent);
return findByCategories(categories, user, unreadOnly, null, -1, -1,
order, includeContent);
}
public List<FeedEntryStatus> findByCategories(
List<FeedCategory> categories, User user, boolean unreadOnly,
int offset, int limit, ReadingOrder order, boolean includeContent) {
Date newerThan, int offset, int limit, ReadingOrder order,
boolean includeContent) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
@@ -220,6 +238,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read)));
}
if (newerThan != null) {
predicates.add(builder.greaterThanOrEqualTo(
entryJoin.get(FeedEntry_.inserted), newerThan));
}
query.where(predicates.toArray(new Predicate[0]));
orderBy(query, entryJoin, order);

13
src/main/java/com/commafeed/frontend/model/Entries.java
View File

@@ -26,9 +26,12 @@ public class Entries implements Serializable {
@ApiProperty("times the server tried to refresh the feed and failed")
private int errorCount;
@ApiProperty("list generation Timestamp")
@ApiProperty("list generation timestamp")
private long timestamp;
@ApiProperty("if the query has more elements")
private boolean hasMore;
@ApiProperty("list of entries")
private List<Entry> entries = Lists.newArrayList();
@@ -72,4 +75,12 @@ public class Entries implements Serializable {
this.timestamp = timestamp;
}
public boolean isHasMore() {
return hasMore;
}
public void setHasMore(boolean hasMore) {
this.hasMore = hasMore;
}
}

12
src/main/java/com/commafeed/frontend/model/Entry.java
View File

@@ -37,6 +37,7 @@ public class Entry implements Serializable {
entry.setEnclosureType(status.getEntry().getContent()
.getEnclosureType());
entry.setDate(feedEntry.getUpdated());
entry.setInsertedDate(feedEntry.getInserted());
entry.setUrl(feedEntry.getUrl());
entry.setRead(status.isRead());
@@ -93,6 +94,9 @@ public class Entry implements Serializable {
@ApiProperty("entry publication date")
private Date date;
@ApiProperty("entry insertion date in the database")
private Date insertedDate;
@ApiProperty("feed id")
private String feedId;
@@ -253,4 +257,12 @@ public class Entry implements Serializable {
this.rtl = rtl;
}
public Date getInsertedDate() {
return insertedDate;
}
public void setInsertedDate(Date insertedDate) {
this.insertedDate = insertedDate;
}
}

4
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, 0, 1,
statuses = feedEntryStatusDAO.findAll(user, true, null, 0, 1,
ReadingOrder.desc, true);
} else {
FeedCategory category = feedCategoryDAO.findById(user,
@@ -50,7 +50,7 @@ public class NextUnreadRedirectPage extends WebPage {
List<FeedCategory> children = feedCategoryDAO
.findAllChildrenCategories(user, category);
statuses = feedEntryStatusDAO.findByCategories(children, user,
true, 0, 1, ReadingOrder.desc, false);
true, null, 0, 1, ReadingOrder.desc, false);
}
}

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

@@ -65,6 +65,7 @@ public class CategoryREST extends AbstractResourceREST {
public Response getCategoryEntries(
@ApiParam(value = "id of the category, 'all' or 'starred'", required = true) @QueryParam("id") String id,
@ApiParam(value = "all entries or only unread ones", allowableValues = "all,unread", required = true) @QueryParam("readType") ReadType readType,
@ApiParam(value = "only entries newer than this") @QueryParam("newerThan") Long newerThan,
@ApiParam(value = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset,
@ApiParam(value = "limit for paging, default 20, maximum 50") @DefaultValue("20") @QueryParam("limit") int limit,
@ApiParam(value = "date ordering", allowableValues = "asc,desc") @QueryParam("order") @DefaultValue("desc") ReadingOrder order) {
@@ -78,11 +79,15 @@ 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, offset, limit, order, true);
getUser(), unreadOnly, newerThanDate, offset, limit + 1, order,
true);
for (FeedEntryStatus status : unreadEntries) {
entries.getEntries().add(
Entry.build(status, applicationSettingsService.get()
@@ -92,7 +97,7 @@ public class CategoryREST extends AbstractResourceREST {
} else if (STARRED.equals(id)) {
entries.setName("Starred");
List<FeedEntryStatus> starred = feedEntryStatusDAO.findStarred(
getUser(), offset, limit, order, true);
getUser(), newerThanDate, offset, limit + 1, order, true);
for (FeedEntryStatus status : starred) {
entries.getEntries().add(
Entry.build(status, applicationSettingsService.get()
@@ -106,7 +111,8 @@ public class CategoryREST extends AbstractResourceREST {
.findAllChildrenCategories(getUser(), feedCategory);
List<FeedEntryStatus> unreadEntries = feedEntryStatusDAO
.findByCategories(childrenCategories, getUser(),
unreadOnly, offset, limit, order, true);
unreadOnly, newerThanDate, offset, limit + 1,
order, true);
for (FeedEntryStatus status : unreadEntries) {
entries.getEntries().add(
Entry.build(status, applicationSettingsService
@@ -116,6 +122,13 @@ public class CategoryREST extends AbstractResourceREST {
}
}
boolean hasMore = entries.getEntries().size() > limit;
if (hasMore) {
entries.setHasMore(true);
entries.getEntries().remove(entries.getEntries().size() - 1);
}
entries.setTimestamp(Calendar.getInstance().getTimeInMillis());
return Response.ok(entries).build();
}
@@ -135,8 +148,8 @@ public class CategoryREST extends AbstractResourceREST {
int offset = 0;
int limit = 20;
Entries entries = (Entries) getCategoryEntries(id, readType, offset,
limit, order).getEntity();
Entries entries = (Entries) getCategoryEntries(id, readType, null,
offset, limit, order).getEntity();
SyndFeed feed = new SyndFeedImpl();
feed.setFeedType("rss_2.0");

17
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -72,6 +72,7 @@ public class FeedREST extends AbstractResourceREST {
public Response getFeedEntries(
@ApiParam(value = "id of the feed", required = true) @QueryParam("id") String id,
@ApiParam(value = "all entries or only unread ones", allowableValues = "all,unread", required = true) @QueryParam("readType") ReadType readType,
@ApiParam(value = "only entries newer than this") @QueryParam("newerThan") Long newerThan,
@ApiParam(value = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset,
@ApiParam(value = "limit for paging, default 20, maximum 50") @DefaultValue("20") @QueryParam("limit") int limit,
@ApiParam(value = "date ordering", allowableValues = "asc,desc") @QueryParam("order") @DefaultValue("desc") ReadingOrder order) {
@@ -85,6 +86,10 @@ public class FeedREST extends AbstractResourceREST {
Entries entries = new Entries();
boolean unreadOnly = readType == ReadType.unread;
Date newerThanDate = newerThan == null ? null : new Date(
Long.valueOf(newerThan));
System.out.println(newerThanDate);
FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(),
Long.valueOf(id));
if (subscription != null) {
@@ -94,12 +99,18 @@ public class FeedREST extends AbstractResourceREST {
List<FeedEntryStatus> unreadEntries = feedEntryStatusDAO
.findByFeed(subscription.getFeed(), getUser(), unreadOnly,
offset, limit, order, true);
newerThanDate, offset, limit + 1, order, true);
for (FeedEntryStatus status : unreadEntries) {
entries.getEntries().add(
Entry.build(status, applicationSettingsService.get()
.getPublicUrl()));
}
boolean hasMore = entries.getEntries().size() > limit;
if (hasMore) {
entries.setHasMore(true);
entries.getEntries().remove(entries.getEntries().size() - 1);
}
}
entries.setTimestamp(Calendar.getInstance().getTimeInMillis());
@@ -121,8 +132,8 @@ public class FeedREST extends AbstractResourceREST {
int offset = 0;
int limit = 20;
Entries entries = (Entries) getFeedEntries(id, readType, offset, limit,
order).getEntity();
Entries entries = (Entries) getFeedEntries(id, readType, null, offset,
limit, order).getEntity();
SyndFeed feed = new SyndFeedImpl();
feed.setFeedType("rss_2.0");