@golemio/fcd 1.1.6-dev.899782642 → 1.1.6-rc.906686893

package/db/migrations/postgresql/20230619150515-v-traffic-params-last-hour.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+  * We receive the dbmigrate dependency from dbmigrate initially.
+  * This enables us to not have to rely on NODE_PATH.
+  */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20230619150515-v-traffic-params-last-hour-up.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20230619150515-v-traffic-params-last-hour-down.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  "version": 1
+};

package/db/migrations/postgresql/sqls/20230619150515-v-traffic-params-last-hour-down.sql

@@ -0,0 +1 @@
+DROP VIEW fcd.v_traffic_params_last_hour;

package/db/migrations/postgresql/sqls/20230619150515-v-traffic-params-last-hour-up.sql

@@ -0,0 +1,86 @@
+-- fcd.v_traffic_params_last_hour view source
+
+CREATE OR REPLACE VIEW fcd.v_traffic_params_last_hour AS (
+    SELECT *
+    FROM  (
+        SELECT
+            DISTINCT ON (tr_all.source_identification)
+            tr_all.publication_time,
+            tr_all.source_identification,
+            tr_all.measurement_or_calculation_time,
+            tr_all.predefined_location,
+            tr_all.version_of_predefined_location,
+            tr_all.traffic_level,
+            tr_all.queue_exists,
+            tr_all.queue_length,
+            tr_all.from_point,
+            tr_all.to_point,
+            tr_all.data_quality,
+            tr_all.input_values,
+            tr_all.average_vehicle_speed,
+            tr_all.travel_time,
+            tr_all.free_flow_travel_time,
+            tr_all.free_flow_speed,
+            tr_all.create_batch_id,
+            tr_all.created_at,
+            tr_all.created_by,
+            tr_all.update_batch_id,
+            tr_all.updated_at,
+            tr_all.updated_by
+        FROM (
+            SELECT
+                fcd_traff_params_part.publication_time,
+                fcd_traff_params_part.source_identification,
+                fcd_traff_params_part.measurement_or_calculation_time,
+                fcd_traff_params_part.predefined_location,
+                fcd_traff_params_part.version_of_predefined_location,
+                fcd_traff_params_part.traffic_level,
+                fcd_traff_params_part.queue_exists,
+                fcd_traff_params_part.queue_length,
+                fcd_traff_params_part.from_point,
+                fcd_traff_params_part.to_point,
+                fcd_traff_params_part.data_quality,
+                fcd_traff_params_part.input_values,
+                fcd_traff_params_part.average_vehicle_speed,
+                fcd_traff_params_part.travel_time,
+                fcd_traff_params_part.free_flow_travel_time,
+                fcd_traff_params_part.free_flow_speed,
+                fcd_traff_params_part.create_batch_id,
+                fcd_traff_params_part.created_at,
+                fcd_traff_params_part.created_by,
+                fcd_traff_params_part.update_batch_id,
+                fcd_traff_params_part.updated_at,
+                fcd_traff_params_part.updated_by
+            FROM fcd.fcd_traff_params_part
+            WHERE fcd_traff_params_part.measurement_or_calculation_time >= NOW() - INTERVAL '1 HOUR'
+            UNION ALL
+            SELECT
+                fcd_traff_params_regions.publication_time,
+                fcd_traff_params_regions.source_identification,
+                fcd_traff_params_regions.measurement_or_calculation_time,
+                fcd_traff_params_regions.predefined_location,
+                fcd_traff_params_regions.version_of_predefined_location,
+                fcd_traff_params_regions.traffic_level,
+                fcd_traff_params_regions.queue_exists,
+                fcd_traff_params_regions.queue_length,
+                fcd_traff_params_regions.from_point,
+                fcd_traff_params_regions.to_point,
+                fcd_traff_params_regions.data_quality,
+                fcd_traff_params_regions.input_values,
+                fcd_traff_params_regions.average_vehicle_speed,
+                fcd_traff_params_regions.travel_time,
+                fcd_traff_params_regions.free_flow_travel_time,
+                fcd_traff_params_regions.free_flow_speed,
+                fcd_traff_params_regions.create_batch_id,
+                fcd_traff_params_regions.created_at,
+                fcd_traff_params_regions.created_by,
+                fcd_traff_params_regions.update_batch_id,
+                fcd_traff_params_regions.updated_at,
+                fcd_traff_params_regions.updated_by
+            FROM fcd.fcd_traff_params_regions
+            WHERE fcd_traff_params_regions.measurement_or_calculation_time >= NOW() - INTERVAL '1 HOUR'
+        ) tr_all
+        ORDER BY tr_all.source_identification ASC, tr_all.measurement_or_calculation_time DESC
+    ) as tr
+    ORDER BY tr.measurement_or_calculation_time DESC
+)

