@golemio/pid 2.11.6-dev.1158774210 → 2.11.6-rc.1169330401

package/db/example/15_vehicle_descriptors.sql

@@ -6,8 +6,10 @@ INSERT INTO vehiclepositions_vehicle_descriptors (id,state,registration_number,r
 	 (14,'zar',9366,1,NULL,'Dopravní podnik hl. m. Prahy','Škoda','15T5','tramvaj',0,true,false,'CVR Tommy Hilfiger – Klenoty Aurum, bílá s modrými a červenými pruhy',NULL,NULL,NULL,now(),NULL,NULL,now(),NULL),
 	 (15,'zar',9366,1,'8T0 XXXX','ARRIVA STŘEDNÍ ČECHY','SOR','C 10.5','autobus',3,false,false,'Veolia, červená s šedým pruhem',NULL,NULL,NULL,now(),NULL,NULL,now(),NULL),
 	 (16,'zar',8582,2,'5SX XXXX','OAD Kolín','Iveco','Crossway LE LINE 12M','autobus',3,false,false,'schéma PID, šedá s červenými svislými pruhy',NULL,NULL,NULL,now(),NULL,NULL,now(),NULL),
-	 (17,'zar',8581,2,'5SU XXXX','OAD Kolín','Iveco','Crossway LE LINE 12M','autobus',3,true,false,'schéma PID, šedá s červenými svislými pruhy',NULL,NULL,NULL,now(),NULL,NULL,now(),NULL);
+	 (17,'zar',8581,2,'5SU XXXX','OAD Kolín','Iveco','Crossway LE LINE 12M','autobus',3,true,false,'schéma PID, šedá s červenými svislými pruhy',NULL,NULL,NULL,now(),NULL,NULL,now(),NULL),
+	 (18,'zar',3927,2,'7AP 7543','Dopravní podnik hl. m. Prahy','SOR','NB 12','autobus',3,true,false,'městské schéma, červeno-bílá',null,null,NULL,now(),NULL,NULL,now(),NULL);
+
 
 -- To be deleted by the test
 INSERT INTO vehiclepositions_vehicle_descriptors (id,state,registration_number,registration_number_index,license_plate,"operator",manufacturer,"type",traction,gtfs_route_type,is_air_conditioned,has_usb_chargers,paint,thumbnail_url,photo_url,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
-	 (18,'zar',1094,1,'5AC XXXX','ČSAD Česká Lípa','Iveco','Crossway LINE 12M','autobus',3,true,false,'bílá',NULL,NULL,NULL,now() - interval '1 day',NULL,NULL,now() - interval '1 day',NULL);
+	 (19,'zar',1094,1,'5AC XXXX','ČSAD Česká Lípa','Iveco','Crossway LINE 12M','autobus',3,true,false,'bílá',NULL,NULL,NULL,now() - interval '1 day',NULL,NULL,now() - interval '1 day',NULL);

package/db/example/16_preset_logs.sql

@@ -6,4 +6,6 @@ INSERT INTO ropid_departures_presets (route_name,api_version,route,url_query_par
 
 -- To be deleted by the test
 INSERT INTO ropid_departures_preset_logs (device_alias,received_at,is_processed,request_url,request_method,request_user_agent,response_status,response_time_ms,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
-	 ('test-povstani-del',now() - interval '1 day',true,'/pid/test-povstani-del','GET','Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/114.0',200,496,NULL,now() - interval '1 day',NULL,NULL,now() - interval '1 day',NULL);
+	 ('test1-povstani-del1',now() - interval '1 day',true,'/pid/test-povstani-del','GET','Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/114.0',200,496,NULL,now() - interval '1 day',NULL,NULL,now() - interval '1 day',NULL),
+	 ('test2-povstani-del2',now(),true,'/pid/test-random-del','GET','test2',200,496,NULL,now(),NULL,NULL,now(),NULL),
+	 ('test3-povstani-del3',now(),true,'/pid/test-deadly-del','GET','test3',200,496,NULL,now(),NULL,NULL,now(),NULL);

package/db/example/redis/publicDelayCompObjectMock.json

@@ -0,0 +1,308 @@
+{
+    "stop_times": [
+        {
+            "arrival_time": "16:53:00",
+            "departure_time": "16:53:00",
+            "shape_dist_traveled": 0,
+            "stop_headsign": null,
+            "stop_id": "U1040Z19P",
+            "stop_sequence": 1,
+            "arrival_time_seconds": 60780,
+            "departure_time_seconds": 60780,
+            "stop": {
+                "stop_id": "U1040Z19P",
+                "stop_lat": 50.068737,
+                "stop_lon": 14.404152,
+                "stop_name": "Na Knížecí",
+                "zone_id": "P",
+                "wheelchair_boarding": 0
+            }
+        },
+        {
+            "arrival_time": "16:55:00",
+            "departure_time": "16:55:00",
+            "shape_dist_traveled": 0.65801,
+            "stop_headsign": null,
+            "stop_id": "U638Z1P",
+            "stop_sequence": 2,
+            "arrival_time_seconds": 60900,
+            "departure_time_seconds": 60900,
+            "stop": {
+                "stop_id": "U638Z1P",
+                "stop_lat": 50.066711,
+                "stop_lon": 14.399107,
+                "stop_name": "Santoška",
+                "zone_id": "P",
+                "wheelchair_boarding": 0
+            }
+        },
+        {
+            "arrival_time": "16:57:00",
+            "departure_time": "16:57:00",
+            "shape_dist_traveled": 1.209992,
+            "stop_headsign": null,
+            "stop_id": "U835Z1P",
+            "stop_sequence": 3,
+            "arrival_time_seconds": 61020,
+            "departure_time_seconds": 61020,
+            "stop": {
+                "stop_id": "U835Z1P",
+                "stop_lat": 50.065201,
+                "stop_lon": 14.393001,
+                "stop_name": "Václavka",
+                "zone_id": "P",
+                "wheelchair_boarding": 0
+            }
+        },
+        {
+            "arrival_time": "16:59:00",
+            "departure_time": "16:59:00",
+            "shape_dist_traveled": 1.606345,
+            "stop_headsign": null,
+            "stop_id": "U363Z1P",
+            "stop_sequence": 4,
+            "arrival_time_seconds": 61140,
+            "departure_time_seconds": 61140,
+            "stop": {
+                "stop_id": "U363Z1P",
+                "stop_lat": 50.064968,
+                "stop_lon": 14.3883,
+                "stop_name": "Malvazinky",
+                "zone_id": "P",
+                "wheelchair_boarding": 0
+            }
+        },
+        {
+            "arrival_time": "17:00:00",
+            "departure_time": "17:00:00",
+            "shape_dist_traveled": 1.992387,
+            "stop_headsign": null,
+            "stop_id": "U815Z1P",
+            "stop_sequence": 5,
+            "arrival_time_seconds": 61200,
+            "departure_time_seconds": 61200,
+            "stop": {
+                "stop_id": "U815Z1P",
+                "stop_lat": 50.062717,
+                "stop_lon": 14.3842,
+                "stop_name": "Urbanova",
+                "zone_id": "P",
+                "wheelchair_boarding": 0
+            }
+        },
+        {
+            "arrival_time": "17:01:00",
+            "departure_time": "17:01:00",
+            "shape_dist_traveled": 2.315504,
+            "stop_headsign": null,
+            "stop_id": "U116Z1P",
+            "stop_sequence": 6,
+            "arrival_time_seconds": 61260,
+            "departure_time_seconds": 61260,
+            "stop": {
+                "stop_id": "U116Z1P",
+                "stop_lat": 50.060677,
+                "stop_lon": 14.381,
+                "stop_name": "Farkáň",
+                "zone_id": "P",
+                "wheelchair_boarding": 0
+            }
+        },
+        {
+            "arrival_time": "17:02:00",
+            "departure_time": "17:02:00",
+            "shape_dist_traveled": 2.881882,
+            "stop_headsign": null,
+            "stop_id": "U396Z3P",
+            "stop_sequence": 7,
+            "arrival_time_seconds": 61320,
+            "departure_time_seconds": 61320,
+            "stop": {
+                "stop_id": "U396Z3P",
+                "stop_lat": 50.058533,
+                "stop_lon": 14.374084,
+                "stop_name": "U Waltrovky",
+                "zone_id": "P",
+                "wheelchair_boarding": 0
+            }
+        }
+    ],
+    "shapes": [
+        {
+            "dist": 0,
+            "coords": [14.404205, 50.068688]
+        },
+        {
+            "dist": 0.01058,
+            "coords": [14.404082, 50.068635]
+        },
+        {
+            "dist": 0.044712,
+            "coords": [14.403617, 50.068567]
+        },
+        {
+            "dist": 0.059745,
+            "coords": [14.40366, 50.068434]
+        },
+        {
+            "dist": 0.084765,
+            "coords": [14.403721, 50.068213]
+        },
+        {
+            "dist": 0.200199,
+            "coords": [14.402149, 50.067983]
+        },
+        {
+            "dist": 0.295907,
+            "coords": [14.401721, 50.068798]
+        },
+        {
+            "dist": 0.360976,
+            "coords": [14.400827, 50.068691]
+        },
+        {
+            "dist": 0.403178,
+            "coords": [14.400279, 50.068552]
+        },
+        {
+            "dist": 0.472604,
+            "coords": [14.399364, 50.068343]
+        },
+        {
+            "dist": 0.517881,
+            "coords": [14.399381, 50.067937]
+        },
+        {
+            "dist": 0.603356,
+            "coords": [14.399419, 50.067168]
+        },
+        {
+            "dist": 0.617285,
+            "coords": [14.399374, 50.067046]
+        },
+        {
+            "dist": 0.65801,
+            "coords": [14.399237, 50.066691]
+        },
+        {
+            "dist": 0.687292,
+            "coords": [14.399138, 50.066436]
+        },
+        {
+            "dist": 0.768563,
+            "coords": [14.398926, 50.065718]
+        },
+        {
+            "dist": 0.944574,
+            "coords": [14.396494, 50.065484]
+        },
+        {
+            "dist": 1.057871,
+            "coords": [14.394951, 50.06571]
+        },
+        {
+            "dist": 1.144033,
+            "coords": [14.393905, 50.065326]
+        },
+        {
+            "dist": 1.209992,
+            "coords": [14.393026, 50.06515]
+        },
+        {
+            "dist": 1.302185,
+            "coords": [14.391796, 50.064903]
+        },
+        {
+            "dist": 1.413343,
+            "coords": [14.390305, 50.064625]
+        },
+        {
+            "dist": 1.427235,
+            "coords": [14.390125, 50.064673]
+        },
+        {
+            "dist": 1.513142,
+            "coords": [14.389478, 50.065323]
+        },
+        {
+            "dist": 1.5457,
+            "coords": [14.389047, 50.065231]
+        },
+        {
+            "dist": 1.606345,
+            "coords": [14.388344, 50.064926]
+        },
+        {
+            "dist": 1.693733,
+            "coords": [14.387331, 50.064488]
+        },
+        {
+            "dist": 1.79135,
+            "coords": [14.386246, 50.063956]
+        },
+        {
+            "dist": 1.85738,
+            "coords": [14.385572, 50.063551]
+        },
+        {
+            "dist": 1.877629,
+            "coords": [14.385358, 50.063432]
+        },
+        {
+            "dist": 1.956502,
+            "coords": [14.384609, 50.062912]
+        },
+        {
+            "dist": 1.992387,
+            "coords": [14.384258, 50.062682]
+        },
+        {
+            "dist": 2.023509,
+            "coords": [14.383954, 50.062482]
+        },
+        {
+            "dist": 2.108156,
+            "coords": [14.383142, 50.061928]
+        },
+        {
+            "dist": 2.242171,
+            "coords": [14.381833, 50.061068]
+        },
+        {
+            "dist": 2.315504,
+            "coords": [14.381076, 50.060623]
+        },
+        {
+            "dist": 2.355064,
+            "coords": [14.380668, 50.060383]
+        },
+        {
+            "dist": 2.385935,
+            "coords": [14.380306, 50.060233]
+        },
+        {
+            "dist": 2.504636,
+            "coords": [14.378887, 50.05968]
+        },
+        {
+            "dist": 2.566321,
+            "coords": [14.378125, 50.059422]
+        },
+        {
+            "dist": 2.618876,
+            "coords": [14.377484, 50.059192]
+        },
+        {
+            "dist": 2.692306,
+            "coords": [14.376667, 50.058793]
+        },
+        {
+            "dist": 2.740389,
+            "coords": [14.376057, 50.058611]
+        },
+        {
+            "dist": 2.881882,
+            "coords": [14.374089, 50.058498]
+        }
+    ]
+}

package/db/example/redis/publicStopTimesMock.json

@@ -0,0 +1,37 @@
+[
+    {
+        "sequence": 1,
+        "arr_delay": -12,
+        "dep_delay": 17
+    },
+    {
+        "sequence": 2,
+        "arr_delay": null,
+        "dep_delay": 133
+    },
+    {
+        "sequence": 3,
+        "arr_delay": 83,
+        "dep_delay": 113
+    },
+    {
+        "sequence": 4,
+        "arr_delay": 35,
+        "dep_delay": 80
+    },
+    {
+        "sequence": 5,
+        "arr_delay": 80,
+        "dep_delay": 80
+    },
+    {
+        "sequence": 6,
+        "arr_delay": 80,
+        "dep_delay": 80
+    },
+    {
+        "sequence": 7,
+        "arr_delay": 80,
+        "dep_delay": 80
+    }
+]

package/db/example/redis/publicVehiclePositionsMock.json

@@ -1,42 +1,50 @@
 [
     {
-        "gtfs_trip_id": "705_735_231002",
+        "gtfs_trip_id": "137_2032_240103",
         "route_type": 3,
-        "gtfs_route_short_name": "705",
-        "lat": 49.90276,
-        "lng": 15.4047,
-        "bearing": 221,
-        "delay": null,
-        "vehicle_id": "service-3-8585",
+        "gtfs_route_short_name": "137",
+        "lat": 50.06061,
+        "lng": 14.38097,
+        "bearing": 229,
+        "delay": 89,
         "state_position": "on_track",
+        "vehicle_id": "service-3-3927",
         "detailed_info": {
-            "origin_route_name": "705",
-            "shape_id": null,
-            "run_number": 29,
-            "trip_headsign": "Nádraží 1",
-            "shape_dist_traveled": 7.035025,
-            "last_stop_sequence": 3,
-            "origin_timestamp": "2024-03-23T14:00:00.000Z"
+            "is_wheelchair_accessible": true,
+            "origin_route_name": "137",
+            "shape_id": "L137V2",
+            "run_number": 1,
+            "trip_headsign": "U Waltrovky",
+            "shape_dist_traveled": 2.316,
+            "last_stop_sequence": 6,
+            "origin_timestamp": "2024-02-01T16:02:29.000Z",
+            "registration_number": 3927,
+            "operator": "DP PRAHA",
+            "vehicle_type_id": 3
         }
     },
     {
-        "gtfs_trip_id": "781_4_231030",
+        "gtfs_trip_id": "535_31_231201",
         "route_type": 3,
-        "gtfs_route_short_name": "781",
-        "lat": 49.92452,
-        "lng": 15.4669,
-        "bearing": 305,
-        "delay": 211,
-        "vehicle_id": "service-3-7630",
+        "gtfs_route_short_name": "535",
+        "lat": 50.02284,
+        "lng": 15.21076,
+        "bearing": 149,
+        "delay": 11,
         "state_position": "on_track",
+        "vehicle_id": "service-3-8650",
         "detailed_info": {
-            "origin_route_name": "781",
-            "shape_id": null,
-            "run_number": 19,
-            "trip_headsign": "Nádraží 2",
-            "shape_dist_traveled": 8.035025,
-            "last_stop_sequence": 4,
-            "origin_timestamp": "2024-03-23T14:00:20.000Z"
+            "is_wheelchair_accessible": true,
+            "origin_route_name": "421",
+            "shape_id": "L535V4",
+            "run_number": 69,
+            "trip_headsign": "Kolín,nádraží",
+            "shape_dist_traveled": 27.545,
+            "last_stop_sequence": 20,
+            "origin_timestamp": "2024-02-01T16:02:59.000Z",
+            "registration_number": 8650,
+            "operator": "OAD KOLÍN (Nymburk)",
+            "vehicle_type_id": 4
         }
     }
 ]

package/dist/integration-engine/data-retention/helpers/SelectRepositoryFactory.d.ts

@@ -0,0 +1,7 @@
+import { IPresetLogRepository } from "../../ropid-gtfs/workers/presets/data-access/interfaces/IPresetLogRepository";
+import { AbstractRunRepository } from "../../vehicle-positions/workers/runs/data-access/AbstractRunRepository";
+import { RepositoryTableName } from "../workers/constants/RepositoryTableNameEnum";
+export declare class SelectRepositoryFactory {
+    select(repo: RepositoryTableName): IPresetLogRepository | AbstractRunRepository;
+    getColumnNameByRepositoryName(repo: RepositoryTableName): "" | "msg_last_timestamp" | "message_timestamp" | "vehicle_timestamp";
+}

package/dist/integration-engine/data-retention/helpers/SelectRepositoryFactory.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SelectRepositoryFactory = void 0;
+const Di_1 = require("../../ioc/Di");
+const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
+const CommonRunsRepository_1 = require("../../vehicle-positions/workers/runs/data-access/CommonRunsRepository");
+const MetroRunsMessagesRepository_1 = require("../../vehicle-positions/workers/runs/data-access/MetroRunsMessagesRepository");
+const RegionalBusRunsMessagesRepository_1 = require("../../vehicle-positions/workers/runs/data-access/RegionalBusRunsMessagesRepository");
+const DescriptorRepository_1 = require("../../vehicle-positions/workers/vehicle-descriptors/data-access/DescriptorRepository");
+const PositionsRepository_1 = require("../../vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository");
+const TripsRepository_1 = require("../../vehicle-positions/workers/vehicle-positions/data-access/TripsRepository");
+const RepositoryTableNameEnum_1 = require("../workers/constants/RepositoryTableNameEnum");
+class SelectRepositoryFactory {
+    select(repo) {
+        switch (repo) {
+            case RepositoryTableNameEnum_1.RepositoryTableName.TRIPS:
+                return new TripsRepository_1.TripsRepository();
+            case RepositoryTableNameEnum_1.RepositoryTableName.POSITIONS:
+                return new PositionsRepository_1.PositionsRepository();
+            case RepositoryTableNameEnum_1.RepositoryTableName.DESCRIPTOR:
+                return new DescriptorRepository_1.DescriptorRepository();
+            case RepositoryTableNameEnum_1.RepositoryTableName.METRO:
+                return new MetroRunsMessagesRepository_1.MetroRunsMessagesRepository();
+            case RepositoryTableNameEnum_1.RepositoryTableName.REGIONAL_BUS:
+                return new RegionalBusRunsMessagesRepository_1.RegionalBusRunsMessagesRepository();
+            case RepositoryTableNameEnum_1.RepositoryTableName.COMMON_RUNS:
+                return new CommonRunsRepository_1.CommonRunsRepository();
+            case RepositoryTableNameEnum_1.RepositoryTableName.LOGS:
+                return Di_1.PidContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.PresetLogRepository);
+            default:
+                throw new golemio_errors_1.GeneralError("Repository type undefined.");
+        }
+    }
+    getColumnNameByRepositoryName(repo) {
+        switch (repo) {
+            case RepositoryTableNameEnum_1.RepositoryTableName.METRO:
+                return "message_timestamp";
+            case RepositoryTableNameEnum_1.RepositoryTableName.REGIONAL_BUS:
+                return "vehicle_timestamp";
+            case RepositoryTableNameEnum_1.RepositoryTableName.COMMON_RUNS:
+                return "msg_last_timestamp";
+            default:
+                return "";
+        }
+    }
+}
+exports.SelectRepositoryFactory = SelectRepositoryFactory;
+//# sourceMappingURL=SelectRepositoryFactory.js.map

package/dist/integration-engine/data-retention/helpers/SelectRepositoryFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SelectRepositoryFactory.js","sourceRoot":"","sources":["../../../../src/integration-engine/data-retention/helpers/SelectRepositoryFactory.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,yEAAoE;AAGpE,6EAAwE;AAExE,gHAA6G;AAC7G,8HAA2H;AAC3H,0IAAuI;AACvI,+HAA4H;AAC5H,2HAAwH;AACxH,mHAAgH;AAChH,0FAAmF;AAEnF,MAAa,uBAAuB;IACzB,MAAM,CAAC,IAAyB;QACnC,QAAQ,IAAI,EAAE;YACV,KAAK,6CAAmB,CAAC,KAAK;gBAC1B,OAAO,IAAI,iCAAe,EAAE,CAAC;YACjC,KAAK,6CAAmB,CAAC,SAAS;gBAC9B,OAAO,IAAI,yCAAmB,EAAE,CAAC;YACrC,KAAK,6CAAmB,CAAC,UAAU;gBAC/B,OAAO,IAAI,2CAAoB,EAAE,CAAC;YACtC,KAAK,6CAAmB,CAAC,KAAK;gBAC1B,OAAO,IAAI,yDAA2B,EAAE,CAAC;YAC7C,KAAK,6CAAmB,CAAC,YAAY;gBACjC,OAAO,IAAI,qEAAiC,EAAE,CAAC;YACnD,KAAK,6CAAmB,CAAC,WAAW;gBAChC,OAAO,IAAI,2CAAoB,EAAE,CAAC;YACtC,KAAK,6CAAmB,CAAC,IAAI;gBACzB,OAAO,iBAAY,CAAC,OAAO,CAAuB,2CAAoB,CAAC,mBAAmB,CAAC,CAAC;YAChG;gBACI,MAAM,IAAI,6BAAY,CAAC,4BAA4B,CAAC,CAAC;SAC5D;IACL,CAAC;IAEM,6BAA6B,CAAC,IAAyB;QAC1D,QAAQ,IAAI,EAAE;YACV,KAAK,6CAAmB,CAAC,KAAK;gBAC1B,OAAO,mBAAmB,CAAC;YAC/B,KAAK,6CAAmB,CAAC,YAAY;gBACjC,OAAO,mBAAmB,CAAC;YAC/B,KAAK,6CAAmB,CAAC,WAAW;gBAChC,OAAO,oBAAoB,CAAC;YAChC;gBACI,OAAO,EAAE,CAAC;SACjB;IACL,CAAC;CACJ;AAlCD,0DAkCC"}

package/dist/integration-engine/data-retention/workers/DataRetentionWorker.js

@@ -5,6 +5,7 @@ const Di_1 = require("../ioc/Di");
 const RetentionContainerToken_1 = require("../ioc/RetentionContainerToken");
 const WorkerName_1 = require("./constants/WorkerName");
 const workers_1 = require("@golemio/core/dist/integration-engine/workers");
+const DeleteDataTask_1 = require("./tasks/DeleteDataTask");
 class DataRetentionWorker extends workers_1.AbstractWorker {
     constructor() {
         super();
@@ -15,6 +16,7 @@ class DataRetentionWorker extends workers_1.AbstractWorker {
         };
         // Register tasks
         this.registerTask(Di_1.RetentionContainer.resolve(RetentionContainerToken_1.RetentionContainerToken.TableStorageRetentionTask));
+        this.registerTask(new DeleteDataTask_1.DeleteDataTask(this.getQueuePrefix()));
     }
 }
 exports.DataRetentionWorker = DataRetentionWorker;

package/dist/integration-engine/data-retention/workers/DataRetentionWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataRetentionWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/data-retention/workers/DataRetentionWorker.ts"],"names":[],"mappings":";;;AAAA,kCAA+D;AAC/D,4EAAyF;AACzF,uDAA8E;AAG9E,2EAA+E;AAE/E,MAAa,mBAAoB,SAAQ,wBAAc;IAGnD;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,wBAAW,CAAC;QAWtB,iBAAY,GAAG,CAAC,IAAuB,EAAQ,EAAE;YACpD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QATE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CACb,uBAAkB,CAAC,OAAO,CAA4B,iDAAuB,CAAC,yBAAyB,CAAC,CAC3G,CAAC;IACN,CAAC;CAMJ;AAhBD,kDAgBC"}
+{"version":3,"file":"DataRetentionWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/data-retention/workers/DataRetentionWorker.ts"],"names":[],"mappings":";;;AAAA,kCAA+D;AAC/D,4EAAyF;AACzF,uDAA8E;AAG9E,2EAA+E;AAC/E,2DAAiF;AAEjF,MAAa,mBAAoB,SAAQ,wBAAc;IAGnD;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,wBAAW,CAAC;QAYtB,iBAAY,GAAG,CAAC,IAAuB,EAAQ,EAAE;YACpD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAVE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CACb,uBAAkB,CAAC,OAAO,CAA4B,iDAAuB,CAAC,yBAAyB,CAAC,CAC3G,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,IAAI,+BAAc,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACjE,CAAC;CAMJ;AAjBD,kDAiBC"}

package/dist/integration-engine/data-retention/workers/constants/RepositoryTableNameEnum.d.ts

@@ -0,0 +1,9 @@
+export declare enum RepositoryTableName {
+    TRIPS = "TripsRepository",
+    POSITIONS = "PositionsRepository",
+    DESCRIPTOR = "DescriptorRepository",
+    METRO = "MetroRunsMessagesRepository",
+    REGIONAL_BUS = "RegionalBusRunsMessagesRepository",
+    COMMON_RUNS = "CommonRunsRepository",
+    LOGS = "PresetLogRepository"
+}

package/dist/integration-engine/data-retention/workers/constants/RepositoryTableNameEnum.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RepositoryTableName = void 0;
+var RepositoryTableName;
+(function (RepositoryTableName) {
+    RepositoryTableName["TRIPS"] = "TripsRepository";
+    RepositoryTableName["POSITIONS"] = "PositionsRepository";
+    RepositoryTableName["DESCRIPTOR"] = "DescriptorRepository";
+    RepositoryTableName["METRO"] = "MetroRunsMessagesRepository";
+    RepositoryTableName["REGIONAL_BUS"] = "RegionalBusRunsMessagesRepository";
+    RepositoryTableName["COMMON_RUNS"] = "CommonRunsRepository";
+    RepositoryTableName["LOGS"] = "PresetLogRepository";
+})(RepositoryTableName || (exports.RepositoryTableName = RepositoryTableName = {}));
+//# sourceMappingURL=RepositoryTableNameEnum.js.map

package/dist/integration-engine/data-retention/workers/constants/RepositoryTableNameEnum.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RepositoryTableNameEnum.js","sourceRoot":"","sources":["../../../../../src/integration-engine/data-retention/workers/constants/RepositoryTableNameEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAQX;AARD,WAAY,mBAAmB;IAC3B,gDAAyB,CAAA;IACzB,wDAAiC,CAAA;IACjC,0DAAmC,CAAA;IACnC,4DAAqC,CAAA;IACrC,yEAAkD,CAAA;IAClD,2DAAoC,CAAA;IACpC,mDAA4B,CAAA;AAChC,CAAC,EARW,mBAAmB,mCAAnB,mBAAmB,QAQ9B"}

package/dist/integration-engine/{vehicle-positions/workers/vehicle-positions → data-retention/workers}/tasks/DeleteDataTask.d.ts

@@ -1,12 +1,11 @@
-import { IDataDeletionParams } from "../../../../shared/interfaces/IDataDeletionParams";
-import { DataDeletionValidationSchema } from "../../../../shared/schema/DataDeletionSchema";
+import { IDataDeletionParams } from "../../../shared/interfaces/IDataDeletionParams";
+import { DataDeletionValidationSchema } from "../../../shared/schema/DataDeletionSchema";
 import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
 export declare class DeleteDataTask extends AbstractTask<IDataDeletionParams> {
     readonly queueName = "deleteData";
     readonly queueTtl: number;
     readonly schema: typeof DataDeletionValidationSchema;
-    private readonly tripsRepository;
-    private readonly positionsRepository;
+    private readonly selectRepositoryFactory;
     constructor(queuePrefix: string);
     protected execute(data: IDataDeletionParams): Promise<void>;
 }

package/dist/integration-engine/{vehicle-positions/workers/vehicle-positions → data-retention/workers}/tasks/DeleteDataTask.js

@@ -10,23 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteDataTask = void 0;
-const DataDeletionSchema_1 = require("../../../../shared/schema/DataDeletionSchema");
+const DataDeletionSchema_1 = require("../../../shared/schema/DataDeletionSchema");
 const workers_1 = require("@golemio/core/dist/integration-engine/workers");
-const PositionsRepository_1 = require("../data-access/PositionsRepository");
-const TripsRepository_1 = require("../data-access/TripsRepository");
+const SelectRepositoryFactory_1 = require("../../helpers/SelectRepositoryFactory");
 class DeleteDataTask extends workers_1.AbstractTask {
     constructor(queuePrefix) {
         super(queuePrefix);
         this.queueName = "deleteData";
-        this.queueTtl = 29 * 60 * 1000; // 29 minutes
+        this.queueTtl = 15 * 60 * 1000; // 15 minutes
         this.schema = DataDeletionSchema_1.DataDeletionValidationSchema;
-        this.tripsRepository = new TripsRepository_1.TripsRepository();
-        this.positionsRepository = new PositionsRepository_1.PositionsRepository();
+        this.selectRepositoryFactory = new SelectRepositoryFactory_1.SelectRepositoryFactory();
     }
     execute(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.tripsRepository.deleteNHoursOldData(data.targetHours);
-            yield this.positionsRepository.deleteNHoursOldData(data.targetHours);
+            const repository = yield this.selectRepositoryFactory.select(data.repoName);
+            const columnName = yield this.selectRepositoryFactory.getColumnNameByRepositoryName(data.repoName);
+            yield repository.deleteNHoursOldData(data.targetHours, columnName);
         });
     }
 }

