@golemio/parkings 1.8.9 → 1.8.10-dev.1254677597

package/docs/implementation-documentation.md

@@ -33,7 +33,7 @@ Modul slouží k ukládání a poskytování informací o parkování.
 
 ### Data aktivně stahujeme
 
-Data stahujeme pravidelně od IPR, TSK, z nového API TSK (značené jako v2) a Smart4City.
+Data stahujeme pravidelně od IPR, TSK, z nového API TSK (značené jako v2) a Smart4City. Dále z blob storage IPT.
 
 Pro ZTP parkoviště se z API se stahuje JSON z https://services5.arcgis.com/SBTXIEUGWbqzUecw/arcgis/rest/services/DOP_CUR_DOP_TSK_STANI_ZTP_B/FeatureServer/0/query?outFields=*&where=1%3D1&f=geojson
 Pro parkovací zony se stahuje z https://services5.arcgis.com/SBTXIEUGWbqzUecw/arcgis/rest/services/DOP_CUR_DOP_ZPS_USEKY_P/FeatureServer/0/query?outFields=*&where=1%3D1&f=geojson
@@ -43,6 +43,7 @@ Pro statické (ručně zadané) tarify se stahuje JSON ze zdroje IPT.
 Pro statické (ručně vytvořené) polygony placených parkovišť se stahuje GeoJSON ze zdroje IPT.
 
 Data o vjezdech do parkovišť se stahují z ručně vytvořeného zdroje IPT.
+Data o parkovacích automatech OSM se stahují z exportovaného zdroje IPT.
 
 Data o platbách se stahují z ručně vytvořeného zdroje IPT, nejsou-li součástí púvodního.
 
@@ -243,6 +244,24 @@ Vybraným parkovištím může být nahrazena location za Multipolygon ze zdroje
     -   dataplatform.parkings.updateSmart4CityLocations
     -   dataplatform.parkings.updateSmart4CityMeasurements
 
+#### _parkomats_
+-  zdroj dat
+   -  url: `https://apicore.zpspraha.cz/CISICTService/CISICTService.svc/parkingsessionshistory`
+   -  parametry
+      -  `from` - nastavujeme na predchozi den 00
+      -  `to` - nastavujeme na dnesni den v 04
+   - poznamka stahujeme data za 28 hodin abychom o zadna data neprisli
+   -  protokol: http
+   -  datovy typ: json
+   -  validacni schema: [parkomatInputSchema](../src/schema-definitions/parkomats/datasources/ParkomatInputSchema.ts)
+-  frekvence stahovani:
+   -  cron definice
+      -  rabin: `0 04,16 * * *`
+      -  prod: `0 07,19 * * *`
+-  nazev rabbitmq fronty
+   -  dataplatform.parkomats.refreshDataInDB
+
+
 ## Zpracování dat / transformace
 
 Při transformaci dat lokací data obohacujeme o adresu parkoviště, která vychází z centroidu geometrie daného parkoviště a získává se z Photon API metodou `GeocodeApi.getAddressByLatLngFromPhoton` v modulu Core.
@@ -359,12 +378,23 @@ Vybraným parkovištím může být nahrazena location za Multipolygon ze zdroje
     -   název: `dataplatform.parkings.saveOsmEntrancesDataTask`
     -   bez parametrů
 -   datové zdroje
-    -   Ipt blob storage ručně tvořený zdroj (http)        
+    -   Ipt blob storage ručně tvořený zdroj (http)
         - geojson formát
 -   transformace
     -   [OsmEntrancesTransformation](../src/integration-engine/transformations/osm/OsmEntrancesTransformation.ts)
 -   data modely
-    -   EntranceModel -> (schéma parkings) `parking_entrances`      
+    -   EntranceModel -> (schéma parkings) `parking_entrances`
+
+#### Task _SaveOsmParkingMachinesTask_
+
+-   vstupní rabbitmq fronta:
+    -   název: `dataplatform.parkings.saveOsmParkingMachinesTask`
+    -   bez parametrů
+-   datové zdroje:
+    - Ipt blob storage exportovaný zdroj (http)
+      - geojson formát
+-   transformace: [OsmParkingMachinesTransformation](../src/integration-engine/transformations/osm/OsmParkingMachinesTransformation.ts)
+-   cílová tabulka: `parkings_machines`
 
 #### Task _GenerateIptOictParkingJobsTask_
 
