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

rewrote query engine

Browse Source
This commit is contained in:
Athou
2013-03-25 23:15:52 +01:00
parent 6d3d03ef53
commit ef209ea321
4 changed files with 62 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/commafeed/backend/dao/FeedCategoryService.java
View File

@@ -5,6 +5,8 @@ import java.util.List;
import javax.ejb.Stateless;
import javax.persistence.NoResultException;
import org.apache.commons.lang.ObjectUtils;
import com.commafeed.backend.model.FeedCategory;
import com.commafeed.backend.model.User;
import com.commafeed.frontend.utils.ModelFactory.MF;
@@ -44,4 +46,19 @@ public class FeedCategoryService extends GenericDAO<FeedCategory, Long> {
}
return category;
}
public boolean isChild(FeedCategory child, FeedCategory parent) {
if (parent == null) {
return true;
}
boolean isChild = false;
while (child != null) {
if (ObjectUtils.equals(child.getId(), parent.getId())) {
isChild = true;
break;
}
child = child.getParent();
}
return isChild;
}
}

55
src/main/java/com/commafeed/backend/dao/FeedEntryService.java
View File

@@ -39,39 +39,28 @@ public class FeedEntryService extends GenericDAO<FeedEntry, Long> {
em.merge(feed);
}
private TypedQuery<FeedEntry> unreadQuery(Feed feed, User user) {
String query = "select e from FeedEntry e where e.feed =:feed and not exists (select s from FeedEntryStatus s where s.entry = e and s.user =:user and s.read = true)";
TypedQuery<FeedEntry> typedQuery = em.createQuery(query,
public List<FeedEntry> getEntries(Feed feed, User user, boolean read) {
return getEntries(feed, user, read, -1, -1);
}
public List<FeedEntry> getEntries(Feed feed, User user, boolean read,
int offset, int limit) {
String queryName = null;
if (read) {
queryName = "Entry.readByFeed";
} else {
queryName = "Entry.unreadByFeed";
}
TypedQuery<FeedEntry> query = em.createNamedQuery(queryName,
FeedEntry.class);
typedQuery.setParameter("feed", feed);
typedQuery.setParameter("user", user);
return typedQuery;
}
public List<FeedEntry> getUnreadEntries(Feed feed, User user) {
return unreadQuery(feed, user).getResultList();
}
public List<FeedEntry> getUnreadEntries(Feed feed, User user, int offset,
int limit) {
return unreadQuery(feed, user).setFirstResult(offset)
.setMaxResults(limit).getResultList();
}
private TypedQuery<FeedEntry> allQuery(Feed feed) {
String query = "select e from FeedEntry e where e.feed=:feed";
TypedQuery<FeedEntry> typedQuery = em.createQuery(query,
FeedEntry.class);
typedQuery.setParameter("feed", feed);
return typedQuery;
}
public List<FeedEntry> getAllEntries(Feed feed) {
return allQuery(feed).getResultList();
}
public List<FeedEntry> getAllEntries(Feed feed, int offset, int limit) {
return allQuery(feed).setFirstResult(offset).setMaxResults(limit)
.getResultList();
query.setParameter("feed", feed);
query.setParameter("user", user);
if (offset > -1) {
query.setFirstResult(offset);
}
if (limit > -1) {
query.setMaxResults(limit);
}
return query.getResultList();
}
}