package/dist/integration-engine/data-retention/workers/tasks/DeleteDataTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DeleteDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/data-retention/workers/tasks/DeleteDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,kFAAoF;AACpF,2EAA6E;AAC7E,mFAAgF;AAEhF,MAAa,cAAe,SAAQ,sBAAiC;IAMjE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QANP,cAAS,GAAG,YAAY,CAAC;QACzB,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QACxC,WAAM,GAAG,iDAA4B,CAAC;QAKlD,IAAI,CAAC,uBAAuB,GAAG,IAAI,iDAAuB,EAAE,CAAC;IACjE,CAAC;IAEe,OAAO,CAAC,IAAyB;;YAC7C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,6BAA6B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnG,MAAM,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACvE,CAAC;KAAA;CACJ;AAhBD,wCAgBC"}

package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.js

@@ -47,7 +47,7 @@ class RopidGTFSTripsModel extends models_1.PostgresModel {
                         model: this.modelGTFSStopTimes.sequelizeModel,
                         include: [
                             {
-                                attributes: ["stop_id", "stop_lat", "stop_lon", "stop_name", "zone_id"],
+                                attributes: ["stop_id", "stop_lat", "stop_lon", "stop_name", "zone_id", "wheelchair_boarding"],
                                 as: "stop",
                                 model: this.modelGTFSStops.sequelizeModel,
                                 required: true,

package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"RopidGTFSTripsModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSTripsModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RopidGTFSTripsModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSTripsModel.ts"],"names":[],"mappings":"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"}