garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

rewrite queries with criteria for more flexibility

Browse Source
This commit is contained in:
Athou
2013-04-10 10:14:27 +02:00
parent d0a6a00ce6
commit 1683a1ce50
3 changed files with 135 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
pom.xml
View File

@@ -44,6 +44,7 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
<compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
<plugin>
@@ -89,6 +90,52 @@
</libs>
</configuration>
</plugin>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>process</id>
<goals>
<goal>process</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<processors>
<processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
</processors>
<outputDirectory>target/metamodel</outputDirectory>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>1.2.0.Final</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>target/metamodel</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

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

@@ -9,13 +9,19 @@ import javax.inject.Inject;
import javax.persistence.NoResultException;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedCategory;
import com.commafeed.backend.model.FeedEntryStatus;
import com.commafeed.backend.model.FeedEntryStatus_;
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.frontend.utils.ModelFactory.MF;
import com.google.api.client.util.Lists;
@@ -56,20 +62,38 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
public List<FeedEntryStatus> getStatusesByKeywords(User user,
String keywords, int offset, int limit) {
TypedQuery<FeedEntryStatus> query = em.createNamedQuery(
"EntryStatus.allByKeywords", FeedEntryStatus.class);
query.setParameter("user", user);
String joinedKeywords = StringUtils.join(
keywords.toLowerCase().split(" "), "%");
query.setParameter("keywords", "%" + joinedKeywords + "%");
joinedKeywords = "%" + joinedKeywords + "%";
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
List<Predicate> predicates = Lists.newArrayList();
predicates.add(builder.equal(root.get(FeedEntryStatus_.subscription)
.get(FeedSubscription_.user), user));
Predicate content = builder.like(
builder.lower(root.get(FeedEntryStatus_.entry).get(
FeedEntry_.content)), joinedKeywords);
Predicate title = builder.like(
builder.lower(root.get(FeedEntryStatus_.entry).get(
FeedEntry_.title)), joinedKeywords);
predicates.add(builder.or(content, title));
query.where(predicates.toArray(new Predicate[0]));
query.orderBy(builder.desc(root.get(FeedEntryStatus_.entry).get(
FeedEntry_.updated)));
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
if (offset > -1) {
query.setFirstResult(offset);
q.setFirstResult(offset);
}
if (limit > -1) {
query.setMaxResults(limit);
q.setMaxResults(limit);
}
return query.getResultList();
return q.getResultList();
}
public List<FeedEntryStatus> getStatuses(User user, boolean unreadOnly) {
@@ -78,18 +102,27 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
public List<FeedEntryStatus> getStatuses(User user, boolean unreadOnly,
int offset, int limit) {
String queryName = unreadOnly ? "EntryStatus.unread"
: "EntryStatus.all";
TypedQuery<FeedEntryStatus> query = em.createNamedQuery(queryName,
FeedEntryStatus.class);
query.setParameter("user", user);
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
List<Predicate> predicates = Lists.newArrayList();
predicates.add(builder.equal(root.get(FeedEntryStatus_.subscription)
.get(FeedSubscription_.user), user));
if (unreadOnly) {
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)));
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
if (offset > -1) {
query.setFirstResult(offset);
q.setFirstResult(offset);
}
if (limit > -1) {
query.setMaxResults(limit);
q.setMaxResults(limit);
}
return query.getResultList();
return q.getResultList();
}
/**
@@ -115,20 +148,30 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
public List<FeedEntryStatus> getStatuses(Feed feed, User user,
boolean unreadOnly, int offset, int limit) {
String queryName = unreadOnly ? "EntryStatus.unreadByFeed"
: "EntryStatus.allByFeed";
TypedQuery<FeedEntryStatus> query = em.createNamedQuery(queryName,
FeedEntryStatus.class);
query.setParameter("feed", feed);
query.setParameter("user", user);
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
List<Predicate> predicates = Lists.newArrayList();
predicates.add(builder.equal(root.get(FeedEntryStatus_.subscription)
.get(FeedSubscription_.user), user));
predicates.add(builder.equal(root.get(FeedEntryStatus_.subscription)
.get(FeedSubscription_.feed), feed));
if (unreadOnly) {
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)));
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
if (offset > -1) {
query.setFirstResult(offset);
q.setFirstResult(offset);
}
if (limit > -1) {
query.setMaxResults(limit);
q.setMaxResults(limit);
}
return query.getResultList();
return q.getResultList();
}
public List<FeedEntryStatus> getStatuses(List<FeedCategory> categories,
@@ -138,19 +181,30 @@ public class FeedEntryStatusService extends GenericDAO<FeedEntryStatus> {
public List<FeedEntryStatus> getStatuses(List<FeedCategory> categories,
User user, boolean unreadOnly, int offset, int limit) {
String queryName = unreadOnly ? "EntryStatus.unreadByCategories"
: "EntryStatus.allByCategories";
TypedQuery<FeedEntryStatus> query = em.createNamedQuery(queryName,
FeedEntryStatus.class);
query.setParameter("categories", categories);
query.setParameter("user", user);
CriteriaQuery<FeedEntryStatus> query = builder.createQuery(getType());
Root<FeedEntryStatus> root = query.from(getType());
List<Predicate> predicates = Lists.newArrayList();
predicates.add(builder.equal(root.get(FeedEntryStatus_.subscription)
.get(FeedSubscription_.user), user));
predicates.add(root.get(FeedEntryStatus_.subscription)
.get(FeedSubscription_.category).in(categories));
if (unreadOnly) {
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)));
TypedQuery<FeedEntryStatus> q = em.createQuery(query);
if (offset > -1) {
query.setFirstResult(offset);
q.setFirstResult(offset);
}
if (limit > -1) {
query.setMaxResults(limit);
q.setMaxResults(limit);
}
return query.getResultList();
return q.getResultList();
}
public void markFeedEntries(User user, Feed feed, Date olderThan) {

28
src/main/resources/META-INF/orm.xml
View File

@@ -8,37 +8,9 @@
<named-query name="User.byName">
<query>select u FROM User u WHERE lower(u.name)=:name</query>
</named-query>
<named-query name="EntryStatus.byId">
<query>select s from FeedEntryStatus s where s.subscription.user=:user and s.id=:id</query>
</named-query>
<named-query name="EntryStatus.unread">
<query>select s from FeedEntryStatus s where s.subscription.user=:user and s.read=false order by s.entry.updated desc</query>
</named-query>
<named-query name="EntryStatus.all">
<query>select s from FeedEntryStatus s where s.subscription.user=:user order by s.entry.updated desc</query>
</named-query>
<named-query name="EntryStatus.unreadByFeed">
<query>select s from FeedEntryStatus s where s.subscription.user=:user and s.subscription.feed=:feed and s.read=false order by s.entry.updated desc</query>
</named-query>
<named-query name="EntryStatus.unreadCounts">
<query>select s.subscription.id, count(s) from FeedEntryStatus s where s.subscription.user=:user and s.read=false group by s.subscription.id</query>
</named-query>
<named-query name="EntryStatus.allByFeed">
<query>select s from FeedEntryStatus s where s.subscription.user=:user and s.subscription.feed=:feed order by s.entry.updated desc</query>
</named-query>
<named-query name="EntryStatus.unreadByCategories">
<query>select s from FeedEntryStatus s where s.subscription.user=:user and s.subscription.category in (:categories) and s.read=false order by s.entry.updated desc</query>
</named-query>
<named-query name="EntryStatus.allByCategories">
<query>select s from FeedEntryStatus s where s.subscription.user=:user and s.subscription.category in (:categories) order by s.entry.updated desc</query>
</named-query>
<named-query name="EntryStatus.allByKeywords">
<query>select s from FeedEntryStatus s where s.subscription.user=:user and (lower(s.entry.content) like :keywords or lower(s.entry.title) like :keywords) order by s.entry.updated desc</query>
</named-query>
</entity-mappings>