@golemio/fcd 1.0.1-dev.423382545 → 1.0.2-dev.442649433

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.floatingCarDataRouter = void 0;
13
13
  const express_1 = require("@golemio/core/dist/shared/express");
14
+ const monitoring_1 = require("@golemio/core/dist/monitoring");
14
15
  const helpers_1 = require("@golemio/core/dist/input-gateway/helpers");
15
16
  const FloatingCarDataController_1 = require("./FloatingCarDataController");
16
17
  class FloatingCarDataRouter {
@@ -23,11 +24,13 @@ class FloatingCarDataRouter {
23
24
  this.floatingCarData = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
24
25
  try {
25
26
  yield this.floatingCarDataController.processData(req.body);
27
+ const numberOfRecords = (JSON.stringify(req.body.d2LogicalModel.payloadPublication.elaboratedData || {}).match(/basicData/g) || []).length;
26
28
  const metrics = {
27
- numberOfRecords: (JSON.stringify(req.body.d2LogicalModel.payloadPublication.elaboratedData || {}).match(/basicData/g) || []).length,
29
+ numberOfRecords,
28
30
  req,
29
31
  };
30
32
  helpers_1.loggerEvents.emit(helpers_1.LoggerEventType.NumberOfRecords, metrics);
33
+ monitoring_1.metricsService.recordNumberOfRecords(req, numberOfRecords);
31
34
  res.sendStatus(204);
32
35
  }
33
36
  catch (err) {
@@ -1 +1 @@
1
- {"version":3,"file":"FloatingCarDataRouter.js","sourceRoot":"","sources":["../../src/input-gateway/FloatingCarDataRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4F;AAC5F,sEAKkD;AAClD,2EAA0E;AAE1E,MAAM,qBAAqB;IAKvB;QAJO,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAEzB,8BAAyB,GAAG,IAAI,qDAAyB,EAAE,CAAC;QAM5D,eAAU,GAAG,GAAS,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,IAAA,oCAA0B,EAAC,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACrH,CAAC,CAAC;QAEM,oBAAe,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;YAC/F,IAAI;gBACA,MAAM,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE3D,MAAM,OAAO,GAA8B;oBACvC,eAAe,EAAE,CACb,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAC5G,CAAC,MAAM;oBACR,GAAG;iBACN,CAAC;gBACF,sBAAY,CAAC,IAAI,CAAC,yBAAe,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBAC5D,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACvB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QAtBE,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;CAsBJ;AAED,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,EAAE,CAAC,MAAM,CAAC;AAExD,sDAAqB"}
1
+ {"version":3,"file":"FloatingCarDataRouter.js","sourceRoot":"","sources":["../../src/input-gateway/FloatingCarDataRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4F;AAC5F,8DAA+D;AAC/D,sEAKkD;AAClD,2EAA0E;AAE1E,MAAM,qBAAqB;IAKvB;QAJO,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAEzB,8BAAyB,GAAG,IAAI,qDAAyB,EAAE,CAAC;QAM5D,eAAU,GAAG,GAAS,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,IAAA,oCAA0B,EAAC,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACrH,CAAC,CAAC;QAEM,oBAAe,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;YAC/F,IAAI;gBACA,MAAM,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE3D,MAAM,eAAe,GAAG,CACpB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAC5G,CAAC,MAAM,CAAC;gBAET,MAAM,OAAO,GAA8B;oBACvC,eAAe;oBACf,GAAG;iBACN,CAAC;gBACF,sBAAY,CAAC,IAAI,CAAC,yBAAe,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBAE5D,2BAAc,CAAC,qBAAqB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;gBAE3D,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACvB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QA3BE,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;CA2BJ;AAED,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,EAAE,CAAC,MAAM,CAAC;AAExD,sDAAqB"}
@@ -60,11 +60,13 @@ interface ITrafficStatusExtension {
60
60
  };
61
61
  trafficLevelValue: string;
62
62
  };
63
- };
64
- queueInformation?: {
65
- queueLength: string;
66
- fromPoint: string;
67
- toPoint: string;
63
+ queueInformation?: {
64
+ queue: {
65
+ queueLength: string;
66
+ fromPoint: string;
67
+ toPoint: string;
68
+ };
69
+ };
68
70
  };
69
71
  }
70
72
  interface ITravelTime {
@@ -38,11 +38,11 @@ class FloatingCarDataTransformation extends integration_engine_1.BaseTransformat
38
38
  data_quality =
39
39
  +item.basicData.trafficStatusExtension.ndicFcdExtension.trafficLevel.$.supplierCalculatedDataQuality;
40
40
  input_values = +item.basicData.trafficStatusExtension.ndicFcdExtension.trafficLevel.$.numberOfInputValuesUsed;
41
- queue_exists = Boolean(item.basicData.trafficStatusExtension.queueInformation);
42
- if (item.basicData.trafficStatusExtension.queueInformation) {
43
- queue_length = +item.basicData.trafficStatusExtension.queueInformation.queueLength;
44
- from_point = +item.basicData.trafficStatusExtension.queueInformation.fromPoint;
45
- to_point = +item.basicData.trafficStatusExtension.queueInformation.toPoint;
41
+ queue_exists = Boolean(item.basicData.trafficStatusExtension.ndicFcdExtension.queueInformation);
42
+ if (item.basicData.trafficStatusExtension.ndicFcdExtension.queueInformation) {
43
+ queue_length = +item.basicData.trafficStatusExtension.ndicFcdExtension.queueInformation.queue.queueLength;
44
+ from_point = +item.basicData.trafficStatusExtension.ndicFcdExtension.queueInformation.queue.fromPoint;
45
+ to_point = +item.basicData.trafficStatusExtension.ndicFcdExtension.queueInformation.queue.toPoint;
46
46
  }
47
47
  }
48
48
  if (item.basicData.averageVehicleSpeed) {
@@ -1 +1 @@
1
- {"version":3,"file":"FloatingCarDataTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/FloatingCarDataTransformation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FloatingCarDataTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/FloatingCarDataTransformation.ts"],"names":[],"mappings":"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"}
@@ -45,8 +45,12 @@ class RsdTmcOsmMappingModel extends models_1.SequelizeModel {
45
45
  raw: true,
46
46
  where,
47
47
  });
48
- let resultArr = (rsdTmcOsmMappingFromDB === null || rsdTmcOsmMappingFromDB === void 0 ? void 0 : rsdTmcOsmMappingFromDB.osm_path) || null;
49
- return resultArr;
48
+ try {
49
+ return JSON.parse(rsdTmcOsmMappingFromDB === null || rsdTmcOsmMappingFromDB === void 0 ? void 0 : rsdTmcOsmMappingFromDB.osm_path);
50
+ }
51
+ catch (e) {
52
+ return null;
53
+ }
50
54
  }
51
55
  catch (err) {
52
56
  throw new golemio_errors_1.CustomError("GetOne method error", true, "RsdTmcOsmMappingModel", 500, err);
@@ -1 +1 @@
1
- {"version":3,"file":"RsdTmcOsmMappingModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/RsdTmcOsmMappingModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oFAA4D;AAC5D,6EAAuE;AACvE,qEAA0E;AAC1E,mDAA2B;AAE3B,MAAa,qBAAsB,SAAQ,uBAAc;IACrD;QACI,KAAK,CACD,UAAG,CAAC,mBAAmB,CAAC,IAAI,GAAG,OAAO,EACtC,UAAG,CAAC,mBAAmB,CAAC,WAAW,EACnC,UAAG,CAAC,mBAAmB,CAAC,yBAAyB,CACpD,CAAC;QAGN;;;;;WAKG;QAEI,WAAM,GAAG,CAAO,OAA2C,EAAgB,EAAE;YAChF,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;YACjC,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YAEpC,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,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACf,QAAQ,EAAE,CAAC,OAAO;iBACrB,CAAC,CAAC;gBAEH,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACf,MAAM,EAAE,CAAC,KAAK;iBACjB,CAAC,CAAC;gBAEH,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC7D,GAAG,EAAE,IAAI;oBACT,KAAK;iBACR,CAAC,CAAC;gBAEH,IAAI,SAAS,GAAG,CAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,QAAQ,KAAI,IAAI,CAAC;gBACzD,OAAO,SAAS,CAAC;aACpB;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,4BAAW,CAAC,qBAAqB,EAAE,IAAI,EAAE,uBAAuB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACzF;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,GAAiC,EAAE;YAC/C,MAAM,IAAI,4BAAW,CAAC,iBAAiB,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAAC;QAC5E,CAAC,CAAA,CAAC;IAzCF,CAAC;CA0CJ;AAjDD,sDAiDC"}
1
+ {"version":3,"file":"RsdTmcOsmMappingModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/RsdTmcOsmMappingModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oFAA4D;AAC5D,6EAAuE;AACvE,qEAA0E;AAC1E,mDAA2B;AAE3B,MAAa,qBAAsB,SAAQ,uBAAc;IACrD;QACI,KAAK,CACD,UAAG,CAAC,mBAAmB,CAAC,IAAI,GAAG,OAAO,EACtC,UAAG,CAAC,mBAAmB,CAAC,WAAW,EACnC,UAAG,CAAC,mBAAmB,CAAC,yBAAyB,CACpD,CAAC;QAGN;;;;;WAKG;QAEI,WAAM,GAAG,CAAO,OAA2C,EAAgB,EAAE;YAChF,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;YACjC,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YAEpC,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,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACf,QAAQ,EAAE,CAAC,OAAO;iBACrB,CAAC,CAAC;gBAEH,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACf,MAAM,EAAE,CAAC,KAAK;iBACjB,CAAC,CAAC;gBAEH,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC7D,GAAG,EAAE,IAAI;oBACT,KAAK;iBACR,CAAC,CAAC;gBAEH,IAAI;oBACA,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,QAAQ,CAAC,CAAC;iBACvD;gBAAC,OAAO,CAAC,EAAE;oBACR,OAAO,IAAI,CAAC;iBACf;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,4BAAW,CAAC,qBAAqB,EAAE,IAAI,EAAE,uBAAuB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACzF;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,GAAiC,EAAE;YAC/C,MAAM,IAAI,4BAAW,CAAC,iBAAiB,EAAE,IAAI,EAAE,uBAAuB,CAAC,CAAC;QAC5E,CAAC,CAAA,CAAC;IA5CF,CAAC;CA6CJ;AApDD,sDAoDC"}
@@ -47,9 +47,9 @@ exports.outputFloatingCarDataSchema = {
47
47
  };
48
48
  exports.outputFloatingCarDataSDMA = {
49
49
  publication_time: { type: sequelize_1.default.DATE },
50
- source_identification: { type: sequelize_1.default.STRING(50) },
50
+ source_identification: { primaryKey: true, type: sequelize_1.default.STRING(50) },
51
51
  measurement_or_calculation_time: { primaryKey: true, type: sequelize_1.default.DATE },
52
- predefined_location: { primaryKey: true, type: sequelize_1.default.STRING(50) },
52
+ predefined_location: { type: sequelize_1.default.STRING(50) },
53
53
  version_of_predefined_location: { type: sequelize_1.default.INTEGER },
54
54
  traffic_level: { type: sequelize_1.default.STRING(50) },
55
55
  // ⬐ Not required
@@ -1 +1 @@
1
- {"version":3,"file":"fcd_output_schema.js","sourceRoot":"","sources":["../../../src/schema-definitions/schemas/fcd_output_schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fcd_output_schema.js","sourceRoot":"","sources":["../../../src/schema-definitions/schemas/fcd_output_schema.ts"],"names":[],"mappings":"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"}
package/docs/openapi.yaml CHANGED
@@ -2,7 +2,7 @@ openapi: 3.0.3
2
2
  info:
3
3
  title: 🚢 Floating Car Data
4
4
  description: >-
5
- version: 1.0.0
5
+ version: 1.0.1
6
6
  contact:
7
7
  name: Golemio Prague Data Plaform
8
8
  email: golemio@operatorict.cz
@@ -181,14 +181,16 @@ components:
181
181
  example: "true"
182
182
  queueLength:
183
183
  type: string
184
- example: ""
184
+ example: "180"
185
185
  fromPoint:
186
186
  type: string
187
- example: ""
187
+ example: "0.591"
188
188
  toPoint:
189
189
  type: string
190
- example: ""
190
+ example: "0.708"
191
191
  osmPath:
192
- type: string
192
+ type: array
193
193
  nullable: true
194
- example: "[30372268, 1945960089, 1663150068, 30372270, 1945960092, 30372272, 1945960105]"
194
+ items:
195
+ type: number
196
+ example: 32948103
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/fcd",
3
- "version": "1.0.1-dev.423382545",
3
+ "version": "1.0.2-dev.442649433",
4
4
  "description": "Golemio Floating Car Data Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -29,9 +29,9 @@
29
29
  "devDependencies": {
30
30
  "@commitlint/cli": "^11.0.0",
31
31
  "@commitlint/config-conventional": "^11.0.0",
32
- "@golemio/core": "1.1.8",
32
+ "@golemio/core": "1.1.10",
33
33
  "@golemio/eslint-config": "^1.0.2",
34
- "@golemio/schema-definitions": "2.0.21",
34
+ "@golemio/schema-definitions": "2.0.22",
35
35
  "@types/body-parser-xml": "^1.1.0",
36
36
  "@types/chai": "4.2.3",
37
37
  "@types/chai-as-promised": "7.1.2",
package/CHANGELOG.md DELETED
@@ -1,18 +0,0 @@
1
- # Changelog
2
-
3
- All notable changes to this project will be documented in this file.
4
-
5
- ## [Unreleased]
6
-
7
- ## [1.0.1] - 2021-12-01
8
-
9
- ### Added
10
-
11
- - Swagger doc
12
- - Portman tests
13
-
14
- ## [1.0.0] - 2021-11-30
15
-
16
- ### Added
17
-
18
- - Create the FCD module