@golemio/pid 2.8.11-dev.992817797 → 2.8.11-dev.992961204

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.
Files changed (46) hide show
  1. package/db/example/03_ropidgtfs_dump.sql +2 -2
  2. package/db/example/12_metro_line_A_gtfs_trips.sql +7 -7
  3. package/db/example/13_http-propagate-delay.sql +5 -5
  4. package/db/migrations/postgresql/20230831122446-add-route-sub-agencies.js +53 -0
  5. package/db/migrations/postgresql/20230831141134-trip-number.js +53 -0
  6. package/db/migrations/postgresql/sqls/20230831122446-add-route-sub-agencies-down.sql +75 -0
  7. package/db/migrations/postgresql/sqls/20230831122446-add-route-sub-agencies-up.sql +106 -0
  8. package/db/migrations/postgresql/sqls/20230831141134-trip-number-down.sql +3 -0
  9. package/db/migrations/postgresql/sqls/20230831141134-trip-number-up.sql +3 -0
  10. package/dist/integration-engine/ropid-gtfs/data-access/cache/StaticFileRedisRepository.d.ts +2 -0
  11. package/dist/integration-engine/ropid-gtfs/data-access/cache/StaticFileRedisRepository.js +28 -0
  12. package/dist/integration-engine/ropid-gtfs/data-access/cache/StaticFileRedisRepository.js.map +1 -1
  13. package/dist/integration-engine/ropid-gtfs/data-access/cache/interfaces/IRouteSubAgencyRaw.d.ts +6 -0
  14. package/dist/integration-engine/ropid-gtfs/data-access/cache/interfaces/IRouteSubAgencyRaw.js +3 -0
  15. package/dist/integration-engine/ropid-gtfs/data-access/cache/interfaces/IRouteSubAgencyRaw.js.map +1 -0
  16. package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js +4 -2
  17. package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js.map +1 -1
  18. package/dist/integration-engine/ropid-gtfs/transformations/RopidGtfsRouteSubAgencyTransformation.d.ts +14 -0
  19. package/dist/integration-engine/ropid-gtfs/transformations/RopidGtfsRouteSubAgencyTransformation.js +66 -0
  20. package/dist/integration-engine/ropid-gtfs/transformations/RopidGtfsRouteSubAgencyTransformation.js.map +1 -0
  21. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/TransformAndSaveDataTask.d.ts +0 -2
  22. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/TransformAndSaveDataTask.js +18 -39
  23. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/TransformAndSaveDataTask.js.map +1 -1
  24. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/HelperTypes.d.ts +4 -0
  25. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/HelperTypes.js +6 -1
  26. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/HelperTypes.js.map +1 -1
  27. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/RopidGtfsFactory.d.ts +7 -1
  28. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/RopidGtfsFactory.js +49 -0
  29. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/RopidGtfsFactory.js.map +1 -1
  30. package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.d.ts +3 -0
  31. package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js +4 -0
  32. package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
  33. package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.d.ts +7 -0
  34. package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.js +10 -0
  35. package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.js.map +1 -1
  36. package/dist/schema-definitions/ropid-gtfs/RopidGtfsSchedule.d.ts +9 -0
  37. package/dist/schema-definitions/ropid-gtfs/RopidGtfsSchedule.js +9 -0
  38. package/dist/schema-definitions/ropid-gtfs/RopidGtfsSchedule.js.map +1 -1
  39. package/dist/schema-definitions/ropid-gtfs/interfaces/IRouteSubAgencyDto.d.ts +6 -0
  40. package/dist/schema-definitions/ropid-gtfs/interfaces/IRouteSubAgencyDto.js +3 -0
  41. package/dist/schema-definitions/ropid-gtfs/interfaces/IRouteSubAgencyDto.js.map +1 -0
  42. package/dist/schema-definitions/ropid-gtfs/models/RouteSubAgencyDto.d.ts +11 -0
  43. package/dist/schema-definitions/ropid-gtfs/models/RouteSubAgencyDto.js +27 -0
  44. package/dist/schema-definitions/ropid-gtfs/models/RouteSubAgencyDto.js.map +1 -0
  45. package/docs/implementation_documentation.md +6 -2
  46. package/package.json +1 -1
