@golemio/pid 2.10.3 → 2.10.4-dev.1111301464

package/db/migrations/postgresql/20231207135833-vp-gtfs-direction-id.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', '20231207135833-vp-gtfs-direction-id-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', '20231207135833-vp-gtfs-direction-id-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/20231208130901-run-number-int.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', '20231208130901-run-number-int-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', '20231208130901-run-number-int-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/20231213075143-stop-time-origin-route-name.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', '20231213075143-stop-time-origin-route-name-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', '20231213075143-stop-time-origin-route-name-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/20231207135833-vp-gtfs-direction-id-down.sql

@@ -0,0 +1,36 @@
+CREATE or replace PROCEDURE vehiclepositions_data_retention(inout numberOfRows int, in dataRetentionMinutes int)
+LANGUAGE plpgsql
+AS $procedure$
+	declare
+		idsForDelete varchar(255)[];
+	begin
+        select array_agg(t.id) from pid.vehiclepositions_trips t
+        left join pid.vehiclepositions_positions p on
+            p.id = t.last_position_id
+        where
+            p.valid_to < (NOW() - (dataRetentionMinutes || ' minutes')::interval)
+            or (gtfs_trip_id is null and p.created_at < NOW() - (dataRetentionMinutes || ' minutes')::interval) -- entries with valid to is null
+        into idsForDelete;
+
+        INSERT INTO pid.vehiclepositions_trips_history
+        select * from pid.vehiclepositions_trips where id = ANY(idsForDelete)
+        on conflict do nothing;
+
+        INSERT INTO pid.vehiclepositions_positions_history
+        select * from pid.vehiclepositions_positions where trips_id = ANY(idsForDelete)
+        on conflict do nothing;
+
+        delete from pid.vehiclepositions_positions where trips_id = ANY(idsForDelete);
+        delete from pid.vehiclepositions_trips where id = ANY(idsForDelete);
+
+        select array_length(idsForDelete,1) into numberOfRows;
+	end;
+$procedure$;
+
+drop view v_vehiclepositions_past_stop_times;
+drop table vehiclepositions_stop_times_history;
+
+alter table vehiclepositions_trips drop column gtfs_direction_id;
+alter table vehiclepositions_trips_history drop column gtfs_direction_id;
+
+alter table ropidgtfs_precomputed_trip_schedule drop column direction_id;

package/db/migrations/postgresql/sqls/20231207135833-vp-gtfs-direction-id-up.sql

