@golemio/ndic 1.4.1-dev.1685774441 → 1.4.1-dev.1685779508

package/db/migrations/postgresql/20250220160454-optimize-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', '20250220160454-optimize-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', '20250220160454-optimize-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/sqls/20250220160454-optimize-traffic-restrictions-down.sql

@@ -0,0 +1,5 @@
+drop function fetch_valid_traffic_restrictions(timestamptz);
+drop index ndic_traffic_restrictions_regions_situation_record_id_idx;
+drop index ndic_traffic_restrictions_situation_record_id_idx;
+drop index ndic_traffic_restrictions_regions_validity_overall_time_idx;
+drop index ndic_traffic_restrictions_validity_overall_time_idx;

package/db/migrations/postgresql/sqls/20250220160454-optimize-traffic-restrictions-up.sql

@@ -0,0 +1,48 @@
+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.'
+    ;
+
+create index ndic_traffic_restrictions_regions_situation_record_id_idx
+    on ndic_traffic_restrictions_regions
+    using hash (situation_record_id)
+    ;
+create index ndic_traffic_restrictions_situation_record_id_idx
+    on ndic_traffic_restrictions
+    using hash (situation_record_id)
+    ;
+
+create index ndic_traffic_restrictions_regions_validity_overall_time_idx
+    on ndic_traffic_restrictions_regions
+    using btree (validity_overall_start_time, validity_overall_end_time)
+    ;
+create index ndic_traffic_restrictions_validity_overall_time_idx
+    on ndic_traffic_restrictions
+    using btree (validity_overall_start_time, validity_overall_end_time)
+    ;

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

