@golemio/pid 5.7.2-dev.2375920152 → 5.7.2-rc.2378043360

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 (112) hide show
  1. package/dist/const.d.ts +1 -0
  2. package/dist/const.js +2 -1
  3. package/dist/const.js.map +1 -1
  4. package/dist/integration-engine/ropid-gtfs/datasources/StaticDataSourceFactory.d.ts +2 -3
  5. package/dist/integration-engine/ropid-gtfs/datasources/StaticDataSourceFactory.js +2 -4
  6. package/dist/integration-engine/ropid-gtfs/datasources/StaticDataSourceFactory.js.map +1 -1
  7. package/dist/integration-engine/ropid-gtfs/ioc/Di.js +0 -6
  8. package/dist/integration-engine/ropid-gtfs/ioc/Di.js.map +1 -1
  9. package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.d.ts +0 -3
  10. package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js +0 -3
  11. package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js.map +1 -1
  12. package/dist/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.js +0 -1
  13. package/dist/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.js.map +1 -1
  14. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/SaveStaticDataTask.d.ts +1 -6
  15. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/SaveStaticDataTask.js +10 -39
  16. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/SaveStaticDataTask.js.map +1 -1
  17. package/dist/integration-engine/vehicle-positions/ioc/Di.js +0 -2
  18. package/dist/integration-engine/vehicle-positions/ioc/Di.js.map +1 -1
  19. package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.d.ts +0 -1
  20. package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js +0 -1
  21. package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js.map +1 -1
  22. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.d.ts +5 -10
  23. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.js +11 -37
  24. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.js.map +1 -1
  25. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.d.ts +1 -4
  26. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js +9 -22
  27. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js.map +1 -1
  28. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TramMessageFilter.d.ts +3 -7
  29. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TramMessageFilter.js +10 -28
  30. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/TramMessageFilter.js.map +1 -1
  31. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonMessageFilter.d.ts +1 -1
  32. package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js +1 -1
  33. package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js.map +1 -1
  34. package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js +1 -1
  35. package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js.map +1 -1
  36. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/IUpdateRunsGtfsTripInput.d.ts +0 -6
  37. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js +2 -3
  38. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js.map +1 -1
  39. package/dist/output-gateway/public/data-access/redis/PublicGtfsDepartureRepository.js +1 -0
  40. package/dist/output-gateway/public/data-access/redis/PublicGtfsDepartureRepository.js.map +1 -1
  41. package/dist/output-gateway/public/service/facade/DetailedTripFacade.js +1 -1
  42. package/dist/output-gateway/public/service/facade/DetailedTripFacade.js.map +1 -1
  43. package/dist/output-gateway/public/service/helpers/trip-scope/strategy/ShapesTripScopeHandler.js +1 -1
  44. package/dist/output-gateway/public/service/helpers/trip-scope/strategy/ShapesTripScopeHandler.js.map +1 -1
  45. package/dist/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.js +1 -1
  46. package/dist/output-gateway/public/service/helpers/trip-scope/strategy/StopTimesTripScopeHandler.js.map +1 -1
  47. package/dist/output-gateway/vehicle-positions/data-access/PositionRepository.d.ts +3 -10
  48. package/dist/output-gateway/vehicle-positions/data-access/PositionRepository.js +7 -30
  49. package/dist/output-gateway/vehicle-positions/data-access/PositionRepository.js.map +1 -1
  50. package/dist/output-gateway/vehicle-positions/data-access/TripRepository.d.ts +3 -7
  51. package/dist/output-gateway/vehicle-positions/data-access/TripRepository.js +7 -30
  52. package/dist/output-gateway/vehicle-positions/data-access/TripRepository.js.map +1 -1
  53. package/dist/output-gateway/vehicle-positions/data-access/VehicleDescriptorRepository.d.ts +3 -10
  54. package/dist/output-gateway/vehicle-positions/data-access/VehicleDescriptorRepository.js +7 -30
  55. package/dist/output-gateway/vehicle-positions/data-access/VehicleDescriptorRepository.js.map +1 -1
  56. package/dist/output-gateway/vehicle-positions/data-access/VehicleTypeRepository.d.ts +3 -10
  57. package/dist/output-gateway/vehicle-positions/data-access/VehicleTypeRepository.js +7 -30
  58. package/dist/output-gateway/vehicle-positions/data-access/VehicleTypeRepository.js.map +1 -1
  59. package/dist/output-gateway/vehicle-positions/data-access/index.js +18 -9
  60. package/dist/output-gateway/vehicle-positions/data-access/index.js.map +1 -1
  61. package/dist/output-gateway/vehicle-positions/data-access/interfaces/ITripWithPositionRepository.d.ts +2 -3
  62. package/dist/output-gateway/vehicle-positions/data-access/interfaces/IVPRepositoryInstances.d.ts +6 -6
  63. package/dist/output-gateway/vehicle-positions/data-access/views/ProcessedPositionRepository.d.ts +3 -7
  64. package/dist/output-gateway/vehicle-positions/data-access/views/ProcessedPositionRepository.js +7 -30
  65. package/dist/output-gateway/vehicle-positions/data-access/views/ProcessedPositionRepository.js.map +1 -1
  66. package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.d.ts +7 -17
  67. package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js +42 -112
  68. package/dist/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.js.map +1 -1
  69. package/dist/schema-definitions/datasources/static-data/index.d.ts +0 -1
  70. package/dist/schema-definitions/datasources/static-data/index.js +0 -1
  71. package/dist/schema-definitions/datasources/static-data/index.js.map +1 -1
  72. package/dist/schema-definitions/datasources/static-data/interfaces/index.d.ts +0 -1
  73. package/dist/schema-definitions/datasources/static-data/interfaces/index.js +0 -1
  74. package/dist/schema-definitions/datasources/static-data/interfaces/index.js.map +1 -1
  75. package/dist/schema-definitions/ropid-gtfs/redis/const.d.ts +0 -2
  76. package/dist/schema-definitions/ropid-gtfs/redis/const.js +1 -3
  77. package/dist/schema-definitions/ropid-gtfs/redis/const.js.map +1 -1
  78. package/dist/schema-definitions/vehicle-positions/models/interfaces/ICommonRunWithMessageDto.d.ts +0 -6
  79. package/docs/asyncapi.yaml +2 -17
  80. package/docs/cache/types/redis.md +2 -58
  81. package/docs/implementation_documentation.md +3 -116
  82. package/docs/jis/index.md +0 -17
  83. package/docs/processing/input_realtime_data/http_mpvnet.md +0 -21
  84. package/docs/processing/state_position_tracking/http_mpvnet.md +0 -1
  85. package/docs/processing/state_position_tracking/tcp_dpp_common.md +0 -1
  86. package/package.json +5 -8
  87. package/dist/integration-engine/ropid-gtfs/data-access/cache/NotPublicVehiclesRedisRepository.d.ts +0 -14
  88. package/dist/integration-engine/ropid-gtfs/data-access/cache/NotPublicVehiclesRedisRepository.js +0 -47
  89. package/dist/integration-engine/ropid-gtfs/data-access/cache/NotPublicVehiclesRedisRepository.js.map +0 -1
  90. package/dist/integration-engine/ropid-gtfs/datasources/static-data/NotPublicVehiclesDataSourceProvider.d.ts +0 -9
  91. package/dist/integration-engine/ropid-gtfs/datasources/static-data/NotPublicVehiclesDataSourceProvider.js +0 -47
  92. package/dist/integration-engine/ropid-gtfs/datasources/static-data/NotPublicVehiclesDataSourceProvider.js.map +0 -1
  93. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/EnsureCacheTask.d.ts +0 -9
  94. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/EnsureCacheTask.js +0 -49
  95. package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/EnsureCacheTask.js.map +0 -1
  96. package/dist/output-gateway/vehicle-positions/data-access/cache/NotPublicVehiclesRedisRepository.d.ts +0 -10
  97. package/dist/output-gateway/vehicle-positions/data-access/cache/NotPublicVehiclesRedisRepository.js +0 -45
  98. package/dist/output-gateway/vehicle-positions/data-access/cache/NotPublicVehiclesRedisRepository.js.map +0 -1
  99. package/dist/output-gateway/vehicle-positions/ioc/Di.d.ts +0 -3
  100. package/dist/output-gateway/vehicle-positions/ioc/Di.js +0 -23
  101. package/dist/output-gateway/vehicle-positions/ioc/Di.js.map +0 -1
  102. package/dist/output-gateway/vehicle-positions/ioc/OgVehiclePositionsToken.d.ts +0 -9
  103. package/dist/output-gateway/vehicle-positions/ioc/OgVehiclePositionsToken.js +0 -15
  104. package/dist/output-gateway/vehicle-positions/ioc/OgVehiclePositionsToken.js.map +0 -1
  105. package/dist/schema-definitions/datasources/static-data/NotPublicVehiclesJsonSchema.d.ts +0 -3
  106. package/dist/schema-definitions/datasources/static-data/NotPublicVehiclesJsonSchema.js +0 -40
  107. package/dist/schema-definitions/datasources/static-data/NotPublicVehiclesJsonSchema.js.map +0 -1
  108. package/dist/schema-definitions/datasources/static-data/interfaces/NotPublicVehiclesDataInterface.d.ts +0 -35
  109. package/dist/schema-definitions/datasources/static-data/interfaces/NotPublicVehiclesDataInterface.js +0 -18
  110. package/dist/schema-definitions/datasources/static-data/interfaces/NotPublicVehiclesDataInterface.js.map +0 -1
  111. package/docs/examples/not_public_vehicles.json +0 -9
  112. package/docs/processing/transferboards_filtering.md +0 -312