package/dist/output-gateway/FCDRouter.d.ts

@@ -1,12 +1,13 @@
 /// <reference types="express" />
 import { NextFunction, Request, Response, Router } from "@golemio/core/dist/shared/express";
 import { BaseRouter } from "@golemio/core/dist/output-gateway/routes/BaseRouter";
-import { FloatingCarDataModel } from "./models";
+import { FloatingCarDataModel, FloatingCarExtendedDataModel } from "./models";
 import { OutputFloatingCarDataTransformation } from "./transformations/OutputFloatingCarDataTransformation";
 export declare class FCDRouter extends BaseRouter {
     protected floatingCarDataModel: FloatingCarDataModel;
+    protected floatingCarExtendedDataModel: FloatingCarExtendedDataModel;
     private outputFloatingCarDataTransformation;
-    constructor(floatingCarDataModel: FloatingCarDataModel, outputFloatingCarDataTransformation: OutputFloatingCarDataTransformation);
+    constructor(floatingCarDataModel: FloatingCarDataModel, floatingCarExtendedDataModel: FloatingCarExtendedDataModel, outputFloatingCarDataTransformation: OutputFloatingCarDataTransformation);
     GetFloatingCarData: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 }
 declare const fcdRouter: Router;

package/dist/output-gateway/FCDRouter.js

@@ -19,18 +19,24 @@ const models_1 = require("./models");
 const OutputFloatingCarDataTransformation_1 = require("./transformations/OutputFloatingCarDataTransformation");
 const repositories_1 = require("@golemio/traffic-common/dist/output-gateway/repositories");
 class FCDRouter extends BaseRouter_1.BaseRouter {
-    constructor(floatingCarDataModel, outputFloatingCarDataTransformation) {
+    constructor(floatingCarDataModel, floatingCarExtendedDataModel, outputFloatingCarDataTransformation) {
         super();
         this.floatingCarDataModel = floatingCarDataModel;
+        this.floatingCarExtendedDataModel = floatingCarExtendedDataModel;
         this.outputFloatingCarDataTransformation = outputFloatingCarDataTransformation;
         this.GetFloatingCarData = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             try {
                 const isRequestedPathOsm = req.query.osmPath == "true";
-                const dataFromDb = yield this.floatingCarDataModel.GetAll({
+                const minutesBefore = req.query.minutesBefore ? parseInt(req.query.minutesBefore, 10) : undefined;
+                const options = {
                     locationId: req.query.locationId,
                     limit: req.query.limit ? +req.query.limit : undefined,
                     offset: req.query.offset ? +req.query.offset : undefined,
-                });
+                    minutesBefore,
+                };
+                const dataFromDb = minutesBefore
+                    ? yield this.floatingCarExtendedDataModel.GetAll(options)
+                    : yield this.floatingCarDataModel.GetAll(options);
                 if (!(dataFromDb === null || dataFromDb === void 0 ? void 0 : dataFromDb.length)) {
                     throw new golemio_errors_1.GeneralError("No data found", "FCDRouter", undefined, 404);
                 }
@@ -41,10 +47,14 @@ class FCDRouter extends BaseRouter_1.BaseRouter {
                 next(err);
             }
         });
-        this.router.get("/info", [(0, express_validator_1.query)("osmPath").optional().isString(), (0, express_validator_1.query)("locationId").optional().isString()], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)("FCDRouter"), (0, redis_1.useCacheMiddleware)(), this.GetFloatingCarData);
+        this.router.get("/info", [
+            (0, express_validator_1.query)("osmPath").optional().isString(),
+            (0, express_validator_1.query)("locationId").optional().isString(),
+            (0, express_validator_1.query)("minutesBefore").optional().isInt({ min: 1, max: 60 }),
+        ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)("FCDRouter"), (0, redis_1.useCacheMiddleware)(), this.GetFloatingCarData);
     }
 }
 exports.FCDRouter = FCDRouter;
