@golemio/ndic 1.1.4-dev.856047480 → 1.1.4-dev.872604229

package/docs/implementation_documentation.md

@@ -62,7 +62,7 @@ Popis dat, jak nám jsou posíláná na input-gateway. Pokud je vystaveno více
 
 Popis transformace a případného obohacení dat. Zaměřeno hlavně na workery a jejich metody.
 
-### *NdicWorker*
+### *LegacyNdicWorker*
 
 Worker slouží pro zpracování příchozích dat NdicTrafficInfo a NdicTrafficRestrictions.
 
@@ -96,6 +96,36 @@ Worker slouží pro zpracování příchozích dat NdicTrafficInfo a NdicTraffic
 - data modely
   - `ndicTrafficRestrictionsModel` se ukládá do tabulky ndic_traffic_restrictions
 
+#### Task *SaveTrafficRestrictionsRegions*
+
+- vstupní rabbitmq fronta
+  - `dataplatform.ndic.saveTrafficRestrictionsRegions`
+- (volitelně) závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
+  - žádné
+- datové zdroje
+  - `rsdTmcPointsModel` - pro zjištění geo souřadnic
+- transformace
+  - [odkaz na transformaci dat](https://gitlab.com/operator-ict/golemio/code/modules/ndic/-/blob/master/src/integration-engine/transformations/TrafficRestrictionsTransformation.ts)
+- (volitelně) obohacení dat
+  - stejné jako u předešlé metody *`saveTrafficInfo`*
+- repository
+  - ukládá do tabulky `ndic_traffic_restrictions_regions`
+  - předpis stejný jako u saveTrafficRestrictions
+- retence
+  - 48h
+
+#### Task *RegionsDataRetention*
+- spouští procedura `regions_data_retention` pro retenci dat v tabulce `ndic_traffic_restrictions_regions`.
+- vstupní rabbitmq fronta
+  - `dataplatform.ndic.regionsDataRetention`
+- (volitelně) závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
+  - žádné
+- datové zdroje
+  - n/a
+- transformace
+  - n/a
+- (volitelně) obohacení dat
+  - n/a
 
 ## Uložení dat
 
@@ -107,7 +137,10 @@ Popis ukládání dat.
   - PSQL
 - datábázové schéma
   - tabulka `ndic_traffic_info`
-  - tabulka `ndic_traffic_restrictions`
+  - tabulka `ndic_traffic_restrictions` (obsahuje kompletní informace z Hlavního města Prahy a Středočeského kraje)
+  - tabulka `ndic_traffic_restrictions_regions` (obsahuje časově omezené informace z regionů okolo Středočeského kraje)
+  - view `v_traffic_restrictions_all`
+  - procedura `regions_data_retention`
   ![ndic er diagram](ndic_erdiagram.png "ERD")
  - retence dat
   - n/a
@@ -145,13 +178,11 @@ Popis output-api.
 - veřejné / neveřejné endpointy
   - api je neveřejné, endpoint /restrictions je přístupný pro uživatele s rolí NDIC
 - (volitelně) ACL
-- postman kolekce
-  - TBD
 
 #### */restrictions*
 
 - zdrojové tabulky
-    - `ndic_traffic_restrictions`
+    - `v_traffic_restrictions_all` - view vzniklo spojením tabulek `ndic_traffic_restrictions` a `ndic_traffic_restrictions_regions`
 - (volitlně) nestandardní dodatečná transformace
     - vrací pouze poslední známe stavy ( max `situation_record_version_time` ) všech dopravních situací podle klíče `situation_record_id`, které jsou platné ve vybraný čas
 - (volitelně) nestandardní url a query parametry

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/ndic",
-    "version": "1.1.4-dev.856047480",
+    "version": "1.1.4-dev.872604229",
     "description": "Golemio NDIC Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -36,6 +36,7 @@
         "@commitlint/config-conventional": "^11.0.0",
         "@golemio/cli": "1.4.2",
         "@golemio/core": "1.6.8",
+        "@golemio/traffic-common": "0.1.0-dev.864393677",
         "@golemio/db-common": "1.1.1",
         "@golemio/eslint-config": "1.1.0",
         "@ovos-media/ts-transform-paths": "^1.7.18-1",
@@ -69,6 +70,7 @@
         "typescript": "4.6.4"
     },
     "peerDependencies": {
-        "@golemio/core": ">=1.5.0"
+        "@golemio/core": ">=1.5.0",
+        "@golemio/traffic-common": ">=0.1.0"
     }
 }

package/dist/output-gateway/models/RsdTmcOsmMappingModel.d.ts

@@ -1,17 +0,0 @@
-import { SequelizeModel } from "@golemio/core/dist/output-gateway/models";
-export declare class RsdTmcOsmMappingModel extends SequelizeModel {
-    constructor();
-    /**
-     * @param {object} [options] Options object with params
-     * @param {number} [options.ltStart] Options object with params
-     * @param {number} [options.ltEnd] Options object with params
-     * @param {number} [options.ltDirection] Options object with params
-     * @returns Array of the retrieved records
-     */
-    GetOne: (options: {
-        ltStart: string;
-        ltEnd: string;
-        ltDirection: string;
-    }) => Promise<any>;
-    GetAll: () => Promise<object | null>;
-}

