From d40f5823ff1c7d996f7deea208826f17b4284346 Mon Sep 17 00:00:00 2001
From: Chantsova Ekaterina <chantsova.ekaterina@gmail.com>
Date: Mon, 9 Nov 2020 15:18:37 +0200
Subject: [PATCH] Add getEntityTimeseries method to Attributes Service

---
 ui-ngx/src/app/core/http/attribute.service.ts | 30 ++++++++++++++++++-
 .../models/telemetry/telemetry.models.ts      | 14 +++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/core/http/attribute.service.ts b/ui-ngx/src/app/core/http/attribute.service.ts
index 044b9314ba..775360be5c 100644
--- a/ui-ngx/src/app/core/http/attribute.service.ts
+++ b/ui-ngx/src/app/core/http/attribute.service.ts
@@ -19,8 +19,9 @@ import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils';
 import { forkJoin, Observable, of } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { EntityId } from '@shared/models/id/entity-id';
-import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models';
+import { AttributeData, AttributeScope, DataSortOrder, TimeseriesData } from '@shared/models/telemetry/telemetry.models';
 import { isDefinedAndNotNull } from '@core/utils';
+import { AggregationType } from '@shared/models/time/time.models';
 
 @Injectable({
   providedIn: 'root'
@@ -110,4 +111,31 @@ export class AttributeService {
     }
     return forkJoin([saveEntityTimeseriesObservable, deleteEntityTimeseriesObservable]);
   }
+
+  public getEntityTimeseries(entityId: EntityId, keys: Array<string>, startTs: number, endTs: number,
+                             limit: number = 100, agg: AggregationType = AggregationType.NONE, interval?: number,
+                             orderBy: DataSortOrder = DataOrder.DESC, useStrictDataTypes: boolean = false,
+                             config?: RequestConfig): Observable<TimeseriesData> {
+    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/values/timeseries`;
+    url += `?keys=${keys.join(',')}`;
+    url += `&startTs=${startTs}`;
+    url += `&endTs=${endTs}`;
+    if (isDefinedAndNotNull(limit)) {
+      url += `&limit=${limit}`;
+    }
+    if (isDefinedAndNotNull(agg)) {
+      url += `&agg=${agg}`;
+    }
+    if (isDefinedAndNotNull(interval)) {
+      url += `&interval=${interval}`;
+    }
+    if (isDefinedAndNotNull(orderBy)) {
+      url += `&orderBy=${orderBy}`;
+    }
+    if (isDefinedAndNotNull(useStrictDataTypes)) {
+      url += `&useStrictDataTypes=${useStrictDataTypes}`;
+    }
+
+    return this.http.get<any>(url, defaultHttpOptionsFromConfig(config));
+  }
 }
diff --git a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
index 18858bdbf7..28a887fe9b 100644
--- a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
+++ b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
@@ -81,6 +81,20 @@ export interface AttributeData {
   value: any;
 }
 
+export interface TimeseriesData {
+  [key: string]: Array<TimeseriesKeyData>;
+}
+
+export interface TimeseriesKeyData {
+  value: any;
+  ts: number;
+}
+
+export enum DataSortOrder {
+  ASC = 'ASC',
+  DESC = 'DESC'
+}
+
 export interface WebsocketCmd {
   cmdId: number;
 }