@@ -533,9 +533,9 @@ INSERT INTO "ropidgtfs_cis_stop_groups_actual"("avg_jtsk_x","avg_jtsk_y","avg_la
533
533
  VALUES
534
534
  (-737498.7,-1041664.5,50.1059647,14.4922361,47178,E'AB',E'Českomoravská',E'301003',E'Českomoravská',E'Praha',E'Českomoravská',510,E'2021-05-19 05:35:04.963+02',E'Českomoravská',NULL,NULL,NULL,E'2021-05-19 05:35:04.963+02',NULL);
535
535
 
536
- INSERT INTO "ropidgtfs_run_numbers_actual"("route_id","run_number","service_id","trip_id","vehicle_type","created_at","create_batch_id","created_by","update_batch_id","updated_at","updated_by")
536
+ INSERT INTO "ropidgtfs_run_numbers_actual"("route_id","run_number","service_id","trip_id","vehicle_type","trip_number","created_at","create_batch_id","created_by","update_batch_id","updated_at","updated_by")
537
537
  VALUES
538
- (E'L991',1,E'1111100-1',E'991_1_210419',3,E'2021-05-19 05:35:04.963+02',NULL,NULL,NULL,E'2021-05-19 05:35:04.963+02',NULL);
538
+ (E'L991',1,E'1111100-1',E'991_1_210419',3,NULL,E'2021-05-19 05:35:04.963+02',NULL,NULL,NULL,E'2021-05-19 05:35:04.963+02',NULL);
539
539
 
540
540
  INSERT INTO ropidgtfs_trips_actual (trip_id,bikes_allowed,block_id,direction_id,exceptional,route_id,service_id,shape_id,trip_headsign,trip_operation_type,trip_short_name,wheelchair_accessible,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
541
541
  ('991_1_210419',1,NULL,0,0,'L991','0000001-1','L991V2','Nemocnice Motol',NULL,NULL,1,NULL,'2023-04-09 05:27:39.626',NULL,NULL,'2023-04-09 05:27:39.626',NULL);
@@ -92,13 +92,13 @@ INSERT INTO ropidgtfs_trips_actual (bikes_allowed,block_id,direction_id,exceptio
92
92
  (1,NULL,1,0,'L991','1111111-1','L991V6','Skalka','991_78_220321',NULL,NULL,1,-1,'2022-10-24 10:22:47.459+02',NULL,-1,'2022-10-24 10:22:47.459+02',NULL),
93
93
  (1,NULL,0,0,'L991','1111111-2','L991V1','Nemocnice Motol','991_124_201230',NULL,NULL,1,-1,'2022-10-24 10:22:47.459+02',NULL,-1,'2022-10-24 10:22:47.459+02',NULL);
94
94
 
95
- INSERT INTO ropidgtfs_run_numbers_actual (route_id,run_number,service_id,trip_id,vehicle_type,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
96
- ('L991',5,'1111111-1','991_77_220901',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
97
- ('L991',5,'1111111-1','991_78_220321',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
98
- ('L991',5,'1111111-1','991_124_201230',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
99
- ('L991',8,'1111111-3','991_124_201230',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
100
- ('L991',9,'1111111-1','991_294_220901',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
101
- ('L991',17,'1111111-3','991_294_220901',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL);
95
+ INSERT INTO ropidgtfs_run_numbers_actual (route_id,run_number,service_id,trip_id,vehicle_type,trip_number,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
96
+ ('L991',5,'1111111-1','991_77_220901',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
97
+ ('L991',5,'1111111-1','991_78_220321',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
98
+ ('L991',5,'1111111-1','991_124_201230',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
99
+ ('L991',8,'1111111-3','991_124_201230',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
100
+ ('L991',9,'1111111-1','991_294_220901',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
101
+ ('L991',17,'1111111-3','991_294_220901',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL);
102
102
 
103
103
  WITH init_values AS (
104
104
  SELECT CAST(current_date - INTERVAL '1 day' + INTERVAL '10 hour' AS TIMESTAMP WITH TIME ZONE) AT TIME ZONE 'Europe/Prague' AS origin_datetime
@@ -20,12 +20,12 @@ VALUES
20
20
 
21
21
 
22
22
  -- run_numbers
23
- INSERT INTO "ropidgtfs_run_numbers_actual"("route_id","run_number","service_id","trip_id","vehicle_type","create_batch_id","created_at","created_by","update_batch_id","updated_at","updated_by")
23
+ INSERT INTO "ropidgtfs_run_numbers_actual"("route_id","run_number","service_id","trip_id","vehicle_type","trip_number","create_batch_id","created_at","created_by","update_batch_id","updated_at","updated_by")
24
24
  VALUES
25
- (E'L212',2,E'1111100-5',E'212_365_221211',42,-1,E'2022-12-23 05:36:28.005+01',NULL,-1,E'2022-12-23 05:36:28.005+01',NULL),
26
- (E'L212',2,E'1111100-5',E'212_366_221211',42,-1,E'2022-12-23 05:36:28.005+01',NULL,-1,E'2022-12-23 05:36:28.005+01',NULL),
27
- (E'L212',2,E'1111100-5',E'212_367_221211',42,-1,E'2022-12-23 05:36:28.005+01',NULL,-1,E'2022-12-23 05:36:28.005+01',NULL),
28
- (E'L212',2,E'1111100-5',E'212_368_221211',42,-1,E'2022-12-23 05:36:28.005+01',NULL,-1,E'2022-12-23 05:36:28.005+01',NULL);
25
+ (E'L212',2,E'1111100-5',E'212_365_221211',42,-1,NULL,E'2022-12-23 05:36:28.005+01',NULL,-1,E'2022-12-23 05:36:28.005+01',NULL),
26
+ (E'L212',2,E'1111100-5',E'212_366_221211',42,-1,NULL,E'2022-12-23 05:36:28.005+01',NULL,-1,E'2022-12-23 05:36:28.005+01',NULL),
27
+ (E'L212',2,E'1111100-5',E'212_367_221211',42,-1,NULL,E'2022-12-23 05:36:28.005+01',NULL,-1,E'2022-12-23 05:36:28.005+01',NULL),
28
+ (E'L212',2,E'1111100-5',E'212_368_221211',42,-1,NULL,E'2022-12-23 05:36:28.005+01',NULL,-1,E'2022-12-23 05:36:28.005+01',NULL);
29
29
 
30
30
  -- stops
31
31
  INSERT INTO "ropidgtfs_stops_actual"("location_type","parent_station","platform_code","stop_id","stop_lat","stop_lon","stop_name","stop_url","wheelchair_boarding","zone_id","create_batch_id","created_at","created_by","update_batch_id","updated_at","updated_by","level_id","stop_code","stop_desc","stop_timezone","asw_node_id","asw_stop_id")
@@ -0,0 +1,53 @@
1
+ 'use strict';
2
+
3
+ var dbm;
4
+ var type;
5
+ var seed;
6
+ var fs = require('fs');
7
+ var path = require('path');
8
+ var Promise;
9
+
10
+ /**
11
+ * We receive the dbmigrate dependency from dbmigrate initially.
12
+ * This enables us to not have to rely on NODE_PATH.
13
+ */
14
+ exports.setup = function(options, seedLink) {
15
+ dbm = options.dbmigrate;
16
+ type = dbm.dataType;
17
+ seed = seedLink;
18
+ Promise = options.Promise;
19
+ };
20
+
21
+ exports.up = function(db) {
22
+ var filePath = path.join(__dirname, 'sqls', '20230831122446-add-route-sub-agencies-up.sql');
23
+ return new Promise( function( resolve, reject ) {
24
+ fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
25
+ if (err) return reject(err);
26
+ console.log('received data: ' + data);
27
+
28
+ resolve(data);
29
+ });
30
+ })
31
+ .then(function(data) {
32
+ return db.runSql(data);
33
+ });
34
+ };
35
+
36
+ exports.down = function(db) {
37
+ var filePath = path.join(__dirname, 'sqls', '20230831122446-add-route-sub-agencies-down.sql');
38
+ return new Promise( function( resolve, reject ) {
39
+ fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
40
+ if (err) return reject(err);
41
+ console.log('received data: ' + data);
42
+
43
+ resolve(data);
44
+ });
45
+ })
46
+ .then(function(data) {
47
+ return db.runSql(data);
48
+ });
49
+ };
50
+
51
+ exports._meta = {
52
+ "version": 1
53
+ };
@@ -0,0 +1,53 @@
1
+ 'use strict';
2
+
3
+ var dbm;
4
+ var type;
5
+ var seed;
6
+ var fs = require('fs');
7
+ var path = require('path');
8
+ var Promise;
9
+
10
+ /**
11
+ * We receive the dbmigrate dependency from dbmigrate initially.
12
+ * This enables us to not have to rely on NODE_PATH.
13
+ */
14
+ exports.setup = function(options, seedLink) {
15
+ dbm = options.dbmigrate;
16
+ type = dbm.dataType;
17
+ seed = seedLink;
18
+ Promise = options.Promise;
19
+ };
20
+
21
+ exports.up = function(db) {
22
+ var filePath = path.join(__dirname, 'sqls', '20230831141134-trip-number-up.sql');
23
+ return new Promise( function( resolve, reject ) {
24
+ fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
25
+ if (err) return reject(err);
26
+ console.log('received data: ' + data);
27
+
28
+ resolve(data);
29
+ });
30
+ })
31
+ .then(function(data) {
32
+ return db.runSql(data);
33
+ });
34
+ };
35
+
36
+ exports.down = function(db) {
37
+ var filePath = path.join(__dirname, 'sqls', '20230831141134-trip-number-down.sql');
38
+ return new Promise( function( resolve, reject ) {
39
+ fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
40
+ if (err) return reject(err);
41
+ console.log('received data: ' + data);
42
+
43
+ resolve(data);
44
+ });
45
+ })
46
+ .then(function(data) {
47
+ return db.runSql(data);
48
+ });
49
+ };
50
+
51
+ exports._meta = {
52
+ "version": 1
53
+ };
@@ -0,0 +1,75 @@
1
+ DROP TABLE ropidgtfs_route_sub_agencies_actual;
2
+ DROP TABLE ropidgtfs_route_sub_agencies;
3
+
4
+ CREATE OR REPLACE PROCEDURE ropidgtfs_preparetmptables()
5
+ LANGUAGE plpgsql
6
+ SET search_path from CURRENT
7
+ AS $procedure$
8
+ begin
9
+ CALL ropidgtfs_cleanTmpTables();
10
+ CALL ropidgtfs_cleanOldTables();
11
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_agency');
12
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_calendar');
13
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_calendar_dates');
14
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_shapes');
15
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_stop_times');
16
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_stops');
17
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_routes');
18
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_trips');
19
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_cis_stops');
20
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_cis_stop_groups');
21
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_run_numbers');
22
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_ois');
23
+ alter table ropidgtfs_stop_times_tmp drop computed_dwell_time_seconds;
24
+ alter table ropidgtfs_stop_times_tmp add computed_dwell_time_seconds int2 NOT NULL GENERATED ALWAYS AS (pid.calculate_dwell_time_seconds(arrival_time, departure_time)) stored;
25
+ end
26
+ $procedure$
27
+ ;
28
+
29
+ CREATE OR REPLACE PROCEDURE ropidgtfs_cleanoldtables()
30
+ LANGUAGE plpgsql
31
+ SET search_path from CURRENT
32
+ AS $procedure$
33
+ begin
34
+ drop table if exists "ropidgtfs_agency_old";
35
+ drop table if exists "ropidgtfs_calendar_old";
36
+ drop table if exists "ropidgtfs_calendar_dates_old";
37
+ drop table if exists "ropidgtfs_shapes_old";
38
+ drop table if exists "ropidgtfs_stop_times_old";
39
+ drop table if exists "ropidgtfs_stops_old";
40
+ drop table if exists "ropidgtfs_routes_old";
41
+ drop table if exists "ropidgtfs_trips_old";
42
+ drop table if exists "ropidgtfs_cis_stops_old";
43
+ drop table if exists "ropidgtfs_cis_stop_groups_old";
44
+ drop table if exists "ropidgtfs_run_numbers_old";
45
+ drop table if exists "ropidgtfs_ois_old";
46
+ drop table if exists "ropidgtfs_precomputed_services_calendar_old";
47
+ drop table if exists "ropidgtfs_precomputed_minmax_stop_sequences_old";
48
+ drop table if exists "ropidgtfs_precomputed_trip_schedule_old";
49
+ end
50
+ $procedure$
51
+ ;
52
+
53
+ CREATE OR REPLACE PROCEDURE ropidgtfs_cleantmptables()
54
+ LANGUAGE plpgsql
55
+ SET search_path from CURRENT
56
+ AS $procedure$
57
+ begin
58
+ drop table if exists "ropidgtfs_agency_tmp";
59
+ drop table if exists "ropidgtfs_calendar_tmp";
60
+ drop table if exists "ropidgtfs_calendar_dates_tmp";
61
+ drop table if exists "ropidgtfs_shapes_tmp";
62
+ drop table if exists "ropidgtfs_stop_times_tmp";
63
+ drop table if exists "ropidgtfs_stops_tmp";
64
+ drop table if exists "ropidgtfs_routes_tmp";
65
+ drop table if exists "ropidgtfs_trips_tmp";
66
+ drop table if exists "ropidgtfs_cis_stops_tmp";
67
+ drop table if exists "ropidgtfs_cis_stop_groups_tmp";
68
+ drop table if exists "ropidgtfs_run_numbers_tmp";
69
+ drop table if exists "ropidgtfs_ois_tmp";
70
+ drop table if exists "ropidgtfs_precomputed_services_calendar_tmp";
71
+ drop table if exists "ropidgtfs_precomputed_minmax_stop_sequences_tmp";
72
+ drop table if exists "ropidgtfs_precomputed_trip_schedule_tmp";
73
+ end
74
+ $procedure$
75
+ ;
@@ -0,0 +1,106 @@
1
+ CREATE TABLE ropidgtfs_route_sub_agencies (
2
+ route_id varchar NOT NULL,
3
+ route_licence_number int4 NULL,
4
+ sub_agency_id int4 NOT NULL,
5
+ sub_agency_name varchar NULL,
6
+ create_batch_id int8 NULL,
7
+ created_at timestamptz NULL,
8
+ created_by varchar(150) NULL,
9
+ update_batch_id int8 NULL,
10
+ updated_at timestamptz NULL,
11
+ updated_by varchar(150) NULL,
12
+ CONSTRAINT route_sub_agencies_pk PRIMARY KEY (route_id, sub_agency_id)
13
+ );
14
+
15
+
16
+ CREATE TABLE ropidgtfs_route_sub_agencies_actual (
17
+ route_id varchar NULL,
18
+ route_licence_number int4 NULL,
19
+ sub_agency_id int4 NULL,
20
+ sub_agency_name varchar NULL,
21
+ create_batch_id int8 NULL,
22
+ created_at timestamptz NULL,
23
+ created_by varchar(150) NULL,
24
+ update_batch_id int8 NULL,
25
+ updated_at timestamptz NULL,
26
+ updated_by varchar(150) NULL,
27
+ CONSTRAINT route_sub_agencies_actual_pk PRIMARY KEY (route_id, sub_agency_id)
28
+ )
29
+ INHERITS (ropidgtfs_route_sub_agencies);
30
+
31
+
32
+ CREATE OR REPLACE PROCEDURE ropidgtfs_preparetmptables()
33
+ LANGUAGE plpgsql
34
+ SET search_path from CURRENT
35
+ AS $procedure$
36
+ begin
37
+ CALL ropidgtfs_cleanTmpTables();
38
+ CALL ropidgtfs_cleanOldTables();
39
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_agency');
40
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_calendar');
41
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_calendar_dates');
42
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_shapes');
43
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_stop_times');
44
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_stops');
45
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_routes');
46
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_route_sub_agencies');
47
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_trips');
48
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_cis_stops');
49
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_cis_stop_groups');
50
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_run_numbers');
51
+ CALL ropidgtfs_prepareTmpTable('ropidgtfs_ois');
52
+ alter table ropidgtfs_stop_times_tmp drop computed_dwell_time_seconds;
53
+ alter table ropidgtfs_stop_times_tmp add computed_dwell_time_seconds int2 NOT NULL GENERATED ALWAYS AS (calculate_dwell_time_seconds(arrival_time, departure_time)) stored;
54
+ end
55
+ $procedure$
56
+ ;
57
+
58
+ CREATE OR REPLACE PROCEDURE ropidgtfs_cleanoldtables()
59
+ LANGUAGE plpgsql
60
+ SET search_path from CURRENT
61
+ AS $procedure$
62
+ begin
63
+ drop table if exists "ropidgtfs_agency_old";
64
+ drop table if exists "ropidgtfs_calendar_old";
65
+ drop table if exists "ropidgtfs_calendar_dates_old";
66
+ drop table if exists "ropidgtfs_shapes_old";
67
+ drop table if exists "ropidgtfs_stop_times_old";
68
+ drop table if exists "ropidgtfs_stops_old";
69
+ drop table if exists "ropidgtfs_routes_old";
70
+ drop table if exists "ropidgtfs_route_sub_agencies_old";
71
+ drop table if exists "ropidgtfs_trips_old";
72
+ drop table if exists "ropidgtfs_cis_stops_old";
73
+ drop table if exists "ropidgtfs_cis_stop_groups_old";
74
+ drop table if exists "ropidgtfs_run_numbers_old";
75
+ drop table if exists "ropidgtfs_ois_old";
76
+ drop table if exists "ropidgtfs_precomputed_services_calendar_old";
77
+ drop table if exists "ropidgtfs_precomputed_minmax_stop_sequences_old";
78
+ drop table if exists "ropidgtfs_precomputed_trip_schedule_old";
79
+ end
80
+ $procedure$
81
+ ;
82
+
83
+ CREATE OR REPLACE PROCEDURE ropidgtfs_cleantmptables()
84
+ LANGUAGE plpgsql
85
+ SET search_path from CURRENT
86
+ AS $procedure$
87
+ begin
88
+ drop table if exists "ropidgtfs_agency_tmp";
89
+ drop table if exists "ropidgtfs_calendar_tmp";
90
+ drop table if exists "ropidgtfs_calendar_dates_tmp";
91
+ drop table if exists "ropidgtfs_shapes_tmp";
92
+ drop table if exists "ropidgtfs_stop_times_tmp";
93
+ drop table if exists "ropidgtfs_stops_tmp";
94
+ drop table if exists "ropidgtfs_routes_tmp";
95
+ drop table if exists "ropidgtfs_route_sub_agencies_tmp";
96
+ drop table if exists "ropidgtfs_trips_tmp";
97
+ drop table if exists "ropidgtfs_cis_stops_tmp";
98
+ drop table if exists "ropidgtfs_cis_stop_groups_tmp";
99
+ drop table if exists "ropidgtfs_run_numbers_tmp";
100
+ drop table if exists "ropidgtfs_ois_tmp";
101
+ drop table if exists "ropidgtfs_precomputed_services_calendar_tmp";
102
+ drop table if exists "ropidgtfs_precomputed_minmax_stop_sequences_tmp";
103
+ drop table if exists "ropidgtfs_precomputed_trip_schedule_tmp";
104
+ end
105
+ $procedure$
106
+ ;
@@ -0,0 +1,3 @@
1
+ ALTER TABLE ropidgtfs_run_numbers DROP COLUMN IF EXISTS trip_number;
2
+
3
+ ALTER TABLE ropidgtfs_precomputed_trip_schedule DROP COLUMN IF EXISTS trip_number;
@@ -0,0 +1,3 @@
1
+ ALTER TABLE ropidgtfs_run_numbers ADD COLUMN trip_number SMALLINT;
2
+
3
+ ALTER TABLE ropidgtfs_precomputed_trip_schedule ADD COLUMN trip_number SMALLINT;
@@ -1,5 +1,7 @@
1
1
  import { RedisModel } from "@golemio/core/dist/integration-engine/models/RedisModel";
2
+ import { IRouteSubAgencyRaw } from "./interfaces/IRouteSubAgencyRaw";
2
3
  export declare class StaticFileRedisRepository extends RedisModel {
3
4
  static NAMESPACE_PREFIX: string;
4
5
  constructor();
6
+ getCsvAsJson(key: string): Promise<IRouteSubAgencyRaw[]>;
5
7
  }
@@ -8,11 +8,24 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
12
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
13
+ return new (P || (P = Promise))(function (resolve, reject) {
14
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
15
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
16
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
17
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
18
+ });
19
+ };
20
+ var __importDefault = (this && this.__importDefault) || function (mod) {
21
+ return (mod && mod.__esModule) ? mod : { "default": mod };
22
+ };
11
23
  var StaticFileRedisRepository_1;
12
24
  Object.defineProperty(exports, "__esModule", { value: true });
13
25
  exports.StaticFileRedisRepository = void 0;
14
26
  const RedisModel_1 = require("@golemio/core/dist/integration-engine/models/RedisModel");
15
27
  const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
28
+ const csv_parser_1 = __importDefault(require("csv-parser"));
16
29
  let StaticFileRedisRepository = exports.StaticFileRedisRepository = StaticFileRedisRepository_1 = class StaticFileRedisRepository extends RedisModel_1.RedisModel {
17
30
  constructor() {
18
31
  super("GTFSStaticFileRedisRepository", {
@@ -20,6 +33,21 @@ let StaticFileRedisRepository = exports.StaticFileRedisRepository = StaticFileRe
20
33
  prefix: StaticFileRedisRepository_1.NAMESPACE_PREFIX,
21
34
  });
22
35
  }
36
+ getCsvAsJson(key) {
37
+ return __awaiter(this, void 0, void 0, function* () {
38
+ return yield new Promise((resolve, reject) => {
39
+ const results = [];
40
+ this.getReadableStream(key)
41
+ .pipe((0, csv_parser_1.default)())
42
+ .on("data", (data) => {
43
+ results.push(data);
44
+ })
45
+ .on("end", () => {
46
+ resolve(results);
47
+ });
48
+ });
49
+ });
50
+ }
23
51
  };
24
52
  StaticFileRedisRepository.NAMESPACE_PREFIX = "files:gtfsStatic";
25
53
  exports.StaticFileRedisRepository = StaticFileRedisRepository = StaticFileRedisRepository_1 = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"StaticFileRedisRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/cache/StaticFileRedisRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wFAAqF;AACrF,iEAAgE;AAGzD,IAAM,yBAAyB,qEAA/B,MAAM,yBAA0B,SAAQ,uBAAU;IAGrD;QACI,KAAK,CAAC,+BAA+B,EAAE;YACnC,wBAAwB,EAAE,KAAK;YAC/B,MAAM,EAAE,2BAAyB,CAAC,gBAAgB;SACrD,CAAC,CAAC;IACP,CAAC;;AAPa,0CAAgB,GAAG,kBAAkB,AAArB,CAAsB;oCAD3C,yBAAyB;IADrC,IAAA,qBAAU,GAAE;;GACA,yBAAyB,CASrC"}
1
+ {"version":3,"file":"StaticFileRedisRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/cache/StaticFileRedisRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wFAAqF;AACrF,iEAAgE;AAChE,4DAA6B;AAItB,IAAM,yBAAyB,qEAA/B,MAAM,yBAA0B,SAAQ,uBAAU;IAGrD;QACI,KAAK,CAAC,+BAA+B,EAAE;YACnC,wBAAwB,EAAE,KAAK;YAC/B,MAAM,EAAE,2BAAyB,CAAC,gBAAgB;SACrD,CAAC,CAAC;IACP,CAAC;IAEY,YAAY,CAAC,GAAW;;YACjC,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACzC,MAAM,OAAO,GAAyB,EAAE,CAAC;gBAEzC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;qBACtB,IAAI,CAAC,IAAA,oBAAG,GAAE,CAAC;qBACX,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvB,CAAC,CAAC;qBACD,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACZ,OAAO,CAAC,OAAO,CAAC,CAAC;gBACrB,CAAC,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;;AAtBa,0CAAgB,GAAG,kBAAkB,AAArB,CAAsB;oCAD3C,yBAAyB;IADrC,IAAA,qBAAU,GAAE;;GACA,yBAAyB,CAwBrC"}
@@ -0,0 +1,6 @@
1
+ export interface IRouteSubAgencyRaw {
2
+ route_id: string | undefined;
3
+ route_licence_number: string | undefined;
4
+ sub_agency_id: string | undefined;
5
+ sub_agency_name: string | undefined;
6
+ }
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=IRouteSubAgencyRaw.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IRouteSubAgencyRaw.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/data-access/cache/interfaces/IRouteSubAgencyRaw.ts"],"names":[],"mappings":""}
@@ -93,7 +93,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
93
93
  END as end_timestamp,
94
94
  t0.first_stop_id,
95
95
  t0.last_stop_id,
96
- right(t0.origin_route_id, -1) as origin_route_name
96
+ right(t0.origin_route_id, -1) as origin_route_name,
97
+ t0.trip_number
97
98
  FROM (
98
99
  SELECT
99
100
  t1.route_id AS origin_route_id,
@@ -114,7 +115,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
114
115
  LEAST(t5.arrival_time::INTERVAL, t5.departure_time::INTERVAL) AS min_stop_time,
115
116
  GREATEST(t6.arrival_time::INTERVAL, t6.departure_time::INTERVAL) AS max_stop_time,
116
117
  t5.stop_id AS first_stop_id,
117
- t6.stop_id AS last_stop_id
118
+ t6.stop_id AS last_stop_id,
119
+ t1.trip_number
118
120
  FROM "${const_1.PG_SCHEMA}".ropidgtfs_run_numbers${sourceTableSuffix} t1
119
121
  INNER JOIN "${const_1.PG_SCHEMA}".ropidgtfs_precomputed_services_calendar_tmp t3 ON t1.service_id = t3.service_id
120
122
  INNER JOIN "${const_1.PG_SCHEMA}".ropidgtfs_precomputed_minmax_stop_sequences_tmp t4 ON t1.trip_id = t4.trip_id
@@ -1 +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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAqFI,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;IAhHF,CAAC;CAiHJ;AA9HD,wDA8HC"}
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAuFI,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;IAlHF,CAAC;CAmHJ;AAhID,wDAgIC"}
@@ -0,0 +1,14 @@
1
+ import { IRouteSubAgencyDto } from "../../../schema-definitions/ropid-gtfs/interfaces/IRouteSubAgencyDto";
2
+ import { AbstractTransformation } from "@golemio/core/dist/helpers/transformation/AbstractTransformation";
3
+ import { IRouteSubAgencyRaw } from "../data-access/cache/interfaces/IRouteSubAgencyRaw";
4
+ export declare class RopidGtfsRouteSubAgencyTransformation extends AbstractTransformation<IRouteSubAgencyRaw, IRouteSubAgencyDto> {
5
+ name: string;
6
+ constructor();
7
+ transformArray: (input: IRouteSubAgencyRaw[], includeDuplicates?: boolean) => IRouteSubAgencyDto[];
8
+ /**
9
+ * Filter duplicates by route_id and sub_agency_id.
10
+ * In case of duplicates, keep the first one in order with route_licence_number.
11
+ */
12
+ filterDuplicates: (data: IRouteSubAgencyDto[]) => IRouteSubAgencyDto[];
13
+ protected transformInternal: (data: IRouteSubAgencyRaw) => IRouteSubAgencyDto;
14
+ }
@@ -0,0 +1,66 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.RopidGtfsRouteSubAgencyTransformation = void 0;
13
+ const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
14
+ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
15
+ const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
16
+ let RopidGtfsRouteSubAgencyTransformation = exports.RopidGtfsRouteSubAgencyTransformation = class RopidGtfsRouteSubAgencyTransformation extends AbstractTransformation_1.AbstractTransformation {
17
+ constructor() {
18
+ super();
19
+ this.name = "RopidGtfsRouteSubAgencyTransformation";
20
+ this.transformArray = (input, includeDuplicates = false) => {
21
+ const output = [];
22
+ for (let index = 0; index < input.length; index++) {
23
+ const element = input[index];
24
+ if (!element.route_id) {
25
+ continue;
26
+ }
27
+ if (!/^\d+$/.test(element.sub_agency_id)) {
28
+ new golemio_errors_1.GeneralError(`sub_agency_id should be number, got ${element.sub_agency_id} for route_id ${element.route_id}`, this.name);
29
+ }
30
+ output.push(this.transformElement(element));
31
+ }
32
+ return !includeDuplicates ? this.filterDuplicates(output) : output;
33
+ };
34
+ /**
35
+ * Filter duplicates by route_id and sub_agency_id.
36
+ * In case of duplicates, keep the first one in order with route_licence_number.
37
+ */
38
+ this.filterDuplicates = (data) => {
39
+ const transformation = {};
40
+ for (let index = 0; index < data.length; index++) {
41
+ const element = data[index];
42
+ const key = `${element.route_id}-${element.sub_agency_id}`;
43
+ if (!transformation[key]) {
44
+ transformation[key] = element;
45
+ }
46
+ else if (!transformation[key].route_licence_number && element.route_licence_number) {
47
+ transformation[key] = element;
48
+ }
49
+ }
50
+ return Object.values(transformation);
51
+ };
52
+ this.transformInternal = (data) => {
53
+ return {
54
+ route_id: data.route_id,
55
+ route_licence_number: /^\d+$/.test(data.route_licence_number) ? Number.parseInt(data.route_licence_number) : null,
56
+ sub_agency_id: Number.parseInt(data.sub_agency_id),
57
+ sub_agency_name: data.sub_agency_name,
58
+ };
59
+ };
60
+ }
61
+ };
62
+ exports.RopidGtfsRouteSubAgencyTransformation = RopidGtfsRouteSubAgencyTransformation = __decorate([
63
+ (0, tsyringe_1.injectable)(),
64
+ __metadata("design:paramtypes", [])
65
+ ], RopidGtfsRouteSubAgencyTransformation);
66
+ //# sourceMappingURL=RopidGtfsRouteSubAgencyTransformation.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RopidGtfsRouteSubAgencyTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/transformations/RopidGtfsRouteSubAgencyTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6GAA0G;AAC1G,6EAAwE;AACxE,iEAAgE;AAIzD,IAAM,qCAAqC,mDAA3C,MAAM,qCAAsC,SAAQ,+CAA8D;IAGrH;QACI,KAAK,EAAE,CAAC;QAHL,SAAI,GAAG,uCAAuC,CAAC;QAM/C,mBAAc,GAAG,CAAC,KAA2B,EAAE,iBAAiB,GAAG,KAAK,EAAwB,EAAE;YACrG,MAAM,MAAM,GAAyB,EAAE,CAAC;YAExC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC7B,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;oBACnB,SAAS;iBACZ;gBAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAc,CAAC,EAAE;oBACvC,IAAI,6BAAY,CACZ,uCAAuC,OAAO,CAAC,aAAa,iBAAiB,OAAO,CAAC,QAAQ,EAAE,EAC/F,IAAI,CAAC,IAAI,CACZ,CAAC;iBACL;gBAED,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;aAC/C;YAED,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACvE,CAAC,CAAC;QAEF;;;WAGG;QACI,qBAAgB,GAAG,CAAC,IAA0B,EAAwB,EAAE;YAC3E,MAAM,cAAc,GAAuC,EAAE,CAAC;YAE9D,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC5B,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;gBAE3D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;oBACtB,cAAc,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;iBACjC;qBAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,EAAE;oBAClF,cAAc,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;iBACjC;aACJ;YAED,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACzC,CAAC,CAAC;QAEQ,sBAAiB,GAAG,CAAC,IAAwB,EAAsB,EAAE;YAC3E,OAAO;gBACH,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,oBAAoB,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAqB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI;gBACnH,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAc,CAAC;gBACnD,eAAe,EAAE,IAAI,CAAC,eAAe;aAClB,CAAC;QAC5B,CAAC,CAAC;IApDF,CAAC;CAqDJ,CAAA;gDA1DY,qCAAqC;IADjD,IAAA,qBAAU,GAAE;;GACA,qCAAqC,CA0DjD"}
@@ -8,10 +8,8 @@ export declare class TransformAndSaveDataTask extends AbstractTask<ICachedDatase
8
8
  readonly schema: typeof CachedDatasetSchema;
9
9
  private logger;
10
10
  private metadataRepository;
11
- private staticFileRedisRepository;
12
11
  private ropidGtfsFactory;
13
12
  private gtfsRedisChannel;
14
- private transformationGtfs;
15
13
  constructor(queuePrefix: string);
16
14
  protected execute(inputData: ICachedDataset, msgProperties?: MessageProperties): Promise<void>;
17
15
  private saveTransformedDataset;
@@ -34,14 +34,13 @@ class TransformAndSaveDataTask extends workers_1.AbstractTask {
34
34
  this.schema = CachedDatasetSchema_1.CachedDatasetSchema;
35
35
  this.saveTransformedDataset = (transformedData, dataset, modelName) => __awaiter(this, void 0, void 0, function* () {
36
36
  var _a;
37
- switch (dataset) {
38
- case ropid_gtfs_1.DatasetEnum.PID_GTFS:
39
- case ropid_gtfs_1.DatasetEnum.RUN_NUMBERS:
40
- yield this.streamDataToTmp(transformedData, modelName);
41
- break;
42
- default:
43
- yield ((_a = this.getTmpModelByName(modelName)) === null || _a === void 0 ? void 0 : _a.save(transformedData, false));
44
- this.logger.info(`Datasets: copying to tmp success (${modelName})`);
37
+ const saveMethod = this.ropidGtfsFactory.getSaveMethod(dataset, modelName);
38
+ if (saveMethod === HelperTypes_1.SaveMethod.STREAM) {
39
+ yield this.streamDataToTmp(transformedData, modelName);
40
+ }
41
+ else {
42
+ yield ((_a = this.getTmpModelByName(modelName)) === null || _a === void 0 ? void 0 : _a.save(transformedData, false));
43
+ this.logger.info(`Datasets: copying to tmp success (${modelName})`);
45
44
  }
46
45
  const dbLastModified = yield this.metadataRepository.getLastModified(dataset);
47
46
  yield this.metadataRepository.updateState(dataset, modelName, RopidMetadataModel_1.MetaStateEnum.SAVED, dbLastModified.version);
@@ -85,51 +84,31 @@ class TransformAndSaveDataTask extends workers_1.AbstractTask {
85
84
  return model;
86
85
  };
87
86
  this.logger = Di_2.RopidGtfsContainer.resolve(CoreToken_1.CoreToken.Logger);
88
- this.staticFileRedisRepository = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.StaticFileRedisRepository);
89
87
  this.ropidGtfsFactory = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsFactory);
90
88
  this.gtfsRedisChannel = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RedisPubSubChannel);
91
89
  this.metadataRepository = Di_2.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGtfsMetadataRepository);
92
- this.transformationGtfs = this.ropidGtfsFactory.getTransformation(ropid_gtfs_1.DatasetEnum.PID_GTFS);
93
90
  }
94
91
  execute(inputData, msgProperties) {
95
92
  return __awaiter(this, void 0, void 0, function* () {
96
- const datasetMap = this.ropidGtfsFactory.getDatasetMap();
93
+ this.logger.info(`Datasets: transforming and saving (${inputData.name})`);
97
94
  let modelName = (0, HelperTypes_1.datasetFileModelMap)(inputData.dataset, inputData.name);
98
95
  if (!Array.isArray(modelName)) {
99
96
  modelName = [modelName];
100
97
  }
101
98
  let errorMessage;
102
- if (inputData.dataset === ropid_gtfs_1.DatasetEnum.PID_GTFS || inputData.dataset === ropid_gtfs_1.DatasetEnum.RUN_NUMBERS) {
103
- try {
104
- const sourceStream = this.staticFileRedisRepository.getReadableStream(inputData.filepath);
105
- const transformedDataset = yield this.transformationGtfs.transform({
106
- sourceStream,
107
- name: modelName[0],
108
- });
109
- yield this.saveTransformedDataset(transformedDataset, inputData.dataset, modelName[0]);
99
+ try {
100
+ const transformedData = yield this.ropidGtfsFactory.loadAndTransformDataset(inputData, modelName[0]);
101
+ if (inputData.dataset === ropid_gtfs_1.DatasetEnum.CIS_STOPS) {
102
+ yield this.saveTransformedDataset(transformedData.cis_stops, inputData.dataset, modelName[0]);
103
+ yield this.saveTransformedDataset(transformedData.cis_stop_groups, inputData.dataset, modelName[1]);
110
104
  }
111
- catch (err) {
112
- errorMessage = err.message;
105
+ else {
106
+ yield this.saveTransformedDataset(transformedData, inputData.dataset, modelName[0]);
113
107
  }
114
108
  }
115
- else {
116
- try {
117
- const data = yield this.staticFileRedisRepository.get(inputData.filepath);
118
- const transformedDataset = yield datasetMap[inputData.dataset].transformation.transform({
119
- data: datasetMap[inputData.dataset].cacheContentType === HelperTypes_1.CacheContentType.JSON ? JSON.parse(data) : data,
120
- name: inputData.name,
121
- });
122
- if (inputData.dataset === ropid_gtfs_1.DatasetEnum.CIS_STOPS) {
123
- yield this.saveTransformedDataset(transformedDataset.cis_stops, inputData.dataset, modelName[0]);
124
- yield this.saveTransformedDataset(transformedDataset.cis_stop_groups, inputData.dataset, modelName[1]);
125
- }
126
- else {
127
- yield this.saveTransformedDataset(transformedDataset, inputData.dataset, modelName[0]);
128
- }
129
- }
130
- catch (err) {
131
- errorMessage = err.message;
132
- }
109
+ catch (err) {
110
+ this.logger.error(`Datasets: transforming and saving error (${modelName}): ${err.toString()}`);
111
+ errorMessage = err.message;
133
112
  }
134
113
  if (msgProperties === null || msgProperties === void 0 ? void 0 : msgProperties.headers[HelperTypes_1.ORIGIN_HOSTNAME_HEADER]) {
135
114
  yield this.gtfsRedisChannel.publishMessage(`${errorMessage !== null && errorMessage !== void 0 ? errorMessage : "OK"} (${modelName})`, {
@@ -1 +1 @@
1
- {"version":3,"file":"TransformAndSaveDataTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/TransformAndSaveDataTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TransformAndSaveDataTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/TransformAndSaveDataTask.ts"],"names":[],"mappings":"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"}
@@ -23,3 +23,7 @@ export type DatasetMap = {
23
23
  export declare const isCachedDataset: (obj: any) => obj is ICachedDataset;
24
24
  export declare const datasetFileModelMap: (dataset: GTFSDatasets, name: string) => DatasetModelName | DatasetModelName[];
25
25
  export declare const getTableNameFromModel: (modelName: DatasetModelName) => string;
26
+ export declare enum SaveMethod {
27
+ STREAM = "stream",
28
+ SEQUELIZE = "sequelize"
29
+ }
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getTableNameFromModel = exports.datasetFileModelMap = exports.isCachedDataset = exports.CacheContentType = exports.ORIGIN_HOSTNAME_HEADER = void 0;
3
+ exports.SaveMethod = exports.getTableNameFromModel = exports.datasetFileModelMap = exports.isCachedDataset = exports.CacheContentType = exports.ORIGIN_HOSTNAME_HEADER = void 0;
4
4
  const RopidGtfsFacade_1 = require("../../../../RopidGtfsFacade");
5
5
  const ropid_gtfs_1 = require("../../../../../../schema-definitions/ropid-gtfs");
6
6
  exports.ORIGIN_HOSTNAME_HEADER = "x-origin-hostname";
@@ -38,4 +38,9 @@ const getTableNameFromModel = (modelName) => {
38
38
  return ropid_gtfs_1.RopidGTFS[modelName].pgTableName;
39
39
  };
40
40
  exports.getTableNameFromModel = getTableNameFromModel;
41
+ var SaveMethod;
42
+ (function (SaveMethod) {
43
+ SaveMethod["STREAM"] = "stream";
44
+ SaveMethod["SEQUELIZE"] = "sequelize";
45
+ })(SaveMethod || (exports.SaveMethod = SaveMethod = {}));
41
46
  //# sourceMappingURL=HelperTypes.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"HelperTypes.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/HelperTypes.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAC7D,gFAAiF;AAKpE,QAAA,sBAAsB,GAAG,mBAAmB,CAAC;AAQ1D,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,+BAAW,CAAA;IACX,iCAAa,CAAA;AACjB,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAYM,MAAM,eAAe,GAAG,CAAC,GAAQ,EAAyB,EAAE;IAC/D,OAAO,GAAG,YAAY,MAAM,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC;AACtH,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AAEK,MAAM,mBAAmB,GAAG,CAAC,OAAqB,EAAE,IAAY,EAAyC,EAAE;IAC9G,IAAI,KAAK,CAAC;IACV,QAAQ,OAAO,EAAE;QACb,KAAK,6BAAW,CAAC,QAAQ;YACrB,KAAK,GAAG,IAAyB,CAAC;YAClC,MAAM;QACV,KAAK,6BAAW,CAAC,WAAW;YACxB,KAAK,GAAU,aAAa,CAAC;YAC7B,MAAM;QACV,KAAK,6BAAW,CAAC,WAAW;YACxB,KAAK,GAAU,KAAK,CAAC;YACrB,MAAM;QACV,KAAK,6BAAW,CAAC,SAAS;YACtB,KAAK,GAAG,CAAQ,WAAW,EAAS,iBAAiB,CAAC,CAAC;YACvD,MAAM;QACV;YACI,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,eAAe,IAAI,EAAE,CAAC,CAAC;KAC9E;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B;AAEK,MAAM,qBAAqB,GAAG,CAAC,SAA2B,EAAU,EAAE;IACzE,OAAO,sBAAS,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC;AAC5C,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC"}
1
+ {"version":3,"file":"HelperTypes.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/HelperTypes.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAC7D,gFAAiF;AAKpE,QAAA,sBAAsB,GAAG,mBAAmB,CAAC;AAQ1D,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,+BAAW,CAAA;IACX,iCAAa,CAAA;AACjB,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAYM,MAAM,eAAe,GAAG,CAAC,GAAQ,EAAyB,EAAE;IAC/D,OAAO,GAAG,YAAY,MAAM,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC;AACtH,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AAEK,MAAM,mBAAmB,GAAG,CAAC,OAAqB,EAAE,IAAY,EAAyC,EAAE;IAC9G,IAAI,KAAK,CAAC;IACV,QAAQ,OAAO,EAAE;QACb,KAAK,6BAAW,CAAC,QAAQ;YACrB,KAAK,GAAG,IAAyB,CAAC;YAClC,MAAM;QACV,KAAK,6BAAW,CAAC,WAAW;YACxB,KAAK,GAAU,aAAa,CAAC;YAC7B,MAAM;QACV,KAAK,6BAAW,CAAC,WAAW;YACxB,KAAK,GAAU,KAAK,CAAC;YACrB,MAAM;QACV,KAAK,6BAAW,CAAC,SAAS;YACtB,KAAK,GAAG,CAAQ,WAAW,EAAS,iBAAiB,CAAC,CAAC;YACvD,MAAM;QACV;YACI,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,eAAe,IAAI,EAAE,CAAC,CAAC;KAC9E;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B;AAEK,MAAM,qBAAqB,GAAG,CAAC,SAA2B,EAAU,EAAE;IACzE,OAAO,sBAAS,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC;AAC5C,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEF,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,+BAAiB,CAAA;IACjB,qCAAuB,CAAA;AAC3B,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB"}
@@ -1,4 +1,6 @@
1
- import { DatasetMap, GTFSDatasets } from "./HelperTypes";
1
+ import { DatasetEnum } from "../../../../RopidGtfsFacade";
2
+ import { DatasetModelName } from "../../../../../../schema-definitions/ropid-gtfs";
3
+ import { DatasetMap, GTFSDatasets, ICachedDataset, SaveMethod } from "./HelperTypes";
2
4
  export declare class RopidGtfsFactory {
3
5
  private dataSourceGtfs;
4
6
  private dataSourceCisStops;
@@ -8,7 +10,11 @@ export declare class RopidGtfsFactory {
8
10
  private transformationCisStops;
9
11
  private transformationOisMapping;
10
12
  private datasetMap;
13
+ private staticFileRedisRepository;
14
+ private ropidGtfsRouteSubAgencyTransformation;
11
15
  constructor();
12
16
  getDatasetMap(): DatasetMap;
13
17
  getTransformation(dataset: GTFSDatasets): import("@golemio/core/dist/integration-engine").ITransformation;
18
+ getSaveMethod(dataset: DatasetEnum, modelName: string): SaveMethod;
19
+ loadAndTransformDataset(inputData: ICachedDataset, modelName: DatasetModelName): Promise<any>;
14
20
  }
@@ -8,12 +8,24 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
12
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
13
+ return new (P || (P = Promise))(function (resolve, reject) {
14
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
15
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
16
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
17
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
18
+ });
19
+ };
11
20
  Object.defineProperty(exports, "__esModule", { value: true });
12
21
  exports.RopidGtfsFactory = void 0;
13
22
  const RopidGtfsFacade_1 = require("../../../../RopidGtfsFacade");
23
+ const Di_1 = require("../../../../ioc/Di");
24
+ const RopidGtfsContainerToken_1 = require("../../../../ioc/RopidGtfsContainerToken");
14
25
  const RopidGTFSCisStopsTransformation_1 = require("../../../../transformations/RopidGTFSCisStopsTransformation");
15
26
  const RopidGTFSOisTransformation_1 = require("../../../../transformations/RopidGTFSOisTransformation");
16
27
  const RopidGTFSTransformation_1 = require("../../../../transformations/RopidGTFSTransformation");
28
+ const RopidGtfsRouteSubAgencyTransformation_1 = require("../../../../transformations/RopidGtfsRouteSubAgencyTransformation");
17
29
  const ropid_gtfs_1 = require("../../../../../../schema-definitions/ropid-gtfs");
18
30
  const integration_engine_1 = require("@golemio/core/dist/integration-engine");
19
31
  const RetryDataSource_1 = require("@golemio/core/dist/integration-engine/datasources/RetryDataSource");
@@ -37,6 +49,7 @@ let RopidGtfsFactory = exports.RopidGtfsFactory = class RopidGtfsFactory {
37
49
  "stop_times.txt",
38
50
  "stops.txt",
39
51
  "routes.txt",
52
+ "route_sub_agencies.txt",
40
53
  "trips.txt",
41
54
  ],
42
55
  encoding: "utf8",
@@ -90,6 +103,8 @@ let RopidGtfsFactory = exports.RopidGtfsFactory = class RopidGtfsFactory {
90
103
  cacheContentType: HelperTypes_1.CacheContentType.JSON,
91
104
  },
92
105
  };
106
+ this.staticFileRedisRepository = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.StaticFileRedisRepository);
107
+ this.ropidGtfsRouteSubAgencyTransformation = new RopidGtfsRouteSubAgencyTransformation_1.RopidGtfsRouteSubAgencyTransformation();
93
108
  }
94
109
  getDatasetMap() {
95
110
  return this.datasetMap;
@@ -97,6 +112,40 @@ let RopidGtfsFactory = exports.RopidGtfsFactory = class RopidGtfsFactory {
97
112
  getTransformation(dataset) {
98
113
  return this.datasetMap[dataset].transformation;
99
114
  }
115
+ getSaveMethod(dataset, modelName) {
116
+ if (modelName === "route_sub_agencies") {
117
+ return HelperTypes_1.SaveMethod.SEQUELIZE;
118
+ }
119
+ switch (dataset) {
120
+ case RopidGtfsFacade_1.DatasetEnum.PID_GTFS:
121
+ case RopidGtfsFacade_1.DatasetEnum.RUN_NUMBERS:
122
+ return HelperTypes_1.SaveMethod.STREAM;
123
+ default:
124
+ return HelperTypes_1.SaveMethod.SEQUELIZE;
125
+ }
126
+ }
127
+ loadAndTransformDataset(inputData, modelName) {
128
+ return __awaiter(this, void 0, void 0, function* () {
129
+ if (inputData.name === "route_sub_agencies") {
130
+ const data = yield this.staticFileRedisRepository.getCsvAsJson(inputData.filepath);
131
+ return this.ropidGtfsRouteSubAgencyTransformation.transformArray(data);
132
+ }
133
+ else if (inputData.dataset === RopidGtfsFacade_1.DatasetEnum.PID_GTFS || inputData.dataset === RopidGtfsFacade_1.DatasetEnum.RUN_NUMBERS) {
134
+ const sourceStream = this.staticFileRedisRepository.getReadableStream(inputData.filepath);
135
+ return yield this.transformationGtfs.transform({
136
+ sourceStream,
137
+ name: modelName,
138
+ });
139
+ }
140
+ else {
141
+ const data = yield this.staticFileRedisRepository.get(inputData.filepath);
142
+ return yield this.datasetMap[inputData.dataset].transformation.transform({
143
+ data: this.datasetMap[inputData.dataset].cacheContentType === HelperTypes_1.CacheContentType.JSON ? JSON.parse(data) : data,
144
+ name: inputData.name,
145
+ });
146
+ }
147
+ });
148
+ }
100
149
  };
101
150
  exports.RopidGtfsFactory = RopidGtfsFactory = __decorate([
102
151
  (0, tsyringe_1.injectable)(),
@@ -1 +1 @@
1
- {"version":3,"file":"RopidGtfsFactory.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/RopidGtfsFactory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RopidGtfsFactory.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/RopidGtfsFactory.ts"],"names":[],"mappings":"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"}
@@ -114,6 +114,9 @@ export declare const RopidGTFSPrecomputed: {
114
114
  origin_route_name: {
115
115
  type: string;
116
116
  };
117
+ trip_number: {
118
+ type: string;
119
+ };
117
120
  };
118
121
  required: string[];
119
122
  };
@@ -76,6 +76,7 @@ const outputTripScheduleSDMA = {
76
76
  first_stop_id: sequelize_1.DataTypes.STRING,
77
77
  last_stop_id: sequelize_1.DataTypes.STRING,
78
78
  origin_route_name: sequelize_1.DataTypes.STRING(50),
79
+ trip_number: sequelize_1.DataTypes.SMALLINT,
79
80
  };
80
81
  const outputTripScheduleJsonSchema = {
81
82
  type: "object",
@@ -146,6 +147,9 @@ const outputTripScheduleJsonSchema = {
146
147
  origin_route_name: {
147
148
  type: "string",
148
149
  },
150
+ trip_number: {
151
+ type: "integer",
152
+ },
149
153
  },
150
154
  required: ["route_type"],
151
155
  };
@@ -1 +1 @@
1
- {"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":";;;AAAA,mEAAsG;AAEtG,MAAM,0BAA0B,GAAyB;IACrD,IAAI,EAAE,qBAAS,CAAC,IAAI;IACpB,QAAQ,EAAE,qBAAS,CAAC,OAAO;IAC3B,UAAU,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,MAAM,gCAAgC,GAAG;IACrC,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;SACjB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,SAAS;SAClB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,QAAQ;SACjB;KACJ;IACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC;CAC/C,CAAC;AAEF,MAAM,6BAA6B,GAAyB;IACxD,OAAO,EAAE,qBAAS,CAAC,MAAM;IACzB,iBAAiB,EAAE,qBAAS,CAAC,OAAO;IACpC,iBAAiB,EAAE,qBAAS,CAAC,OAAO;IACpC,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,aAAa,EAAE,qBAAS,CAAC,MAAM,EAAE,aAAa;CACjD,CAAC;AAEF,MAAM,mCAAmC,GAAG;IACxC,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,OAAO,EAAE;YACL,IAAI,EAAE,QAAQ;SACjB;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,SAAS;SAClB;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,SAAS;SAClB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;KACJ;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe,CAAC;CACpG,CAAC;AAEF,MAAM,sBAAsB,GAAyB;IACjD,eAAe,EAAE,qBAAS,CAAC,MAAM;IACjC,OAAO,EAAE,qBAAS,CAAC,MAAM;IACzB,UAAU,EAAE,qBAAS,CAAC,MAAM;IAC5B,UAAU,EAAE,qBAAS,CAAC,OAAO;IAC7B,IAAI,EAAE,qBAAS,CAAC,MAAM;IACtB,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,UAAU,EAAE;QACR,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK;KACnB;IACD,gBAAgB,EAAE,qBAAS,CAAC,MAAM;IAClC,WAAW,EAAE,qBAAS,CAAC,MAAM;IAC7B,uBAAuB,EAAE,qBAAS,CAAC,MAAM;IACzC,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,eAAe,EAAE,qBAAS,CAAC,MAAM;IACjC,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,WAAW,EAAE,qBAAS,CAAC,MAAM;IAC7B,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,eAAe,EAAE,qBAAS,CAAC,MAAM;IACjC,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,YAAY,EAAE,qBAAS,CAAC,MAAM;IAC9B,iBAAiB,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IACvC,WAAW,EAAE,qBAAS,CAAC,QAAQ;CAClC,CAAC;AAEF,MAAM,4BAA4B,GAAG;IACjC,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,eAAe,EAAE;YACb,IAAI,EAAE,QAAQ;SACjB;QACD,OAAO,EAAE;YACL,IAAI,EAAE,QAAQ;SACjB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,QAAQ;SACjB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,QAAQ;SACjB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;SACjB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;SACjB;QACD,UAAU,EAAE;YACR,IAAI,EAAE,SAAS;SAClB;QACD,gBAAgB,EAAE;YACd,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,uBAAuB,EAAE;YACrB,IAAI,EAAE,QAAQ;SACjB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;SACjB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,eAAe,EAAE;YACb,IAAI,EAAE,QAAQ;SACjB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,SAAS;SAClB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,eAAe,EAAE;YACb,IAAI,EAAE,QAAQ;SACjB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,aAAa,EAAE;YACX,IAAI,EAAE,QAAQ;SACjB;QACD,YAAY,EAAE;YACV,IAAI,EAAE,QAAQ;SACjB;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,SAAS;SAClB;KACJ;IACD,QAAQ,EAAE,CAAC,YAAY,CAAC;CAC3B,CAAC;AAEW,QAAA,oBAAoB,GAAG;IAChC,gBAAgB,EAAE;QACd,gBAAgB,EAAE,gCAAgC;QAClD,yBAAyB,EAAE,0BAA0B;QACrD,WAAW,EAAE,yCAAyC;KACzD;IACD,mBAAmB,EAAE;QACjB,gBAAgB,EAAE,mCAAmC;QACrD,yBAAyB,EAAE,6BAA6B;QACxD,WAAW,EAAE,6CAA6C;KAC7D;IACD,YAAY,EAAE;QACV,gBAAgB,EAAE,4BAA4B;QAC9C,yBAAyB,EAAE,sBAAsB;QACjD,WAAW,EAAE,qCAAqC;KACrD;CACJ,CAAC"}
@@ -5,6 +5,7 @@ export interface IRopidGTFSRunNumbersInputData {
5
5
  service_id: string;
6
6
  trip_id: string;
7
7
  vehicle_type: string;
8
+ trip_number: string | null;
8
9
  }
9
10
  export type IRopidGTFSRunNumbersData = IRopidGTFSRunNumbersInputData | {
10
11
  run_number: number;
@@ -37,6 +38,9 @@ export declare const RopidGTFSRunNumbers: {
37
38
  vehicle_type: {
38
39
  type: string;
39
40
  };
41
+ trip_number: {
42
+ type: string;
43
+ };
40
44
  };
41
45
  required: string[];
42
46
  };
@@ -62,6 +66,9 @@ export declare const RopidGTFSRunNumbers: {
62
66
  vehicle_type: {
63
67
  type: string;
64
68
  };
69
+ trip_number: {
70
+ type: string;
71
+ };
65
72
  };
66
73
  required: string[];
67
74
  };
@@ -26,6 +26,9 @@ const datasourceJsonSchema = {
26
26
  vehicle_type: {
27
27
  type: "string",
28
28
  },
29
+ trip_number: {
30
+ type: "string",
31
+ },
29
32
  },
30
33
  required: ["route_id", "run_number", "service_id", "trip_id", "vehicle_type"],
31
34
  },
@@ -51,6 +54,9 @@ const outputJsonSchema = Object.assign(Object.assign({}, datasourceJsonSchema),
51
54
  vehicle_type: {
52
55
  type: "number",
53
56
  },
57
+ trip_number: {
58
+ type: "number",
59
+ },
54
60
  },
55
61
  required: datasourceJsonSchema.$defs.item.required,
56
62
  },
@@ -77,6 +83,10 @@ const outputSequelizeAttributes = {
77
83
  type: sequelize_1.DataTypes.INTEGER,
78
84
  allowNull: false,
79
85
  },
86
+ trip_number: {
87
+ type: sequelize_1.DataTypes.SMALLINT,
88
+ allowNull: true,
89
+ },
80
90
  };
81
91
  exports.RopidGTFSRunNumbers = {
82
92
  name: "RopidGTFSRunNumbers",
@@ -1 +1 @@
1
- {"version":3,"file":"RopidGTFSRunNumbers.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.ts"],"names":[],"mappings":";;;AAAA,mEAAiF;AAkBjF,MAAM,oBAAoB,GAAG;IACzB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,cAAc;KACvB;IACD,KAAK,EAAE;QACH,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACR,QAAQ,EAAE;oBACN,IAAI,EAAE,QAAQ;iBACjB;gBACD,UAAU,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACjB;gBACD,UAAU,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACjB;gBACD,OAAO,EAAE;oBACL,IAAI,EAAE,QAAQ;iBACjB;gBACD,YAAY,EAAE;oBACV,IAAI,EAAE,QAAQ;iBACjB;aACJ;YACD,QAAQ,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,cAAc,CAAC;SAChF;KACJ;CACJ,CAAC;AAEF,kCAAkC;AAClC,MAAM,gBAAgB,mCACf,oBAAoB,KACvB,KAAK,EAAE;QACH,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACR,QAAQ,EAAE;oBACN,IAAI,EAAE,QAAQ;iBACjB;gBACD,UAAU,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACjB;gBACD,UAAU,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACjB;gBACD,OAAO,EAAE;oBACL,IAAI,EAAE,QAAQ;iBACjB;gBACD,YAAY,EAAE;oBACV,IAAI,EAAE,QAAQ;iBACjB;aACJ;YACD,QAAQ,EAAE,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ;SACrD;KACJ,GACJ,CAAC;AAEF,8BAA8B;AAC9B,MAAM,yBAAyB,GAAmD;IAC9E,QAAQ,EAAE;QACN,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;IACD,UAAU,EAAE;QACR,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,OAAO;KAC1B;IACD,UAAU,EAAE;QACR,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,OAAO,EAAE;QACL,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,YAAY,EAAE;QACV,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,KAAK;KACnB;CACJ,CAAC;AAEW,QAAA,mBAAmB,GAAG;IAC/B,IAAI,EAAE,qBAAqB;IAC3B,oBAAoB;IACpB,gBAAgB;IAChB,yBAAyB;IACzB,WAAW,EAAE,uBAAuB;CACvC,CAAC"}
1
+ {"version":3,"file":"RopidGTFSRunNumbers.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.ts"],"names":[],"mappings":";;;AAAA,mEAAiF;AAmBjF,MAAM,oBAAoB,GAAG;IACzB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,cAAc;KACvB;IACD,KAAK,EAAE;QACH,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACR,QAAQ,EAAE;oBACN,IAAI,EAAE,QAAQ;iBACjB;gBACD,UAAU,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACjB;gBACD,UAAU,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACjB;gBACD,OAAO,EAAE;oBACL,IAAI,EAAE,QAAQ;iBACjB;gBACD,YAAY,EAAE;oBACV,IAAI,EAAE,QAAQ;iBACjB;gBACD,WAAW,EAAE;oBACT,IAAI,EAAE,QAAQ;iBACjB;aACJ;YACD,QAAQ,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,cAAc,CAAC;SAChF;KACJ;CACJ,CAAC;AAEF,kCAAkC;AAClC,MAAM,gBAAgB,mCACf,oBAAoB,KACvB,KAAK,EAAE;QACH,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACR,QAAQ,EAAE;oBACN,IAAI,EAAE,QAAQ;iBACjB;gBACD,UAAU,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACjB;gBACD,UAAU,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACjB;gBACD,OAAO,EAAE;oBACL,IAAI,EAAE,QAAQ;iBACjB;gBACD,YAAY,EAAE;oBACV,IAAI,EAAE,QAAQ;iBACjB;gBACD,WAAW,EAAE;oBACT,IAAI,EAAE,QAAQ;iBACjB;aACJ;YACD,QAAQ,EAAE,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ;SACrD;KACJ,GACJ,CAAC;AAEF,8BAA8B;AAC9B,MAAM,yBAAyB,GAAmD;IAC9E,QAAQ,EAAE;QACN,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,SAAS,EAAE,KAAK;KACnB;IACD,UAAU,EAAE;QACR,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,OAAO;KAC1B;IACD,UAAU,EAAE;QACR,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,OAAO,EAAE;QACL,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAC7B;IACD,YAAY,EAAE;QACV,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,SAAS,EAAE,KAAK;KACnB;IACD,WAAW,EAAE;QACT,IAAI,EAAE,qBAAS,CAAC,QAAQ;QACxB,SAAS,EAAE,IAAI;KAClB;CACJ,CAAC;AAEW,QAAA,mBAAmB,GAAG;IAC/B,IAAI,EAAE,qBAAqB;IAC3B,oBAAoB;IACpB,gBAAgB;IAChB,yBAAyB;IACzB,WAAW,EAAE,uBAAuB;CACvC,CAAC"}
@@ -2,6 +2,7 @@ import { AgencyDto } from "./models/AgencyDto";
2
2
  import { CalendarDatesDto } from "./models/CalendarDatesDto";
3
3
  import { CalendarDto } from "./models/CalendarDto";
4
4
  import { RouteDto } from "./models/RouteDto";
5
+ import { RouteSubAgencyDto } from "./models/RouteSubAgencyDto";
5
6
  import { ShapeDto } from "./models/ShapeDto";
6
7
  import { StopDto } from "./models/StopDto";
7
8
  import { StopTimesDto } from "./models/StopTimesDto";
@@ -63,6 +64,14 @@ export declare const RopidGTFSSchedule: {
63
64
  */
64
65
  outputSequelizeAttributes: import("sequelize/types/model").ModelAttributes<RouteDto, any>;
65
66
  };
67
+ route_sub_agencies: {
68
+ name: string;
69
+ pgTableName: string;
70
+ /**
71
+ * @deprecated The property should not be used
72
+ */
73
+ outputSequelizeAttributes: import("sequelize/types/model").ModelAttributes<RouteSubAgencyDto, any>;
74
+ };
66
75
  trips: {
67
76
  name: string;
68
77
  pgTableName: string;
@@ -5,6 +5,7 @@ const AgencyDto_1 = require("./models/AgencyDto");
5
5
  const CalendarDatesDto_1 = require("./models/CalendarDatesDto");
6
6
  const CalendarDto_1 = require("./models/CalendarDto");
7
7
  const RouteDto_1 = require("./models/RouteDto");
8
+ const RouteSubAgencyDto_1 = require("./models/RouteSubAgencyDto");
8
9
  const ShapeDto_1 = require("./models/ShapeDto");
9
10
  const StopDto_1 = require("./models/StopDto");
10
11
  const StopTimesDto_1 = require("./models/StopTimesDto");
@@ -66,6 +67,14 @@ exports.RopidGTFSSchedule = {
66
67
  */
67
68
  outputSequelizeAttributes: RouteDto_1.RouteDto.attributeModel,
68
69
  },
70
+ route_sub_agencies: {
71
+ name: "RopidGTFSRouteSubAgencies",
72
+ pgTableName: "ropidgtfs_route_sub_agencies",
73
+ /**
74
+ * @deprecated The property should not be used
75
+ */
76
+ outputSequelizeAttributes: RouteSubAgencyDto_1.RouteSubAgencyDto.attributeModel,
77
+ },
69
78
  trips: {
70
79
  name: "RopidGTFSTrips",
71
80
  pgTableName: "ropidgtfs_trips",
@@ -1 +1 @@
1
- {"version":3,"file":"RopidGtfsSchedule.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGtfsSchedule.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAC/C,gEAA6D;AAC7D,sDAAmD;AACnD,gDAA6C;AAC7C,gDAA6C;AAC7C,8CAA2C;AAC3C,wDAAqD;AACrD,8CAA2C;AAG9B,QAAA,iBAAiB,GAAG;IAC7B,MAAM,EAAE;QACJ,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,kBAAkB;QAC/B;;WAEG;QACH,yBAAyB,EAAE,qBAAS,CAAC,cAAc;KACtD;IACD,QAAQ,EAAE;QACN,IAAI,EAAE,mBAAmB;QACzB,WAAW,EAAE,oBAAoB;QACjC;;WAEG;QACH,yBAAyB,EAAE,yBAAW,CAAC,cAAc;KACxD;IACD,cAAc,EAAE;QACZ,IAAI,EAAE,wBAAwB;QAC9B,WAAW,EAAE,0BAA0B;QACvC;;WAEG;QACH,yBAAyB,EAAE,mCAAgB,CAAC,cAAc;KAC7D;IACD,MAAM,EAAE;QACJ,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,kBAAkB;QAC/B;;WAEG;QACH,yBAAyB,EAAE,mBAAQ,CAAC,cAAc;KACrD;IACD,UAAU,EAAE;QACR,IAAI,EAAE,oBAAoB;QAC1B,WAAW,EAAE,sBAAsB;QACnC;;WAEG;QACH,yBAAyB,EAAE,2BAAY,CAAC,cAAc;KACzD;IACD,KAAK,EAAE;QACH,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,iBAAiB;QAC9B;;WAEG;QACH,yBAAyB,EAAE,iBAAO,CAAC,cAAc;KACpD;IACD,MAAM,EAAE;QACJ,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,kBAAkB;QAC/B;;WAEG;QACH,yBAAyB,EAAE,mBAAQ,CAAC,cAAc;KACrD;IACD,KAAK,EAAE;QACH,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,iBAAiB;QAC9B;;WAEG;QACH,yBAAyB,EAAE,iBAAO,CAAC,cAAc;KACpD;CACJ,CAAC"}
1
+ {"version":3,"file":"RopidGtfsSchedule.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGtfsSchedule.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAC/C,gEAA6D;AAC7D,sDAAmD;AACnD,gDAA6C;AAC7C,kEAA+D;AAC/D,gDAA6C;AAC7C,8CAA2C;AAC3C,wDAAqD;AACrD,8CAA2C;AAG9B,QAAA,iBAAiB,GAAG;IAC7B,MAAM,EAAE;QACJ,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,kBAAkB;QAC/B;;WAEG;QACH,yBAAyB,EAAE,qBAAS,CAAC,cAAc;KACtD;IACD,QAAQ,EAAE;QACN,IAAI,EAAE,mBAAmB;QACzB,WAAW,EAAE,oBAAoB;QACjC;;WAEG;QACH,yBAAyB,EAAE,yBAAW,CAAC,cAAc;KACxD;IACD,cAAc,EAAE;QACZ,IAAI,EAAE,wBAAwB;QAC9B,WAAW,EAAE,0BAA0B;QACvC;;WAEG;QACH,yBAAyB,EAAE,mCAAgB,CAAC,cAAc;KAC7D;IACD,MAAM,EAAE;QACJ,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,kBAAkB;QAC/B;;WAEG;QACH,yBAAyB,EAAE,mBAAQ,CAAC,cAAc;KACrD;IACD,UAAU,EAAE;QACR,IAAI,EAAE,oBAAoB;QAC1B,WAAW,EAAE,sBAAsB;QACnC;;WAEG;QACH,yBAAyB,EAAE,2BAAY,CAAC,cAAc;KACzD;IACD,KAAK,EAAE;QACH,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,iBAAiB;QAC9B;;WAEG;QACH,yBAAyB,EAAE,iBAAO,CAAC,cAAc;KACpD;IACD,MAAM,EAAE;QACJ,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,kBAAkB;QAC/B;;WAEG;QACH,yBAAyB,EAAE,mBAAQ,CAAC,cAAc;KACrD;IACD,kBAAkB,EAAE;QAChB,IAAI,EAAE,2BAA2B;QACjC,WAAW,EAAE,8BAA8B;QAC3C;;WAEG;QACH,yBAAyB,EAAE,qCAAiB,CAAC,cAAc;KAC9D;IACD,KAAK,EAAE;QACH,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,iBAAiB;QAC9B;;WAEG;QACH,yBAAyB,EAAE,iBAAO,CAAC,cAAc;KACpD;CACJ,CAAC"}
@@ -0,0 +1,6 @@
1
+ export interface IRouteSubAgencyDto {
2
+ route_id: string;
3
+ route_licence_number: number | null;
4
+ sub_agency_id: number;
5
+ sub_agency_name: string;
6
+ }
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=IRouteSubAgencyDto.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IRouteSubAgencyDto.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-gtfs/interfaces/IRouteSubAgencyDto.ts"],"names":[],"mappings":""}
@@ -0,0 +1,11 @@
1
+ import { Model, ModelAttributes } from "@golemio/core/dist/shared/sequelize";
2
+ import { IRouteSubAgencyDto } from "../interfaces/IRouteSubAgencyDto";
3
+ import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
4
+ export declare class RouteSubAgencyDto extends Model<IRouteSubAgencyDto> implements IRouteSubAgencyDto {
5
+ route_id: string;
6
+ route_licence_number: number | null;
7
+ sub_agency_id: number;
8
+ sub_agency_name: string;
9
+ static attributeModel: ModelAttributes<RouteSubAgencyDto>;
10
+ static jsonSchema: JSONSchemaType<IRouteSubAgencyDto[]>;
11
+ }
@@ -0,0 +1,27 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RouteSubAgencyDto = void 0;
4
+ const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
5
+ class RouteSubAgencyDto extends sequelize_1.Model {
6
+ }
7
+ exports.RouteSubAgencyDto = RouteSubAgencyDto;
8
+ RouteSubAgencyDto.attributeModel = {
9
+ route_id: { type: sequelize_1.DataTypes.STRING, primaryKey: true },
10
+ route_licence_number: { type: sequelize_1.DataTypes.INTEGER, allowNull: true },
11
+ sub_agency_id: { type: sequelize_1.DataTypes.INTEGER, primaryKey: true },
12
+ sub_agency_name: { type: sequelize_1.DataTypes.STRING },
13
+ };
14
+ RouteSubAgencyDto.jsonSchema = {
15
+ type: "array",
16
+ items: {
17
+ type: "object",
18
+ properties: {
19
+ route_id: { type: "string" },
20
+ route_licence_number: { oneOf: [{ type: "integer" }, { type: "null", nullable: true }] },
21
+ sub_agency_id: { type: "integer" },
22
+ sub_agency_name: { type: "string" },
23
+ },
24
+ required: ["route_id", "sub_agency_id", "sub_agency_name"],
25
+ },
26
+ };
27
+ //# sourceMappingURL=RouteSubAgencyDto.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RouteSubAgencyDto.js","sourceRoot":"","sources":["../../../../src/schema-definitions/ropid-gtfs/models/RouteSubAgencyDto.ts"],"names":[],"mappings":";;;AAAA,mEAAwF;AAIxF,MAAa,iBAAkB,SAAQ,iBAAyB;;AAAhE,8CA0BC;AApBiB,gCAAc,GAAuC;IAC/D,QAAQ,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE;IACtD,oBAAoB,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE;IAClE,aAAa,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;IAC5D,eAAe,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE;CAC9C,CAAC;AAEY,4BAAU,GAAyC;IAC7D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,oBAAoB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACxF,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACtC;QACD,QAAQ,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,iBAAiB,CAAC;KAC7D;CACJ,CAAC"}
@@ -38,7 +38,7 @@ Modul slouží k ukládání a poskytování informací o jízdních řádech a
38
38
  - zdroj dat
39
39
  - cesta: /GTFS (config.datasources.RopidGTFSPath)
40
40
  - soubory:
41
- - PID_GTFS.zip (config.datasources.RopidGTFSFilename) -> agency.txt, calendar.txt, calendar_dates.txt, shapes.txt, stop_times.txt, stops.txt, routes.txt, trips.txt
41
+ - PID_GTFS.zip (config.datasources.RopidGTFSFilename) -> agency.txt, calendar.txt, calendar_dates.txt, shapes.txt, stop_times.txt, stops.txt, routes.txt, route_sub_agencies.txt, trips.txt
42
42
  - formát dat
43
43
  - protokol: ftp
44
44
  - datový typ: csv
@@ -448,12 +448,15 @@ Worker má na starost aktualizaci presets číselníků
448
448
  - [RopidGTFSCisStopsTransformation](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/blob/development/src/integration-engine/ropid-gtfs/transformations/RopidGTFSCisStopsTransformation.ts)
449
449
  - [RopidGTFSOisMappingTransformation](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/blob/development/src/integration-engine/ropid-gtfs/transformations/RopidGTFSOisTransformation.ts)
450
450
  - [RopidGTFSRunNumbersTransformation](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/blob/development/src/integration-engine/ropid-gtfs/transformations/RopidGTFSRunNumbersTransformation.ts)
451
+ - [RopidGtfsRouteSubAgencyTransformation](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/blob/development/src/integration-engine/ropid-gtfs/transformations/RopidGtfsRouteSubAgencyTransformation.ts)
452
+ - on top of transformation functionality it also removes duplicates. Rule: If there are multiple rows with same `route_id` and `sub_agency_id` only the first with filled licence number is kept.
451
453
  - data modely
452
454
  - RopidGTFSMetadataModel `ropidgtfs_metadata`
453
455
  - RopidGTFSAgencyModel `ropidgtfs_agency`
454
456
  - RopidGTFSCalendarModel `ropidgtfs_calendar`
455
- - RopidGTFSCalendarDatesModel `ropidgtfs_calendar_dates`
457
+ - RopidGTFSCalendarDatesModel `ropidgtfs_calendar_dates`
456
458
  - RopidGTFSRoutesModel `ropidgtfs_routes`
459
+ - RouteSubAgencyDto `ropidgtfs_route_sub_agencies`
457
460
  - RopidGTFSShapesModel `ropidgtfs_shapes`
458
461
  - RopidGTFSStopTimesModel `ropidgtfs_stop_times`
459
462
  - RopidGTFSStopsModel `ropidgtfs_stops`
@@ -482,6 +485,7 @@ Worker má na starost aktualizaci presets číselníků
482
485
  - RopidGTFSAgencyModel `ropidgtfs_agency`
483
486
  - RopidGTFSCalendarModel `ropidgtfs_calendar`
484
487
  - RopidGTFSCalendarDatesModel `ropidgtfs_calendar_dates`
488
+ - RouteSubAgencyDto `ropidgtfs_route_sub_agencies`
485
489
  - RopidGTFSRoutesModel `ropidgtfs_routes`
486
490
  - RopidGTFSShapesModel `ropidgtfs_shapes`
487
491
  - RopidGTFSStopTimesModel `ropidgtfs_stop_times`
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/pid",
3
- "version": "2.8.11-dev.992817797",
3
+ "version": "2.8.11-dev.992961204",
4
4
  "description": "Golemio PID Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",