@@ -0,0 +1,147 @@
+alter table ropidgtfs_precomputed_trip_schedule add column direction_id smallint;
+
+alter table vehiclepositions_trips add column gtfs_direction_id smallint;
+alter table vehiclepositions_trips_history add column gtfs_direction_id smallint;
+
+
+create table vehiclepositions_stop_times_history (
+    rt_trip_id varchar(100) not null,
+    gtfs_date date,
+    gtfs_trip_id varchar(50),
+    gtfs_direction_id smallint,
+    gtfs_route_short_name varchar(20),
+    gtfs_route_type int,
+    run_number int,
+    vehicle_registration_number int,
+    gtfs_stop_sequence smallint not null,
+    gtfs_stop_id varchar(20),
+    current_stop_arrival timestamp with time zone,
+    current_stop_departure timestamp with time zone,
+    current_stop_arr_delay int,
+    current_stop_dep_delay int,
+
+    -- audit fields
+    create_batch_id bigint,
+    created_at timestamp with time zone,
+    created_by varchar(150),
+    update_batch_id bigint,
+    updated_at timestamp with time zone,
+    updated_by varchar(150),
+
+    constraint vehiclepositions_stop_times_history_pkey primary key (rt_trip_id, gtfs_stop_sequence)
+);
+
+
+create view v_vehiclepositions_past_stop_times as
+select
+    trips_id as rt_trip_id,
+    last_stop_sequence as stop_sequence,
+    last_stop_id as stop_id,
+    last_stop_arrival_time as stop_arrival,
+    last_stop_departure_time as stop_departure,
+    min(delay_stop_arrival) as stop_arr_delay,
+    max(delay_stop_departure) as stop_dep_delay
+from (
+    select
+    	trips_id,
+        last_stop_sequence,
+        last_stop_id,
+        last_stop_arrival_time,
+        last_stop_departure_time,
+        delay_stop_arrival,
+        delay_stop_departure,
+        row_number() over seq as rn
+    from
+        vehiclepositions_positions rt_position
+    where
+        (delay_stop_arrival is not null or delay_stop_departure is not null)
+        and state_position in ('on_track', 'at_stop', 'after_track')
+    window
+        seq as (partition by trips_id, last_stop_sequence, state_position order by id)
+) as sub
+where
+    rn = 1
+group by
+    trips_id,
+    last_stop_arrival_time,
+    last_stop_departure_time,
+    last_stop_sequence,
+    last_stop_id
+order by
+    trips_id,
+    last_stop_sequence;
+
+
+CREATE or replace PROCEDURE vehiclepositions_data_retention(inout numberOfRows int, in dataRetentionMinutes int)
+LANGUAGE plpgsql
+SET search_path FROM CURRENT
+AS $procedure$
+	declare
+		idsForDelete varchar(255)[];
+	begin
+        select array_agg(t.id) from vehiclepositions_trips t
+        left join vehiclepositions_positions p on
+            p.id = t.last_position_id
+        where
+            p.valid_to < (NOW() - (dataRetentionMinutes || ' minutes')::interval)
+            or (gtfs_trip_id is null and p.created_at < NOW() - (dataRetentionMinutes || ' minutes')::interval) -- entries with valid to is null
+        into idsForDelete;
+
+        INSERT INTO vehiclepositions_trips_history
+        select * from vehiclepositions_trips where id = ANY(idsForDelete)
+        on conflict do nothing;
+
+        INSERT INTO vehiclepositions_positions_history
+        select * from vehiclepositions_positions where trips_id = ANY(idsForDelete)
+        on conflict do nothing;
+
+        insert into vehiclepositions_stop_times_history (
+            rt_trip_id,
+            gtfs_date,
+            gtfs_trip_id,
+            gtfs_direction_id,
+            gtfs_route_short_name,
+            gtfs_route_type,
+            run_number,
+            vehicle_registration_number,
+            gtfs_stop_id,
+            gtfs_stop_sequence,
+            current_stop_arrival,
+            current_stop_departure,
+            current_stop_arr_delay,
+            current_stop_dep_delay,
+            created_at,
+            updated_at
+        )
+        select
+            rt_trip.id,
+            rt_trip.gtfs_date,
+            rt_trip.gtfs_trip_id,
+            rt_trip.gtfs_direction_id,
+            rt_trip.gtfs_route_short_name,
+            rt_trip.gtfs_route_type,
+            rt_trip.run_number,
+            rt_trip.vehicle_registration_number,
+            stop_time.stop_id,
+            stop_time.stop_sequence,
+            stop_time.stop_arrival,
+            stop_time.stop_departure,
+            stop_time.stop_arr_delay,
+            stop_time.stop_dep_delay,
+            now(),
+            now()
+        from
+            vehiclepositions_trips rt_trip
+        join
+            v_vehiclepositions_past_stop_times stop_time on stop_time.rt_trip_id  = rt_trip.id
+        where
+            rt_trip.id = ANY(idsForDelete)
+        on conflict do nothing;
+
+
+        delete from vehiclepositions_positions where trips_id = ANY(idsForDelete);
+        delete from vehiclepositions_trips where id = ANY(idsForDelete);
+
+        select array_length(idsForDelete,1) into numberOfRows;
+	end;
+$procedure$;

package/db/migrations/postgresql/sqls/20231208130901-run-number-int-down.sql

@@ -0,0 +1 @@
+alter table vehiclepositions_runs alter column run_number type varchar(50) using run_number::varchar(50);

package/db/migrations/postgresql/sqls/20231208130901-run-number-int-up.sql

@@ -0,0 +1 @@
+alter table vehiclepositions_runs alter column run_number type int using run_number::int;

package/db/migrations/postgresql/sqls/20231213075143-stop-time-origin-route-name-down.sql

