Merge pull request #175 from devgateway/fix/OCE-121

OCE-121

Author: mpostelnicu

web/src/main/java/org/devgateway/ocds/web/rest/controller/AverageNumberOfTenderersController.java

@@ -11,14 +11,23 @@
  *******************************************************************************/
 package org.devgateway.ocds.web.rest.controller;
 
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import io.swagger.annotations.ApiOperation;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.group;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.limit;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.match;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.newAggregation;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.project;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.skip;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
 import org.devgateway.ocds.web.rest.controller.request.DefaultFilterPagingRequest;
 import org.devgateway.toolkit.persistence.mongo.aggregate.CustomProjectionOperation;
+import org.devgateway.toolkit.persistence.mongo.aggregate.CustomSortingOperation;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.aggregation.Fields;
@@ -27,17 +36,10 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import java.util.List;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
 
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.group;
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.limit;
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.match;
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.newAggregation;
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.project;
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.skip;
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.sort;
-import static org.springframework.data.mongodb.core.query.Criteria.where;
+import io.swagger.annotations.ApiOperation;
 
 /**
  *
@@ -74,7 +76,7 @@ public List<DBObject> averageNumberOfTenderers(@ModelAttribute @Valid final Defa
                 project(Fields.from(Fields.field("year", Fields.UNDERSCORE_ID_REF)))
                         .andInclude(Keys.AVERAGE_NO_OF_TENDERERS)
                         .andExclude(Fields.UNDERSCORE_ID),
-                sort(Direction.ASC, Keys.YEAR),
+				new CustomSortingOperation(new BasicDBObject(Keys.YEAR, 1)),
                 skip(filter.getSkip()), limit(filter.getPageSize()));
 
         AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, "release", DBObject.class);

web/src/main/java/org/devgateway/ocds/web/rest/controller/NumberOfTendersByItemClassification.java

@@ -18,6 +18,7 @@
 import org.devgateway.toolkit.persistence.mongo.aggregate.CustomProjectionOperation;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.aggregation.Fields;
@@ -31,6 +32,7 @@
 
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.group;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.match;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.sort;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.newAggregation;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.unwind;
 import static org.springframework.data.mongodb.core.query.Criteria.where;
@@ -67,7 +69,8 @@ public List<DBObject> numberOfTendersByItemClassification(
                         .andOperator(getYearFilterCriteria("tender.tenderPeriod.startDate", filter))),
                 match(getDefaultFilterCriteria(filter)), new CustomProjectionOperation(project),
                 unwind("tender.items"),
-                group("$tender." + Keys.ITEMS_CLASSIFICATION).count().as(Keys.TOTAL_TENDERS)
+                group("$tender." + Keys.ITEMS_CLASSIFICATION).count().as(Keys.TOTAL_TENDERS),
+				sort(Direction.ASC, Fields.UNDERSCORE_ID)
         );
 
         AggregationResults<DBObject> results = mongoTemplate.aggregate(agg, "release", DBObject.class);

web/src/test/java/org/devgateway/ocds/web/rest/controller/AverageNumberOfTenderersControllerTest.java

@@ -23,15 +23,15 @@ public void averageNumberOfTenderers() throws Exception {
         final List<DBObject> averageNumberOfTenderers = averageNumberOfTenderersController
                 .averageNumberOfTenderers(new DefaultFilterPagingRequest());
 
-        final DBObject first = averageNumberOfTenderers.get(0);
-        int year = (int) first.get(AverageNumberOfTenderersController.Keys.YEAR);
-        double averageNoTenderers = (double) first.get(AverageNumberOfTenderersController.Keys.AVERAGE_NO_OF_TENDERERS);
+        final DBObject sec = averageNumberOfTenderers.get(1);
+        int year = (int) sec.get(AverageNumberOfTenderersController.Keys.YEAR);
+        double averageNoTenderers = (double) sec.get(AverageNumberOfTenderersController.Keys.AVERAGE_NO_OF_TENDERERS);
         Assert.assertEquals(2015, year);
         Assert.assertEquals(5.5, averageNoTenderers, 0);
 
-        final DBObject second = averageNumberOfTenderers.get(1);
-        year = (int) second.get(AverageNumberOfTenderersController.Keys.YEAR);
-        averageNoTenderers = (double) second.get(AverageNumberOfTenderersController.Keys.AVERAGE_NO_OF_TENDERERS);
+        final DBObject first = averageNumberOfTenderers.get(0);
+        year = (int) first.get(AverageNumberOfTenderersController.Keys.YEAR);
+        averageNoTenderers = (double) first.get(AverageNumberOfTenderersController.Keys.AVERAGE_NO_OF_TENDERERS);
         Assert.assertEquals(2014, year);
         Assert.assertEquals(5.0, averageNoTenderers, 0);
     }