-const fcdRouter = new FCDRouter(new models_1.FloatingCarDataModel(), new OutputFloatingCarDataTransformation_1.OutputFloatingCarDataTransformation(new repositories_1.RsdTmcOsmMappingRepository())).router;
+const fcdRouter = new FCDRouter(new models_1.FloatingCarDataModel(), new models_1.FloatingCarExtendedDataModel(), new OutputFloatingCarDataTransformation_1.OutputFloatingCarDataTransformation(new repositories_1.RsdTmcOsmMappingRepository())).router;
 exports.fcdRouter = fcdRouter;
 //# sourceMappingURL=FCDRouter.js.map

package/dist/output-gateway/FCDRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"FCDRouter.js","sourceRoot":"","sources":["../../src/output-gateway/FCDRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mFAAoE;AACpE,6EAAwE;AACxE,mEAA6E;AAC7E,oFAAiF;AACjF,6EAAkH;AAClH,qCAAgD;AAChD,+GAA8G;AAC9G,2FAAsG;AAEtG,MAAa,SAAU,SAAQ,uBAAU;IACrC,YACc,oBAA0C,EAC5C,mCAAwE;QAEhF,KAAK,EAAE,CAAC;QAHE,yBAAoB,GAApB,oBAAoB,CAAsB;QAC5C,wCAAmC,GAAnC,mCAAmC,CAAqC;QAe7E,uBAAkB,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAClF,IAAI;gBACA,MAAM,kBAAkB,GAAI,GAAG,CAAC,KAAK,CAAC,OAAkB,IAAI,MAAM,CAAC;gBAEnE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;oBACtD,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,UAAoB;oBAC1C,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;oBACrD,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;iBAC3D,CAAC,CAAC;gBACH,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAA,EAAE;oBACrB,MAAM,IAAI,6BAAY,CAAC,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;iBACxE;gBACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAAC,SAAS,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;gBACjH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aACzC;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QA5BE,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,OAAO,EACP,CAAC,IAAA,yBAAK,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAA,yBAAK,EAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,EACnF,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,WAAW,CAAC,EACtC,IAAA,0BAAkB,GAAE,EACpB,IAAI,CAAC,kBAAkB,CAC1B,CAAC;IACN,CAAC;CAoBJ;AApCD,8BAoCC;AAED,MAAM,SAAS,GAAW,IAAI,SAAS,CACnC,IAAI,6BAAoB,EAAE,EAC1B,IAAI,yEAAmC,CAAC,IAAI,yCAA0B,EAAE,CAAC,CAC5E,CAAC,MAAM,CAAC;AAEA,8BAAS"}
+{"version":3,"file":"FCDRouter.js","sourceRoot":"","sources":["../../src/output-gateway/FCDRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mFAAoE;AACpE,6EAAwE;AACxE,mEAA6E;AAC7E,oFAAiF;AACjF,6EAAkH;AAClH,qCAA8E;AAC9E,+GAA8G;AAC9G,2FAAsG;AAEtG,MAAa,SAAU,SAAQ,uBAAU;IACrC,YACc,oBAA0C,EAC1C,4BAA0D,EAC5D,mCAAwE;QAEhF,KAAK,EAAE,CAAC;QAJE,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC5D,wCAAmC,GAAnC,mCAAmC,CAAqC;QAmB7E,uBAAkB,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAClF,IAAI;gBACA,MAAM,kBAAkB,GAAI,GAAG,CAAC,KAAK,CAAC,OAAkB,IAAI,MAAM,CAAC;gBACnE,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,aAAuB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE5G,MAAM,OAAO,GAAG;oBACZ,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,UAAoB;oBAC1C,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;oBACrD,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;oBACxD,aAAa;iBAChB,CAAC;gBAEF,MAAM,UAAU,GAAG,aAAa;oBAC5B,CAAC,CAAC,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,OAAO,CAAC;oBACzD,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAEtD,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAA,EAAE;oBACrB,MAAM,IAAI,6BAAY,CAAC,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;iBACxE;gBACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAAC,SAAS,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;gBACjH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aACzC;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QAvCE,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,OAAO,EACP;YACI,IAAA,yBAAK,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;YACtC,IAAA,yBAAK,EAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;YACzC,IAAA,yBAAK,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;SAC/D,EACD,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,WAAW,CAAC,EACtC,IAAA,0BAAkB,GAAE,EACpB,IAAI,CAAC,kBAAkB,CAC1B,CAAC;IACN,CAAC;CA2BJ;AAhDD,8BAgDC;AAED,MAAM,SAAS,GAAW,IAAI,SAAS,CACnC,IAAI,6BAAoB,EAAE,EAC1B,IAAI,qCAA4B,EAAE,EAClC,IAAI,yEAAmC,CAAC,IAAI,yCAA0B,EAAE,CAAC,CAC5E,CAAC,MAAM,CAAC;AAEA,8BAAS"}

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

@@ -0,0 +1,12 @@
+import { IFloatingCarDataModel } from "../../integration-engine/transformations/FloatingCarDataInterface";
+import { SequelizeModel } from "@golemio/core/dist/output-gateway/models";
+export declare class FloatingCarExtendedDataModel extends SequelizeModel {
+    constructor();
+    GetAll: (options?: {
+        locationId?: string;
+        minutesBefore?: number;
+        limit?: number;
+        offset?: number;
+    }) => Promise<IFloatingCarDataModel[]>;
+    GetOne: () => Promise<object | null>;
+}

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

@@ -0,0 +1,61 @@
+"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.FloatingCarExtendedDataModel = void 0;
+const index_1 = require("../../schema-definitions/index");
+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 FloatingCarExtendedDataModel extends models_1.SequelizeModel {
+    constructor() {
+        super(index_1.FCD.fcd_info.name, "v_traffic_params_last_hour", index_1.FCD.fcd_info.outputSequelizeAttributes, {
+            schema: index_1.FCD.pgSchema,
+        });
+        this.GetAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
+            const { locationId, minutesBefore, limit, offset } = options;
+            try {
+                const Op = sequelize_1.default.Op;
+                const where = {
+                    [Op.and]: [{}],
+                };
+                if (locationId) {
+                    where[Op.and].push({
+                        predefined_location: locationId,
+                    });
+                }
+                if (minutesBefore) {
+                    where[Op.and].push({
+                        measurement_or_calculation_time: {
+                            [sequelize_1.default.Op.gte]: sequelize_1.default.literal(`NOW() - INTERVAL '${minutesBefore} minutes'`),
+                        },
+                    });
+                }
+                return yield this.sequelizeModel.findAll({
+                    limit,
+                    offset,
+                    raw: true,
+                    where,
+                });
+            }
+            catch (err) {
+                throw new golemio_errors_1.GeneralError(`GetAll method error: ${err.message}`, "FloatingCarExtendedDataModel", err, 500);
+            }
+        });
+        this.GetOne = () => __awaiter(this, void 0, void 0, function* () {
+            throw new golemio_errors_1.GeneralError("Not implemented", "FloatingCarExtendedDataModel");
+        });
+    }
+}
+exports.FloatingCarExtendedDataModel = FloatingCarExtendedDataModel;
+//# sourceMappingURL=FloatingCarExtendedDataModel.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FloatingCarExtendedDataModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/FloatingCarExtendedDataModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0DAAiC;AACjC,qEAA0E;AAC1E,6EAAwE;AACxE,oFAA4D;AAE5D,MAAa,4BAA6B,SAAQ,uBAAc;IAC5D;QACI,KAAK,CAAC,WAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,4BAA4B,EAAE,WAAG,CAAC,QAAQ,CAAC,yBAAyB,EAAE;YAC3F,MAAM,EAAE,WAAG,CAAC,QAAQ;SACvB,CAAC,CAAC;QAGA,WAAM,GAAG,CACZ,UAKI,EAAE,EAC0B,EAAE;YAClC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAC7D,IAAI;gBACA,MAAM,EAAE,GAAG,mBAAS,CAAC,EAAE,CAAC;gBACxB,MAAM,KAAK,GAAG;oBACV,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;iBACjB,CAAC;gBAEF,IAAI,UAAU,EAAE;oBACZ,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACf,mBAAmB,EAAE,UAAU;qBAClC,CAAC,CAAC;iBACN;gBAED,IAAI,aAAa,EAAE;oBACf,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACf,+BAA+B,EAAE;4BAC7B,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,mBAAS,CAAC,OAAO,CAAC,qBAAqB,aAAa,WAAW,CAAC;yBACvF;qBACJ,CAAC,CAAC;iBACN;gBAED,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,KAAK;oBACL,MAAM;oBACN,GAAG,EAAE,IAAI;oBACT,KAAK;iBACR,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,wBAAwB,GAAG,CAAC,OAAO,EAAE,EAAE,8BAA8B,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC3G;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,GAAiC,EAAE;YAC/C,MAAM,IAAI,6BAAY,CAAC,iBAAiB,EAAE,8BAA8B,CAAC,CAAC;QAC9E,CAAC,CAAA,CAAC;IA5CF,CAAC;CA6CJ;AAlDD,oEAkDC"}

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

