feat: values aggregates for events

cognitedata · Jun 22, 2020 · d195799 · d195799
1 parent 2e6a4e2
commit d195799
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 11 deletions.
diff --git a/src/__tests__/resources/events.integration.spec.ts b/src/__tests__/resources/events.integration.spec.ts
@@ -95,6 +95,18 @@ describe('Events integration test', () => {
     expect(aggregates[0].count).toBeDefined();
   });
 
+  test('values aggregate', async () => {
+    const aggregates = await client.events.uniqueValuesAggregate({
+      filter: {
+        source: 'WORKMATE',
+      },
+      fields: ['type'],
+    });
+    expect(aggregates.length).toBe(1);
+    expect(aggregates[0].count).toBeDefined();
+    expect(aggregates[0].value).toBeDefined();
+  });
+
   test('delete', async () => {
     await client.events.delete(createdEvents.map(event => ({ id: event.id })));
   });

diff --git a/src/resources/events/eventsApi.ts b/src/resources/events/eventsApi.ts
@@ -4,15 +4,17 @@ import { CursorAndAsyncIterator } from '../../autoPagination';
 import { BaseResourceAPI } from '../../resources/baseResourceApi';
 import {
   CogniteEvent,
-  EventAggregate,
-  EventAggregateQuery,
   EventChange,
   EventFilterRequest,
   EventSearchRequest,
   EventSort,
   ExternalEvent,
   IdEither,
   IgnoreUnknownIds,
+  EventCountAggregate,
+  CountAggregateResponse,
+  UniqueValuesAggregateResponse,
+  EventUniqueValuesAggregate,
 } from '../../types/types';
 
 export class EventsAPI extends BaseResourceAPI<CogniteEvent> {
@@ -56,11 +58,28 @@ export class EventsAPI extends BaseResourceAPI<CogniteEvent> {
    * ```
    */
   public aggregate = (
-    query: EventAggregateQuery
-  ): Promise<EventAggregate[]> => {
+    query: EventCountAggregate
+  ): Promise<CountAggregateResponse[]> => {
     return super.aggregateEndpoint(query);
   };
 
+  /**
+   * [Aggregate events](https://docs.cognite.com/api/v1/#operation/aggregateEvents)
+   *
+   * ```js
+   * const aggregates = await client.events.uniqueValuesAggregate({ filter: { assetIds: [1, 2, 3] }, fields: ['subtype'] });
+   * console.log('Unique values: ', aggregates)
+   * ```
+   */
+  public uniqueValuesAggregate = (
+    query: EventUniqueValuesAggregate
+  ): Promise<UniqueValuesAggregateResponse[]> => {
+    return super.aggregateEndpoint({
+      ...query,
+      aggregate: 'uniqueValues',
+    });
+  };
+
   /**
    * [Retrieve events](https://doc.cognitedata.com/api/v1/#operation/byIdsEvents)
    * <!-- or [similar](https://doc.cognitedata.com/api/v1/#operation/getEventByInternalId) -->

diff --git a/src/types/types.ts b/src/types/types.ts
@@ -191,13 +191,22 @@ export interface Asset
   parentExternalId?: CogniteExternalId;
 }
 
-export interface AggregateResponse {
+export type AggregateResponse = CountAggregateResponse;
+
+export interface CountAggregateResponse {
   /**
    * Size of the aggregation group
    */
   count: number;
 }
 
+export interface UniqueValuesAggregateResponse extends CountAggregateResponse {
+  /**
+   * A unique value from the requested field
+   */
+  value: string | number;
+}
+
 /**
  * Response from asset aggregate endpoint
  */
@@ -585,8 +594,8 @@ export interface DatapointsDeleteRange {
 }
 
 export type DatapointsDeleteRequest =
-  | InternalId & DatapointsDeleteRange
-  | ExternalId & DatapointsDeleteRange;
+  | (InternalId & DatapointsDeleteRange)
+  | (ExternalId & DatapointsDeleteRange);
 
 export interface DatapointsGetAggregateDatapoint extends DatapointsMetadata {
   datapoints: GetAggregateDatapoint[];
@@ -713,15 +722,26 @@ export type DeleteAssetMapping3D = AssetMapping3DBase;
 export type EXECUTE = 'EXECUTE';
 
 /**
- * Query schema for asset aggregate endpoint
+ * Query schema for event aggregate endpoint
  */
-export interface EventAggregateQuery {
+export type EventAggregateQuery = EventCountAggregate;
+
+export interface EventBaseAggregate {
   /**
    * Filter on events with strict matching.
    */
   filter?: EventFilter;
 }
 
+export interface EventCountAggregate extends EventBaseAggregate {}
+
+export interface EventUniqueValuesAggregate extends EventBaseAggregate {
+  /**
+   * The field name(s) to apply the aggregation on. Currently limited to one field.
+   */
+  fields: ('type' | 'subtype' | 'dataSetId')[];
+}
+
 export type EventChange = EventChangeById | EventChangeByExternalId;
 
 export interface EventChangeByExternalId extends EventPatch, ExternalId {}
@@ -1148,8 +1168,8 @@ export interface ItemsWrapper<T> {
 export type LIST = 'LIST';
 
 export type LatestDataBeforeRequest =
-  | InternalId & LatestDataPropertyFilter
-  | ExternalId & LatestDataPropertyFilter;
+  | (InternalId & LatestDataPropertyFilter)
+  | (ExternalId & LatestDataPropertyFilter);
 
 export interface LatestDataPropertyFilter {
   /**