@golemio/ndic 1.6.7-dev.2411589925 → 1.6.7-dev.2460425347

package/db/migrations/postgresql/20260408145914-fix-traffic-restrictions.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', '20260408145914-fix-traffic-restrictions-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', '20260408145914-fix-traffic-restrictions-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/20260414213317-ndic-traffic-info-indexes.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', '20260414213317-ndic-traffic-info-indexes-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', '20260414213317-ndic-traffic-info-indexes-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/20260408145914-fix-traffic-restrictions-down.sql

@@ -0,0 +1,29 @@
+create or replace function fetch_valid_traffic_restrictions(validity_datetime timestamptz)
+    returns setof v_traffic_restrictions_all
+    language sql
+    set search_path from current
+as $function$
+    select *
+    from (
+        select distinct on (situation_record_id) *
+        from v_traffic_restrictions_all
+        where situation_record_id in (
+            select distinct situation_record_id
+            from v_traffic_restrictions_all
+            where
+                validity_overall_start_time < validity_datetime
+                and validity_overall_end_time > validity_datetime
+        )
+        order by situation_record_id, situation_record_version_time desc
+    ) tmp
+    where
+      tmp.validity_overall_start_time < validity_datetime
+        and tmp.validity_overall_end_time > validity_datetime
+    ;
+$function$;
+
+comment on function fetch_valid_traffic_restrictions(timestamptz) is E''
+    'Get all traffic restrictions (both from Prague and from regions) with'
+    ' validity_overall_start_time < validity_datetime < validity_overall_end_time. Only one row per situation_record_id will be'
+    ' returned - the one with the highest situation_record_version_time.'
+    ;

package/db/migrations/postgresql/sqls/20260408145914-fix-traffic-restrictions-up.sql

@@ -0,0 +1,24 @@
+create or replace function fetch_valid_traffic_restrictions(validity_datetime timestamptz)
+    returns setof v_traffic_restrictions_all
+    language sql
+    set search_path from current
+as $function$
+    select distinct on (situation_record_id) *
+    from v_traffic_restrictions_all valid_rows
+    where
+        validity_overall_start_time < validity_datetime
+        and validity_overall_end_time > validity_datetime
+        and not exists (
+            select 1
+            from v_traffic_restrictions_all
+            where
+                situation_record_id = valid_rows.situation_record_id
+                and situation_record_version_time > valid_rows.situation_record_version_time
+        )
+    order by situation_record_id, situation_record_version_time desc
+$function$;
+
+comment on function fetch_valid_traffic_restrictions(timestamptz) is E''
+    'Get all traffic restrictions (both from Prague and from regions) valid at validity_datetime'
+    ' (validity_overall_start_time < validity_datetime < validity_overall_end_time).'
+    ' Only one row per situation_record_id will be returned - the one with the highest situation_record_version_time.';

package/db/migrations/postgresql/sqls/20260414213317-ndic-traffic-info-indexes-down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS ndic.ndic_traffic_info_validity_idx;

package/db/migrations/postgresql/sqls/20260414213317-ndic-traffic-info-indexes-up.sql

@@ -0,0 +1,3 @@
+-- Validity range join in rush-hour-aggregation NdicEventsFull query.
+CREATE INDEX IF NOT EXISTS ndic_traffic_info_validity_idx
+    ON ndic.ndic_traffic_info (validity_overall_start_time, validity_overall_end_time);

package/dist/integration-engine/helpers/TrafficRestrictionsHelper.js

@@ -8,13 +8,13 @@ class TrafficRestrictionsHelper {
 }
 exports.TrafficRestrictionsHelper = TrafficRestrictionsHelper;
 _a = TrafficRestrictionsHelper;
