Revize a7285540

Re #8676 - Definovat analytics API

+ new API endpoints (analytics)

• changing getting sensor observation data from analytics endpoint

proxy-config.json

@@ -1 +1 @@
 {
   "/senslog1": {
-    "target": "http://51.15.45.95:8080",
+    "target": "https://51.15.45.95:8080",
     "secure": false
   },
   "/senslog-lite2/rest": {
-    "target": "http://51.15.45.95:8080",
+    "target": "https://51.15.45.95:8080",
     "secure": false
   },
   "/api/SensLogV1/OGCSensorThings": {
-    "target": "http://51.15.45.95:9080",
+    "target": "https://51.15.45.95:9080",
+    "secure": false
+  },
+  "/analytics": {
+    "target": "https://51.15.45.95:9090",
     "secure": false
   }
 }

src/app/auth/interceptors/auth.interceptor.ts

@@ -28 +28 @@
       return of(null);
     }
 
-    if (!request.url.includes('ControllerServlet')){
+    if (request.url.includes('DataService')){
       request = request.clone({
         setParams: {
           user: localStorage.getItem(GlobalVariable.USER_NAME)

src/app/shared/api/endpoints/api.module.ts

@@ -8 +8 @@
 import { GroupService } from './services/group.service';
 import { ObservationService } from './services/observation.service';
 import { DataService } from './services/data.service';
+import { AnalyticsService } from './services/analytics.service';
 
 /**
  * Module that provides all services and configuration.
@@ -21 +22 @@
     GroupService,
     ObservationService,
     DataService,
+    AnalyticsService,
     ApiConfiguration
   ],
 })

src/app/shared/api/endpoints/models.ts

@@ -10 +10 @@
 export { GeneralInfo } from './models/general-info';
 export { Drivers } from './models/drivers';
 export { Observation } from './models/observation';
+export { Sensors } from './models/sensors';
+export { SensorsData } from './models/sensors-data';
+export { Data } from './models/data';
+export { Obser } from './models/obser';
+export { Statistics } from './models/statistics';

src/app/shared/api/endpoints/models/data.ts

@@ +1 @@
+/* tslint:disable */
+/* eslint-disable */
+import { Obser } from './obser';
+export interface Data {
+  observation?: Obser;
+}

src/app/shared/api/endpoints/models/obser.ts

@@ +1 @@
+/* tslint:disable */
+/* eslint-disable */
+export interface Obser {
+  avg?: number;
+  max?: number;
+  min?: number;
+  sum?: number;
+  timestamp?: string;
+}

src/app/shared/api/endpoints/models/sensors-data.ts

@@ +1 @@
+/* tslint:disable */
+/* eslint-disable */
+import { Data } from './data';
+import { Statistics } from './statistics';
+export interface SensorsData {
+  data?: Data;
+  interval?: number;
+  statistics?: Statistics;
+}

src/app/shared/api/endpoints/models/sensors.ts

@@ +1 @@
+/* tslint:disable */
+/* eslint-disable */
+import { SensorsData } from './sensors-data';
+export interface Sensors {
+  sensorsData?: SensorsData;
+}

src/app/shared/api/endpoints/models/statistics.ts

@@ +1 @@
+/* tslint:disable */
+/* eslint-disable */
+export interface Statistics {
+  avg?: number;
+  max?: number;
+  min?: number;
+  sum?: number;
+}

src/app/shared/api/endpoints/services.ts

@@ -2 +2 @@
 export { GroupService } from './services/group.service';
 export { ObservationService } from './services/observation.service';
 export { DataService } from './services/data.service';
+export { AnalyticsService } from './services/analytics.service';

src/app/shared/api/endpoints/services/analytics.service.ts

@@ +1 @@
+/* tslint:disable */
+/* eslint-disable */
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpResponse } from '@angular/common/http';
+import { BaseService } from '../base-service';
+import { ApiConfiguration } from '../api-configuration';
+import { StrictHttpResponse } from '../strict-http-response';
+import { RequestBuilder } from '../request-builder';
+import { Observable } from 'rxjs';
+import { map, filter } from 'rxjs/operators';
+
+import { Sensors } from '../models/sensors';
+
+
+/**
+ * Analitics endpoints
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class AnalyticsService extends BaseService {
+  constructor(
+    config: ApiConfiguration,
+    http: HttpClient
+  ) {
+    super(config, http);
+  }
+
+  /**
+   * Path part for operation getAnalytics
+   */
+  static readonly GetAnalyticsPath = '/analytics/analytics';
+
+  /**
+   * Get analytics.
+   *
+   *
+   *
+   * This method provides access to the full `HttpResponse`, allowing access to response headers.
+   * To access only the response body, use `getAnalytics()` instead.
+   *
+   * This method doesn't expect any request body.
+   */
+  getAnalytics$Response(params: {
+    unit_id: number;
+    sensor_id?: number;
+    from?: string;
+    to?: string;
+    interval?: string;
+  }): Observable<StrictHttpResponse<Array<any>>> {
+
+    const rb = new RequestBuilder(this.rootUrl, AnalyticsService.GetAnalyticsPath, 'get');
+    if (params) {
+      rb.query('unit_id', params.unit_id, {});
+      rb.query('sensor_id', params.sensor_id, {});
+      rb.query('from', params.from, {});
+      rb.query('to', params.to, {});
+      rb.query('interval', params.interval, {});
+    }
+
+    return this.http.request(rb.build({
+      responseType: 'json',
+      accept: 'application/json'
+    })).pipe(
+      filter((r: any) => r instanceof HttpResponse),
+      map((r: HttpResponse<any>) => {
+        return r as StrictHttpResponse<Array<any>>;
+      })
+    );
+  }
+
+  /**
+   * Get analytics.
+   *
+   *
+   *
+   * This method provides access to only to the response body.
+   * To access the full response (for headers, for example), `getAnalytics$Response()` instead.
+   *
+   * This method doesn't expect any request body.
+   */
+  getAnalytics(params: {
+    unit_id: number;
+    sensor_id?: number;
+    from?: string;
+    to?: string;
+    interval?: string;
+  }): Observable<Array<any>> {
+
+    return this.getAnalytics$Response(params).pipe(
+      map((r: StrictHttpResponse<Array<any>>) => r.body as Array<any>)
+    );
+  }
+
+}

src/app/shared/api/endpoints/services/observation.service.ts

@@ -11 +11 @@
 
 import { Observation } from '../models/observation';
 
+
+/**
+ * Observations endpoints
+ */
 @Injectable({
   providedIn: 'root',
 })

src/app/shared/api/openapi.yaml

@@ -19 +19 @@
   description: Data endpoints
 - name: observation
   description: Observations endpoints
+- name: analytics
+  description: Analitics endpoints
 
 paths:
   /senslog1/ControllerServlet:
@@ -145 +147 @@
                         unit:
                           $ref: '#/components/schemas/Unit'
 
+  /analytics/analytics:
+    get:
+      tags:
+        - analytics
+      summary: Get analytics
+      operationId: getAnalytics
+      parameters:
+        - in: query
+          name: unit_id
+          required: true
+          schema:
+            type: integer
+        - in: query
+          name: sensor_id
+          required: false
+          schema:
+            type: integer
+        - in: query
+          name: from
+          schema:
+            type: string
+        - in: query
+          name: to
+          schema:
+            type: string
+        - in: query
+          name: interval
+          schema:
+            type: string
+      responses:
+        200:
+          description: Get observation for unit
+          content:
+            application/json:
+              schema:
+                type: array
+                properties:
+                  sensor:
+                    $ref: '#/components/schemas/Sensors'
+
 components:
   schemas:
     UserInfo:
@@ -272 +314 @@
         value:
           type: number
 
+    Sensors:
+      type: object
+      properties:
+        sensorsData:
+          $ref: '#/components/schemas/SensorsData'
+
+    SensorsData:
+      type: object
+      properties:
+        interval:
+          type: number
+        data:
+          $ref: '#/components/schemas/Data'
+        statistics:
+          $ref: '#/components/schemas/Statistics'
+
+    Data:
+      type: object
+      properties:
+        observation:
+          $ref: '#/components/schemas/Obser'
+
+    Obser:
+      type: object
+      properties:
+        min:
+          type: number
+        max:
+          type: number
+        avg:
+          type: number
+        sum:
+          type: number
+        timestamp:
+          type: string
+          format: date-time
+
+    Statistics:
+      type: object
+      properties:
+        min:
+          type: number
+        max:
+          type: number
+        avg:
+          type: number
+        sum:
+          type: number
+
+
+
+
+
+
 

src/app/shared/models/aggreation.model.ts

@@ +1 @@
+/* tslint:disable */
+/* eslint-disable */
+export interface AggreationModel {
+  name?: string,
+  code?: string
+}

src/vega/data.json

@@ -7 +7 @@
   "signals": [
     {
       "name": "length",
-      "value":  ["year","month"],
+      "value":  ["year","month", "date"],
       "bind": {
         "input": "select",
         "options": [
@@ -48 +48 @@
       "transform": [
         {
           "type": "formula",
-          "expr": "toDate(datum[\"time\"])",
+          "expr": "toDate(datum[\"timestamp\"])",
           "as": "dateTime"
         },
         {
@@ -58 +58 @@
         },
         {
           "type": "aggregate",
-          "fields": ["value"],
+          "fields": ["max"],
           "ops": [{"signal" :  "operation"}],
           "groupby": ["unit0"],
           "as": ["avg"]