Merge branch 'release/2.1.0'

tandg-digital · Jan 11, 2019 · 18a123e · 18a123e
2 parents 2453cea + abcfa36
commit 18a123e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "objection-filter",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "A filter module for objection.js",
   "main": "./dist/index.js",
   "engines": {

diff --git a/src/lib/FilterQueryBuilder.js b/src/lib/FilterQueryBuilder.js
@@ -140,7 +140,9 @@ const buildAggregation = function(aggregation, builder, utils) {
     throw new Error(`Must specify "field" with [${type}] aggregation`);
   }
 
-  const baseIdColumn = Model.tableName + '.' + Model.idColumn;
+  const baseIdColumn = typeof Model.idColumn === 'string'
+    ? Model.tableName + '.' + Model.idColumn
+    : Model.idColumn.map(idColumn => Model.tableName + '.' + idColumn);
 
   // When joining the filter query, the base left-joined table is aliased
   // as the full relation name joined by the : character

diff --git a/test/aggregation.test.js b/test/aggregation.test.js
@@ -25,12 +25,13 @@ const fillArray = function(counts = [], objects = []) {
 describe('aggregation', function () {
   _.each(testUtils.testDatabaseConfigs, function (knexConfig) {
     describe(knexConfig.client, function() {
-      let session, Person, Animal;
+      let session, Person, Animal, MovieVersion;
 
       before(function () {
         session = testUtils.initialize(knexConfig);
         Person = session.models.Person;
         Animal = session.models.Animal;
+        MovieVersion = session.models.MovieVersion;
       });
 
       before(function () {
@@ -212,6 +213,23 @@ describe('aggregation', function () {
         });
       });
 
+      describe('composite ids', function() {
+        it('should aggregate if root model has composite id', async function() {
+          const result = await buildFilter(MovieVersion)
+            .build({
+              eager: {
+                $aggregations: [
+                  {
+                    type: 'count',
+                    relation: 'movie'
+                  }
+                ]
+              }
+            });
+          result.map(item => item.count).should.deep.equal(fillArray([100], [1]));
+        });
+      });
+
       describe('multiple aggregations', function() {
         it('should apply multiple counts', async () => {
           const result = await buildFilter(Animal)