@golemio/pid 2.14.2-dev.1355988562 → 2.14.2-dev.1357024917

package/db/migrations/postgresql/20240701093122-fix-delay-in-view-v-public-vehiclepositions-past-stop-times.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+  * We receive the dbmigrate dependency from dbmigrate initially.
+  * This enables us to not have to rely on NODE_PATH.
+  */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20240701093122-fix-delay-in-view-v-public-vehiclepositions-past-stop-times-up.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20240701093122-fix-delay-in-view-v-public-vehiclepositions-past-stop-times-down.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  "version": 1
+};

package/db/migrations/postgresql/sqls/20240701093122-fix-delay-in-view-v-public-vehiclepositions-past-stop-times-down.sql

@@ -0,0 +1,31 @@
+CREATE OR REPLACE VIEW v_public_vehiclepositions_past_stop_times AS
+SELECT
+    sub.trips_id AS rt_trip_id,
+    sub.last_stop_sequence AS stop_sequence,
+    sub.stop_arr_delay,
+    sub.stop_dep_delay,
+    sub.last_stop_id AS stop_id
+FROM (
+    SELECT
+        rt_position.trips_id,
+        rt_position.last_stop_id,
+        rt_position.last_stop_sequence,
+        rt_position.delay_stop_arrival,
+        rt_position.delay_stop_departure,
+        max(rt_position.delay_stop_arrival) AS stop_arr_delay,
+        min(rt_position.delay_stop_departure) AS stop_dep_delay
+    FROM
+        vehiclepositions_positions rt_position
+    WHERE (rt_position.delay_stop_arrival IS NOT NULL
+        OR rt_position.delay_stop_departure IS NOT NULL)
+    AND (rt_position.state_position::text = ANY (ARRAY['on_track'::character varying::text, 'at_stop'::character varying::text, 'after_track'::character varying::text]))
+GROUP BY
+    rt_position.trips_id,
+    rt_position.last_stop_id,
+    rt_position.last_stop_sequence,
+    rt_position.delay_stop_arrival,
+    rt_position.delay_stop_departure) sub
+ORDER BY
+    sub.trips_id,
+    sub.last_stop_sequence;
+

package/db/migrations/postgresql/sqls/20240701093122-fix-delay-in-view-v-public-vehiclepositions-past-stop-times-up.sql

@@ -0,0 +1,38 @@
+CREATE OR REPLACE VIEW v_public_vehiclepositions_past_stop_times AS
+SELECT
+    sub.trips_id AS rt_trip_id,
+    sub.last_stop_sequence AS stop_sequence,
+    sub.stop_arr_delay,
+    sub.stop_dep_delay,
+    sub.last_stop_id AS stop_id
+FROM (
+    SELECT
+        rt_position.trips_id,
+        rt_position.last_stop_id,
+        rt_position.last_stop_sequence,
+        CASE WHEN (rt_position.last_stop_departure_time::time +(interval '1 second' * min(rt_position.delay_stop_departure)) > rt_position.next_stop_arrival_time::time +(interval '1 second' * max(rt_position.delay_stop_arrival))) THEN
+            NULL
+        ELSE
+            max(rt_position.delay_stop_arrival)
+        END AS stop_arr_delay,
+        CASE WHEN (rt_position.last_stop_arrival_time::time +(interval '1 second' * max(rt_position.delay_stop_arrival)) > rt_position.last_stop_departure_time::time +(interval '1 second' * min(rt_position.delay_stop_departure))) THEN
+            NULL
+        ELSE
+            min(rt_position.delay_stop_departure)
+        END AS stop_dep_delay
+    FROM
+        vehiclepositions_positions rt_position
+    WHERE (rt_position.delay_stop_arrival IS NOT NULL
+        OR rt_position.delay_stop_departure IS NOT NULL)
+    AND (rt_position.state_position::text = ANY (ARRAY['on_track'::character varying::text, 'at_stop'::character varying::text, 'after_track'::character varying::text]))
+GROUP BY
+    rt_position.trips_id,
+    rt_position.last_stop_id,
+    rt_position.last_stop_sequence,
+    rt_position.last_stop_arrival_time,
+    rt_position.last_stop_departure_time,
+    rt_position.next_stop_arrival_time) sub
+ORDER BY
+    sub.trips_id,
+    sub.last_stop_sequence;
+