@@ -461,12 +491,12 @@ Vybraným parkovištím může být nahrazena location za Multipolygon ze zdroje
     -   název: `dataplatform.parkings.saveManualEntrancesDataTask`
     -   bez parametrů
 -   datové zdroje
-    -   Ipt blob storage ručně tvořený zdroj (http)        
+    -   Ipt blob storage ručně tvořený zdroj (http)
         - geojson formát
 -   transformace
     -   [EntrancesManualTransformation](../src/integration-engine/transformations/osm/OsmEntrancesTransformation.ts)
 -   data modely
-    -   EntranceModel -> (schéma parkings) `parking_entrances`        
+    -   EntranceModel -> (schéma parkings) `parking_entrances`
 
 ### Worker _ParkingsWorker_
 
@@ -565,6 +595,25 @@ Vybraným parkovištím může být nahrazena location za Multipolygon ze zdroje
 -   ukládá data z queue `saveParkingSourceToDB` do db
 -   zdroj je IG přes `ParkingSourcesRouter`
 -   transformace není
+-   
+
+### ParkomatsWorker
+
+ #### _RefreshDataInDbTask_
+
+-   vstupní rabbitmq fronta:
+    -   název: `refreshDataInDB`
+    -   optional paramtery
+        -   from
+        -   to
+-   datový zdroj
+    -   JSON stahovaný z API
+-   transformace
+    - Mapovani z `IParkomatInput` na `IParkomatDto`
+-   data modely
+    -   `parkomats`
+
+
 
 ## Uložení dat
 

package/docs/openapi-output.yaml

@@ -948,9 +948,8 @@ paths:
               required: true
               schema:
                 type: string
-                format: uuid
-              example: '4521afac-66db-4680-abc5-0006837d977a'
-              description: 'UUID of the parking machine to retrieve'
+              example: 'tsk_v2-4521afac-66db-4680-abc5-0006837d977a'
+              description: 'ID of the parking machine to retrieve'
           responses:
             '200':
               description: 'Successful response'
@@ -2342,8 +2341,8 @@ components:
               properties:
                 id:
                   type: string
-                  format: uuid
-                  description: The UUID identifier for the parking machine.
+                  example: 'tsk_v2-4521afac-66db-4680-abc5-0006837d977a'
+                  description: ID of the parking machine. Formatted as primary_source-primary_source_id
                 primary_source:
                   type: string
                   enum:
@@ -2355,7 +2354,7 @@ components:
                   description: The ID defined by the primary source.
                 code:
                   type: string
-                  description: The code of the parking machine.
+                  description: TSK parking machine identification code.
                 machine_type:
                   type: string
                   enum:
@@ -2373,6 +2372,7 @@ components:
                   type: string
                   format: uuid
                   description: The UUID identifier for the tariff connected to the parking machine.
+                  nullable: true
               required:
               - id
               - primary_source

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/parkings",
-    "version": "1.8.9",
+    "version": "1.8.10-dev.1254677597",
     "description": "Golemio Parkings Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -80,4 +80,4 @@
         "@turf/turf": "^6.5.0",
         "uuid-by-string": "^3.0.2"
     }
-}
+}

package/dist/integration-engine/ParkomatsWorker.d.ts

@@ -1,10 +0,0 @@
-import { BaseWorker } from "@golemio/core/dist/integration-engine/workers";
-export declare class ParkomatsWorker extends BaseWorker {
-    private dataSource;
-    private dataSourceHTTPSettings;
-    private transformation;
-    private model;
-    private dataSourceUrl;
-    constructor();
-    refreshDataInDB: (msg: any) => Promise<void>;
-}

package/dist/integration-engine/ParkomatsWorker.js