@@ -1,31 +1,14 @@
1
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
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
2
  Object.defineProperty(exports, "__esModule", { value: true });
15
3
  exports.VehicleDescriptorRepository = void 0;
16
4
  const const_1 = require("../../../schema-definitions/const");
17
5
  const DescriptorModel_1 = require("../../../schema-definitions/vehicle-descriptors/models/DescriptorModel");
18
- const AbstractBasicRepository_1 = require("@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository");
19
- const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
20
- const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
21
- let VehicleDescriptorRepository = class VehicleDescriptorRepository extends AbstractBasicRepository_1.AbstractBasicRepository {
22
- constructor(connector, logger) {
23
- super(connector, logger);
24
- this.schema = const_1.PG_SCHEMA;
25
- this.tableName = DescriptorModel_1.DescriptorModel.tableName;
26
- this.sequelizeModel = connector
27
- .getConnection()
28
- .define(this.tableName, DescriptorModel_1.DescriptorModel.attributeModel, { schema: this.schema });
6
+ const output_gateway_1 = require("@golemio/core/dist/output-gateway");
7
+ class VehicleDescriptorRepository extends output_gateway_1.SequelizeModel {
8
+ constructor() {
9
+ super("VehicleDescriptorRepository", DescriptorModel_1.DescriptorModel.tableName, DescriptorModel_1.DescriptorModel.attributeModel, {
10
+ schema: const_1.PG_SCHEMA,
11
+ });
29
12
  }
30
13
  GetAll() {
31
14
  throw new Error("Not implemented");
@@ -33,12 +16,6 @@ let VehicleDescriptorRepository = class VehicleDescriptorRepository extends Abst
33
16
  GetOne() {
34
17
  throw new Error("Not implemented");
35
18
  }
36
- };
19
+ }
37
20
  exports.VehicleDescriptorRepository = VehicleDescriptorRepository;
38
- exports.VehicleDescriptorRepository = VehicleDescriptorRepository = __decorate([
39
- (0, tsyringe_1.injectable)(),
40
- __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
41
- __param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
42
- __metadata("design:paramtypes", [Object, Object])
43
- ], VehicleDescriptorRepository);
44
21
  //# sourceMappingURL=VehicleDescriptorRepository.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"VehicleDescriptorRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/vehicle-positions/data-access/VehicleDescriptorRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,4GAAkF;AAClF,kIAA+H;AAG/H,wEAAqE;AACrE,iEAAwE;AAIjE,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,iDAAuB;IAMpE,YAAiD,SAA6B,EAA4B,MAAe;QACrH,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QANtB,WAAM,GAAG,iBAAS,CAAC;QACnB,cAAS,GAAG,iCAAe,CAAC,SAAS,CAAC;QAMzC,IAAI,CAAC,cAAc,GAAG,SAAS;aAC1B,aAAa,EAAE;aACf,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,iCAAe,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzF,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ,CAAA;AApBY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,qBAAU,GAAE;IAOI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IAAiC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GANhG,2BAA2B,CAoBvC"}
1
+ {"version":3,"file":"VehicleDescriptorRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/vehicle-positions/data-access/VehicleDescriptorRepository.ts"],"names":[],"mappings":";;;AAAA,6DAAuC;AACvC,4GAAkF;AAClF,sEAAmE;AAEnE,MAAa,2BAA4B,SAAQ,+BAAc;IAC3D;QACI,KAAK,CAAC,6BAA6B,EAAE,iCAAe,CAAC,SAAS,EAAE,iCAAe,CAAC,cAAc,EAAE;YAC5F,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;IACP,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ;AAdD,kEAcC"}
@@ -1,13 +1,6 @@
1
- import { VehicleTypeDto } from "../../../schema-definitions/vehicle-positions/models/VehicleTypeDto";
2
- import { AbstractBasicRepository } from "@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository";
3
- import { IDatabaseConnector } from "@golemio/core/dist/helpers/data-access/postgres/IDatabaseConnector";
4
- import { ILogger } from "@golemio/core/dist/helpers/logger/LoggerProvider";
5
- import { ModelStatic } from "@golemio/core/dist/shared/sequelize";
6
- export declare class VehicleTypeRepository extends AbstractBasicRepository {
7
- schema: string;
8
- tableName: string;
9
- sequelizeModel: ModelStatic<VehicleTypeDto>;
10
- constructor(connector: IDatabaseConnector, logger: ILogger);
1
+ import { SequelizeModel } from "@golemio/core/dist/output-gateway";
2
+ export declare class VehicleTypeRepository extends SequelizeModel {
3
+ constructor();
11
4
  GetAll(): never;
12
5
  GetOne(): never;
13
6
  }
@@ -1,32 +1,15 @@
1
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
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
2
  Object.defineProperty(exports, "__esModule", { value: true });
15
3
  exports.VehicleTypeRepository = void 0;
16
4
  const const_1 = require("../../../schema-definitions/const");
17
5
  const vehicle_positions_1 = require("../../../schema-definitions/vehicle-positions");
18
6
  const VehicleTypeDto_1 = require("../../../schema-definitions/vehicle-positions/models/VehicleTypeDto");
19
- const AbstractBasicRepository_1 = require("@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository");
20
- const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
21
- const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
22
- let VehicleTypeRepository = class VehicleTypeRepository extends AbstractBasicRepository_1.AbstractBasicRepository {
23
- constructor(connector, logger) {
24
- super(connector, logger);
25
- this.schema = const_1.PG_SCHEMA;
26
- this.tableName = vehicle_positions_1.VehiclePositions.vehicleTypes.pgTableName;
27
- this.sequelizeModel = connector
28
- .getConnection()
29
- .define(this.tableName, VehicleTypeDto_1.VehicleTypeDto.attributeModel, { schema: this.schema });
7
+ const output_gateway_1 = require("@golemio/core/dist/output-gateway");
8
+ class VehicleTypeRepository extends output_gateway_1.SequelizeModel {
9
+ constructor() {
10
+ super(vehicle_positions_1.VehiclePositions.vehicleTypes.name + "Repository", vehicle_positions_1.VehiclePositions.vehicleTypes.pgTableName, VehicleTypeDto_1.VehicleTypeDto.attributeModel, {
11
+ schema: const_1.PG_SCHEMA,
12
+ });
30
13
  }
31
14
  GetAll() {
32
15
  throw new Error("Not implemented");
@@ -34,12 +17,6 @@ let VehicleTypeRepository = class VehicleTypeRepository extends AbstractBasicRep
34
17
  GetOne() {
35
18
  throw new Error("Not implemented");
36
19
  }
37
- };
20
+ }
38
21
  exports.VehicleTypeRepository = VehicleTypeRepository;
39
- exports.VehicleTypeRepository = VehicleTypeRepository = __decorate([
40
- (0, tsyringe_1.injectable)(),
41
- __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
42
- __param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
43
- __metadata("design:paramtypes", [Object, Object])
44
- ], VehicleTypeRepository);
45
22
  //# sourceMappingURL=VehicleTypeRepository.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"VehicleTypeRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/vehicle-positions/data-access/VehicleTypeRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,qFAA0D;AAC1D,wGAA8E;AAC9E,kIAA+H;AAG/H,wEAAqE;AACrE,iEAAwE;AAIjE,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,iDAAuB;IAM9D,YAAiD,SAA6B,EAA4B,MAAe;QACrH,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QANtB,WAAM,GAAG,iBAAS,CAAC;QACnB,cAAS,GAAG,oCAAgB,CAAC,YAAY,CAAC,WAAW,CAAC;QAMzD,IAAI,CAAC,cAAc,GAAG,SAAS;aAC1B,aAAa,EAAE;aACf,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,+BAAc,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACxF,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ,CAAA;AApBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,qBAAU,GAAE;IAOI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IAAiC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GANhG,qBAAqB,CAoBjC"}
1
+ {"version":3,"file":"VehicleTypeRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/vehicle-positions/data-access/VehicleTypeRepository.ts"],"names":[],"mappings":";;;AAAA,6DAAuC;AACvC,qFAA0D;AAC1D,wGAA8E;AAC9E,sEAAmE;AAEnE,MAAa,qBAAsB,SAAQ,+BAAc;IACrD;QACI,KAAK,CACD,oCAAgB,CAAC,YAAY,CAAC,IAAI,GAAG,YAAY,EACjD,oCAAgB,CAAC,YAAY,CAAC,WAAW,EACzC,+BAAc,CAAC,cAAc,EAC7B;YACI,MAAM,EAAE,iBAAS;SACpB,CACJ,CAAC;IACN,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ;AAnBD,sDAmBC"}
@@ -1,16 +1,25 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.repositories = void 0;
4
- const Di_1 = require("../ioc/Di");
5
- const OgVehiclePositionsToken_1 = require("../ioc/OgVehiclePositionsToken");
6
- // Resolve repositories from container
4
+ const PositionRepository_1 = require("./PositionRepository");
5
+ const TripRepository_1 = require("./TripRepository");
6
+ const VehicleDescriptorRepository_1 = require("./VehicleDescriptorRepository");
7
+ const VehicleTypeRepository_1 = require("./VehicleTypeRepository");
8
+ const ProcessedPositionRepository_1 = require("./views/ProcessedPositionRepository");
9
+ const TripWithLastPositionRepository_1 = require("./views/TripWithLastPositionRepository");
7
10
  const repositories = {
8
- positionRepository: Di_1.OgVehiclePositionsContainer.resolve(OgVehiclePositionsToken_1.OgVehiclePositionsToken.PositionRepository),
9
- tripRepository: Di_1.OgVehiclePositionsContainer.resolve(OgVehiclePositionsToken_1.OgVehiclePositionsToken.TripRepository),
10
- vehicleTypeRepository: Di_1.OgVehiclePositionsContainer.resolve(OgVehiclePositionsToken_1.OgVehiclePositionsToken.VehicleTypeRepository),
11
- vehicleDescriptorRepository: Di_1.OgVehiclePositionsContainer.resolve(OgVehiclePositionsToken_1.OgVehiclePositionsToken.VehicleDescriptorRepository),
12
- processedPositionRepository: Di_1.OgVehiclePositionsContainer.resolve(OgVehiclePositionsToken_1.OgVehiclePositionsToken.ProcessedPositionRepository),
13
- tripWithLastPositionRepository: Di_1.OgVehiclePositionsContainer.resolve(OgVehiclePositionsToken_1.OgVehiclePositionsToken.TripWithLastPositionRepository),
11
+ positionRepository: new PositionRepository_1.PositionRepository(),
12
+ tripRepository: new TripRepository_1.TripRepository(),
13
+ vehicleTypeRepository: new VehicleTypeRepository_1.VehicleTypeRepository(),
14
+ vehicleDescriptorRepository: new VehicleDescriptorRepository_1.VehicleDescriptorRepository(),
15
+ tripWithLastPositionRepository: new TripWithLastPositionRepository_1.TripWithLastPositionRepository(),
16
+ processedPositionRepository: new ProcessedPositionRepository_1.ProcessedPositionRepository(),
14
17
  };
15
18
  exports.repositories = repositories;
19
+ for (const type of Object.keys(repositories)) {
20
+ const model = repositories[type];
21
+ if (model.hasOwnProperty("Associate")) {
22
+ model.Associate(repositories);
23
+ }
24
+ }
16
25
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/output-gateway/vehicle-positions/data-access/index.ts"],"names":[],"mappings":";;;AAAA,kCAAwD;AACxD,4EAAyE;AASzE,sCAAsC;AACtC,MAAM,YAAY,GAA2B;IACzC,kBAAkB,EAAE,gCAA2B,CAAC,OAAO,CAAqB,iDAAuB,CAAC,kBAAkB,CAAC;IACvH,cAAc,EAAE,gCAA2B,CAAC,OAAO,CAAiB,iDAAuB,CAAC,cAAc,CAAC;IAC3G,qBAAqB,EAAE,gCAA2B,CAAC,OAAO,CACtD,iDAAuB,CAAC,qBAAqB,CAChD;IACD,2BAA2B,EAAE,gCAA2B,CAAC,OAAO,CAC5D,iDAAuB,CAAC,2BAA2B,CACtD;IACD,2BAA2B,EAAE,gCAA2B,CAAC,OAAO,CAC5D,iDAAuB,CAAC,2BAA2B,CACtD;IACD,8BAA8B,EAAE,gCAA2B,CAAC,OAAO,CAC/D,iDAAuB,CAAC,8BAA8B,CACzD;CACJ,CAAC;AAEO,oCAAY"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/output-gateway/vehicle-positions/data-access/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAC1D,qDAAkD;AAClD,+EAA4E;AAC5E,mEAAgE;AAEhE,qFAAkF;AAClF,2FAAwF;AAExF,MAAM,YAAY,GAA2B;IACzC,kBAAkB,EAAE,IAAI,uCAAkB,EAAE;IAC5C,cAAc,EAAE,IAAI,+BAAc,EAAE;IACpC,qBAAqB,EAAE,IAAI,6CAAqB,EAAE;IAClD,2BAA2B,EAAE,IAAI,yDAA2B,EAAE;IAC9D,8BAA8B,EAAE,IAAI,+DAA8B,EAAE;IACpE,2BAA2B,EAAE,IAAI,yDAA2B,EAAE;CACjE,CAAC;AASO,oCAAY;AAPrB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3C,MAAM,KAAK,GAAG,YAAY,CAAC,IAAoC,CAAC,CAAC;IACjE,IAAI,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC;QACpC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;AACL,CAAC"}
@@ -1,5 +1,4 @@
1
- import { AbstractBasicRepository } from "@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository";
2
- import { IGeoJSONFeature } from "@golemio/core/dist/output-gateway";
1
+ import { IGeoJSONFeature, SequelizeModel } from "@golemio/core/dist/output-gateway";
3
2
  import { FeatureCollection } from "@golemio/core/dist/shared/geojson";
4
3
  export interface ITripGetAllOutput {
5
4
  data: FeatureCollection;
@@ -7,7 +6,7 @@ export interface ITripGetAllOutput {
7
6
  maxUpdatedAt: string;
8
7
  };
9
8
  }
10
- export interface ITripWithPositionRepository extends AbstractBasicRepository {
9
+ export interface ITripWithPositionRepository extends SequelizeModel {
11
10
  GetAll(options: {
12
11
  cisTripNumber?: number;
13
12
  routeId?: string;
@@ -1,10 +1,10 @@
1
+ import { SequelizeModel } from "@golemio/core/dist/output-gateway";
1
2
  import { ITripWithPositionRepository } from "./ITripWithPositionRepository";
2
- import { AbstractBasicRepository } from "@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository";
3
3
  export interface IVPRepositoryInstances {
4
- positionRepository: AbstractBasicRepository;
5
- tripRepository: AbstractBasicRepository;
6
- vehicleTypeRepository: AbstractBasicRepository;
7
- vehicleDescriptorRepository: AbstractBasicRepository;
4
+ positionRepository: SequelizeModel;
5
+ tripRepository: SequelizeModel;
6
+ vehicleTypeRepository: SequelizeModel;
7
+ vehicleDescriptorRepository: SequelizeModel;
8
8
  tripWithLastPositionRepository: ITripWithPositionRepository;
9
- processedPositionRepository: AbstractBasicRepository;
9
+ processedPositionRepository: SequelizeModel;
10
10
  }
@@ -1,13 +1,9 @@
1
1
  import { ProcessedPositionModel } from "../../../../schema-definitions/vehicle-positions/models/views";
2
- import { AbstractBasicRepository } from "@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository";
3
- import { IDatabaseConnector } from "@golemio/core/dist/helpers/data-access/postgres/IDatabaseConnector";
4
- import { ILogger } from "@golemio/core/dist/helpers/logger/LoggerProvider";
2
+ import { SequelizeModel } from "@golemio/core/dist/output-gateway";
5
3
  import { ModelStatic } from "@golemio/core/dist/shared/sequelize";
6
- export declare class ProcessedPositionRepository extends AbstractBasicRepository {
7
- schema: string;
8
- tableName: string;
4
+ export declare class ProcessedPositionRepository extends SequelizeModel {
9
5
  sequelizeModel: ModelStatic<ProcessedPositionModel>;
10
- constructor(connector: IDatabaseConnector, logger: ILogger);
6
+ constructor();
11
7
  GetAll(): never;
12
8
  GetOne(): never;
13
9
  }
@@ -1,31 +1,14 @@
1
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
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
2
  Object.defineProperty(exports, "__esModule", { value: true });
15
3
  exports.ProcessedPositionRepository = void 0;
16
4
  const const_1 = require("../../../../schema-definitions/const");
17
5
  const views_1 = require("../../../../schema-definitions/vehicle-positions/models/views");
18
- const AbstractBasicRepository_1 = require("@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository");
19
- const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
20
- const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
21
- let ProcessedPositionRepository = class ProcessedPositionRepository extends AbstractBasicRepository_1.AbstractBasicRepository {
22
- constructor(connector, logger) {
23
- super(connector, logger);
24
- this.schema = const_1.PG_SCHEMA;
25
- this.tableName = views_1.ProcessedPositionModel.tableName;
26
- this.sequelizeModel = connector
27
- .getConnection()
28
- .define(this.tableName, views_1.ProcessedPositionModel.attributeModel, { schema: this.schema });
6
+ const output_gateway_1 = require("@golemio/core/dist/output-gateway");
7
+ class ProcessedPositionRepository extends output_gateway_1.SequelizeModel {
8
+ constructor() {
9
+ super("ProcessedPositionRepository", views_1.ProcessedPositionModel.tableName, views_1.ProcessedPositionModel.attributeModel, {
10
+ schema: const_1.PG_SCHEMA,
11
+ });
29
12
  }
30
13
  GetAll() {
31
14
  throw new Error("Not implemented");
@@ -33,12 +16,6 @@ let ProcessedPositionRepository = class ProcessedPositionRepository extends Abst
33
16
  GetOne() {
34
17
  throw new Error("Not implemented");
35
18
  }
36
- };
19
+ }
37
20
  exports.ProcessedPositionRepository = ProcessedPositionRepository;
38
- exports.ProcessedPositionRepository = ProcessedPositionRepository = __decorate([
39
- (0, tsyringe_1.injectable)(),
40
- __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
41
- __param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
42
- __metadata("design:paramtypes", [Object, Object])
43
- ], ProcessedPositionRepository);
44
21
  //# sourceMappingURL=ProcessedPositionRepository.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ProcessedPositionRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/views/ProcessedPositionRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAuC;AACvC,yFAA6E;AAC7E,kIAA+H;AAG/H,wEAAqE;AACrE,iEAAwE;AAIjE,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,iDAAuB;IAMpE,YAAiD,SAA6B,EAA4B,MAAe;QACrH,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QANtB,WAAM,GAAG,iBAAS,CAAC;QACnB,cAAS,GAAG,8BAAsB,CAAC,SAAS,CAAC;QAMhD,IAAI,CAAC,cAAc,GAAG,SAAS;aAC1B,aAAa,EAAE;aACf,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,8BAAsB,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAChG,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ,CAAA;AApBY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,qBAAU,GAAE;IAOI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IAAiC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GANhG,2BAA2B,CAoBvC"}
1
+ {"version":3,"file":"ProcessedPositionRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/views/ProcessedPositionRepository.ts"],"names":[],"mappings":";;;AAAA,gEAAuC;AACvC,yFAA6E;AAC7E,sEAAmE;AAGnE,MAAa,2BAA4B,SAAQ,+BAAc;IAG3D;QACI,KAAK,CAAC,6BAA6B,EAAE,8BAAsB,CAAC,SAAS,EAAE,8BAAsB,CAAC,cAAc,EAAE;YAC1G,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;IACP,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ;AAhBD,kEAgBC"}
@@ -1,23 +1,14 @@
1
- import { NotPublicVehiclesRedisRepository } from "../cache/NotPublicVehiclesRedisRepository";
2
- import { ProcessedPositionRepository } from "./ProcessedPositionRepository";
3
- import { VehicleTypeRepository } from "../VehicleTypeRepository";
4
- import { VehicleDescriptorRepository } from "../VehicleDescriptorRepository";
5
1
  import { TripWithLastPositionModel } from "../../../../schema-definitions/vehicle-positions/models/views";
6
- import { IDatabaseConnector } from "@golemio/core/dist/helpers/data-access/postgres/IDatabaseConnector";
2
+ import { SequelizeModel } from "@golemio/core/dist/output-gateway";
7
3
  import { IGeoJSONFeature } from "@golemio/core/dist/output-gateway/Geo";
8
4
  import { ModelStatic } from "@golemio/core/dist/shared/sequelize";
9
- import { ITripGetAllOutput } from "../interfaces/ITripWithPositionRepository";
10
- import { AbstractBasicRepository } from "@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository";
11
- import { ILogger } from "@golemio/core/dist/helpers";
12
- export declare class TripWithLastPositionRepository extends AbstractBasicRepository {
13
- private notPublicVehiclesRepository;
14
- private processedPositionRepository;
15
- private vehicleTypeRepository;
16
- private vehicleDescriptorRepository;
17
- schema: string;
18
- tableName: string;
5
+ import { ITripGetAllOutput, ITripWithPositionRepository } from "../interfaces/ITripWithPositionRepository";
6
+ import { IVPRepositoryInstances } from "../interfaces/IVPRepositoryInstances";
7
+ export declare class TripWithLastPositionRepository extends SequelizeModel implements ITripWithPositionRepository {
19
8
  sequelizeModel: ModelStatic<TripWithLastPositionModel>;
20
- constructor(connector: IDatabaseConnector, logger: ILogger, notPublicVehiclesRepository: NotPublicVehiclesRedisRepository, processedPositionRepository: ProcessedPositionRepository, vehicleTypeRepository: VehicleTypeRepository, vehicleDescriptorRepository: VehicleDescriptorRepository);
9
+ private dbConnector;
10
+ constructor();
11
+ Associate: (repositories: IVPRepositoryInstances) => void;
21
12
  /** Retrieves all vehicle trips
22
13
  * @param {object} options Options object with params
23
14
  * @param {number} [options.limit] Limit
@@ -56,5 +47,4 @@ export declare class TripWithLastPositionRepository extends AbstractBasicReposit
56
47
  }) => Promise<IGeoJSONFeature | null>;
57
48
  private composeIncludes;
58
49
  private determinePossibleStatePositions;
59
- private getNotPublicWhereConditions;
60
50
  }
@@ -15,12 +15,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
19
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
20
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
21
- 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;
22
- return c > 3 && r && Object.defineProperty(target, key, r), r;
23
- };
24
18
  var __importStar = (this && this.__importStar) || (function () {
25
19
  var ownKeys = function(o) {
26
20
  ownKeys = Object.getOwnPropertyNames || function (o) {
@@ -38,45 +32,52 @@ var __importStar = (this && this.__importStar) || (function () {
38
32
  return result;
39
33
  };
40
34
  })();
41
- var __metadata = (this && this.__metadata) || function (k, v) {
42
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
43
- };
44
- var __param = (this && this.__param) || function (paramIndex, decorator) {
45
- return function (target, key) { decorator(target, key, paramIndex); }
46
- };
47
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
48
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
49
37
  };
50
38
  Object.defineProperty(exports, "__esModule", { value: true });
51
39
  exports.TripWithLastPositionRepository = void 0;
52
40
  const const_1 = require("../../../../schema-definitions/const");
53
- const NotPublicVehiclesRedisRepository_1 = require("../cache/NotPublicVehiclesRedisRepository");
54
- const ProcessedPositionRepository_1 = require("./ProcessedPositionRepository");
55
- const VehicleTypeRepository_1 = require("../VehicleTypeRepository");
56
- const VehicleDescriptorRepository_1 = require("../VehicleDescriptorRepository");
57
- const OgVehiclePositionsToken_1 = require("../../ioc/OgVehiclePositionsToken");
58
41
  const models_1 = require("../../../../schema-definitions/vehicle-descriptors/models");
59
42
  const vehicle_positions_1 = require("../../../../schema-definitions/vehicle-positions");
60
43
  const views_1 = require("../../../../schema-definitions/vehicle-positions/models/views");
44
+ const output_gateway_1 = require("@golemio/core/dist/output-gateway");
61
45
  const Geo_1 = require("@golemio/core/dist/output-gateway/Geo");
46
+ const ioc_1 = require("@golemio/core/dist/output-gateway/ioc/");
62
47
  const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
63
48
  const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
64
49
  const sequelize_1 = __importStar(require("@golemio/core/dist/shared/sequelize"));
65
50
  const const_2 = require("../../../../const");
66
- const RouteTypeEnums_1 = require("../../../../helpers/RouteTypeEnums");
67
51
  const PositionOutputMapper_1 = require("../helpers/PositionOutputMapper");
68
- const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
69
- const AbstractBasicRepository_1 = require("@golemio/core/dist/helpers/data-access/postgres/repositories/AbstractBasicRepository");
70
- const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
71
- let TripWithLastPositionRepository = class TripWithLastPositionRepository extends AbstractBasicRepository_1.AbstractBasicRepository {
72
- constructor(connector, logger, notPublicVehiclesRepository, processedPositionRepository, vehicleTypeRepository, vehicleDescriptorRepository) {
73
- super(connector, logger);
74
- this.notPublicVehiclesRepository = notPublicVehiclesRepository;
75
- this.processedPositionRepository = processedPositionRepository;
76
- this.vehicleTypeRepository = vehicleTypeRepository;
77
- this.vehicleDescriptorRepository = vehicleDescriptorRepository;
78
- this.schema = const_1.PG_SCHEMA;
79
- this.tableName = views_1.TripWithLastPositionModel.tableName;
52
+ class TripWithLastPositionRepository extends output_gateway_1.SequelizeModel {
53
+ constructor() {
54
+ super("TripWithLastPositionRepository", views_1.TripWithLastPositionModel.tableName, views_1.TripWithLastPositionModel.attributeModel, {
55
+ schema: const_1.PG_SCHEMA,
56
+ });
57
+ this.Associate = (repositories) => {
58
+ this.sequelizeModel.hasMany(repositories.processedPositionRepository.sequelizeModel, {
59
+ as: "all_positions",
60
+ foreignKey: "trips_id",
61
+ scope: {
62
+ lat: { [sequelize_1.Op.not]: null },
63
+ lng: { [sequelize_1.Op.not]: null },
64
+ },
65
+ });
66
+ this.sequelizeModel.belongsTo(repositories.vehicleTypeRepository.sequelizeModel, {
67
+ as: "vehicle_type",
68
+ foreignKey: "vehicle_type_id",
69
+ });
70
+ this.sequelizeModel.belongsTo(repositories.vehicleDescriptorRepository.sequelizeModel, {
71
+ as: "vehicle_descriptor",
72
+ foreignKey: "vehicle_registration_number",
73
+ targetKey: "registration_number",
74
+ scope: {
75
+ [sequelize_1.default.Op.and]: [
76
+ sequelize_1.default.literal(`${views_1.TripWithLastPositionModel.tableName}.gtfs_route_type = vehicle_descriptor.gtfs_route_type`),
77
+ ],
78
+ },
79
+ });
80
+ };
80
81
  /** Retrieves all vehicle trips
81
82
  * @param {object} options Options object with params
82
83
  * @param {number} [options.limit] Limit
@@ -93,10 +94,6 @@ let TripWithLastPositionRepository = class TripWithLastPositionRepository extend
93
94
  // updatedSince cannot be more than 10 minutes ago
94
95
  const maxUpdatedAt = updatedSince && (0, moment_timezone_1.default)(updatedSince).isSameOrAfter(minUpdatedAt) ? updatedSince.toISOString() : null;
95
96
  const include = this.composeIncludes(options);
96
- let notPublicWhereConditions = [];
97
- if (options.includeNotPublic) {
98
- notPublicWhereConditions = await this.getNotPublicWhereConditions();
99
- }
100
97
  try {
101
98
  const rows = await this.sequelizeModel.findAll({
102
99
  attributes: {
@@ -113,7 +110,12 @@ let TripWithLastPositionRepository = class TripWithLastPositionRepository extend
113
110
  },
114
111
  },
115
112
  {
116
- [sequelize_1.Op.or]: [{ gtfs_trip_id: { [sequelize_1.Op.ne]: null } }, ...notPublicWhereConditions],
113
+ [sequelize_1.Op.or]: [
114
+ { gtfs_trip_id: { [sequelize_1.Op.ne]: null } },
115
+ {
116
+ vehicle_registration_number: { [sequelize_1.Op.in]: const_2.ArrayNotPublicRegistrationNumbers },
117
+ },
118
+ ],
117
119
  },
118
120
  maxUpdatedAt
119
121
  ? {
@@ -194,11 +196,11 @@ let TripWithLastPositionRepository = class TripWithLastPositionRepository extend
194
196
  const include = [
195
197
  {
196
198
  as: "vehicle_type",
197
- model: this.connector.getConnection().models[vehicle_positions_1.VehiclePositions.vehicleTypes.pgTableName],
199
+ model: this.dbConnector.getConnection().models[vehicle_positions_1.VehiclePositions.vehicleTypes.pgTableName],
198
200
  },
199
201
  {
200
202
  as: "vehicle_descriptor",
201
- model: this.connector.getConnection().models[models_1.DescriptorModel.tableName],
203
+ model: this.dbConnector.getConnection().models[models_1.DescriptorModel.tableName],
202
204
  attributes: ["is_air_conditioned", "has_usb_chargers"],
203
205
  },
204
206
  ];
@@ -208,7 +210,7 @@ let TripWithLastPositionRepository = class TripWithLastPositionRepository extend
208
210
  exclude: ["trips_id", "state_position"],
209
211
  },
210
212
  as: "all_positions",
211
- model: this.connector.getConnection().models[views_1.ProcessedPositionModel.tableName],
213
+ model: this.dbConnector.getConnection().models[views_1.ProcessedPositionModel.tableName],
212
214
  where: {
213
215
  state_position: {
214
216
  [sequelize_1.Op.in]: possibleStatePositions,
@@ -228,83 +230,11 @@ let TripWithLastPositionRepository = class TripWithLastPositionRepository extend
228
230
  }
229
231
  return possibleStatePosition;
230
232
  };
231
- this.getNotPublicWhereConditions = async () => {
232
- const conditions = [];
233
- // Fetch not-public vehicles config from Redis
234
- const { tram: { registrationNumbers: tramRegistrationNumbers }, road: { registrationNumbers: roadRegistrationNumbers }, routeIds: allowedRouteNames, } = await this.notPublicVehiclesRepository.getConfig();
235
- // Add tram vehicles condition only if we have tram registration numbers
236
- if (tramRegistrationNumbers && tramRegistrationNumbers.length > 0) {
237
- conditions.push({
238
- [sequelize_1.Op.and]: [
239
- { gtfs_route_type: RouteTypeEnums_1.GTFSRouteTypeEnum.TRAM },
240
- { vehicle_registration_number: { [sequelize_1.Op.in]: tramRegistrationNumbers } },
241
- ],
242
- });
243
- }
244
- // Add road vehicles condition only if we have road registration numbers
245
- if (roadRegistrationNumbers && roadRegistrationNumbers.length > 0) {
246
- conditions.push({
247
- [sequelize_1.Op.and]: [
248
- {
249
- gtfs_route_type: {
250
- [sequelize_1.Op.in]: [RouteTypeEnums_1.GTFSRouteTypeEnum.BUS, RouteTypeEnums_1.GTFSRouteTypeEnum.TROLLEYBUS],
251
- },
252
- },
253
- { vehicle_registration_number: { [sequelize_1.Op.in]: roadRegistrationNumbers } },
254
- ],
255
- });
256
- }
257
- // Add route names condition only if we have route IDs
258
- if (allowedRouteNames && allowedRouteNames.length > 0) {
259
- conditions.push({
260
- origin_route_name: { [sequelize_1.Op.in]: allowedRouteNames },
261
- });
262
- }
263
- return conditions;
264
- };
265
- this.sequelizeModel = connector.getConnection().define(this.tableName, views_1.TripWithLastPositionModel.attributeModel, {
266
- schema: this.schema,
267
- });
268
- // Set up associations
269
- this.sequelizeModel.hasMany(this.processedPositionRepository.sequelizeModel, {
270
- as: "all_positions",
271
- foreignKey: "trips_id",
272
- scope: {
273
- lat: { [sequelize_1.Op.not]: null },
274
- lng: { [sequelize_1.Op.not]: null },
275
- },
276
- });
277
- this.sequelizeModel.belongsTo(this.vehicleTypeRepository.sequelizeModel, {
278
- as: "vehicle_type",
279
- foreignKey: "vehicle_type_id",
280
- });
281
- this.sequelizeModel.belongsTo(this.vehicleDescriptorRepository.sequelizeModel, {
282
- as: "vehicle_descriptor",
283
- foreignKey: "vehicle_registration_number",
284
- targetKey: "registration_number",
285
- scope: {
286
- [sequelize_1.default.Op.and]: [
287
- sequelize_1.default.literal(`${views_1.TripWithLastPositionModel.tableName}.gtfs_route_type = vehicle_descriptor.gtfs_route_type`),
288
- ],
289
- },
290
- });
233
+ this.dbConnector = ioc_1.OutputGatewayContainer.resolve(ioc_1.ContainerToken.PostgresDatabase);
291
234
  }
292
235
  GetOne() {
293
236
  throw new Error("Not implemented");
294
237
  }
295
- };
238
+ }
296
239
  exports.TripWithLastPositionRepository = TripWithLastPositionRepository;
297
- exports.TripWithLastPositionRepository = TripWithLastPositionRepository = __decorate([
298
- (0, tsyringe_1.injectable)(),
299
- __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
300
- __param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
301
- __param(2, (0, tsyringe_1.inject)(OgVehiclePositionsToken_1.OgVehiclePositionsToken.NotPublicVehiclesRedisRepository)),
302
- __param(3, (0, tsyringe_1.inject)(OgVehiclePositionsToken_1.OgVehiclePositionsToken.ProcessedPositionRepository)),
303
- __param(4, (0, tsyringe_1.inject)(OgVehiclePositionsToken_1.OgVehiclePositionsToken.VehicleTypeRepository)),
304
- __param(5, (0, tsyringe_1.inject)(OgVehiclePositionsToken_1.OgVehiclePositionsToken.VehicleDescriptorRepository)),
305
- __metadata("design:paramtypes", [Object, Object, NotPublicVehiclesRedisRepository_1.NotPublicVehiclesRedisRepository,
306
- ProcessedPositionRepository_1.ProcessedPositionRepository,
307
- VehicleTypeRepository_1.VehicleTypeRepository,
308
- VehicleDescriptorRepository_1.VehicleDescriptorRepository])
309
- ], TripWithLastPositionRepository);
310
240
  //# sourceMappingURL=TripWithLastPositionRepository.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"TripWithLastPositionRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TripWithLastPositionRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/vehicle-positions/data-access/views/TripWithLastPositionRepository.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
1
  export * from "./MetroRailTrackJsonSchema";
2
2
  export * from "./DeparturesDirectionsJsonSchema";
3
- export * from "./NotPublicVehiclesJsonSchema";
4
3
  export * from "./interfaces";
@@ -16,6 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./MetroRailTrackJsonSchema"), exports);
18
18
  __exportStar(require("./DeparturesDirectionsJsonSchema"), exports);
19
- __exportStar(require("./NotPublicVehiclesJsonSchema"), exports);
20
19
  __exportStar(require("./interfaces"), exports);
21
20
  //# sourceMappingURL=index.js.map