@golemio/pid 5.1.0 → 5.1.1-dev.2180888118
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.
- package/dist/helpers/jis/JISEventEffectHelper.d.ts +5 -0
- package/dist/helpers/jis/JISEventEffectHelper.js +22 -0
- package/dist/helpers/jis/JISEventEffectHelper.js.map +1 -0
- package/dist/integration-engine/jis/repositories/JISEventsRepository.d.ts +1 -0
- package/dist/integration-engine/jis/repositories/JISEventsRepository.js +29 -3
- package/dist/integration-engine/jis/repositories/JISEventsRepository.js.map +1 -1
- package/dist/integration-engine/jis/transformations/JISEventsGtfsRtTransformation.js +2 -1
- package/dist/integration-engine/jis/transformations/JISEventsGtfsRtTransformation.js.map +1 -1
- package/dist/integration-engine/jis/transformations/JISEventsTransformation.js +2 -1
- package/dist/integration-engine/jis/transformations/JISEventsTransformation.js.map +1 -1
- package/dist/integration-engine/jis/transformations/UpdateEventWebhookTransformation.d.ts +1 -0
- package/dist/integration-engine/jis/transformations/UpdateEventWebhookTransformation.js +10 -6
- package/dist/integration-engine/jis/transformations/UpdateEventWebhookTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/cache/PublicStopTimeCacheRepository.js +6 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/cache/PublicStopTimeCacheRepository.js.map +1 -1
- package/dist/output-gateway/jis/controllers/v1/V1EventsController.js +2 -2
- package/dist/output-gateway/jis/controllers/v1/V1EventsController.js.map +1 -1
- package/dist/output-gateway/jis/data-access/JISEventsRepository.d.ts +1 -1
- package/dist/output-gateway/jis/data-access/JISEventsRepository.js +6 -3
- package/dist/output-gateway/jis/data-access/JISEventsRepository.js.map +1 -1
- package/dist/output-gateway/jis/dto/EventsDto.d.ts +1 -0
- package/dist/output-gateway/jis/dto/EventsDto.js.map +1 -1
- package/dist/output-gateway/jis/routers/v1/V1JISRouter.js +2 -0
- package/dist/output-gateway/jis/routers/v1/V1JISRouter.js.map +1 -1
- package/dist/output-gateway/jis/transformations/JISEventsCustomFormatTransformation.d.ts +1 -0
- package/dist/output-gateway/jis/transformations/JISEventsCustomFormatTransformation.js +10 -6
- package/dist/output-gateway/jis/transformations/JISEventsCustomFormatTransformation.js.map +1 -1
- package/dist/schema-definitions/jis/constants/jisEventEffect.d.ts +1 -0
- package/dist/schema-definitions/jis/constants/jisEventEffect.js +2 -1
- package/dist/schema-definitions/jis/constants/jisEventEffect.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/JISEventsJsonSchema.js +18 -1
- package/dist/schema-definitions/jis/datasources/JISEventsJsonSchema.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/interfaces/IJISEvent.d.ts +1 -1
- package/dist/schema-definitions/jis/models/JISEventsModel.d.ts +1 -1
- package/dist/schema-definitions/jis/models/JISEventsModel.js +13 -2
- package/dist/schema-definitions/jis/models/JISEventsModel.js.map +1 -1
- package/dist/schema-definitions/jis/models/interfaces/IJISEvent.d.ts +1 -1
- package/docs/openapi-input.yaml +40 -15
- package/docs/openapi-output.yaml +11 -0
- package/package.json +1 -1
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.JISEventEffectHelper = void 0;
|
|
4
|
+
const jisEventEffect_1 = require("../../schema-definitions/jis/constants/jisEventEffect");
|
|
5
|
+
class JISEventEffectHelper {
|
|
6
|
+
static getEffectAsList(eventEffect) {
|
|
7
|
+
if (Array.isArray(eventEffect)) {
|
|
8
|
+
return eventEffect.flatMap((effect) => effect.split(jisEventEffect_1.eventEffectDelimiter));
|
|
9
|
+
}
|
|
10
|
+
else {
|
|
11
|
+
return eventEffect.split(jisEventEffect_1.eventEffectDelimiter);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
static getMainEffect(eventEffect) {
|
|
15
|
+
return JISEventEffectHelper.getEffectAsList(eventEffect)[0];
|
|
16
|
+
}
|
|
17
|
+
static getEffectAsString(eventEffect) {
|
|
18
|
+
return JISEventEffectHelper.getEffectAsList(eventEffect).join(jisEventEffect_1.eventEffectDelimiter);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
exports.JISEventEffectHelper = JISEventEffectHelper;
|
|
22
|
+
//# sourceMappingURL=JISEventEffectHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JISEventEffectHelper.js","sourceRoot":"","sources":["../../../src/helpers/jis/JISEventEffectHelper.ts"],"names":[],"mappings":";;;AAAA,0FAAyE;AAEzE,MAAa,oBAAoB;IACtB,MAAM,CAAC,eAAe,CAAC,WAA8B;QACxD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7B,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAoB,CAAC,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACJ,OAAO,WAAW,CAAC,KAAK,CAAC,qCAAoB,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,WAA8B;QACtD,OAAO,oBAAoB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,WAA8B;QAC1D,OAAO,oBAAoB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,qCAAoB,CAAC,CAAC;IACxF,CAAC;CACJ;AAhBD,oDAgBC"}
|
|
@@ -18,6 +18,7 @@ export declare class JISEventsRepository extends AbstractValidatableRepository {
|
|
|
18
18
|
private sequelizeModel;
|
|
19
19
|
private ropidGTFSRoutesRepository;
|
|
20
20
|
constructor(connector: IDatabaseConnector, logger: ILogger, eventsRopidGTFSRoutesRepository: JISEventsRopidGTFSRoutesRepository);
|
|
21
|
+
private static hooks;
|
|
21
22
|
getCurrentIncidents(organizationNames: string[]): Promise<Array<JISEventsModel & {
|
|
22
23
|
routes: Array<{
|
|
23
24
|
route_id: string;
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var JISEventsRepository_1;
|
|
14
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
16
|
exports.JISEventsRepository = void 0;
|
|
16
17
|
const const_1 = require("../../../schema-definitions/const");
|
|
@@ -26,7 +27,8 @@ const JISEventsRopidGTFSRoutesRepository_1 = require("./JISEventsRopidGTFSRoutes
|
|
|
26
27
|
const Di_1 = require("../../ropid-gtfs/ioc/Di");
|
|
27
28
|
const RopidGtfsContainerToken_1 = require("../../ropid-gtfs/ioc/RopidGtfsContainerToken");
|
|
28
29
|
const RepositoryUtils_1 = require("../../shared/RepositoryUtils");
|
|
29
|
-
|
|
30
|
+
const JISEventEffectHelper_1 = require("../../../helpers/jis/JISEventEffectHelper");
|
|
31
|
+
let JISEventsRepository = JISEventsRepository_1 = class JISEventsRepository extends AbstractValidatableRepository_1.AbstractValidatableRepository {
|
|
30
32
|
constructor(connector, logger, eventsRopidGTFSRoutesRepository) {
|
|
31
33
|
super(connector, logger);
|
|
32
34
|
this.logger = logger;
|
|
@@ -36,10 +38,11 @@ let JISEventsRepository = class JISEventsRepository extends AbstractValidatableR
|
|
|
36
38
|
this.validator = new golemio_validator_1.JSONSchemaValidator("JISEventsRepository", JISEventsModel_1.JISEventsModel.jsonSchema);
|
|
37
39
|
this.sequelizeModel = connector.getConnection().define(this.tableName, JISEventsModel_1.JISEventsModel.attributeModel, {
|
|
38
40
|
schema: this.schema,
|
|
41
|
+
hooks: JISEventsRepository_1.hooks,
|
|
39
42
|
});
|
|
40
43
|
this.ropidGTFSRoutesRepository = Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RopidGTFSRoutesRepository);
|
|
41
44
|
this.sequelizeModel.belongsToMany(this.ropidGTFSRoutesRepository["sequelizeModel"], {
|
|
42
|
-
through: eventsRopidGTFSRoutesRepository["sequelizeModel"],
|
|
45
|
+
through: this.eventsRopidGTFSRoutesRepository["sequelizeModel"],
|
|
43
46
|
foreignKey: "event_id",
|
|
44
47
|
otherKey: "route_id",
|
|
45
48
|
as: "routes",
|
|
@@ -115,7 +118,30 @@ let JISEventsRepository = class JISEventsRepository extends AbstractValidatableR
|
|
|
115
118
|
}
|
|
116
119
|
};
|
|
117
120
|
exports.JISEventsRepository = JISEventsRepository;
|
|
118
|
-
|
|
121
|
+
JISEventsRepository.hooks = {
|
|
122
|
+
beforeBulkCreate(events) {
|
|
123
|
+
events.forEach((event) => {
|
|
124
|
+
event.effect = JISEventEffectHelper_1.JISEventEffectHelper.getEffectAsString(event.effect);
|
|
125
|
+
});
|
|
126
|
+
},
|
|
127
|
+
beforeValidate(event) {
|
|
128
|
+
// to pass sequelize validation of being a string type
|
|
129
|
+
event.effect = JISEventEffectHelper_1.JISEventEffectHelper.getEffectAsString(event.effect);
|
|
130
|
+
},
|
|
131
|
+
afterValidate(event) {
|
|
132
|
+
// and to convert back to list of enums
|
|
133
|
+
event.effect = JISEventEffectHelper_1.JISEventEffectHelper.getEffectAsList(event.effect);
|
|
134
|
+
},
|
|
135
|
+
beforeUpsert(event) {
|
|
136
|
+
event.effect = JISEventEffectHelper_1.JISEventEffectHelper.getEffectAsString(event.effect);
|
|
137
|
+
},
|
|
138
|
+
afterBulkCreate(events) {
|
|
139
|
+
events.forEach((event) => {
|
|
140
|
+
event.effect = JISEventEffectHelper_1.JISEventEffectHelper.getEffectAsList(event.effect);
|
|
141
|
+
});
|
|
142
|
+
},
|
|
143
|
+
};
|
|
144
|
+
exports.JISEventsRepository = JISEventsRepository = JISEventsRepository_1 = __decorate([
|
|
119
145
|
(0, tsyringe_1.injectable)(),
|
|
120
146
|
__param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
|
|
121
147
|
__param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/repositories/JISEventsRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"JISEventsRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/repositories/JISEventsRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var JISEventsGtfsRtTransformation_1;
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.JISEventsGtfsRtTransformation = void 0;
|
|
11
|
+
const JISEventEffectHelper_1 = require("../../../helpers/jis/JISEventEffectHelper");
|
|
11
12
|
const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
|
|
12
13
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
13
14
|
let JISEventsGtfsRtTransformation = JISEventsGtfsRtTransformation_1 = class JISEventsGtfsRtTransformation extends AbstractTransformation_1.AbstractTransformation {
|
|
@@ -27,7 +28,7 @@ let JISEventsGtfsRtTransformation = JISEventsGtfsRtTransformation_1 = class JISE
|
|
|
27
28
|
informedEntity: data.routes.map((route) => ({ routeId: route.route_id })),
|
|
28
29
|
// TODO check these enums and possibly use them in the data models
|
|
29
30
|
cause: data.cause,
|
|
30
|
-
effect: data.effect,
|
|
31
|
+
effect: JISEventEffectHelper_1.JISEventEffectHelper.getMainEffect(data.effect),
|
|
31
32
|
url: {
|
|
32
33
|
translation: [
|
|
33
34
|
...(data.url.cs !== "nevyplněno"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsGtfsRtTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISEventsGtfsRtTransformation.ts"],"names":[],"mappings":";;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"JISEventsGtfsRtTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISEventsGtfsRtTransformation.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,oFAAyE;AAKzE,6GAA0G;AAC1G,iEAAgE;AAMzD,IAAM,6BAA6B,qCAAnC,MAAM,6BAA8B,SAAQ,+CAAiD;IAA7F;;QACI,SAAI,GAAG,+BAA+B,CAAC;QAIpC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,OAAO;gBACH,EAAE,EAAE,SAAS,IAAI,CAAC,EAAE,EAAE;gBACtB,KAAK,EAAE;oBACH,YAAY,EAAE;wBACV;4BACI,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI;4BAC1D,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;yBAChG;qBACJ;oBACD,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACzE,kEAAkE;oBAClE,KAAK,EAAE,IAAI,CAAC,KAA2B;oBACvC,MAAM,EAAE,2CAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAwB;oBAC9E,GAAG,EAAE;wBACD,WAAW,EAAE;4BACT,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,YAAY;gCAC5B,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gCACzC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,+BAA6B,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;4BAClG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;yBAClE;qBACJ;oBACD,UAAU,EAAE;wBACR,WAAW,EAAE;4BACT;gCACI,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE;gCACzB,QAAQ,EAAE,IAAI;6BACjB;4BACD,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;yBAClF;qBACJ;oBACD,eAAe,EAAE;wBACb,WAAW,EAAE;4BACT;gCACI,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE;gCAC9B,QAAQ,EAAE,IAAI;6BACjB;4BACD,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;yBAC5F;qBACJ;iBACJ;aACJ,CAAC;QACN,CAAC,CAAC;IACN,CAAC;;AAhDY,sEAA6B;AAGvB,gDAAkB,GAAG,mCAAmC,AAAtC,CAAuC;wCAH/D,6BAA6B;IADzC,IAAA,qBAAU,GAAE;GACA,6BAA6B,CAgDzC"}
|
|
@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.JISEventsTransformation = void 0;
|
|
10
|
+
const JISEventEffectHelper_1 = require("../../../helpers/jis/JISEventEffectHelper");
|
|
10
11
|
const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
|
|
11
12
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
12
13
|
let JISEventsTransformation = class JISEventsTransformation extends AbstractTransformation_1.AbstractTransformation {
|
|
@@ -25,7 +26,7 @@ let JISEventsTransformation = class JISEventsTransformation extends AbstractTran
|
|
|
25
26
|
active_period_end: data.active_period.end ? new Date(data.active_period.end) : null,
|
|
26
27
|
display_period_start: new Date(data.display_period.start),
|
|
27
28
|
display_period_end: data.display_period.end ? new Date(data.display_period.end) : null,
|
|
28
|
-
effect: data.effect,
|
|
29
|
+
effect: JISEventEffectHelper_1.JISEventEffectHelper.getEffectAsList(data.effect),
|
|
29
30
|
effect_detail: data.effect_detail,
|
|
30
31
|
description_text: data.description_text,
|
|
31
32
|
description_html: data.description_html,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISEventsTransformation.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"JISEventsTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISEventsTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oFAAyE;AAMzE,6GAA0G;AAC1G,iEAAgE;AASzD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,+CAAiD;IAAvF;;QACI,SAAI,GAAG,yBAAyB,CAAC;QAE9B,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,MAAM,KAAK,GAAmB;gBAC1B,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,mBAAmB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;gBACvD,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;gBACnF,oBAAoB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;gBACzD,kBAAkB,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;gBACtF,MAAM,EAAE,2CAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC;gBACzD,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACnD,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC;gBACzD,iBAAiB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI;aACxE,CAAC;YACF,MAAM,qBAAqB,GACvB,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC3C,QAAQ,EAAE,IAAI,CAAC,EAAE;gBACjB,QAAQ,EAAE,EAAE;aACf,CAAC,CAAC,IAAI,EAAE,CAAC;YACd,OAAO;gBACH,KAAK;gBACL,qBAAqB;aACxB,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AAnCY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAU,GAAE;GACA,uBAAuB,CAmCnC"}
|
|
@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.UpdateEventWebhookTransformation = void 0;
|
|
10
|
+
const JISEventEffectHelper_1 = require("../../../helpers/jis/JISEventEffectHelper");
|
|
10
11
|
const JISEventTranslationHelper_1 = require("../../../helpers/jis/JISEventTranslationHelper");
|
|
11
12
|
const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
|
|
12
13
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
@@ -33,12 +34,7 @@ let UpdateEventWebhookTransformation = class UpdateEventWebhookTransformation ex
|
|
|
33
34
|
start: event.display_period.start,
|
|
34
35
|
end: event.display_period.end || null,
|
|
35
36
|
},
|
|
36
|
-
effects:
|
|
37
|
-
{
|
|
38
|
-
cs: JISEventTranslationHelper_1.JISEventTranslationHelper.effectToCs(event.effect),
|
|
39
|
-
en: event.effect.charAt(0).toUpperCase() + event.effect.slice(1).toLowerCase().replaceAll("_", " "),
|
|
40
|
-
},
|
|
41
|
-
],
|
|
37
|
+
effects: this.effectToTranslation(event.effect),
|
|
42
38
|
description_text: event.description_text,
|
|
43
39
|
description_html: event.description_html,
|
|
44
40
|
organization_name: event.organization_name,
|
|
@@ -56,6 +52,14 @@ let UpdateEventWebhookTransformation = class UpdateEventWebhookTransformation ex
|
|
|
56
52
|
};
|
|
57
53
|
};
|
|
58
54
|
}
|
|
55
|
+
effectToTranslation(effects) {
|
|
56
|
+
return JISEventEffectHelper_1.JISEventEffectHelper.getEffectAsList(effects).map((effect) => {
|
|
57
|
+
return {
|
|
58
|
+
cs: JISEventTranslationHelper_1.JISEventTranslationHelper.effectToCs(effect),
|
|
59
|
+
en: effect.charAt(0).toUpperCase() + effect.slice(1).toLowerCase().replaceAll("_", " "),
|
|
60
|
+
};
|
|
61
|
+
});
|
|
62
|
+
}
|
|
59
63
|
};
|
|
60
64
|
exports.UpdateEventWebhookTransformation = UpdateEventWebhookTransformation;
|
|
61
65
|
exports.UpdateEventWebhookTransformation = UpdateEventWebhookTransformation = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateEventWebhookTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/UpdateEventWebhookTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,8FAAmF;AAEnF,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,gCAAgC,GAAtC,MAAM,gCAAiC,SAAQ,+CAMrD;IANM;;QAOI,SAAI,GAAG,kCAAkC,CAAC;QAEvC,sBAAiB,GAAG,CAAC,EAC3B,KAAK,EACL,MAAM,GAIT,EAAmE,EAAE;YAClE,OAAO;gBACH,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,KAAK,EAAE;oBACH,EAAE,EAAE,qDAAyB,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;oBACpD,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC;iBACpG;gBACD,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,aAAa,EAAE;oBACX,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK;oBAChC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG;iBAC/B;gBACD,cAAc,EAAE;oBACZ,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,KAAK;oBACjC,GAAG,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,IAAI,IAAI;iBACxC;gBACD,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"UpdateEventWebhookTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/UpdateEventWebhookTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,oFAAyE;AACzE,8FAAmF;AAEnF,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,gCAAgC,GAAtC,MAAM,gCAAiC,SAAQ,+CAMrD;IANM;;QAOI,SAAI,GAAG,kCAAkC,CAAC;QAEvC,sBAAiB,GAAG,CAAC,EAC3B,KAAK,EACL,MAAM,GAIT,EAAmE,EAAE;YAClE,OAAO;gBACH,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,KAAK,EAAE;oBACH,EAAE,EAAE,qDAAyB,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;oBACpD,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC;iBACpG;gBACD,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,aAAa,EAAE;oBACX,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK;oBAChC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG;iBAC/B;gBACD,cAAc,EAAE;oBACZ,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,KAAK;oBACjC,GAAG,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,IAAI,IAAI;iBACxC;gBACD,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC/C,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;gBACxC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;gBACxC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;gBAC1C,eAAe,EAAE;oBACb,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAoB,EAAE,EAAE,CAAC,CAAC;wBAC1C,EAAE,EAAE,CAAC,CAAC,QAAQ;wBACd,eAAe,EAAE,CAAC,CAAC,eAAe;wBAClC,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;wBACpC,UAAU,EAAE,CAAC,CAAC,UAAU;qBAC3B,CAAC,CAAC;iBACN;gBACD,uBAAuB,EAAE,KAAK,CAAC,uBAAuB;gBACtD,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;gBAC1C,iBAAiB,EAAE,KAAK,CAAC,UAAU;aACtC,CAAC;QACN,CAAC,CAAC;IAUN,CAAC;IARW,mBAAmB,CAAC,OAA0B;QAClD,OAAO,2CAAoB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE;YACxE,OAAO;gBACH,EAAE,EAAE,qDAAyB,CAAC,UAAU,CAAC,MAAM,CAAC;gBAChD,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC;aAC1F,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA5DY,4EAAgC;2CAAhC,gCAAgC;IAD5C,IAAA,qBAAU,GAAE;GACA,gCAAgC,CA4D5C"}
|
|
@@ -30,13 +30,17 @@ let PublicStopTimeCacheRepository = PublicStopTimeCacheRepository_1 = class Publ
|
|
|
30
30
|
this.log = log;
|
|
31
31
|
}
|
|
32
32
|
async createOrUpdate(data, ttlInSeconds) {
|
|
33
|
+
let currentStopTimes;
|
|
34
|
+
let currentTripId;
|
|
33
35
|
try {
|
|
34
|
-
for (const stopTimes of data.
|
|
36
|
+
for (const [id, stopTimes] of data.entries()) {
|
|
37
|
+
currentStopTimes = stopTimes;
|
|
38
|
+
currentTripId = id;
|
|
35
39
|
await this.validator.Validate(stopTimes);
|
|
36
40
|
}
|
|
37
41
|
}
|
|
38
42
|
catch (err) {
|
|
39
|
-
throw new golemio_errors_1.GeneralError(`PublicStopTimeCacheRepository: data validation failed: ${err.message}`, this.constructor.name, err);
|
|
43
|
+
throw new golemio_errors_1.GeneralError(`PublicStopTimeCacheRepository: data validation failed: ${err.message}`, this.constructor.name, { ...err, stopTimes: currentStopTimes, tripId: currentTripId });
|
|
40
44
|
}
|
|
41
45
|
try {
|
|
42
46
|
const stringifiedData = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicStopTimeCacheRepository.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/cache/PublicStopTimeCacheRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8FAA6F;AAE7F,oJAAiH;AAEjH,wEAAqE;AACrE,wFAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iEAAwE;AAGjE,IAAM,6BAA6B,qCAAnC,MAAM,6BAA8B,SAAQ,uBAAU;IAGzD,YAA8C,GAAY;QACtD,KAAK,CACD,+BAA+B,EAC/B;YACI,wBAAwB,EAAE,KAAK;YAC/B,MAAM,EAAE,+BAA6B,CAAC,gBAAgB;SACzD,EACD,IAAI,uCAAmB,CAAC,+BAA+B,EAAE,2DAA4B,CAAC,CACzF,CAAC;QARwC,QAAG,GAAH,GAAG,CAAS;IAS1D,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,IAA4C,EAAE,YAAoB;QAC1F,IAAI,CAAC;YACD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"PublicStopTimeCacheRepository.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/cache/PublicStopTimeCacheRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,8 +29,8 @@ let V1EventsController = class V1EventsController {
|
|
|
29
29
|
const span = (0, monitoring_1.createChildSpan)("V1EventsController.getAllEventsInCustomFormat");
|
|
30
30
|
const queryData = (0, express_validator_1.matchedData)(req);
|
|
31
31
|
try {
|
|
32
|
-
const { displayPeriodEnd, displayPeriodStart, organizationNames } = shared_1.RopidRouterUtils.mapObjectToDTOInstance(EventsDto_1.EventsCustomFormatQueryDto, queryData);
|
|
33
|
-
const events = await this.jisEventsRepository.getAllForCustomFormat(organizationNames, displayPeriodStart, displayPeriodEnd);
|
|
32
|
+
const { displayPeriodEnd, displayPeriodStart, organizationNames, type } = shared_1.RopidRouterUtils.mapObjectToDTOInstance(EventsDto_1.EventsCustomFormatQueryDto, queryData);
|
|
33
|
+
const events = await this.jisEventsRepository.getAllForCustomFormat(organizationNames, displayPeriodStart, displayPeriodEnd, type);
|
|
34
34
|
const transformedEvents = this.eventsCustomFormatTransformation.transformArray(events);
|
|
35
35
|
return res.status(200).json(transformedEvents);
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V1EventsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/jis/controllers/v1/V1EventsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAAoD;AACpD,iEAAwE;AAExE,+EAA4E;AAC5E,mHAAkH;AAClH,8DAAgE;AAChE,mDAAmE;AACnE,4CAA8C;AAC9C,mFAA0E;AAGnE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC3B,YAC4C,mBAAgD,EAExF,gCAA6E;QAF7B,wBAAmB,GAAnB,mBAAmB,CAAqB;QAEhF,qCAAgC,GAAhC,gCAAgC,CAAqC;QAG1E,+BAA0B,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzE,MAAM,IAAI,GAAG,IAAA,4BAAe,EAAC,+CAA+C,CAAC,CAAC;YAC9E,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;YACnC,IAAI,CAAC;gBACD,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,yBAAgB,CAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"V1EventsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/jis/controllers/v1/V1EventsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAAoD;AACpD,iEAAwE;AAExE,+EAA4E;AAC5E,mHAAkH;AAClH,8DAAgE;AAChE,mDAAmE;AACnE,4CAA8C;AAC9C,mFAA0E;AAGnE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC3B,YAC4C,mBAAgD,EAExF,gCAA6E;QAF7B,wBAAmB,GAAnB,mBAAmB,CAAqB;QAEhF,qCAAgC,GAAhC,gCAAgC,CAAqC;QAG1E,+BAA0B,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzE,MAAM,IAAI,GAAG,IAAA,4BAAe,EAAC,+CAA+C,CAAC,CAAC;YAC9E,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;YACnC,IAAI,CAAC;gBACD,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,yBAAgB,CAAC,sBAAsB,CAC7G,sCAA0B,EAC1B,SAAS,CACZ,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAC/D,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,IAAI,CACP,CAAC;gBACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,gCAAgC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAEvF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;gBAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;oBAAS,CAAC;gBACP,IAAI,EAAE,GAAG,EAAE,CAAC;YAChB,CAAC;QACL,CAAC,CAAC;IAzBC,CAAC;CA0BP,CAAA;AA/BY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,uBAAU,CAAC,mBAAmB,CAAC,CAAA;IACtC,WAAA,IAAA,iBAAM,EAAC,uBAAU,CAAC,mCAAmC,CAAC,CAAA;qCADc,yCAAmB;QAE9C,yEAAmC;GAJxE,kBAAkB,CA+B9B"}
|
|
@@ -14,6 +14,6 @@ export declare class JISEventsRepository extends AbstractValidatableRepository {
|
|
|
14
14
|
tableName: string;
|
|
15
15
|
sequelizeModel: ModelStatic<JISEventsModel>;
|
|
16
16
|
constructor(connector: IDatabaseConnector, logger: ILogger, eventsRopidGTFSRoutesRepository: JISEventsRopidGTFSRoutesRepository, ropidGTFSRoutesRepository: RopidGTFSRoutesRepository);
|
|
17
|
-
getAllForCustomFormat: (organizationNames?: string[], displayPeriodStart?: string, displayPeriodEnd?: string) => Promise<JISEventsModel[]>;
|
|
17
|
+
getAllForCustomFormat: (organizationNames?: string[], displayPeriodStart?: string, displayPeriodEnd?: string, type?: string) => Promise<JISEventsModel[]>;
|
|
18
18
|
private buildWhereForCustomFormat;
|
|
19
19
|
}
|
|
@@ -31,9 +31,9 @@ let JISEventsRepository = class JISEventsRepository extends AbstractValidatableR
|
|
|
31
31
|
this.ropidGTFSRoutesRepository = ropidGTFSRoutesRepository;
|
|
32
32
|
this.schema = const_1.PG_SCHEMA;
|
|
33
33
|
this.tableName = JISEventsModel_1.JISEventsModel.tableName;
|
|
34
|
-
this.getAllForCustomFormat = async (organizationNames, displayPeriodStart, displayPeriodEnd) => {
|
|
34
|
+
this.getAllForCustomFormat = async (organizationNames, displayPeriodStart, displayPeriodEnd, type) => {
|
|
35
35
|
try {
|
|
36
|
-
const where = this.buildWhereForCustomFormat(organizationNames, displayPeriodStart, displayPeriodEnd);
|
|
36
|
+
const where = this.buildWhereForCustomFormat(organizationNames, displayPeriodStart, displayPeriodEnd, type);
|
|
37
37
|
return await this.sequelizeModel.findAll({
|
|
38
38
|
where,
|
|
39
39
|
include: { model: this.ropidGTFSRoutesRepository["sequelizeModel"], as: "routes" },
|
|
@@ -54,7 +54,7 @@ let JISEventsRepository = class JISEventsRepository extends AbstractValidatableR
|
|
|
54
54
|
as: "routes",
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
|
-
buildWhereForCustomFormat(organizationNames, displayPeriodStart, displayPeriodEnd) {
|
|
57
|
+
buildWhereForCustomFormat(organizationNames, displayPeriodStart, displayPeriodEnd, type) {
|
|
58
58
|
const where = {
|
|
59
59
|
deleted_timestamp: { [sequelize_1.Op.is]: null },
|
|
60
60
|
};
|
|
@@ -76,6 +76,9 @@ let JISEventsRepository = class JISEventsRepository extends AbstractValidatableR
|
|
|
76
76
|
[sequelize_1.Op.in]: organizationNames.map((organizationName) => organizationName.toUpperCase()),
|
|
77
77
|
};
|
|
78
78
|
}
|
|
79
|
+
if (type) {
|
|
80
|
+
where.type = type;
|
|
81
|
+
}
|
|
79
82
|
return where;
|
|
80
83
|
}
|
|
81
84
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/jis/data-access/JISEventsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAAuC;AACvC,0FAAgE;AAGhE,8IAA2I;AAC3I,wEAAqE;AACrE,mFAAkF;AAClF,mEAAoF;AACpF,iEAAwE;AACxE,6FAA0F;AAC1F,kDAA+C;AAC/C,2EAAwE;AACxE,6EAAwE;AAGjE,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,6DAA6B;IAMlE,YACyC,SAA6B,EACxC,MAAe,EAEzC,+BAA2E,EAC7B,yBAA4D;QAE1G,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAHjB,oCAA+B,GAA/B,+BAA+B,CAAoC;QACrB,8BAAyB,GAAzB,yBAAyB,CAA2B;QATvG,WAAM,GAAG,iBAAS,CAAC;QACnB,cAAS,GAAG,+BAAc,CAAC,SAAS,CAAC;QAwBrC,0BAAqB,GAAG,KAAK,EAChC,iBAA4B,EAC5B,kBAA2B,EAC3B,gBAAyB,
|
|
1
|
+
{"version":3,"file":"JISEventsRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/jis/data-access/JISEventsRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventsDto.js","sourceRoot":"","sources":["../../../../src/output-gateway/jis/dto/EventsDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAuD;AAGvD,MAAa,0BAA0B;
|
|
1
|
+
{"version":3,"file":"EventsDto.js","sourceRoot":"","sources":["../../../../src/output-gateway/jis/dto/EventsDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAuD;AAGvD,MAAa,0BAA0B;CAMtC;AAND,gEAMC;AAJG;IADC,IAAA,2BAAc,GAAE;;qEACY"}
|
|
@@ -4,6 +4,7 @@ exports.v1JisRouter = exports.V1JISRouter = void 0;
|
|
|
4
4
|
const Di_1 = require("../../ioc/Di");
|
|
5
5
|
const OgJisToken_1 = require("../../ioc/OgJisToken");
|
|
6
6
|
const constants_1 = require("../../../shared/constants");
|
|
7
|
+
const jisEventType_1 = require("../../../../schema-definitions/jis/constants/jisEventType");
|
|
7
8
|
const AbstractRouter_1 = require("@golemio/core/dist/helpers/routing/AbstractRouter");
|
|
8
9
|
const ioc_1 = require("@golemio/core/dist/output-gateway/ioc");
|
|
9
10
|
const Validation_1 = require("@golemio/core/dist/output-gateway/Validation");
|
|
@@ -18,6 +19,7 @@ class V1JISRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
18
19
|
(0, express_validator_1.query)("displayPeriodStart").optional().isISO8601(),
|
|
19
20
|
(0, express_validator_1.query)("displayPeriodEnd").optional().isISO8601(),
|
|
20
21
|
(0, express_validator_1.query)("organizationNames").optional().isArray(),
|
|
22
|
+
(0, express_validator_1.query)("type").optional().isIn(jisEventType_1.jisEventType),
|
|
21
23
|
], Validation_1.checkErrors,
|
|
22
24
|
// // max-age 5 seconds, stale-while-revalidate 5 seconds
|
|
23
25
|
this.cacheHeaderMiddleware.getMiddleware(5, 5), this.eventsController.getAllEventsInCustomFormat);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V1JISRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/jis/routers/v1/V1JISRouter.ts"],"names":[],"mappings":";;;AACA,qCAAgD;AAChD,qDAAoD;AACpD,yDAAoD;AACpD,sFAAmF;AAEnF,+DAAuE;AACvE,6EAA2E;AAC3E,+DAA2D;AAC3D,mFAAoE;AAEpE,MAAa,WAAY,SAAQ,+BAAc;IAK3C;QACI,KAAK,CAAC,wBAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QALlB,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAUhC,eAAU,GAAG,GAAS,EAAE;YAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,uBAAuB,EACvB;gBACI,IAAA,yBAAK,EAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE;gBAClD,IAAA,yBAAK,EAAC,kBAAkB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE;gBAChD,IAAA,yBAAK,EAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"V1JISRouter.js","sourceRoot":"","sources":["../../../../../src/output-gateway/jis/routers/v1/V1JISRouter.ts"],"names":[],"mappings":";;;AACA,qCAAgD;AAChD,qDAAoD;AACpD,yDAAoD;AACpD,4FAA+D;AAC/D,sFAAmF;AAEnF,+DAAuE;AACvE,6EAA2E;AAC3E,+DAA2D;AAC3D,mFAAoE;AAEpE,MAAa,WAAY,SAAQ,+BAAc;IAK3C;QACI,KAAK,CAAC,wBAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QALlB,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAUhC,eAAU,GAAG,GAAS,EAAE;YAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,uBAAuB,EACvB;gBACI,IAAA,yBAAK,EAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE;gBAClD,IAAA,yBAAK,EAAC,kBAAkB,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE;gBAChD,IAAA,yBAAK,EAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE;gBAC/C,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,2BAAY,CAAC;aAC9C,EACD,wBAAW;YACX,yDAAyD;YACzD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAC9C,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CACnD,CAAC;QACN,CAAC,CAAC;QAlBE,IAAI,CAAC,gBAAgB,GAAG,mBAAc,CAAC,OAAO,CAAqB,uBAAU,CAAC,kBAAkB,CAAC,CAAC;QAClG,IAAI,CAAC,qBAAqB,GAAG,mBAAc,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;QACjH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;CAgBJ;AA1BD,kCA0BC;AAED,MAAM,WAAW,GAAmB,IAAI,WAAW,EAAE,CAAC;AAE7C,kCAAW"}
|
|
@@ -4,4 +4,5 @@ import { AbstractTransformation } from "@golemio/core/dist/helpers/transformatio
|
|
|
4
4
|
export declare class JISEventsCustomFormatTransformation extends AbstractTransformation<JISEventsModel, IJISEventCustomFormatDto> {
|
|
5
5
|
name: string;
|
|
6
6
|
protected transformInternal: (event: JISEventsModel) => IJISEventCustomFormatDto;
|
|
7
|
+
private effectsToTranslation;
|
|
7
8
|
}
|
|
@@ -10,6 +10,7 @@ exports.JISEventsCustomFormatTransformation = void 0;
|
|
|
10
10
|
const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
|
|
11
11
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
12
12
|
const JISEventTranslationHelper_1 = require("../../../helpers/jis/JISEventTranslationHelper");
|
|
13
|
+
const JISEventEffectHelper_1 = require("../../../helpers/jis/JISEventEffectHelper");
|
|
13
14
|
let JISEventsCustomFormatTransformation = class JISEventsCustomFormatTransformation extends AbstractTransformation_1.AbstractTransformation {
|
|
14
15
|
constructor() {
|
|
15
16
|
super(...arguments);
|
|
@@ -33,12 +34,7 @@ let JISEventsCustomFormatTransformation = class JISEventsCustomFormatTransformat
|
|
|
33
34
|
start: event.display_period_start.toISOString(),
|
|
34
35
|
end: event.display_period_end?.toISOString() || null,
|
|
35
36
|
},
|
|
36
|
-
effects:
|
|
37
|
-
{
|
|
38
|
-
cs: JISEventTranslationHelper_1.JISEventTranslationHelper.effectToCs(event.effect),
|
|
39
|
-
en: event.effect.charAt(0).toUpperCase() + event.effect.slice(1).toLowerCase().replaceAll("_", " "),
|
|
40
|
-
},
|
|
41
|
-
],
|
|
37
|
+
effects: this.effectsToTranslation(event.effect),
|
|
42
38
|
description_text: event.description_text,
|
|
43
39
|
description_html: event.description_html,
|
|
44
40
|
organization_name: event.organization_name,
|
|
@@ -55,6 +51,14 @@ let JISEventsCustomFormatTransformation = class JISEventsCustomFormatTransformat
|
|
|
55
51
|
};
|
|
56
52
|
};
|
|
57
53
|
}
|
|
54
|
+
effectsToTranslation(effect) {
|
|
55
|
+
return JISEventEffectHelper_1.JISEventEffectHelper.getEffectAsList(effect).map((effect) => {
|
|
56
|
+
return {
|
|
57
|
+
cs: JISEventTranslationHelper_1.JISEventTranslationHelper.effectToCs(effect),
|
|
58
|
+
en: effect.charAt(0).toUpperCase() + effect.slice(1).toLowerCase().replaceAll("_", " "),
|
|
59
|
+
};
|
|
60
|
+
});
|
|
61
|
+
}
|
|
58
62
|
};
|
|
59
63
|
exports.JISEventsCustomFormatTransformation = JISEventsCustomFormatTransformation;
|
|
60
64
|
exports.JISEventsCustomFormatTransformation = JISEventsCustomFormatTransformation = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsCustomFormatTransformation.js","sourceRoot":"","sources":["../../../../src/output-gateway/jis/transformations/JISEventsCustomFormatTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,6GAA0G;AAC1G,iEAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"JISEventsCustomFormatTransformation.js","sourceRoot":"","sources":["../../../../src/output-gateway/jis/transformations/JISEventsCustomFormatTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,6GAA0G;AAC1G,iEAAgE;AAChE,8FAAmF;AACnF,oFAAyE;AAIlE,IAAM,mCAAmC,GAAzC,MAAM,mCAAoC,SAAQ,+CAAgE;IAAlH;;QACI,SAAI,GAAG,qCAAqC,CAAC;QAE1C,sBAAiB,GAAG,CAAC,KAAqB,EAA4B,EAAE;YAC9E,OAAO;gBACH,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,KAAK,EAAE;oBACH,EAAE,EAAE,qDAAyB,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;oBACpD,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC;iBACpG;gBACD,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,aAAa,EAAE;oBACX,KAAK,EAAE,KAAK,CAAC,mBAAmB,CAAC,WAAW,EAAE;oBAC9C,GAAG,EAAE,KAAK,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,IAAI;iBACtD;gBACD,cAAc,EAAE;oBACZ,KAAK,EAAE,KAAK,CAAC,oBAAoB,CAAC,WAAW,EAAE;oBAC/C,GAAG,EAAE,KAAK,CAAC,kBAAkB,EAAE,WAAW,EAAE,IAAI,IAAI;iBACvD;gBACD,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC;gBAChD,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;gBACxC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;gBACxC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;gBAC1C,eAAe,EAAE;oBACb,MAAM,EACF,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBAC1B,EAAE,EAAE,KAAK,CAAC,QAAQ;wBAClB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;wBACxC,eAAe,EAAE,KAAK,CAAC,eAAe;wBACtC,UAAU,EAAE,KAAK,CAAC,UAAU;qBAC/B,CAAC,CAAC,IAAI,EAAE;iBAChB;gBACD,uBAAuB,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,EAAE;gBAC9D,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,EAAE;aAC3D,CAAC;QACN,CAAC,CAAC;IAUN,CAAC;IARW,oBAAoB,CAAC,MAAyB;QAClD,OAAO,2CAAoB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE;YACvE,OAAO;gBACH,EAAE,EAAE,qDAAyB,CAAC,UAAU,CAAC,MAAM,CAAC;gBAChD,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC;aAC1F,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAhDY,kFAAmC;8CAAnC,mCAAmC;IAD/C,IAAA,qBAAU,GAAE;GACA,mCAAmC,CAgD/C"}
|
|
@@ -1 +1,2 @@
|
|
|
1
1
|
export declare const jisEventEffect: readonly ["DETOUR", "REDUCED_SERVICE", "MODIFIED_SERVICE", "SIGNIFICANT_DELAYS", "ADDITIONAL_SERVICE", "OTHER_EFFECT", "NO_SERVICE", "UNKNOWN_EFFECT", "STOP_MOVED", "NO_EFFECT", "ACCESSIBILITY_ISSUE"];
|
|
2
|
+
export declare const eventEffectDelimiter = ",";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.jisEventEffect = void 0;
|
|
3
|
+
exports.eventEffectDelimiter = exports.jisEventEffect = void 0;
|
|
4
4
|
exports.jisEventEffect = [
|
|
5
5
|
"DETOUR",
|
|
6
6
|
"REDUCED_SERVICE",
|
|
@@ -14,4 +14,5 @@ exports.jisEventEffect = [
|
|
|
14
14
|
"NO_EFFECT",
|
|
15
15
|
"ACCESSIBILITY_ISSUE",
|
|
16
16
|
];
|
|
17
|
+
exports.eventEffectDelimiter = ",";
|
|
17
18
|
//# sourceMappingURL=jisEventEffect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jisEventEffect.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/constants/jisEventEffect.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC1B,QAAQ;IACR,iBAAiB;IACjB,kBAAkB;IAClB,oBAAoB;IACpB,oBAAoB;IACpB,cAAc;IACd,YAAY;IACZ,gBAAgB;IAChB,YAAY;IACZ,WAAW;IACX,qBAAqB;CACf,CAAC"}
|
|
1
|
+
{"version":3,"file":"jisEventEffect.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/constants/jisEventEffect.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC1B,QAAQ;IACR,iBAAiB;IACjB,kBAAkB;IAClB,oBAAoB;IACpB,oBAAoB;IACpB,cAAc;IACd,YAAY;IACZ,gBAAgB;IAChB,YAAY;IACZ,WAAW;IACX,qBAAqB;CACf,CAAC;AAEE,QAAA,oBAAoB,GAAG,GAAG,CAAC"}
|
|
@@ -44,7 +44,24 @@ exports.jisEventsJsonSchema = {
|
|
|
44
44
|
additionalProperties: false,
|
|
45
45
|
required: ["start"],
|
|
46
46
|
},
|
|
47
|
-
effect: {
|
|
47
|
+
effect: {
|
|
48
|
+
oneOf: [
|
|
49
|
+
{
|
|
50
|
+
type: "array",
|
|
51
|
+
items: {
|
|
52
|
+
type: "string",
|
|
53
|
+
enum: jisEventEffect_1.jisEventEffect,
|
|
54
|
+
},
|
|
55
|
+
minItems: 1,
|
|
56
|
+
maxItems: 3,
|
|
57
|
+
uniqueItems: true,
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
type: "string",
|
|
61
|
+
enum: jisEventEffect_1.jisEventEffect,
|
|
62
|
+
},
|
|
63
|
+
],
|
|
64
|
+
},
|
|
48
65
|
effect_detail: { $ref: "#/definitions/Translation" },
|
|
49
66
|
description_text: { $ref: "#/definitions/Translation" },
|
|
50
67
|
description_html: { $ref: "#/definitions/Translation" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/datasources/JISEventsJsonSchema.ts"],"names":[],"mappings":";;;AAAA,8FAA+E;AAE/E,8DAA2D;AAC3D,gEAA6D;AAE7D,4DAAyD;AAC5C,QAAA,mBAAmB,GAAgC;IAC5D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,2BAAY,EAAE;YAC5C,WAAW,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE;YAClD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,6BAAa,EAAE;YAC9C,YAAY,EAAE,EAAE,IAAI,EAAE,mCAAmC,EAAE;YAC3D,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,iDAAqB,CAAC,EAAE;YAC9E,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;oBAC9C,GAAG,EAAE;wBACD,KAAK,EAAE;4BACH,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;4BACvC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;yBACnC;qBACJ;iBACJ;gBACD,oBAAoB,EAAE,KAAK;gBAC3B,QAAQ,EAAE,CAAC,OAAO,CAAC;aACtB;YACD,cAAc,EAAE;gBACZ,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;oBAC9C,GAAG,EAAE;wBACD,KAAK,EAAE;4BACH,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;4BACvC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;yBACnC;qBACJ;iBACJ;gBACD,oBAAoB,EAAE,KAAK;gBAC3B,QAAQ,EAAE,CAAC,OAAO,CAAC;aACtB;YACD,MAAM,EAAE,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"JISEventsJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/datasources/JISEventsJsonSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare class JISEventsModel extends Model<InferAttributes<JISEventsModel
|
|
|
16
16
|
active_period_end: Date | null;
|
|
17
17
|
display_period_start: Date;
|
|
18
18
|
display_period_end: Date | null;
|
|
19
|
-
effect: string;
|
|
19
|
+
effect: string | string[];
|
|
20
20
|
effect_detail: IJISTranslationText;
|
|
21
21
|
description_text: IJISTranslationText;
|
|
22
22
|
description_html: IJISTranslationText;
|
|
@@ -51,7 +51,7 @@ JISEventsModel.attributeModel = {
|
|
|
51
51
|
type: sequelize_1.DataTypes.DATE,
|
|
52
52
|
},
|
|
53
53
|
effect: {
|
|
54
|
-
type: sequelize_1.DataTypes.STRING(
|
|
54
|
+
type: sequelize_1.DataTypes.STRING(),
|
|
55
55
|
allowNull: false,
|
|
56
56
|
},
|
|
57
57
|
effect_detail: {
|
|
@@ -120,7 +120,18 @@ JISEventsModel.jsonSchema = {
|
|
|
120
120
|
{ type: "null", nullable: true },
|
|
121
121
|
],
|
|
122
122
|
},
|
|
123
|
-
effect: {
|
|
123
|
+
effect: {
|
|
124
|
+
oneOf: [
|
|
125
|
+
{
|
|
126
|
+
type: "array",
|
|
127
|
+
items: { type: "string", enum: jisEventEffect_1.jisEventEffect },
|
|
128
|
+
minItems: 1,
|
|
129
|
+
maxItems: 3,
|
|
130
|
+
uniqueItems: true,
|
|
131
|
+
},
|
|
132
|
+
{ type: "string", enum: jisEventEffect_1.jisEventEffect },
|
|
133
|
+
],
|
|
134
|
+
},
|
|
124
135
|
effect_detail: { $ref: "#/definitions/Translation" },
|
|
125
136
|
description_text: { $ref: "#/definitions/Translation" },
|
|
126
137
|
description_html: { $ref: "#/definitions/Translation" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISEventsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/models/JISEventsModel.ts"],"names":[],"mappings":";;;AAAA,8FAA+E;AAG/E,mEAO6C;AAC7C,8DAA2D;AAC3D,gEAA6D;AAE7D,4DAAyD;AAGzD,MAAa,cACT,SAAQ,iBAA+E;;AAD3F,
|
|
1
|
+
{"version":3,"file":"JISEventsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/models/JISEventsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export interface IJISEvent {
|
|
|
12
12
|
active_period_end: Date | null;
|
|
13
13
|
display_period_start: Date;
|
|
14
14
|
display_period_end: Date | null;
|
|
15
|
-
effect: string;
|
|
15
|
+
effect: string | string[];
|
|
16
16
|
effect_detail: IJISTranslationText;
|
|
17
17
|
description_text: IJISTranslationText;
|
|
18
18
|
description_html: IJISTranslationText;
|
package/docs/openapi-input.yaml
CHANGED
|
@@ -478,6 +478,44 @@ components:
|
|
|
478
478
|
isTesting:
|
|
479
479
|
type: boolean
|
|
480
480
|
example: true
|
|
481
|
+
JISEventEffectBase:
|
|
482
|
+
type: string
|
|
483
|
+
example: DETOUR
|
|
484
|
+
enum:
|
|
485
|
+
- DETOUR
|
|
486
|
+
- REDUCED_SERVICE
|
|
487
|
+
- MODIFIED_SERVICE
|
|
488
|
+
- SIGNIFICANT_DELAYS
|
|
489
|
+
- ADDITIONAL_SERVICE
|
|
490
|
+
- OTHER_EFFECT
|
|
491
|
+
- NO_SERVICE
|
|
492
|
+
- STOP_MOVED
|
|
493
|
+
- NO_EFFECT
|
|
494
|
+
- ACCESSIBILITY_ISSUE
|
|
495
|
+
- UNKNOWN_EFFECT
|
|
496
|
+
description: >
|
|
497
|
+
DETOUR - ODKLON \
|
|
498
|
+
REDUCED_SERVICE - ROZVAZANI_PRESTUPNI_VAZBY || NAHRADNI_DOPRAVA \
|
|
499
|
+
MODIFIED_SERVICE - PROVOZ_ZASTAVEN || PROVOZ_OMEZEN || NEODJETI_SPOJE || PRERUSENI_PROVOZU_METRA || PRERUSENI_PROVOZU_TRAMVAJI || PRERUSENI_PROVOZU || OMEZENI_PROVOZU \
|
|
500
|
+
SIGNIFICANT_DELAYS - ZPOZDENI_SPOJE || ZPOZDENI_SPOJU \
|
|
501
|
+
ADDITIONAL_SERVICE - POSILENI_SPOJU || ZAVEDENI_LINKY \
|
|
502
|
+
OTHER_EFFECT - OSTATNI || PROVOZ_OBNOVEN || PRISTUP_OMEZEN || OMEZENI_BEZBARIEROVEHO_PRISTUPU \
|
|
503
|
+
NO_SERVICE - STANICE_UZAVRENA || ZRUSENI_ZASTAVKY || ZRUSENI_LINKY \
|
|
504
|
+
MODIFIED_SERVICE - ZMENA_ZASTAVEK \
|
|
505
|
+
STOP_MOVED - PREMISTNENI_ZASTAVKY \
|
|
506
|
+
NO_EFFECT - BEZ_OPATRENI \
|
|
507
|
+
ACCESSIBILITY_ISSUE - OMEZENI_BEZBARIEROVEHO_PRISTUPU \,
|
|
508
|
+
UNKNOWN_EFFECT - NEZNAME_OPATRENI - fallback
|
|
509
|
+
JISEventEffect:
|
|
510
|
+
oneOf:
|
|
511
|
+
- $ref: "#/components/schemas/JISEventEffectBase"
|
|
512
|
+
- type: array
|
|
513
|
+
uniqueItems: true
|
|
514
|
+
minItems: 1
|
|
515
|
+
maxItems: 3
|
|
516
|
+
example: ["DETOUR","REDUCED_SERVICE"]
|
|
517
|
+
items:
|
|
518
|
+
$ref: "#/components/schemas/JISEventEffectBase"
|
|
481
519
|
JISEvents:
|
|
482
520
|
title: JIS events
|
|
483
521
|
type: array
|
|
@@ -595,20 +633,7 @@ components:
|
|
|
595
633
|
example: "2024-03-03T14:22:20.958Z"
|
|
596
634
|
description: The start and end date/time of the event visibility
|
|
597
635
|
effect:
|
|
598
|
-
|
|
599
|
-
example: DETOUR
|
|
600
|
-
enum:
|
|
601
|
-
- DETOUR
|
|
602
|
-
- REDUCED_SERVICE
|
|
603
|
-
- MODIFIED_SERVICE
|
|
604
|
-
- SIGNIFICANT_DELAYS
|
|
605
|
-
- ADDITIONAL_SERVICE
|
|
606
|
-
- OTHER_EFFECT
|
|
607
|
-
- NO_SERVICE
|
|
608
|
-
- STOP_MOVED
|
|
609
|
-
- NO_EFFECT
|
|
610
|
-
- ACCESSIBILITY_ISSUE
|
|
611
|
-
- UNKNOWN_EFFECT
|
|
636
|
+
$ref: "#/components/schemas/JISEventEffect"
|
|
612
637
|
effect_detail:
|
|
613
638
|
type: object
|
|
614
639
|
properties:
|
|
@@ -864,7 +889,7 @@ components:
|
|
|
864
889
|
"severity_level": "SEVERE",
|
|
865
890
|
"active_period": { "start": "2024-02-07T12:11:00.000Z", "end": null },
|
|
866
891
|
"display_period": { "start": "2024-02-07T12:11:00.000Z", "end": null },
|
|
867
|
-
"effect": "MODIFIED_SERVICE",
|
|
892
|
+
"effect": ["MODIFIED_SERVICE", "DETOUR"],
|
|
868
893
|
"effect_detail": { "cs": "Provoz omezen" },
|
|
869
894
|
"description_text": {
|
|
870
895
|
"cs": "V Libni je omezen provoz tramvají. Důvodem je technická závada trolejbusu na kolejích."
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -2039,6 +2039,17 @@ paths:
|
|
|
2039
2039
|
type: string
|
|
2040
2040
|
example: "ROPID"
|
|
2041
2041
|
description: List of organization names to filter events by.
|
|
2042
|
+
- name: type
|
|
2043
|
+
in: query
|
|
2044
|
+
required: false
|
|
2045
|
+
schema:
|
|
2046
|
+
type: string
|
|
2047
|
+
example: "INCIDENT"
|
|
2048
|
+
description: Type of events to filter by.
|
|
2049
|
+
enum:
|
|
2050
|
+
- INCIDENT
|
|
2051
|
+
- DISRUPTION
|
|
2052
|
+
- SERVICE_CHANGE
|
|
2042
2053
|
responses:
|
|
2043
2054
|
200:
|
|
2044
2055
|
description: OK
|