@@ -0,0 +1,77 @@
+drop procedure vehiclepositions_data_retention(int, int);
+alter table vehiclepositions_stop_times_history drop column origin_route_name;
+
+
+CREATE PROCEDURE vehiclepositions_data_retention(inout numberOfRows int, in dataRetentionMinutes int)
+LANGUAGE plpgsql
+SET search_path FROM CURRENT
+AS $procedure$
+	declare
+		idsForDelete varchar(255)[];
+	begin
+        select array_agg(t.id) from vehiclepositions_trips t
+        left join vehiclepositions_positions p on
+            p.id = t.last_position_id
+        where
+            p.valid_to < (NOW() - (dataRetentionMinutes || ' minutes')::interval)
+            or (gtfs_trip_id is null and p.created_at < NOW() - (dataRetentionMinutes || ' minutes')::interval) -- entries with valid to is null
+        into idsForDelete;
+
+        INSERT INTO vehiclepositions_trips_history
+        select * from vehiclepositions_trips where id = ANY(idsForDelete)
+        on conflict do nothing;
+
+        INSERT INTO vehiclepositions_positions_history
+        select * from vehiclepositions_positions where trips_id = ANY(idsForDelete)
+        on conflict do nothing;
+
+        insert into vehiclepositions_stop_times_history (
+            rt_trip_id,
+            gtfs_date,
+            gtfs_trip_id,
+            gtfs_direction_id,
+            gtfs_route_short_name,
+            gtfs_route_type,
+            run_number,
+            vehicle_registration_number,
+            gtfs_stop_id,
+            gtfs_stop_sequence,
+            current_stop_arrival,
+            current_stop_departure,
+            current_stop_arr_delay,
+            current_stop_dep_delay,
+            created_at,
+            updated_at
+        )
+        select
+            rt_trip.id,
+            rt_trip.gtfs_date,
+            rt_trip.gtfs_trip_id,
+            rt_trip.gtfs_direction_id,
+            rt_trip.gtfs_route_short_name,
+            rt_trip.gtfs_route_type,
+            rt_trip.run_number,
+            rt_trip.vehicle_registration_number,
+            stop_time.stop_id,
+            stop_time.stop_sequence,
+            stop_time.stop_arrival,
+            stop_time.stop_departure,
+            stop_time.stop_arr_delay,
+            stop_time.stop_dep_delay,
+            now(),
+            now()
+        from
+            vehiclepositions_trips rt_trip
+        join
+            v_vehiclepositions_past_stop_times stop_time on stop_time.rt_trip_id  = rt_trip.id
+        where
+            rt_trip.id = ANY(idsForDelete)
+        on conflict do nothing;
+
+
+        delete from vehiclepositions_positions where trips_id = ANY(idsForDelete);
+        delete from vehiclepositions_trips where id = ANY(idsForDelete);
+
+        select array_length(idsForDelete,1) into numberOfRows;
+	end;
+$procedure$;

package/db/migrations/postgresql/sqls/20231213075143-stop-time-origin-route-name-up.sql

@@ -0,0 +1,77 @@
+alter table vehiclepositions_stop_times_history add column origin_route_name varchar(20);
+
+CREATE OR REPLACE PROCEDURE vehiclepositions_data_retention(inout numberOfRows int, in dataRetentionMinutes int)
+LANGUAGE plpgsql
+SET search_path FROM CURRENT
+AS $procedure$
+	declare
+		idsForDelete varchar(255)[];
+	begin
+        select array_agg(t.id) from vehiclepositions_trips t
+        left join vehiclepositions_positions p on
+            p.id = t.last_position_id
+        where
+            p.valid_to < (NOW() - (dataRetentionMinutes || ' minutes')::interval)
+            or (gtfs_trip_id is null and p.created_at < NOW() - (dataRetentionMinutes || ' minutes')::interval) -- entries with valid to is null
+        into idsForDelete;
+
+        INSERT INTO vehiclepositions_trips_history
+        select * from vehiclepositions_trips where id = ANY(idsForDelete)
+        on conflict do nothing;
+
+        INSERT INTO vehiclepositions_positions_history
+        select * from vehiclepositions_positions where trips_id = ANY(idsForDelete)
+        on conflict do nothing;
+
+        insert into vehiclepositions_stop_times_history (
+            rt_trip_id,
+            gtfs_date,
+            gtfs_trip_id,
+            gtfs_direction_id,
+            gtfs_route_short_name,
+            gtfs_route_type,
+            run_number,
+            vehicle_registration_number,
+            gtfs_stop_id,
+            gtfs_stop_sequence,
+            current_stop_arrival,
+            current_stop_departure,
+            current_stop_arr_delay,
+            current_stop_dep_delay,
+            created_at,
+            updated_at,
+            origin_route_name
+        )
+        select
+            rt_trip.id,
+            rt_trip.gtfs_date,
+            rt_trip.gtfs_trip_id,
+            rt_trip.gtfs_direction_id,
+            rt_trip.gtfs_route_short_name,
+            rt_trip.gtfs_route_type,
+            rt_trip.run_number,
+            rt_trip.vehicle_registration_number,
+            stop_time.stop_id,
+            stop_time.stop_sequence,
+            stop_time.stop_arrival,
+            stop_time.stop_departure,
+            stop_time.stop_arr_delay,
+            stop_time.stop_dep_delay,
+            now(),
+            now(),
+            rt_trip.origin_route_name
+        from
+            vehiclepositions_trips rt_trip
+        join
+            v_vehiclepositions_past_stop_times stop_time on stop_time.rt_trip_id  = rt_trip.id
+        where
+            rt_trip.id = ANY(idsForDelete)
+        on conflict do nothing;
+
+
+        delete from vehiclepositions_positions where trips_id = ANY(idsForDelete);
+        delete from vehiclepositions_trips where id = ANY(idsForDelete);
+
+        select array_length(idsForDelete,1) into numberOfRows;
+	end;
+$procedure$;

