@golemio/pid 5.20.3-dev.2847063270 → 6.0.0-dev.2857220632

package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.js

@@ -1,24 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GTFSStopModel = void 0;
-const GtfsStopParser_1 = require("../../../helpers/GtfsStopParser");
-const StopEnums_1 = require("../../../helpers/StopEnums");
-const const_1 = require("../../../schema-definitions/const");
-const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
-const StopDto_1 = require("../../../schema-definitions/ropid-gtfs/models/StopDto");
-const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
-const Geo_1 = require("@golemio/core/dist/output-gateway/Geo");
-const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
-const models_1 = require("@golemio/core/dist/output-gateway/models");
-const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
-const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
-class GTFSStopModel extends models_1.SequelizeModel {
+import { GtfsStopParser } from "#helpers/GtfsStopParser";
+import { GtfsStopLocationType } from "#helpers/StopEnums";
+import { PG_SCHEMA } from "#sch/const";
+import { RopidGTFS } from "#sch/ropid-gtfs/index";
+import { StopDto } from "#sch/ropid-gtfs/models/StopDto";
+import { CoreToken } from "@golemio/core/dist/helpers/ioc/CoreToken.js";
+import { buildGeojsonFeature, buildGeojsonFeatureCollection, } from "@golemio/core/dist/output-gateway/Geo.js";
+import { OutputGatewayContainer } from "@golemio/core/dist/output-gateway/ioc/index.js";
+import { SequelizeModel } from "@golemio/core/dist/output-gateway/models/index.js";
+import GolemioErrorsCore from "@golemio/core/dist/shared/golemio-errors.js";
+const { GeneralError } = GolemioErrorsCore;
+import Sequelize from "@golemio/core/dist/shared/sequelize.js";
+export class GTFSStopModel extends SequelizeModel {
     constructor() {
-        super(ropid_gtfs_1.RopidGTFS.stops.name, ropid_gtfs_1.RopidGTFS.stops.pgTableName, StopDto_1.StopDto.attributeModel, {
-            schema: const_1.PG_SCHEMA,
+        super(RopidGTFS.stops.name, RopidGTFS.stops.pgTableName, StopDto.attributeModel, {
+            schema: PG_SCHEMA,
         });
         this.outputAttributes = [];
         this.Associate = () => {
@@ -38,7 +33,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
                     raw: true,
                     where: {
                         asw_node_id: aswNodeId,
-                        location_type: StopEnums_1.GtfsStopLocationType.StopOrPlatform,
+                        location_type: GtfsStopLocationType.StopOrPlatform,
                     },
                 });
                 if (!stops || stops.length === 0) {
@@ -47,7 +42,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
                 return stops.map((stop) => stop.stop_id);
             }
             catch (error) {
-                throw new golemio_errors_1.GeneralError("Error while getting GTFS stop ids", this.constructor.name, error, 500);
+                throw new GeneralError("Error while getting GTFS stop ids", this.constructor.name, error, 500);
             }
         };
         /**
@@ -56,7 +51,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
         this.GetOne = async (id) => {
             return this.sequelizeModel.findByPk(id).then((data) => {
                 if (data) {
-                    return (0, Geo_1.buildGeojsonFeature)(data, "stop_lon", "stop_lat", true);
+                    return buildGeojsonFeature(data, "stop_lon", "stop_lat", true);
                 }
                 return null;
             });
@@ -65,15 +60,15 @@ class GTFSStopModel extends models_1.SequelizeModel {
             const stops = await this.cisStopsModel.findAll({
                 raw: true,
                 where: {
-                    [sequelize_1.default.Op.or]: {
+                    [Sequelize.Op.or]: {
                         cis: cisIds,
                     },
                 },
             });
             return stops;
         };
-        const connector = ioc_1.OutputGatewayContainer.resolve(CoreToken_1.CoreToken.PostgresConnector);
-        this.outputAttributes = Object.keys(StopDto_1.StopDto.attributeModel);
+        const connector = OutputGatewayContainer.resolve(CoreToken.PostgresConnector);
+        this.outputAttributes = Object.keys(StopDto.attributeModel);
         const notUsedColumns = [
             "stop_code",
             "stop_desc",
@@ -89,8 +84,8 @@ class GTFSStopModel extends models_1.SequelizeModel {
         }
         this.cisStopsModel = connector
             .getConnection()
-            .define(ropid_gtfs_1.RopidGTFS.cis_stops.pgTableName, ropid_gtfs_1.RopidGTFS.cis_stops.outputSequelizeAttributes, {
-            schema: const_1.PG_SCHEMA,
+            .define(RopidGTFS.cis_stops.pgTableName, RopidGTFS.cis_stops.outputSequelizeAttributes, {
+            schema: PG_SCHEMA,
         });
     }
     async GetAll(options) {
@@ -99,7 +94,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
         let where = {};
         let allGtfsIds = [];
         if (options.aswIds && options.aswIds.length > 0) {
-            where[sequelize_1.default.Op.or] = GtfsStopParser_1.GtfsStopParser.prepareAswWhereOptions(options.aswIds);
+            where[Sequelize.Op.or] = GtfsStopParser.prepareAswWhereOptions(options.aswIds);
         }
         if (options.cisIds && options.cisIds.length > 0) {
             let stops;
@@ -107,7 +102,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
                 stops = await this.prepareCisStops(options.cisIds);
             }
             catch (err) {
-                throw new golemio_errors_1.GeneralError("Database error", "GTFSStopModel", err, 500);
+                throw new GeneralError("Database error", "GTFSStopModel", err, 500);
             }
             // after all stops by other than GTFS ids are collected, we create proper GTFS ids with % like sign.
             // GTFS stops must be split into more ids due to more tarriff zones even if it is one physical stop.
@@ -119,17 +114,17 @@ class GTFSStopModel extends models_1.SequelizeModel {
             if (allGtfsIds.length === 0 &&
                 (options.gtfsIds === undefined || options.gtfsIds?.length === 0) &&
                 (options.names === undefined || options.names.length === 0)) {
-                return options.returnRaw ? [] : (0, Geo_1.buildGeojsonFeatureCollection)([], "stop_lon", "stop_lat", true);
+                return options.returnRaw ? [] : buildGeojsonFeatureCollection([], "stop_lon", "stop_lat", true);
             }
         }
         if (options.lng && options.lat) {
-            const location = sequelize_1.default.literal(`ST_GeomFromText('POINT(${options.lng} ${options.lat})')`);
-            const distance = sequelize_1.default.fn("ST_DistanceSphere", sequelize_1.default.literal("ST_MakePoint(stop_lon, stop_lat)"), location);
+            const location = Sequelize.literal(`ST_GeomFromText('POINT(${options.lng} ${options.lat})')`);
+            const distance = Sequelize.fn("ST_DistanceSphere", Sequelize.literal("ST_MakePoint(stop_lon, stop_lat)"), location);
             attributes.push([distance, "distance"]);
             order.push(["distance", "ASC"]);
             if (options.range) {
                 where.distance = {
-                    [sequelize_1.default.Op.lte]: options.range,
+                    [Sequelize.Op.lte]: options.range,
                 };
             }
         }
@@ -139,7 +134,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
         }
         if (allGtfsIds.length > 0) {
             where.stop_id = {
-                [sequelize_1.default.Op.regexp]: allGtfsIds.join("|"),
+                [Sequelize.Op.regexp]: allGtfsIds.join("|"),
             };
         }
         if (options.names && options.names?.length > 0) {
@@ -149,7 +144,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
             where.location_type = options.locationType;
         }
         if (options.appendAswId) {
-            const aswId = sequelize_1.default.fn("json_build_object", "node", sequelize_1.default.col(`${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.asw_node_id`), "stop", sequelize_1.default.col(`${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.asw_stop_id`));
+            const aswId = Sequelize.fn("json_build_object", "node", Sequelize.col(`${RopidGTFS.stops.pgTableName}.asw_node_id`), "stop", Sequelize.col(`${RopidGTFS.stops.pgTableName}.asw_stop_id`));
             attributes.push([aswId, "asw_id"]);
         }
         let include;
@@ -157,7 +152,7 @@ class GTFSStopModel extends models_1.SequelizeModel {
             // Workaround for distinct selection
             // https://github.com/sequelize/sequelize/issues/2996
             attributes[0] = [
-                sequelize_1.default.literal(`DISTINCT ON(${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.stop_id) ${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.${attributes[0]}`),
+                Sequelize.literal(`DISTINCT ON(${RopidGTFS.stops.pgTableName}.stop_id) ${RopidGTFS.stops.pgTableName}.${attributes[0]}`),
                 attributes[0],
             ];
             const findOptions = this.prepareFindOptionsForMetro(where);
@@ -178,9 +173,9 @@ class GTFSStopModel extends models_1.SequelizeModel {
             });
         }
         catch (err) {
-            throw new golemio_errors_1.GeneralError("Database error", "GTFSStopModel", err, 500);
+            throw new GeneralError("Database error", "GTFSStopModel", err, 500);
         }
-        return options.returnRaw ? data : (0, Geo_1.buildGeojsonFeatureCollection)(data, "stop_lon", "stop_lat", true);
+        return options.returnRaw ? data : buildGeojsonFeatureCollection(data, "stop_lon", "stop_lat", true);
     }
     prepareFindOptionsForMetro(innerWhere) {
         // Select metro and train stops within a node
@@ -195,21 +190,20 @@ class GTFSStopModel extends models_1.SequelizeModel {
             attributes: [],
             on: {
                 asw_node_id: {
-                    [sequelize_1.default.Op.eq]: sequelize_1.default.col(`${ropid_gtfs_1.RopidGTFS.stops.pgTableName}.asw_node_id`),
+                    [Sequelize.Op.eq]: Sequelize.col(`${RopidGTFS.stops.pgTableName}.asw_node_id`),
                 },
             },
             where: innerWhere,
         };
         const where = {
-            [sequelize_1.default.Op.or]: [
+            [Sequelize.Op.or]: [
                 innerWhere,
                 {
-                    asw_stop_id: { [sequelize_1.default.Op.gte]: 100 },
+                    asw_stop_id: { [Sequelize.Op.gte]: 100 },
                 },
             ],
         };
         return { include, where };
     }
 }
-exports.GTFSStopModel = GTFSStopModel;
 //# sourceMappingURL=GTFSStopModel.js.map

package/dist/output-gateway/ropid-gtfs/models/GTFSStopModel.js.map

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

package/dist/output-gateway/ropid-gtfs/models/GTFSStopModelInterfaces.d.ts

@@ -1,5 +1,5 @@
-import { IStopDto } from "../../../schema-definitions/ropid-gtfs/interfaces/IStopDto";
-import { IncludeOptions, WhereAttributeHash, WhereOptions } from "@golemio/core/dist/shared/sequelize";
+import { type IStopDto } from "#sch/ropid-gtfs/interfaces/IStopDto";
+import type { IncludeOptions, WhereAttributeHash, WhereOptions } from "@golemio/core/dist/shared/sequelize.js";
 export type GetAllOptions<T extends boolean = false> = {
     limit?: number;
     offset?: number;

package/dist/output-gateway/ropid-gtfs/models/GTFSStopModelInterfaces.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=GTFSStopModelInterfaces.js.map

package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.d.ts

@@ -1,5 +1,5 @@
-import { SequelizeModel } from "@golemio/core/dist/output-gateway";
-import { IGTFSModels } from "./interfaces/IGTFSModels";
+import { SequelizeModel } from "@golemio/core/dist/output-gateway/index.js";
+import { type IGTFSModels } from "./interfaces/IGTFSModels.js";
 export declare class GTFSStopTimesModel extends SequelizeModel {
     private dbConnector;
     constructor();

package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.js

@@ -1,20 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GTFSStopTimesModel = void 0;
-const const_1 = require("../../../schema-definitions/const");
-const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
-const StopTimesDto_1 = require("../../../schema-definitions/ropid-gtfs/models/StopTimesDto");
-const output_gateway_1 = require("@golemio/core/dist/output-gateway");
-const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
-const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
-const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
-class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
+import { PG_SCHEMA } from "#sch/const";
+import { RopidGTFS } from "#sch/ropid-gtfs/index";
+import { StopTimesDto } from "#sch/ropid-gtfs/models/StopTimesDto";
+import { SequelizeModel } from "@golemio/core/dist/output-gateway/index.js";
+import { ContainerToken, OutputGatewayContainer } from "@golemio/core/dist/output-gateway/ioc/index.js";
+import GolemioErrorsCore from "@golemio/core/dist/shared/golemio-errors.js";
+const { FatalError, GeneralError } = GolemioErrorsCore;
+import Sequelize from "@golemio/core/dist/shared/sequelize.js";
+export class GTFSStopTimesModel extends SequelizeModel {
     constructor() {
-        super(ropid_gtfs_1.RopidGTFS.stop_times.name, ropid_gtfs_1.RopidGTFS.stop_times.pgTableName, StopTimesDto_1.StopTimesDto.attributeModel, {
-            schema: const_1.PG_SCHEMA,
+        super(RopidGTFS.stop_times.name, RopidGTFS.stop_times.pgTableName, StopTimesDto.attributeModel, {
+            schema: PG_SCHEMA,
         });
         this.Associate = (models) => {
             this.sequelizeModel.belongsTo(models.GTFSTripsModel.sequelizeModel, {
@@ -41,13 +36,13 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
             const include = [];
             const where = {
                 stop_id: stopId,
-                [sequelize_1.default.Op.and]: [],
+                [Sequelize.Op.and]: [],
             };
             if (from) {
-                where[sequelize_1.default.Op.and].push(GTFSStopTimesModel.arrivalTimeComparison(from, "<="));
+                where[Sequelize.Op.and].push(GTFSStopTimesModel.arrivalTimeComparison(from, "<="));
             }
             if (to) {
-                where[sequelize_1.default.Op.and].push(GTFSStopTimesModel.arrivalTimeComparison(to, ">="));
+                where[Sequelize.Op.and].push(GTFSStopTimesModel.arrivalTimeComparison(to, ">="));
             }
             if (date) {
                 include.push({
@@ -56,19 +51,19 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
                         {
                             as: "service",
                             attributes: [],
-                            model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.calendar.pgTableName].scope({
+                            model: this.dbConnector.getConnection().models[RopidGTFS.calendar.pgTableName].scope({
                                 method: ["forDate", date],
                             }),
                         },
                     ],
-                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.trips.pgTableName],
+                    model: this.dbConnector.getConnection().models[RopidGTFS.trips.pgTableName],
                     required: true,
                 });
             }
             if (stop) {
                 include.push({
                     as: "stop",
-                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
+                    model: this.dbConnector.getConnection().models[RopidGTFS.stops.pgTableName],
                 });
             }
             try {
@@ -95,18 +90,17 @@ class GTFSStopTimesModel extends output_gateway_1.SequelizeModel {
                 });
             }
             catch (err) {
-                throw new golemio_errors_1.GeneralError("Database error", "GTFSStopTimesModel", err, 500);
+                throw new GeneralError("Database error", "GTFSStopTimesModel", err, 500);
             }
         };
         this.GetOne = (id) => {
-            throw new golemio_errors_1.FatalError("Method not implemented");
+            throw new FatalError("Method not implemented");
         };
-        this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
+        this.dbConnector = OutputGatewayContainer.resolve(ContainerToken.PostgresDatabase);
     }
 }
-exports.GTFSStopTimesModel = GTFSStopTimesModel;
 GTFSStopTimesModel.arrivalTimeComparison = (time, operator) => {
     // arrival_time 25:45:20 -> 01:45:20
-    return sequelize_1.default.literal(`'${time}'::time ${operator} cast(arrival_time as interval)::time`);
+    return Sequelize.literal(`'${time}'::time ${operator} cast(arrival_time as interval)::time`);
 };
 //# sourceMappingURL=GTFSStopTimesModel.js.map

package/dist/output-gateway/ropid-gtfs/models/GTFSStopTimesModel.js.map

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

package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.d.ts

@@ -1,7 +1,7 @@
-import { ITripWithOptionalAssociationsDto } from "../../../schema-definitions/ropid-gtfs/interfaces/ITripWithOptionalAssociationsDto";
-import { SequelizeModel } from "@golemio/core/dist/output-gateway/models";
-import Sequelize from "@golemio/core/dist/shared/sequelize";
-import { IGTFSModels } from "./interfaces/IGTFSModels";
+import { type ITripWithOptionalAssociationsDto } from "#sch/ropid-gtfs/interfaces/ITripWithOptionalAssociationsDto";
+import { SequelizeModel } from "@golemio/core/dist/output-gateway/models/index.js";
+import type { Includeable } from "@golemio/core/dist/shared/sequelize.js";
+import { type IGTFSModels } from "./interfaces/IGTFSModels.js";
 export declare class GTFSTripsModel extends SequelizeModel {
     private dbConnector;
     private tripScheduleRepository;
@@ -62,7 +62,7 @@ export declare class GTFSTripsModel extends SequelizeModel {
         stops?: boolean;
         stopTimes?: boolean;
         date?: string;
-    }) => Sequelize.Includeable[];
+    }) => Includeable[];
     private getInclusionsForPublicGtfsLookup;
     /**
      * Convert a single db result to proper output format with all its included sub-elements
@@ -81,5 +81,5 @@ export declare class GTFSTripsModel extends SequelizeModel {
     /**
      * Builds the correct format of a response data
      */
-    protected BuildResponse: (responseObject: any, longLoc: string, latLoc: string) => import("@golemio/core/dist/output-gateway/Geo").IGeoJSONFeature;
+    protected BuildResponse: (responseObject: any, longLoc: string, latLoc: string) => import("@golemio/core/dist/output-gateway/Geo.js").IGeoJSONFeature;
 }

package/dist/output-gateway/ropid-gtfs/models/GTFSTripsModel.js

@@ -1,23 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GTFSTripsModel = void 0;
-const PassengerTransferEnums_1 = require("../../../helpers/PassengerTransferEnums");
-const const_1 = require("../../../schema-definitions/const");
-const ropid_gtfs_1 = require("../../../schema-definitions/ropid-gtfs");
-const TripDto_1 = require("../../../schema-definitions/ropid-gtfs/models/TripDto");
-const Geo_1 = require("@golemio/core/dist/output-gateway/Geo");
-const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
-const models_1 = require("@golemio/core/dist/output-gateway/models");
-const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
-const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
-const GtfsTripScheduleRepository_1 = require("../data-access/GtfsTripScheduleRepository");
-class GTFSTripsModel extends models_1.SequelizeModel {
+import { GtfsStopTimeDropOffType, GtfsStopTimePickupType } from "#helpers/PassengerTransferEnums";
+import { PG_SCHEMA } from "#sch/const";
+import { RopidGTFS } from "#sch/ropid-gtfs/index";
+import { TripDto } from "#sch/ropid-gtfs/models/TripDto";
+import { buildGeojsonFeature } from "@golemio/core/dist/output-gateway/Geo.js";
+import { ContainerToken, OutputGatewayContainer } from "@golemio/core/dist/output-gateway/ioc/index.js";
+import { SequelizeModel } from "@golemio/core/dist/output-gateway/models/index.js";
+import GolemioErrorsCore from "@golemio/core/dist/shared/golemio-errors.js";
+const { GeneralError } = GolemioErrorsCore;
+import Sequelize from "@golemio/core/dist/shared/sequelize.js";
+import { GtfsTripScheduleRepository } from "../data-access/GtfsTripScheduleRepository.js";
+export class GTFSTripsModel extends SequelizeModel {
     constructor() {
-        super(ropid_gtfs_1.RopidGTFS.trips.name, ropid_gtfs_1.RopidGTFS.trips.pgTableName, TripDto_1.TripDto.attributeModel, {
-            schema: const_1.PG_SCHEMA,
+        super(RopidGTFS.trips.name, RopidGTFS.trips.pgTableName, TripDto.attributeModel, {
+            schema: PG_SCHEMA,
         });
         this.Associate = (models) => {
             this.sequelizeModel.hasMany(models.GTFSStopTimesModel.sequelizeModel, {
@@ -52,7 +47,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 foreignKey: "trip_id",
                 sourceKey: "trip_id",
                 scope: {
-                    [sequelize_1.default.Op.and]: [sequelize_1.default.literal(`start_timestamp::date = CURRENT_DATE`)],
+                    [Sequelize.Op.and]: [Sequelize.literal(`start_timestamp::date = CURRENT_DATE`)],
                 },
             });
         };
@@ -74,7 +69,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                         as: "has_stop_id",
                         attributes: [],
                         duplicating: false,
-                        model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
+                        model: this.dbConnector.getConnection().models[RopidGTFS.stop_times.pgTableName],
                         where: {
                             stop_id: stopId,
                         },
@@ -86,7 +81,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                         attributes: [],
                         model: this.dbConnector
                             .getConnection()
-                            .models[ropid_gtfs_1.RopidGTFS.calendar.pgTableName].scope({ method: ["forDate", date] }),
+                            .models[RopidGTFS.calendar.pgTableName].scope({ method: ["forDate", date] }),
                     });
                 }
                 const data = await this.sequelizeModel.findAll({
@@ -101,7 +96,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 return data;
             }
             catch (err) {
-                throw new golemio_errors_1.GeneralError("Database error", "GTFSTripsModel", err, 500);
+                throw new GeneralError("Database error", "GTFSTripsModel", err, 500);
             }
         };
         /** Retrieves specific GTFS trip
@@ -122,7 +117,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 trip = await this.sequelizeModel.findByPk(id, { include: this.GetInclusions(options) });
             }
             catch (err) {
-                throw new golemio_errors_1.GeneralError("Database error", "GTFSTripsModel", err, 500);
+                throw new GeneralError("Database error", "GTFSTripsModel", err, 500);
             }
             return trip ? this.ConvertItem(trip, { route, stops, shapes, stopTimes }) : null;
         };
@@ -135,7 +130,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 return tripEntity ? tripEntity.toJSON() : null;
             }
             catch (err) {
-                throw new golemio_errors_1.GeneralError("Cannot get GTFS trip from database", this.constructor.name, err, 500);
+                throw new GeneralError("Cannot get GTFS trip from database", this.constructor.name, err, 500);
             }
         };
         /** Prepare ORM query with selected params
@@ -161,12 +156,12 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                     include: [
                         {
                             as: "stop",
-                            model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
+                            model: this.dbConnector.getConnection().models[RopidGTFS.stops.pgTableName],
                         },
                     ],
                     order: [["stop_sequence", "ASC"]],
                     separate: true,
-                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
+                    model: this.dbConnector.getConnection().models[RopidGTFS.stop_times.pgTableName],
                 });
                 // Only stops or only stop times selected to include
             }
@@ -174,7 +169,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                 stops &&
                     include.push({
                         as: "stops",
-                        model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
+                        model: this.dbConnector.getConnection().models[RopidGTFS.stops.pgTableName],
                         through: { attributes: [] },
                     });
                 stopTimes &&
@@ -185,26 +180,26 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                         },
                         order: [["stop_sequence", "ASC"]],
                         separate: true,
-                        model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
+                        model: this.dbConnector.getConnection().models[RopidGTFS.stop_times.pgTableName],
                     });
             }
             shapes &&
                 include.push({
                     as: "shapes",
-                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.shapes.pgTableName],
+                    model: this.dbConnector.getConnection().models[RopidGTFS.shapes.pgTableName],
                 });
             if (date || service) {
                 include.push({
                     as: "service",
                     model: this.dbConnector
                         .getConnection()
-                        .models[ropid_gtfs_1.RopidGTFS.calendar.pgTableName].scope({ method: ["forDate", date] }),
+                        .models[RopidGTFS.calendar.pgTableName].scope({ method: ["forDate", date] }),
                 });
             }
             route &&
                 include.push({
                     as: "route",
-                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.routes.pgTableName],
+                    model: this.dbConnector.getConnection().models[RopidGTFS.routes.pgTableName],
                 });
             return include;
         };
@@ -214,7 +209,7 @@ class GTFSTripsModel extends models_1.SequelizeModel {
             include.push({
                 as: "route",
                 attributes: ["route_id", "route_short_name", "route_type"],
-                model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.routes.pgTableName],
+                model: this.dbConnector.getConnection().models[RopidGTFS.routes.pgTableName],
             });
             include.push({
                 as: "schedule",
@@ -227,32 +222,32 @@ class GTFSTripsModel extends models_1.SequelizeModel {
                     attributes: [
                         "stop_sequence",
                         "shape_dist_traveled",
-                        [sequelize_1.default.literal(`EXTRACT(EPOCH FROM "arrival_time"::INTERVAL)::int`), "arrival_time_seconds"],
-                        [sequelize_1.default.literal(`EXTRACT(EPOCH FROM "departure_time"::INTERVAL)::int`), "departure_time_seconds"],
+                        [Sequelize.literal(`EXTRACT(EPOCH FROM "arrival_time"::INTERVAL)::int`), "arrival_time_seconds"],
+                        [Sequelize.literal(`EXTRACT(EPOCH FROM "departure_time"::INTERVAL)::int`), "departure_time_seconds"],
                     ],
                     include: [
                         {
                             as: "stop",
                             attributes: ["stop_name", "zone_id", "stop_lon", "stop_lat", "wheelchair_boarding"],
                             required: true,
-                            model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stops.pgTableName],
+                            model: this.dbConnector.getConnection().models[RopidGTFS.stops.pgTableName],
                         },
                     ],
                     where: {
                         // exclude no stop waypoints
-                        drop_off_type: { [sequelize_1.default.Op.ne]: PassengerTransferEnums_1.GtfsStopTimeDropOffType.NoDropOff.toString() },
-                        pickup_type: { [sequelize_1.default.Op.ne]: PassengerTransferEnums_1.GtfsStopTimePickupType.NoPickup.toString() },
+                        drop_off_type: { [Sequelize.Op.ne]: GtfsStopTimeDropOffType.NoDropOff.toString() },
+                        pickup_type: { [Sequelize.Op.ne]: GtfsStopTimePickupType.NoPickup.toString() },
                     },
                     order: [["stop_sequence", "ASC"]],
                     separate: true,
-                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.stop_times.pgTableName],
+                    model: this.dbConnector.getConnection().models[RopidGTFS.stop_times.pgTableName],
                 });
             }
             if (shouldIncludeShapes) {
                 include.push({
                     as: "shapes",
                     attributes: ["shape_dist_traveled", "shape_pt_lon", "shape_pt_lat"],
-                    model: this.dbConnector.getConnection().models[ropid_gtfs_1.RopidGTFS.shapes.pgTableName],
+                    model: this.dbConnector.getConnection().models[RopidGTFS.shapes.pgTableName],
                 });
             }
             return include;
@@ -307,11 +302,10 @@ class GTFSTripsModel extends models_1.SequelizeModel {
          * Builds the correct format of a response data
          */
         this.BuildResponse = (responseObject, longLoc, latLoc) => {
-            return (0, Geo_1.buildGeojsonFeature)(responseObject, longLoc, latLoc, true);
+            return buildGeojsonFeature(responseObject, longLoc, latLoc, true);
         };
-        this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
-        this.tripScheduleRepository = new GtfsTripScheduleRepository_1.GtfsTripScheduleRepository();
+        this.dbConnector = OutputGatewayContainer.resolve(ContainerToken.PostgresDatabase);
+        this.tripScheduleRepository = new GtfsTripScheduleRepository();
     }
 }
-exports.GTFSTripsModel = GTFSTripsModel;
 //# sourceMappingURL=GTFSTripsModel.js.map