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

minimum count as parameter

Browse Source
This commit is contained in:
Athou
2013-07-08 20:38:06 +02:00
parent bd047efcd2
commit 132c1b0aaf
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -136,7 +136,7 @@ public class FeedDAO extends GenericDAO<Feed> {
}
public List<FeedCount> findDuplicates(int offset, int limit) {
public List<FeedCount> findDuplicates(int offset, int limit, long minCount) {
CriteriaQuery<String> query = builder.createQuery(String.class);
Root<Feed> root = query.from(getType());
@@ -146,7 +146,7 @@ public class FeedDAO extends GenericDAO<Feed> {
query.select(hashPath);
query.groupBy(hashPath);
query.having(builder.greaterThan(count, 1l));
query.having(builder.greaterThan(count, minCount));
TypedQuery<String> q = em.createQuery(query);
limit(q, offset, limit);

6
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -273,8 +273,8 @@ public class AdminREST extends AbstractResourceREST {
@GET
@ApiOperation(value = "Find duplicate feeds")
public Response findDuplicateFeeds(@QueryParam("page") int page,
@QueryParam("limit") int limit) {
List<FeedCount> list = feedDAO.findDuplicates(limit * page, limit);
@QueryParam("limit") int limit, @QueryParam("minCount") long minCount) {
List<FeedCount> list = feedDAO.findDuplicates(limit * page, limit, minCount);
return Response.ok(list).build();
}
@@ -294,7 +294,7 @@ public class AdminREST extends AbstractResourceREST {
Feed feed = feedDAO.findById(feedId);
feeds.add(feed);
}
if (feeds.isEmpty()) {
return Response.status(Status.BAD_REQUEST)
.entity("'from feeds' empty").build();