package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js

@@ -95,7 +95,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
                 t0.last_stop_id,
                 right(t0.origin_route_id, -1) as origin_route_name,
                 t0.trip_number,
-                t0.route_licence_number
+                t0.route_licence_number,
+                t0.direction_id
             FROM (
                 SELECT
                     t1.route_id AS origin_route_id,
@@ -118,7 +119,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
                     t5.stop_id AS first_stop_id,
                     t6.stop_id AS last_stop_id,
                     t1.trip_number,
-                    t1.route_licence_number
+                    t1.route_licence_number,
+                    t8.direction_id
                 FROM "${const_1.PG_SCHEMA}".ropidgtfs_run_numbers${sourceTableSuffix} t1
                 INNER JOIN "${const_1.PG_SCHEMA}".ropidgtfs_precomputed_services_calendar_tmp t3 ON t1.service_id = t3.service_id
                 INNER JOIN "${const_1.PG_SCHEMA}".ropidgtfs_precomputed_minmax_stop_sequences_tmp t4 ON t1.trip_id = t4.trip_id

package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"TripScheduleRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAuC;AACvC,0EAA4C;AAE5C,2EAAoE;AACpE,yEAAqF;AACrF,mFAAkF;AAElF,+EAA4E;AAE5E,MAAa,sBAAuB,SAAQ,sBAAa;IACrD;QACI,KAAK,CACD,wBAAwB,EACxB;YACI,yBAAyB,EAAE,sBAAS,CAAC,YAAY,CAAC,yBAAyB;YAC3E,WAAW,EAAE,sBAAS,CAAC,YAAY,CAAC,WAAW;YAC/C,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;SACzD,EACD,IAAI,uCAAmB,CAAC,iCAAiC,EAAE,sBAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC,CACtG,CAAC;QAGC,YAAO,GAAG,CAAC,OAAoB,EAA2B,EAAE;YAC/D,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,iBAAG,GAAG,EAAE,IAAI,IAAK,OAAO,EAAG,CAAC;QAClE,CAAC,CAAC;QAEK,aAAQ,GAAG,CAAO,iBAAwC,EAAiB,EAAE;YAChF,4BAA4B;YAC5B,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAyFI,iBAAS,0BAA0B,iBAAiB;8BAC9C,iBAAS;8BACT,iBAAS;6BACV,iBAAS,oBAAoB,iBAAiB;6BAC9C,iBAAS,qBAAqB,iBAAiB;6BAC/C,iBAAS,yBAAyB,iBAAiB;6BACnD,iBAAS,yBAAyB,iBAAiB;;SAEvE,CAAC;YACF,2BAA2B;YAE3B,IAAI;gBACA,MAAM,QAAQ,GAAG,sBAAS,CAAC,YAAY,CAAC,WAAW,GAAG,6CAAqB,CAAC,GAAG,CAAC;gBAEhF,MAAM,IAAI,CAAC,cAAc,CAAC,SAAU,CAAC,KAAK,CAAC,gBAAgB,iBAAS,KAAK,QAAQ,IAAI,GAAG,GAAG,CAAC,CAAC;aAChG;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,GAAG,CAAC;aACb;QACL,CAAC,CAAA,CAAC;IApHF,CAAC;CAqHJ;AAlID,wDAkIC"}
+{"version":3,"file":"TripScheduleRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAuC;AACvC,0EAA4C;AAE5C,2EAAoE;AACpE,yEAAqF;AACrF,mFAAkF;AAElF,+EAA4E;AAE5E,MAAa,sBAAuB,SAAQ,sBAAa;IACrD;QACI,KAAK,CACD,wBAAwB,EACxB;YACI,yBAAyB,EAAE,sBAAS,CAAC,YAAY,CAAC,yBAAyB;YAC3E,WAAW,EAAE,sBAAS,CAAC,YAAY,CAAC,WAAW;YAC/C,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;SACzD,EACD,IAAI,uCAAmB,CAAC,iCAAiC,EAAE,sBAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC,CACtG,CAAC;QAGC,YAAO,GAAG,CAAC,OAAoB,EAA2B,EAAE;YAC/D,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,iBAAG,GAAG,EAAE,IAAI,IAAK,OAAO,EAAG,CAAC;QAClE,CAAC,CAAC;QAEK,aAAQ,GAAG,CAAO,iBAAwC,EAAiB,EAAE;YAChF,4BAA4B;YAC5B,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBA2FI,iBAAS,0BAA0B,iBAAiB;8BAC9C,iBAAS;8BACT,iBAAS;6BACV,iBAAS,oBAAoB,iBAAiB;6BAC9C,iBAAS,qBAAqB,iBAAiB;6BAC/C,iBAAS,yBAAyB,iBAAiB;6BACnD,iBAAS,yBAAyB,iBAAiB;;SAEvE,CAAC;YACF,2BAA2B;YAE3B,IAAI;gBACA,MAAM,QAAQ,GAAG,sBAAS,CAAC,YAAY,CAAC,WAAW,GAAG,6CAAqB,CAAC,GAAG,CAAC;gBAEhF,MAAM,IAAI,CAAC,cAAc,CAAC,SAAU,CAAC,KAAK,CAAC,gBAAgB,iBAAS,KAAK,QAAQ,IAAI,GAAG,GAAG,CAAC,CAAC;aAChG;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,GAAG,CAAC;aACb;QACL,CAAC,CAAA,CAAC;IAtHF,CAAC;CAuHJ;AApID,wDAoIC"}

