Merge pull request #172 from devgateway/feature/OCE-119/nopaginationf…

…orlocation OCE-119
devgateway · Sep 22, 2016 · 4e05beb · 4e05beb
2 parents f8ec694 + 047e2a3
commit 4e05beb
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/web/src/main/java/org/devgateway/ocds/web/rest/controller/FundingByLocationController.java b/web/src/main/java/org/devgateway/ocds/web/rest/controller/FundingByLocationController.java
@@ -77,13 +77,15 @@ public List<DBObject> fundingByTenderDeliveryLocation(
 
         Aggregation agg = newAggregation(
                 match(where("tender").exists(true).and("tender.tenderPeriod.startDate").exists(true)
-                        .and("tender.value.amount").exists(true).andOperator(getDefaultFilterCriteria(filter))),
+                        .andOperator(getDefaultFilterCriteria(filter))),
                 new CustomProjectionOperation(project), unwind("$tender.items"),
                 unwind("$tender.items.deliveryLocation"), match(
                         where("tender.items.deliveryLocation.geometry.coordinates.0").exists(true)),
                 group(Keys.YEAR, "tender." + Keys.ITEMS_DELIVERY_LOCATION).sum("$tender.value.amount")
                         .as(Keys.TOTAL_TENDERS_AMOUNT).count().as(Keys.TENDERS_COUNT),
-                sort(Direction.ASC, Keys.YEAR), skip(filter.getSkip()), limit(filter.getPageSize()));
+                sort(Direction.ASC, Keys.YEAR)
+                //,skip(filter.getSkip()), limit(filter.getPageSize())
+                );
 
         AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, "release", DBObject.class);
         List<DBObject> tagCount = results.getMappedResults();
@@ -125,8 +127,9 @@ public List<DBObject> qualityFundingByTenderDeliveryLocation(
                 group(Fields.UNDERSCORE_ID_REF).max("tenderItemsDeliveryLocation").as("hasTenderItemsDeliverLocation"),
                 group().count().as("totalTendersWithStartDate").sum("hasTenderItemsDeliverLocation")
                         .as(Keys.TOTAL_TENDERS_WITH_START_DATE_AND_LOCATION),
-                new CustomProjectionOperation(project1), skip(filter.getSkip()),
-                limit(filter.getPageSize()));
+                new CustomProjectionOperation(project1)
+                //,skip(filter.getSkip()),limit(filter.getPageSize())
+               );
 
         AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, "release", DBObject.class);
         List<DBObject> tagCount = results.getMappedResults();