From 51256153206267f2a4113da390152a4c8efbc1bb Mon Sep 17 00:00:00 2001
From: Git Automerge <jcguarinpenaranda@gmail.com>
Date: Fri, 23 Mar 2018 10:18:46 -0500
Subject: [PATCH] added aggregate and distinct to Parse

---
 types/parse/index.d.ts     | 15 ++++++++++++++-
 types/parse/parse-tests.ts | 12 +++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 15d653a791..9a158d9287 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -607,6 +607,7 @@ declare namespace Parse {
 
         static or<U extends Object>(...var_args: Query<U>[]): Query<U>;
 
+        aggregate(pipeline: Query.AggregationOptions|Query.AggregationOptions[]): Query<T>;
         addAscending(key: string): Query<T>;
         addAscending(key: string[]): Query<T>;
         addDescending(key: string): Query<T>;
@@ -623,6 +624,7 @@ declare namespace Parse {
         doesNotExist(key: string): Query<T>;
         doesNotMatchKeyInQuery<U extends Object>(key: string, queryKey: string, query: Query<U>): Query<T>;
         doesNotMatchQuery<U extends Object>(key: string, query: Query<U>): Query<T>;
+        distinct(key: string): Query<T>;
         each(callback: Function, options?: Query.EachOptions): Promise<void>;
         endsWith(key: string, suffix: string): Query<T>;
         equalTo(key: string, value: any): Query<T>;
@@ -659,6 +661,17 @@ declare namespace Parse {
         interface FindOptions extends SuccessFailureOptions, ScopeOptions { }
         interface FirstOptions extends SuccessFailureOptions, ScopeOptions { }
         interface GetOptions extends SuccessFailureOptions, ScopeOptions { }
+
+        // According to http://docs.parseplatform.org/rest/guide/#aggregate-queries
+        interface AggregationOptions {
+            group?: { objectId?: string, [key:string]: any };
+            match?: {[key: string]: any};
+            project?: {[key: string]: any};
+            limit?: number;
+            skip?: number;
+            // Sort documentation https://docs.mongodb.com/v3.2/reference/operator/aggregation/sort/#pipe._S_sort
+            sort?: {[key: string]: 1|-1};
+        }
     }
 
     /**
@@ -1151,4 +1164,4 @@ declare module "parse/node" {
 declare module "parse" {
     import * as parse from "parse/node";
     export = parse
-}
\ No newline at end of file
+}
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index ceb5693087..60b688ec6e 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -134,6 +134,16 @@ function test_query() {
     query.include("score");
     query.include(["score.team"]);
 
+    // Find objects that match the aggregation pipeline
+    query.aggregate({
+        group:{
+            objectId: '$name'
+        }
+    });
+
+    // Find objects with distinct key
+    query.distinct('name');
+
     const testQuery = Parse.Query.or(query, query);
 }
 
@@ -396,7 +406,7 @@ function test_cloud_functions() {
 
     Parse.Cloud.beforeSave('MyCustomClass', (request: Parse.Cloud.BeforeSaveRequest,
         response: Parse.Cloud.BeforeSaveResponse) => {
-            
+
             if (request.object.isNew()) {
                 if (!request.object.has('immutable')) return response.error('Field immutable is required')
             } else {