mirror of
https://github.com/Athou/commafeed.git
synced 2026-03-21 21:37:29 +00:00
faster queries for categories
This commit is contained in:
@@ -4,9 +4,6 @@ import java.util.List;
|
||||
|
||||
import javax.ejb.Stateless;
|
||||
import javax.inject.Inject;
|
||||
import javax.persistence.TypedQuery;
|
||||
|
||||
import org.apache.commons.lang.ObjectUtils;
|
||||
|
||||
import com.commafeed.backend.model.Feed;
|
||||
import com.commafeed.backend.model.FeedCategory;
|
||||
@@ -14,7 +11,6 @@ import com.commafeed.backend.model.FeedSubscription;
|
||||
import com.commafeed.backend.model.User;
|
||||
import com.commafeed.frontend.utils.ModelFactory.MF;
|
||||
import com.google.common.collect.Iterables;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.uaihebert.factory.EasyCriteriaFactory;
|
||||
import com.uaihebert.model.EasyCriteria;
|
||||
|
||||
@@ -51,35 +47,4 @@ public class FeedSubscriptionService extends GenericDAO<FeedSubscription, Long>
|
||||
return criteria.getResultList();
|
||||
|
||||
}
|
||||
|
||||
public List<FeedSubscription> findWithCategory(User user,
|
||||
FeedCategory category) {
|
||||
|
||||
List<FeedCategory> categories = Lists.newArrayList();
|
||||
for (FeedCategory c : feedCategoryService.findAll(user)) {
|
||||
if (isChild(c, category)) {
|
||||
categories.add(c);
|
||||
}
|
||||
}
|
||||
|
||||
String query = "select s from FeedSubscription s where s.user=:user and s.category in :categories";
|
||||
TypedQuery<FeedSubscription> typedQuery = em.createQuery(query,
|
||||
FeedSubscription.class);
|
||||
typedQuery.setParameter("user", user);
|
||||
typedQuery.setParameter("categories", categories);
|
||||
return typedQuery.getResultList();
|
||||
}
|
||||
|
||||
private boolean isChild(FeedCategory c, FeedCategory category) {
|
||||
boolean isChild = false;
|
||||
while (c != null) {
|
||||
if (ObjectUtils.equals(c.getId(), category.getId())) {
|
||||
isChild = true;
|
||||
break;
|
||||
}
|
||||
c = c.getParent();
|
||||
}
|
||||
return isChild;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user