@golemio/pid 5.1.1-rc.2189530062 → 5.1.1-rc.2190759737
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/output-gateway/jis/controllers/v1/V1EventsController.d.ts +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/pid/service/transformations/TransferDepartureCacheTransformation.d.ts +1 -0
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js +19 -0
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js.map +1 -1
- package/docs/openapi-output.yaml +11 -0
- package/package.json +3 -3
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RequestHandler } from "express";
|
|
1
|
+
import { RequestHandler } from "@golemio/core/dist/shared/express";
|
|
2
2
|
import { JISEventsRepository } from "../../data-access/JISEventsRepository";
|
|
3
3
|
import { JISEventsCustomFormatTransformation } from "../../transformations/JISEventsCustomFormatTransformation";
|
|
4
4
|
export declare class V1EventsController {
|
|
@@ -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"}
|
package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js
CHANGED
|
@@ -18,6 +18,8 @@ let TransferDepartureCacheTransformation = class TransferDepartureCacheTransform
|
|
|
18
18
|
this.name = "TransferDepartureCacheTransformation";
|
|
19
19
|
this.transformArray = (data) => {
|
|
20
20
|
const departures = new Map();
|
|
21
|
+
const routeDirectionCount = new Map();
|
|
22
|
+
const directionIdCache = new Map();
|
|
21
23
|
const res = [];
|
|
22
24
|
for (const { departure, position, stopTime } of data) {
|
|
23
25
|
if (departure.route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.METRO) {
|
|
@@ -35,7 +37,13 @@ let TransferDepartureCacheTransformation = class TransferDepartureCacheTransform
|
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
39
|
else {
|
|
40
|
+
const routeDirectionKey = this.getRouteDirectionKey(departure, position, directionIdCache);
|
|
41
|
+
const currentCount = routeDirectionCount.get(routeDirectionKey) ?? 0;
|
|
42
|
+
if (currentCount >= 2) {
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
38
45
|
res.push(this.transformInternal({ departure, position, stopTime }));
|
|
46
|
+
routeDirectionCount.set(routeDirectionKey, currentCount + 1);
|
|
39
47
|
}
|
|
40
48
|
}
|
|
41
49
|
return [...Array.from(departures.values()), ...res];
|
|
@@ -70,6 +78,17 @@ let TransferDepartureCacheTransformation = class TransferDepartureCacheTransform
|
|
|
70
78
|
}
|
|
71
79
|
return departure_minutes.toString();
|
|
72
80
|
}
|
|
81
|
+
getRouteDirectionKey(departure, position, directionIdCache) {
|
|
82
|
+
const cacheKey = `${departure.route_short_name}_${departure.trip_headsign}`;
|
|
83
|
+
let directionId = position?.detailed_info?.direction_id;
|
|
84
|
+
if (directionId !== undefined && directionId !== null) {
|
|
85
|
+
directionIdCache.set(cacheKey, directionId);
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
directionId = directionIdCache.get(cacheKey) ?? 0;
|
|
89
|
+
}
|
|
90
|
+
return `${departure.route_short_name}-${directionId}`;
|
|
91
|
+
}
|
|
73
92
|
};
|
|
74
93
|
exports.TransferDepartureCacheTransformation = TransferDepartureCacheTransformation;
|
|
75
94
|
exports.TransferDepartureCacheTransformation = TransferDepartureCacheTransformation = __decorate([
|
package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransferDepartureCacheTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uEAA4D;AAE5D,6GAA0G;AAC1G,iEAAgE;AAChE,oEAAiE;AACjE,4CAAuE;AAGhE,IAAM,oCAAoC,GAA1C,MAAM,oCAAqC,SAAQ,+CAGzD;IAHM;;QAII,SAAI,GAAG,sCAAsC,CAAC;QAE9C,mBAAc,GAAG,CAAC,IAA8B,EAAmC,EAAE;YACxF,MAAM,UAAU,GAA+C,IAAI,GAAG,EAAE,CAAC;YACzE,MAAM,GAAG,GAAoC,EAAE,CAAC;YAEhD,KAAK,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC;gBACnD,IAAI,SAAS,CAAC,UAAU,KAAK,kCAAiB,CAAC,KAAK,EAAE,CAAC;oBACnD,MAAM,wBAAwB,GAAG,GAAG,SAAS,CAAC,gBAAgB,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;oBACtF,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;oBACrD,IAAI,GAAG,EAAE,CAAC;wBACN,IAAI,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;4BAC9C,SAAS;wBACb,CAAC;wBACD,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAChC,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,sBAA8B,CAAC,CAC3E,CAAC;wBACF,UAAU,CAAC,GAAG,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;oBAClD,CAAC;yBAAM,CAAC;wBACJ,UAAU,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAI,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;oBACxG,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"TransferDepartureCacheTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.ts"],"names":[],"mappings":"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"}
|
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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "5.1.1-rc.
|
|
3
|
+
"version": "5.1.1-rc.2190759737",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"@commitlint/cli": "^11.0.0",
|
|
38
38
|
"@commitlint/config-conventional": "^11.0.0",
|
|
39
39
|
"@golemio/cli": "1.11.0",
|
|
40
|
-
"@golemio/core": "2.0.
|
|
41
|
-
"@golemio/db-common": "1.2.
|
|
40
|
+
"@golemio/core": "2.0.4-dev.2180851492",
|
|
41
|
+
"@golemio/db-common": "1.2.0",
|
|
42
42
|
"@golemio/eslint-config": "1.1.2",
|
|
43
43
|
"@types/chai": "4.2.3",
|
|
44
44
|
"@types/chai-as-promised": "7.1.2",
|