@@ -33,27 +33,12 @@ class TrafficRestrictionsModel extends models_1.SequelizeModel {
             try {
                 // take moment from request or now
                 let queryMoment = reqMoment ? reqMoment : (0, helpers_1.dateTime)(new Date()).setTimeZone("Europe/Prague").toISOString();
-                // get rows for each `situation_record_id`,
-                // but with MAX `situation_record_version_time` for each `situation_record_id`
                 let query = `
             SELECT *
-            FROM
-            (
-                SELECT
-                    row_number() OVER (partition by situation_record_id
-                ORDER BY
-                    situation_record_version_time desc) rn,
-                    *
-                FROM
-                    ${index_1.Ndic.pgSchema}.v_traffic_restrictions_all
-            )
-            a
-            WHERE rn = 1
-            AND validity_overall_start_time < '${queryMoment}'
-            AND validity_overall_end_time > '${queryMoment}'
+            FROM ${index_1.Ndic.pgSchema}.fetch_valid_traffic_restrictions(:queryMoment)
             `;
                 if (situationRecordType) {
-                    query += ` AND situation_record_type = '${situationRecordType}'`;
+                    query += "WHERE situation_record_type = :situationRecordType";
                 }
                 if (limit) {
                     query += ` LIMIT ${limit}`;
@@ -61,7 +46,9 @@ class TrafficRestrictionsModel extends models_1.SequelizeModel {
                 if (offset) {
                     query += ` OFFSET ${offset}`;
                 }
-                const trafficRestrictionsFromDB = (yield (database_1.sequelizeConnection === null || database_1.sequelizeConnection === void 0 ? void 0 : database_1.sequelizeConnection.query(query)));
+                const trafficRestrictionsFromDB = (yield (database_1.sequelizeConnection === null || database_1.sequelizeConnection === void 0 ? void 0 : database_1.sequelizeConnection.query(query, {
+                    replacements: { queryMoment, situationRecordType },
+                })));
                 return trafficRestrictionsFromDB[0] || [];
             }
             catch (err) {

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

@@ -1 +1 @@
-{"version":3,"file":"TrafficRestrictionsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/TrafficRestrictionsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0DAAkC;AAClC,yEAAiF;AACjF,qEAA0E;AAC1E,6EAAwE;AACxE,wDAAsD;AAEtD,MAAa,wBAAyB,SAAQ,uBAAc;IACxD;QACI,KAAK,CAAC,YAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,4BAA4B,EAAE,YAAI,CAAC,oBAAoB,CAAC,yBAAyB,EAAE;YACrH,MAAM,EAAE,YAAI,CAAC,QAAQ;SACxB,CAAC,CAAC;QAGP;;;;;;;WAOG;QAEI,WAAM,GAAG,CACZ,UAKI,EAAE,EAC8B,EAAE;YACtC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;YAElE,IAAI;gBACA,kCAAkC;gBAClC,IAAI,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,kBAAQ,EAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAC;gBAE1G,2CAA2C;gBAC3C,8EAA8E;gBAE9E,IAAI,KAAK,GAAG;;;;;;;;;;sBAUF,YAAI,CAAC,QAAQ;;;;iDAIc,WAAW;+CACb,WAAW;aAC7C,CAAC;gBAEF,IAAI,mBAAmB,EAAE;oBACrB,KAAK,IAAI,iCAAiC,mBAAmB,GAAG,CAAC;iBACpE;gBAED,IAAI,KAAK,EAAE;oBACP,KAAK,IAAI,UAAU,KAAK,EAAE,CAAC;iBAC9B;gBAED,IAAI,MAAM,EAAE;oBACR,KAAK,IAAI,WAAW,MAAM,EAAE,CAAC;iBAChC;gBAED,MAAM,yBAAyB,GAAG,CAAC,MAAM,CAAA,8BAAmB,aAAnB,8BAAmB,uBAAnB,8BAAmB,CAAE,KAAK,CAAC,KAAK,CAAC,CAAA,CAAkC,CAAC;gBAE7G,OAAO,yBAAyB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aAC7C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,gBAAgB,EAAE,0BAA0B,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAClF;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAO,EAAU,EAA0B,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACvC,CAAC,CAAA,CAAC;IApEF,CAAC;CAqEJ;AA1ED,4DA0EC"}
+{"version":3,"file":"TrafficRestrictionsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/TrafficRestrictionsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0DAAkC;AAClC,yEAAiF;AACjF,qEAA0E;AAC1E,6EAAwE;AACxE,wDAAsD;AAEtD,MAAa,wBAAyB,SAAQ,uBAAc;IACxD;QACI,KAAK,CAAC,YAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,4BAA4B,EAAE,YAAI,CAAC,oBAAoB,CAAC,yBAAyB,EAAE;YACrH,MAAM,EAAE,YAAI,CAAC,QAAQ;SACxB,CAAC,CAAC;QAGP;;;;;;;WAOG;QAEI,WAAM,GAAG,CACZ,UAKI,EAAE,EAC8B,EAAE;YACtC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;YAElE,IAAI;gBACA,kCAAkC;gBAClC,IAAI,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,kBAAQ,EAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAC;gBAE1G,IAAI,KAAK,GAAG;;mBAEL,YAAI,CAAC,QAAQ;aACnB,CAAC;gBAEF,IAAI,mBAAmB,EAAE;oBACrB,KAAK,IAAI,oDAAoD,CAAC;iBACjE;gBAED,IAAI,KAAK,EAAE;oBACP,KAAK,IAAI,UAAU,KAAK,EAAE,CAAC;iBAC9B;gBAED,IAAI,MAAM,EAAE;oBACR,KAAK,IAAI,WAAW,MAAM,EAAE,CAAC;iBAChC;gBAED,MAAM,yBAAyB,GAAG,CAAC,MAAM,CAAA,8BAAmB,aAAnB,8BAAmB,uBAAnB,8BAAmB,CAAE,KAAK,CAAC,KAAK,EAAE;oBACvE,YAAY,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE;iBACrD,CAAC,CAAA,CAAkC,CAAC;gBAErC,OAAO,yBAAyB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aAC7C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,gBAAgB,EAAE,0BAA0B,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAClF;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAO,EAAU,EAA0B,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACvC,CAAC,CAAA,CAAC;IAtDF,CAAC;CAuDJ;AA5DD,4DA4DC"}

package/package.json

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