@@ -1 +1,2 @@
 export * from "./FloatingCarDataModel";
+export * from "./FloatingCarExtendedDataModel";

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

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FloatingCarDataModel"), exports);
+__exportStar(require("./FloatingCarExtendedDataModel"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,iEAA+C"}

package/docs/openapi.yaml

@@ -1,179 +1,190 @@
-openapi: 3.0.3
-info:
-    title: 🚢 Floating Car Data
-    description: >-
-    version: 1.0.1
-    contact:
-        name: Golemio Prague Data Plaform
-        email: golemio@operatorict.cz
-        url: https://golemio.cz
-
-servers:
-    - url: https://rabin.golemio.cz/v2
-      description: Test (development) server
-    - url: https://api.golemio.cz/v2
-      description: Main (production) server
-
-tags:
-    - name: 🚢 Floating Car Data
-      description: >-
-          💡 FCD
-
-paths:
-    /fcd/info:
-        get:
-            summary: GET Latest floating Car Data
-            description: ""
-            tags:
-                - 🚢 Floating Car Data
-            operationId: getFCD
-            parameters:
-                - name: locationId
-                  in: query
-                  description: >-
-                      Filters data with Predefined Location Id.
-                  required: false
-                  schema:
-                      type: string
-                      example: TS10125T10123
-                - name: osmPath
-                  in: query
-                  description: >-
-                      Includes in the output pathOsm
-                  required: false
-                  schema:
-                      type: boolean
-                      example: true
-                - name: limit
-                  in: query
-                  description: >-
-                      Limits number of retrieved items. The maximum is 10000 (default
-                      value)
-                  required: false
-                  schema:
-                      type: integer
-                      format: int64
-                      example: 10
-                - name: offset
-                  in: query
-                  description: Number of the first items that are skipped
-                  required: false
-                  schema:
-                      type: integer
-                      format: int64
-                      example: 0
-            responses:
-                "200":
-                    description: successful operation
-                    content:
-                        application/json:
-                            schema:
-                                $ref: "#/components/schemas/FloatingCarDataPublication"
-                "401":
-                    $ref: "#/components/responses/UnauthorizedError"
-                "404":
-                    description: Not found
-
-components:
-    responses:
-        UnauthorizedError:
-            description: API key is missing or invalid
-            headers:
-                WWW_Authenticate:
-                    schema:
-                        type: string
-
-    schemas:
-        FloatingCarDataPublication:
-            type: object
-            properties:
-                modelBaseVersion:
-                    type: string
-                    example: 3
-                situationPublicationLight:
-                    type: object
-                    properties:
-                        lang:
-                            type: string
-                            example: cz
-                        publicationTime:
-                            type: string
-                            example: "2021-06-21T10:00:37.000Z"
-                        publicationCreator:
-                            type: object
-                            properties:
-                                country:
-                                    type: string
-                                    example: cz
-                                nationalIdentifier:
-                                    type: string
-                                    example: ŘSD
-                        elaboratedData:
-                            type: array
-                            items:
-                                $ref: "#/components/schemas/FCDElaboratedData"
-
-        FCDElaboratedData:
-            type: object
-            required:
-                [
-                    measurementOrCalculationTime,
-                    sourceIdentification,
-                    supplierCalculatedDataQuality,
-                    numberOfInputValuesUsed,
-                    predefinedLocationId,
-                    trafficLevel,
-                    averageVehicleSpeed,
-                    travelTime,
-                    freeFlowTravelTime,
-                    freeFlowSpeed,
-                ]
-            properties:
-                measurementOrCalculationTime:
-                    type: string
-                    example: "2021-06-21T10:00:37.000Z"
-                sourceIdentification:
-                    type: string
-                    example: "TS01239T25689"
-                supplierCalculatedDataQuality:
-                    type: string
-                    example: "0.5"
-                numberOfInputValuesUsed:
-                    type: string
-                    example: "1"
-                predefinedLocationId:
-                    type: string
-                    example: "TS01239T25689"
-                trafficLevel:
-                    type: string
-                    example: "level3"
-                averageVehicleSpeed:
-                    type: string
-                    example: "86"
-                travelTime:
-                    type: string
-                    example: "116"
-                freeFlowTravelTime:
-                    type: string
-                    example: "80"
-                freeFlowSpeed:
-                    type: string
-                    example: "126"
-                queueExists:
-                    type: string
-                    example: "true"
-                queueLength:
-                    type: string
-                    example: "180"
-                fromPoint:
-                    type: string
-                    example: "0.591"
-                toPoint:
-                    type: string
-                    example: "0.708"
-                osmPath:
-                    type: array
-                    nullable: true
-                    items:
-                        type: number
-                        example: 32948103
+openapi: 3.0.3
+info:
+    title: 🚢 Floating Car Data
+    description: >-
+    version: 1.0.1
+    contact:
+        name: Golemio Prague Data Plaform
+        email: golemio@operatorict.cz
+        url: https://golemio.cz
+
+servers:
+    - url: https://rabin.golemio.cz/v2
+      description: Test (development) server
+    - url: https://api.golemio.cz/v2
+      description: Main (production) server
+
+tags:
+    - name: 🚢 Floating Car Data
+      description: >-
+          💡 FCD
+
+paths:
+    /fcd/info:
+        get:
+            summary: GET Latest floating Car Data
+            description: ""
+            tags:
+                - 🚢 Floating Car Data
+            operationId: getFCD
+            parameters:
+                - name: locationId
+                  in: query
+                  description: >-
+                      Filters data with Predefined Location Id.
+                  required: false
+                  schema:
+                      type: string
+                      example: TS10125T10123
+                - name: osmPath
+                  in: query
+                  description: >-
+                      Includes in the output pathOsm
+                  required: false
+                  schema:
+                      type: boolean
+                      example: true
+                - name: minutesBefore
+                  in: query
+                  description: >-
+                      Lists items updated since given number of minutes, returns unique locations only
+                  schema:
+                      type: integer
+                      example: 10
+                      minimum: 1
+                      exclusiveMinimum: false
+                      maximum: 60
+                      exclusiveMaximum: false
+                - name: limit
+                  in: query
+                  description: >-
+                      Limits number of retrieved items. The maximum is 10000 (default
+                      value)
+                  required: false
+                  schema:
+                      type: integer
+                      format: int64
+                      example: 10
+                - name: offset
+                  in: query
+                  description: Number of the first items that are skipped
+                  required: false
+                  schema:
+                      type: integer
+                      format: int64
+                      example: 0
+            responses:
+                "200":
+                    description: successful operation
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/FloatingCarDataPublication"
+                "401":
+                    $ref: "#/components/responses/UnauthorizedError"
+                "404":
+                    description: Not found
+
+components:
+    responses:
+        UnauthorizedError:
+            description: API key is missing or invalid
+            headers:
+                WWW_Authenticate:
+                    schema:
+                        type: string
+
+    schemas:
+        FloatingCarDataPublication:
+            type: object
+            properties:
+                modelBaseVersion:
+                    type: string
+                    example: 3
+                situationPublicationLight:
+                    type: object
+                    properties:
+                        lang:
+                            type: string
+                            example: cz
+                        publicationTime:
+                            type: string
+                            example: "2021-06-21T10:00:37.000Z"
+                        publicationCreator:
+                            type: object
+                            properties:
+                                country:
+                                    type: string
+                                    example: cz
+                                nationalIdentifier:
+                                    type: string
+                                    example: ŘSD
+                        elaboratedData:
+                            type: array
+                            items:
+                                $ref: "#/components/schemas/FCDElaboratedData"
+
+        FCDElaboratedData:
+            type: object
+            required:
+                [
+                    measurementOrCalculationTime,
+                    sourceIdentification,
+                    supplierCalculatedDataQuality,
+                    numberOfInputValuesUsed,
+                    predefinedLocationId,
+                    trafficLevel,
+                    averageVehicleSpeed,
+                    travelTime,
+                    freeFlowTravelTime,
+                    freeFlowSpeed,
+                ]
+            properties:
+                measurementOrCalculationTime:
+                    type: string
+                    example: "2021-06-21T10:00:37.000Z"
+                sourceIdentification:
+                    type: string
+                    example: "TS01239T25689"
+                supplierCalculatedDataQuality:
+                    type: string
+                    example: "0.5"
+                numberOfInputValuesUsed:
+                    type: string
+                    example: "1"
+                predefinedLocationId:
+                    type: string
+                    example: "TS01239T25689"
+                trafficLevel:
+                    type: string
+                    example: "level3"
+                averageVehicleSpeed:
+                    type: string
+                    example: "86"
+                travelTime:
+                    type: string
+                    example: "116"
+                freeFlowTravelTime:
+                    type: string
+                    example: "80"
+                freeFlowSpeed:
+                    type: string
+                    example: "126"
+                queueExists:
+                    type: string
+                    example: "true"
+                queueLength:
+                    type: string
+                    example: "180"
+                fromPoint:
+                    type: string
+                    example: "0.591"
+                toPoint:
+                    type: string
+                    example: "0.708"
+                osmPath:
+                    type: array
+                    nullable: true
+                    items:
+                        type: number
+                        example: 32948103

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/fcd",
-    "version": "1.1.6-dev.899782642",
+    "version": "1.1.6-rc.906686893",
     "description": "Golemio Floating Car Data Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -36,7 +36,7 @@
         "@commitlint/cli": "^11.0.0",
         "@commitlint/config-conventional": "^11.0.0",
         "@golemio/cli": "1.4.3",
-        "@golemio/core": "1.8.0",
+        "@golemio/core": "1.8.1",
         "@golemio/db-common": "1.1.1",
         "@golemio/eslint-config": "1.1.1",
         "@golemio/traffic-common": "0.1.2",