package/dist/output-gateway/models/RsdTmcOsmMappingModel.js

@@ -1,71 +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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RsdTmcOsmMappingModel = void 0;
-const _sch_1 = require("../../schema-definitions");
-const models_1 = require("@golemio/core/dist/output-gateway/models");
-const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
-const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
-class RsdTmcOsmMappingModel extends models_1.SequelizeModel {
-    constructor() {
-        super(_sch_1.Ndic.rsd_tmc_osm_mapping.name + "Model", _sch_1.Ndic.rsd_tmc_osm_mapping.pgTableName, _sch_1.Ndic.rsd_tmc_osm_mapping.outputSequelizeAttributes);
-        /**
-         * @param {object} [options] Options object with params
-         * @param {number} [options.ltStart] Options object with params
-         * @param {number} [options.ltEnd] Options object with params
-         * @param {number} [options.ltDirection] Options object with params
-         * @returns Array of the retrieved records
-         */
-        this.GetOne = (options) => __awaiter(this, void 0, void 0, function* () {
-            let { ltStart, ltEnd, ltDirection } = options;
-            if (!ltStart || !ltEnd || !ltDirection)
-                return null;
-            try {
-                const and = sequelize_1.default.Op.and;
-                const where = {
-                    [and]: [],
-                };
-                where[and].push({
-                    lt_start: +ltStart,
-                });
-                where[and].push({
-                    lt_end: +ltEnd,
-                });
-                const rsdTmcOsmMappingFromDB = yield this.sequelizeModel.findOne({
-                    attributes: ["lt_start", "lt_end", "osm_path"],
-                    raw: true,
-                    where,
-                });
-                try {
-                    let resultArr = JSON.parse(rsdTmcOsmMappingFromDB === null || rsdTmcOsmMappingFromDB === void 0 ? void 0 : rsdTmcOsmMappingFromDB.osm_path);
-                    if (Array.isArray(resultArr) && ltDirection === "negative") {
-                        return resultArr.reverse();
-                    }
-                    return resultArr;
-                }
-                catch (e) {
-                    return null;
-                }
-            }
-            catch (err) {
-                throw new golemio_errors_1.CustomError("Database error", true, "RsdTmcOsmMappingModel.GetOne", 500, err);
-            }
-        });
-        this.GetAll = () => __awaiter(this, void 0, void 0, function* () {
-            throw new golemio_errors_1.CustomError("Not implemented", true, "Method RsdTmcOsmMappingModel.GetAll is not implemented");
-        });
-    }
-}
-exports.RsdTmcOsmMappingModel = RsdTmcOsmMappingModel;
-//# sourceMappingURL=RsdTmcOsmMappingModel.js.map

package/dist/output-gateway/models/RsdTmcOsmMappingModel.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RsdTmcOsmMappingModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/RsdTmcOsmMappingModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAA4B;AAC5B,qEAA0E;AAC1E,6EAAuE;AACvE,oFAA4D;AAE5D,MAAa,qBAAsB,SAAQ,uBAAc;IACrD;QACI,KAAK,CACD,WAAI,CAAC,mBAAmB,CAAC,IAAI,GAAG,OAAO,EACvC,WAAI,CAAC,mBAAmB,CAAC,WAAW,EACpC,WAAI,CAAC,mBAAmB,CAAC,yBAAyB,CACrD,CAAC;QAGN;;;;;;WAMG;QAEI,WAAM,GAAG,CAAO,OAAgE,EAAgB,EAAE;YACrG,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;YAC9C,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,IAAI,CAAC,WAAW;gBAAE,OAAO,IAAI,CAAC;YACpD,IAAI;gBACA,MAAM,GAAG,GAAG,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC;gBAC7B,MAAM,KAAK,GAAQ;oBACf,CAAC,GAAG,CAAC,EAAE,EAAE;iBACZ,CAAC;gBACF,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACZ,QAAQ,EAAE,CAAC,OAAO;iBACrB,CAAC,CAAC;gBACH,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACZ,MAAM,EAAE,CAAC,KAAK;iBACjB,CAAC,CAAC;gBACH,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC7D,UAAU,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC;oBAC9C,GAAG,EAAE,IAAI;oBACT,KAAK;iBACR,CAAC,CAAC;gBAEH,IAAI;oBACA,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,QAAQ,CAAC,CAAC;oBAC7D,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,WAAW,KAAK,UAAU,EAAE;wBACxD,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC;qBAC9B;oBACD,OAAO,SAAS,CAAC;iBACpB;gBAAC,OAAO,CAAC,EAAE;oBACR,OAAO,IAAI,CAAC;iBACf;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,4BAAW,CAAC,gBAAgB,EAAE,IAAI,EAAE,8BAA8B,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC3F;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,GAAiC,EAAE;YAC/C,MAAM,IAAI,4BAAW,CAAC,iBAAiB,EAAE,IAAI,EAAE,wDAAwD,CAAC,CAAC;QAC7G,CAAC,CAAA,CAAC;IA9CF,CAAC;CA+CJ;AAtDD,sDAsDC"}