package/dist/output-gateway/public/routers/v1/PublicDeparturesRouter.js

@@ -18,7 +18,7 @@ class PublicDeparturesRouter {
     initRoutes() {
         this.router.get("/", [
             (0, express_validator_1.query)("stopIds").exists().custom(CustomStopIdGroupValidator_1.CustomStopIdGroupValidator.validate),
-            (0, express_validator_1.query)("limit").optional().isInt({ min: 1, max: 20 }).not().isArray(),
+            (0, express_validator_1.query)("limit").optional().isInt({ min: 1, max: 30 }).not().isArray(),
             (0, express_validator_1.query)("routeShortNames").optional().not().isEmpty({ ignore_whitespace: true }),
             (0, express_validator_1.query)("minutesAfter").optional().isInt({ min: 1, max: 360 }).not().isArray(),
         ], Validation_1.checkErrors, 

package/dist/output-gateway/public/routers/v1/helpers/CustomStopIdGroupValidator.d.ts

@@ -2,4 +2,5 @@ import { CustomValidator } from "@golemio/core/dist/shared/express-validator";
 export declare class CustomStopIdGroupValidator {
     static validate: CustomValidator;
     private static isStopIdGroupValid;
+    private static parseStopIdsFromGroup;
 }

package/dist/output-gateway/public/routers/v1/helpers/CustomStopIdGroupValidator.js

@@ -2,41 +2,63 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomStopIdGroupValidator = void 0;
+const MAX_STOP_GROUPS = 50;
+const MAX_STOPS_IN_GROUP = 50;
+const MAX_STOPS_TOTAL = 50;
 class CustomStopIdGroupValidator {
-    static isStopIdGroupValid(value) {
+    static isStopIdGroupValid(stopIds) {
         try {
-            const parsed = JSON.parse(value);
-            const keys = Object.keys(parsed);
-            if (keys.length !== 1) {
-                return false;
-            }
-            const priority = Number.parseInt(keys[0]);
-            if (Number.isNaN(priority)) {
-                return false;
-            }
-            const stopIds = parsed[priority];
             if (!Array.isArray(stopIds) ||
                 stopIds.length === 0 ||
-                stopIds.length > 10 ||
+                stopIds.length > MAX_STOPS_IN_GROUP ||
                 stopIds.some((stopId) => typeof stopId !== "string" || stopId.length === 0 || stopId.length > 30)) {
                 return false;
             }
             return true;
         }
-        catch (err) {
+        catch (_b) {
             return false;
         }
     }
+    static parseStopIdsFromGroup(value) {
+        try {
+            const parsed = JSON.parse(value);
+            const keys = Object.keys(parsed);
+            if (keys.length !== 1) {
+                return null;
+            }
+            const priority = Number.parseInt(keys[0]);
+            if (Number.isNaN(priority)) {
+                return null;
+            }
+            return parsed[priority];
+        }
+        catch (_b) {
+            return null;
+        }
+    }
 }
 exports.CustomStopIdGroupValidator = CustomStopIdGroupValidator;
 _a = CustomStopIdGroupValidator;
 CustomStopIdGroupValidator.validate = (value, _) => {
     if (value instanceof Array) {
-        if (value.length === 0 || value.length > 10) {
+        if (value.length === 0 || value.length > MAX_STOP_GROUPS) {
             return false;
         }
-        return value.every((v) => _a.isStopIdGroupValid(v));
+        let stopsTotal = 0;
+        for (const stopIdGroup of value) {
+            const stopIds = _a.parseStopIdsFromGroup(stopIdGroup);
+            if (!_a.isStopIdGroupValid(stopIds)) {
+                return false;
+            }
+            stopsTotal += stopIds.length;
+            if (stopsTotal > MAX_STOPS_TOTAL) {
+                return false;
+            }
+        }
+        return true;
     }
-    return _a.isStopIdGroupValid(value);
+    const stopIds = _a.parseStopIdsFromGroup(value);
+    return _a.isStopIdGroupValid(stopIds);
 };
 //# sourceMappingURL=CustomStopIdGroupValidator.js.map

package/dist/output-gateway/public/routers/v1/helpers/CustomStopIdGroupValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomStopIdGroupValidator.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/routers/v1/helpers/CustomStopIdGroupValidator.ts"],"names":[],"mappings":";;;;AAEA,MAAa,0BAA0B;IAa3B,MAAM,CAAC,kBAAkB,CAAC,KAAa;QAC3C,IAAI;YACA,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACnB,OAAO,KAAK,CAAC;aAChB;YAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBACxB,OAAO,KAAK,CAAC;aAChB;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjC,IACI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;gBACvB,OAAO,CAAC,MAAM,KAAK,CAAC;gBACpB,OAAO,CAAC,MAAM,GAAG,EAAE;gBACnB,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,EACnG;gBACE,OAAO,KAAK,CAAC;aAChB;YAED,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;;AAxCL,gEAyCC;;AAxCiB,mCAAQ,GAAoB,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACnD,IAAI,KAAK,YAAY,KAAK,EAAE;QACxB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,EAAE;YACzC,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;KACzD;IAED,OAAO,EAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC,AAVqB,CAUpB"}
+{"version":3,"file":"CustomStopIdGroupValidator.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/routers/v1/helpers/CustomStopIdGroupValidator.ts"],"names":[],"mappings":";;;;AAEA,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAC9B,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,MAAa,0BAA0B;IA4B3B,MAAM,CAAC,kBAAkB,CAAC,OAAwB;QACtD,IAAI;YACA,IACI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;gBACvB,OAAO,CAAC,MAAM,KAAK,CAAC;gBACpB,OAAO,CAAC,MAAM,GAAG,kBAAkB;gBACnC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,EACnG;gBACE,OAAO,KAAK,CAAC;aAChB;YAED,OAAO,IAAI,CAAC;SACf;QAAC,WAAM;YACJ,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,KAAa;QAC9C,IAAI;YACA,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACnB,OAAO,IAAI,CAAC;aACf;YAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBACxB,OAAO,IAAI,CAAC;aACf;YAED,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;SAC3B;QAAC,WAAM;YACJ,OAAO,IAAI,CAAC;SACf;IACL,CAAC;;AA9DL,gEA+DC;;AA9DiB,mCAAQ,GAAoB,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;IACnD,IAAI,KAAK,YAAY,KAAK,EAAE;QACxB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,eAAe,EAAE;YACtD,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,KAAK,MAAM,WAAW,IAAI,KAAK,EAAE;YAC7B,MAAM,OAAO,GAAG,EAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;YAExD,IAAI,CAAC,EAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE;gBACnC,OAAO,KAAK,CAAC;aAChB;YAED,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;YAC7B,IAAI,UAAU,GAAG,eAAe,EAAE;gBAC9B,OAAO,KAAK,CAAC;aAChB;SACJ;QAED,OAAO,IAAI,CAAC;KACf;IAED,MAAM,OAAO,GAAG,EAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAClD,OAAO,EAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,AAzBqB,CAyBpB"}

package/docs/openapi-output.yaml

@@ -1305,13 +1305,15 @@ paths:
                         items:
                             type: string
                     example: ["{\"0\": [\"U717Z5P\"]}", "{\"1\": [\"U718Z5P\", \"U719Z5P\"]}"]
-                    description: "Groups of stop IDs formatted as JSON (index/priority -> stop IDs). For example ?stopIds[]={\"0\": [\"U717Z5P\"]}&stopIds[]={\"1\": [\"U718Z5P\", \"U719Z5P\"]}. Maximum is 10 groups with a maximum of 10 stop IDs in each group."
+                    description: |
+                        Groups of stop IDs formatted as JSON (index/priority -> stop IDs). For example ?stopIds[]={\"0\": [\"U717Z5P\"]}&stopIds[]={\"1\": [\"U718Z5P\", \"U719Z5P\"]}.
+                        The maximum number of groups is 50. The maximum number of stops in one group is 50. The maximum number of stops combined is 50.
                 -   in: query
                     name: limit
                     required: false
                     schema:
                         type: integer
-                    description: Limit for each group of departures. Default is 5. Maximum is 20.
+                    description: Limit for each group of departures. Default is 5. Maximum is 30.
                     example: 5
                 -   in: query
                     name: routeShortNames

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/pid",
-    "version": "2.14.2-dev.1355988562",
+    "version": "2.14.2-dev.1357024917",
     "description": "Golemio PID Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",