Merge remote-tracking branch 'origin/master'

Author: Valodya

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "backendless",
-  "version": "6.6.2",
+  "version": "6.6.3",
   "description": "Backendless JavaScript SDK for Node.js and the browser",
   "browser": "dist/backendless.js",
   "main": "lib/index.js",

package.json

@@ -166,10 +166,12 @@ export default class DataStore {
 
   async getObjectCount(condition) {
     let distinct = undefined
+    let groupBy = undefined
 
     if (condition) {
       if (condition instanceof DataQueryBuilder) {
         distinct = condition.getDistinct() || undefined
+        groupBy = condition.getGroupBy() || undefined
         condition = condition.getWhereClause() || undefined
       } else if (typeof condition !== 'string') {
         throw new Error('Condition must be a string or an instance of DataQueryBuilder.')
@@ -178,7 +180,7 @@ export default class DataStore {
 
     return this.app.request.post({
       url : this.app.urls.dataTableCount(this.className),
-      data: { where: condition, distinct },
+      data: { where: condition, distinct, groupBy },
     })
   }
 

src/data/store.js

@@ -777,6 +777,31 @@ describe('<Data> Find', function() {
       expect(result3).to.be.equal(4)
     })
 
+    it('with groupBy ', async () => {
+      const req = prepareMockRequest(2)
+
+      const query = Backendless.Data.QueryBuilder.create()
+
+      query.setGroupBy('objectId')
+      query.setWhereClause('foo>123')
+
+      const result = await dataStore.getObjectCount(query)
+
+      expect(req).to.deep.include({
+        method : 'POST',
+        path   : `${APP_PATH}/data/${tableName}/count`,
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body   : {
+          where   : 'foo>123',
+          groupBy: ['objectId']
+        }
+      })
+
+      expect(result).to.be.equal(2)
+    })
+
     it('fails when at least one item is invalid', async () => {
       const errorMsg = 'Condition must be a string or an instance of DataQueryBuilder.'