package/dist/integration-engine/vehicle-positions/workers/runs/interfaces/IMetroRunInputForProcessing.d.ts

@@ -11,4 +11,5 @@ export interface IMetroRunInputForProcessing {
 }
 export interface IExtendedMetroRunInputForProcessing extends IMetroRunInputForProcessing {
     tripId: string;
+    internalRunNumber: number | null;
 }

package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.d.ts

@@ -16,5 +16,5 @@ export declare class ProcessMetroRunMessagesTask extends AbstractTask<IProcessMe
     constructor(queuePrefix: string);
     protected execute({ routeName, messages }: IProcessMetroRunsMessagesInput): Promise<void>;
     private processMessage;
-    private addTripIdToMessage;
+    private enrichRunMessage;
 }

package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProcessMetroRunMessagesTask = void 0;
 const cache_1 = require("../../../../ropid-gtfs/data-access/cache");
+const precomputed_1 = require("../../../../ropid-gtfs/data-access/precomputed");
 const MetroRailtrackGPSRepository_1 = require("../../../../ropid-gtfs/workers/railtrack/tasks/data-access/MetroRailtrackGPSRepository");
 const PositionsRepository_1 = require("../../vehicle-positions/data-access/PositionsRepository");
 const TripsRepository_1 = require("../../vehicle-positions/data-access/TripsRepository");