@@ -1,77 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParkomatsWorker = void 0;
-const _sch_1 = require("../schema-definitions");
-const ParkomatInputSchema_1 = require("../schema-definitions/parkomats/datasources/ParkomatInputSchema");
-const ParkomatDto_1 = require("../schema-definitions/parkomats/models/ParkomatDto");
-const helpers_1 = require("@golemio/core/dist/helpers");
-const config_1 = require("@golemio/core/dist/integration-engine/config");
-const datasources_1 = require("@golemio/core/dist/integration-engine/datasources");
-const HTTPFetchProtocolStrategy_1 = require("@golemio/core/dist/integration-engine/datasources/protocol-strategy/HTTPFetchProtocolStrategy");
-const helpers_2 = require("@golemio/core/dist/integration-engine/helpers");
-const models_1 = require("@golemio/core/dist/integration-engine/models");
-const workers_1 = require("@golemio/core/dist/integration-engine/workers");
-const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
-const ParkomatsTransformation_1 = require("./transformations/ParkomatsTransformation");
-class ParkomatsWorker extends workers_1.BaseWorker {
-    constructor() {
-        super();
-        this.dataSourceUrl = config_1.config.datasources.TSKParkomats + "/parkingsessions?from=";
-        this.refreshDataInDB = (msg) => __awaiter(this, void 0, void 0, function* () {
-            let from;
-            let to;
-            try {
-                // setting custom interval from message data
-                const customInterval = JSON.parse(msg.content.toString());
-                if (customInterval.from && customInterval.to) {
-                    from = (0, helpers_1.dateTime)(new Date(customInterval.from), { timeZone: "Europe/Prague" });
-                    to = (0, helpers_1.dateTime)(new Date(customInterval.to), { timeZone: "Europe/Prague" });
-                    helpers_2.log.debug(`Interval from: ${from} to ${to} was used.`);
-                }
-                else {
-                    throw new Error("Interval must contain from and to properties.");
-                }
-            }
-            catch (err) {
-                // setting default interval (normal situation)
-                to = (0, helpers_1.dateTime)(new Date()).setTimeZone("Europe/Prague");
-                from = to.clone();
-                from.subtract(12, "minutes");
-            }
-            this.dataSourceHTTPSettings.url =
-                this.dataSourceUrl + from.format("yyyy-LL-dd'T'HH:mm:ss") + `&to=${to.format("yyyy-LL-dd'T'HH:mm:ss")}`;
-            this.dataSource.setProtocolStrategy(new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy(this.dataSourceHTTPSettings));
-            const data = yield this.dataSource.getAll();
-            const transformedData = yield this.transformation.transform(data);
-            yield this.model.save(transformedData);
-        });
-        this.dataSourceHTTPSettings = {
-            headers: {
-                authorization: config_1.config.datasources.TSKParkomatsToken,
-            },
-            method: "GET",
-            // Warning! Url must be filled with required `from` and `to` querystring param
-            // if `to` omitted, API returns empty array!
-            url: this.dataSourceUrl,
-        };
-        this.dataSource = new datasources_1.DataSource(_sch_1.Parkomats.name + "DataSource", new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy(this.dataSourceHTTPSettings), new datasources_1.JSONDataTypeStrategy({ resultsPath: "" }), new golemio_validator_1.JSONSchemaValidator(_sch_1.Parkomats.name + "DataSource", ParkomatInputSchema_1.ParkomatInputSchema));
-        this.model = new models_1.PostgresModel(_sch_1.Parkomats.name + "Model", {
-            outputSequelizeAttributes: ParkomatDto_1.ParkomatDto.attributeModel,
-            pgSchema: _sch_1.Parkomats.pgSchema,
-            pgTableName: _sch_1.Parkomats.pgTableName,
-            savingType: "insertOrUpdate",
-        }, new golemio_validator_1.JSONSchemaValidator(_sch_1.Parkomats.name + "ModelValidator", ParkomatDto_1.ParkomatDto.jsonSchema));
-        this.transformation = new ParkomatsTransformation_1.ParkomatsTransformation();
-    }
-}
-exports.ParkomatsWorker = ParkomatsWorker;
-//# sourceMappingURL=ParkomatsWorker.js.map

package/dist/integration-engine/ParkomatsWorker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ParkomatsWorker.js","sourceRoot":"","sources":["../../src/integration-engine/ParkomatsWorker.ts"],"names":[],"mappings":"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"}