-//#region Public Methods
 TrafficRestrictionsHelper.uniqueRestrictionsArray = (arr) => {
-    const constraintsArr = [];
+    const unique = new Set();
     const resultArr = [];
     for (const obj of arr) {
-        if (!constraintsArr.includes(obj.situation_record_id + obj.situation_record_version_time)) {
-            constraintsArr.push(obj.situation_record_id + obj.situation_record_version_time);
+        const key = `${obj.situation_record_id ?? ""}|${obj.situation_record_version_time ?? ""}`;
+        if (!unique.has(key)) {
+            unique.add(key);
             resultArr.push(obj);
         }
     }

package/dist/integration-engine/helpers/TrafficRestrictionsHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"TrafficRestrictionsHelper.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/TrafficRestrictionsHelper.ts"],"names":[],"mappings":";;;;AAAA,0DAA8D;AAC9D,kCAA2C;AAK3C,MAAa,yBAAyB;;AAAtC,8DAiDC;;AAhDG,wBAAwB;AACV,iDAAuB,GAAG,CAAC,GAAgC,EAAE,EAAE;IACzE,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,MAAM,SAAS,GAAgC,EAAE,CAAC;IAClD,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;QACnB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAC,6BAA6B,CAAC,EAAE;YACvF,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAC,6BAA6B,CAAC,CAAC;YACjF,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACvB;KACJ;IACD,OAAO,SAAS,CAAC;AACrB,CAAC,AAVoC,CAUnC;AAEY,gEAAsC,GAAG,KAAK,EACxD,eAA4C,EACR,EAAE;IACtC,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;QACnC,OAAO,CAAC,iBAAiB,GAAG,MAAM,EAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;KACtF;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC,AAPmD,CAOlD;AAEY,6CAAmB,GAAG,KAAK,EACrC,eAAgD,EACjB,EAAE;IACjC,IAAI,CAAC,eAAe;QAAE,OAAO,SAAS,CAAC;IAEvC,MAAM,eAAe,GAAG,kBAAa,CAAC,OAAO,CAAoB,qCAAoB,CAAC,sBAAsB,CAAC,CAAC;IAC9G,MAAM,4BAA4B,GAAG,eAAe,CAAC,iCAAiC,CAAC,cAAc,CAAC,gBAAgB,CAAC;IACvH,MAAM,8BAA8B,GAChC,eAAe,CAAC,mCAAmC,CAAC,cAAc,CAAC,gBAAgB,CAAC;IAExF,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;IACnF,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,8BAA8B,CAAC,CAAC;IAEvF,IAAI,eAAe,IAAI,iBAAiB,EAAE;QACtC,MAAM,cAAc,GAAe;YAC/B,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACtG,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;SAC7G,CAAC;QACF,OAAO;YACH,WAAW,EAAE,cAAc;YAC3B,IAAI,EAAE,YAAY;SACP,CAAC;KACnB;IACD,OAAO,SAAS,CAAC;AACrB,CAAC,AAxBgC,CAwB/B"}
+{"version":3,"file":"TrafficRestrictionsHelper.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/TrafficRestrictionsHelper.ts"],"names":[],"mappings":";;;;AAAA,0DAA8D;AAC9D,kCAA2C;AAK3C,MAAa,yBAAyB;;AAAtC,8DAkDC;;AAjDiB,iDAAuB,GAAG,CAAC,GAAgC,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,MAAM,SAAS,GAAgC,EAAE,CAAC;IAElD,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;QACnB,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,mBAAmB,IAAI,EAAE,IAAI,GAAG,CAAC,6BAA6B,IAAI,EAAE,EAAE,CAAC;QAC1F,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAChB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACvB;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC,AAboC,CAanC;AAEY,gEAAsC,GAAG,KAAK,EACxD,eAA4C,EACR,EAAE;IACtC,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;QACnC,OAAO,CAAC,iBAAiB,GAAG,MAAM,EAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;KACtF;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC,AAPmD,CAOlD;AAEY,6CAAmB,GAAG,KAAK,EACrC,eAAgD,EACjB,EAAE;IACjC,IAAI,CAAC,eAAe;QAAE,OAAO,SAAS,CAAC;IAEvC,MAAM,eAAe,GAAG,kBAAa,CAAC,OAAO,CAAoB,qCAAoB,CAAC,sBAAsB,CAAC,CAAC;IAC9G,MAAM,4BAA4B,GAAG,eAAe,CAAC,iCAAiC,CAAC,cAAc,CAAC,gBAAgB,CAAC;IACvH,MAAM,8BAA8B,GAChC,eAAe,CAAC,mCAAmC,CAAC,cAAc,CAAC,gBAAgB,CAAC;IAExF,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;IACnF,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,8BAA8B,CAAC,CAAC;IAEvF,IAAI,eAAe,IAAI,iBAAiB,EAAE;QACtC,MAAM,cAAc,GAAe;YAC/B,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACtG,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;SAC7G,CAAC;QACF,OAAO;YACH,WAAW,EAAE,cAAc;YAC3B,IAAI,EAAE,YAAY;SACP,CAAC;KACnB;IACD,OAAO,SAAS,CAAC;AACrB,CAAC,AAxBgC,CAwB/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/ndic",
-    "version": "1.6.7-dev.2411589925",
+    "version": "1.6.7-dev.2460425347",
     "description": "Golemio NDIC Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",