@@ -18,12 +19,12 @@ const GTFSTripRunManagerFactory_1 = require("../../vehicle-positions/helpers/gtf
 const vehicle_positions_1 = require("../../../../../schema-definitions/vehicle-positions");
 const integration_engine_1 = require("@golemio/core/dist/integration-engine");
 const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
+const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
 const CommonRunsRepository_1 = require("../data-access/CommonRunsRepository");
 const MetroMessageFilter_1 = require("../helpers/MetroMessageFilter");
 const MetroTransformedRunsSchema_1 = require("../schema/MetroTransformedRunsSchema");
 const MetroRunsMessageProcessingTransformation_1 = require("../transformations/MetroRunsMessageProcessingTransformation");
-const precomputed_1 = require("../../../../ropid-gtfs/data-access/precomputed");
-const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
 class ProcessMetroRunMessagesTask extends integration_engine_1.AbstractTask {
     constructor(queuePrefix) {
         super(queuePrefix);
@@ -52,41 +53,50 @@ class ProcessMetroRunMessagesTask extends integration_engine_1.AbstractTask {
         });
     }
     processMessage(message, gpsData) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const data = yield this.processingTransformation.transform({ message, gpsData });
             if (!data) {
                 return;
             }
-            const scheduledTrips = yield this.gtfsTripRunManager.setAndReturnScheduledTrips(data.runSchedule);
-            if (scheduledTrips.length === 0) {
-                helpers_1.log.verbose(`processMessage: no schedule for metro run: ${JSON.stringify(data.runSchedule)}`);
-                return;
+            let enhancedMessage = null;
+            try {
+                enhancedMessage = yield this.enrichRunMessage(data.runInput);
+            }
+            catch (err) {
+                throw new golemio_errors_1.GeneralError(`processMessage: error while fetching trip schedule`, this.constructor.name, err);
             }
-            const enhancedMessage = yield this.addTripIdToMessage(data.runInput);
             if (!enhancedMessage) {
                 helpers_1.log.verbose(`processMessage: no trip_id for metro run: ${JSON.stringify(data.runInput)}`);
                 return;
             }
+            const scheduledTrips = yield this.gtfsTripRunManager.setAndReturnScheduledTrips(Object.assign(Object.assign({}, data.runSchedule), { 
+                // try to use internal run number if available (input run message is not always reliable)
+                run_number: (_a = enhancedMessage.internalRunNumber) !== null && _a !== void 0 ? _a : data.runSchedule.run_number }));
+            if (scheduledTrips.length === 0) {
+                helpers_1.log.verbose(`processMessage: no schedule for metro run: ${JSON.stringify(data.runSchedule)}`);
+                return;
+            }
             const delayMsg = yield this.gtfsTripRunManager.generateDelayMsg(scheduledTrips, enhancedMessage);
             if (delayMsg.updatedTrips.length > 0) {
                 yield integration_engine_1.QueueManager.sendMessageToExchange(`${integration_engine_1.config.RABBIT_EXCHANGE_NAME}.${vehicle_positions_1.VehiclePositions.name.toLowerCase()}`, "updateDelay", delayMsg);
             }
         });
     }
-    addTripIdToMessage(runInput) {
+    enrichRunMessage(runInput) {
         return __awaiter(this, void 0, void 0, function* () {
-            const runNumbers = yield this.tripScheduleRepository.findOne({
-                attributes: ["trip_id"],
+            const tripSchedule = yield this.tripScheduleRepository.findOne({
+                attributes: ["trip_id", "run_number"],
                 where: {
                     trip_number: runInput.trainNumber,
                     route_id: `L${runInput.routeId}`,
                     [sequelize_1.Op.and]: [sequelize_1.Sequelize.literal("start_timestamp::date = current_date")],
                 },
             });
-            if (!runNumbers) {
+            if (!tripSchedule) {
                 return null;
             }
-            return Object.assign(Object.assign({}, runInput), { tripId: runNumbers.trip_id });
+            return Object.assign(Object.assign({}, runInput), { tripId: tripSchedule.trip_id, internalRunNumber: tripSchedule.run_number });
         });
     }
 }

package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProcessMetroRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProcessMetroRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js

@@ -57,7 +57,7 @@ class CommonRunsMessagesTransformation extends transformations_1.BaseTransformat
                 run: {
                     id: identifiers.runId,
                     route_id: identifiers.routeId,
-                    run_number: identifiers.runNumber,
+                    run_number: Number.parseInt(identifiers.runNumber),
                     line_short_name: attributes.line,
                     registration_number: attributes.evc,
                     msg_start_timestamp: element.timestamp,