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

allow ordering (fix #30)

Browse Source
This commit is contained in:
Athou
2013-04-10 10:28:48 +02:00
parent 1683a1ce50
commit ae4cd0b5e1
8 changed files with 107 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/main/java/com/commafeed/backend/dao/FeedEntryStatusService.java
View File

@@ -10,6 +10,7 @@ import javax.persistence.NoResultException;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -23,6 +24,7 @@ import com.commafeed.backend.model.FeedEntry_;
import com.commafeed.backend.model.FeedSubscription;
import com.commafeed.backend.model.FeedSubscription_;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserSettings.ReadingOrder;
import com.commafeed.frontend.utils.ModelFactory.MF;
import com.google.api.client.util.Lists;
import com.google.api.client.util.Maps;
@@ -83,25 +85,21 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.or(content, title));
query.where(predicates.toArray(new Predicate[0]));
query.orderBy(builder.desc(root.get(FeedEntryStatus_.entry).get(
FeedEntry_.updated)));
orderBy(query, root, ReadingOrder.desc);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
if (offset > -1) {
q.setFirstResult(offset);
}
if (limit > -1) {
q.setMaxResults(limit);
}
limit(q, offset, limit);
return q.getResultList();
}
public List<FeedEntryStatus> getStatuses(User user, boolean unreadOnly) {
return getStatuses(user, unreadOnly, -1, -1);
public List<FeedEntryStatus> getStatuses(User user, boolean unreadOnly,
ReadingOrder order) {
return getStatuses(user, unreadOnly, -1, -1, order);
}
public List<FeedEntryStatus> getStatuses(User user, boolean unreadOnly,
int offset, int limit) {
int offset, int limit, ReadingOrder order) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
@@ -112,16 +110,10 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read)));
}
query.where(predicates.toArray(new Predicate[0]));
query.orderBy(builder.desc(root.get(FeedEntryStatus_.entry).get(
FeedEntry_.updated)));
orderBy(query, root, order);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
if (offset > -1) {
q.setFirstResult(offset);
}
if (limit > -1) {
q.setMaxResults(limit);
}
limit(q, offset, limit);
return q.getResultList();
}
@@ -142,12 +134,12 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
}
public List<FeedEntryStatus> getStatuses(Feed feed, User user,
boolean unreadOnly) {
return getStatuses(feed, user, unreadOnly, -1, -1);
boolean unreadOnly, ReadingOrder order) {
return getStatuses(feed, user, unreadOnly, -1, -1, order);
}
public List<FeedEntryStatus> getStatuses(Feed feed, User user,
boolean unreadOnly, int offset, int limit) {
boolean unreadOnly, int offset, int limit, ReadingOrder order) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
@@ -161,26 +153,22 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read)));
}
query.where(predicates.toArray(new Predicate[0]));
query.orderBy(builder.desc(root.get(FeedEntryStatus_.entry).get(
FeedEntry_.updated)));
orderBy(query, root, order);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
if (offset > -1) {
q.setFirstResult(offset);
}
if (limit > -1) {
q.setMaxResults(limit);
}
limit(q, offset, limit);
return q.getResultList();
}
public List<FeedEntryStatus> getStatuses(List<FeedCategory> categories,
User user, boolean unreadOnly) {
return getStatuses(categories, user, unreadOnly, -1, -1);
User user, boolean unreadOnly, ReadingOrder order) {
return getStatuses(categories, user, unreadOnly, -1, -1, order);
}
public List<FeedEntryStatus> getStatuses(List<FeedCategory> categories,
User user, boolean unreadOnly, int offset, int limit) {
User user, boolean unreadOnly, int offset, int limit,
ReadingOrder order) {
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
@@ -194,32 +182,51 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
predicates.add(builder.isFalse(root.get(FeedEntryStatus_.read)));
}
query.where(predicates.toArray(new Predicate[0]));
query.orderBy(builder.desc(root.get(FeedEntryStatus_.entry).get(
FeedEntry_.updated)));
orderBy(query, root, order);
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
if (offset > -1) {
q.setFirstResult(offset);
}
if (limit > -1) {
q.setMaxResults(limit);
}
limit(q, offset, limit);
return q.getResultList();
}
private void limit(TypedQuery<FeedEntryStatus> query, int offset, int limit) {
if (offset > -1) {
query.setFirstResult(offset);
}
if (limit > -1) {
query.setMaxResults(limit);
}
}
private void orderBy(CriteriaQuery<FeedEntryStatus> query,
Root<FeedEntryStatus> root, ReadingOrder order) {
Path<Date> orderPath = root.get(FeedEntryStatus_.entry).get(
FeedEntry_.updated);
if (order == ReadingOrder.asc) {
query.orderBy(builder.asc(orderPath));
} else {
query.orderBy(builder.desc(orderPath));
}
}
public void markFeedEntries(User user, Feed feed, Date olderThan) {
List<FeedEntryStatus> statuses = getStatuses(feed, user, true);
List<FeedEntryStatus> statuses = getStatuses(feed, user, true,
ReadingOrder.desc);
update(markList(statuses, olderThan));
}
public void markCategoryEntries(User user, List<FeedCategory> categories,
Date olderThan) {
List<FeedEntryStatus> statuses = getStatuses(categories, user, true);
List<FeedEntryStatus> statuses = getStatuses(categories, user, true,
ReadingOrder.desc);
update(markList(statuses, olderThan));
}
public void markAllEntries(User user, Date olderThan) {
List<FeedEntryStatus> statuses = getStatuses(user, true);
List<FeedEntryStatus> statuses = getStatuses(user, true,
ReadingOrder.desc);
update(markList(statuses, olderThan));
}

16
src/main/java/com/commafeed/backend/model/UserSettings.java
View File

@@ -18,6 +18,10 @@ public class UserSettings extends AbstractModel {
all, unread
}
public enum ReadingOrder {
asc, desc
}
@OneToOne
@JoinColumn(name = "user_id", nullable = false)
private User user;
@@ -26,6 +30,10 @@ public class UserSettings extends AbstractModel {
@Column(nullable = false)
private ReadingMode readingMode;
@Enumerated(EnumType.STRING)
@Column(nullable = false)
private ReadingOrder readingOrder;
@Lob
@Column(length = Integer.MAX_VALUE)
private String customCss;
@@ -54,4 +62,12 @@ public class UserSettings extends AbstractModel {
this.customCss = customCss;
}
public ReadingOrder getReadingOrder() {
return readingOrder;
}
public void setReadingOrder(ReadingOrder readingOrder) {
this.readingOrder = readingOrder;
}
}