@golemio/pid 5.7.4-dev.2387470014 → 5.7.4-dev.2396143256
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/db/example/20_jis_infotexts.sql +36 -0
- package/db/migrations/postgresql/20260317154729-add-repeat-fields-to-jis-infotexts.js +53 -0
- package/db/migrations/postgresql/sqls/20260317154729-add-repeat-fields-to-jis-infotexts-down.sql +5 -0
- package/db/migrations/postgresql/sqls/20260317154729-add-repeat-fields-to-jis-infotexts-up.sql +10 -0
- package/dist/helpers/DateTimeUtils.d.ts +12 -1
- package/dist/helpers/DateTimeUtils.js +23 -1
- package/dist/helpers/DateTimeUtils.js.map +1 -1
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.js +3 -0
- package/dist/integration-engine/jis/transformations/JISInfotextCacheTranformation.js.map +1 -1
- package/dist/integration-engine/jis/transformations/JISInfotextsTransformation.js +3 -0
- package/dist/integration-engine/jis/transformations/JISInfotextsTransformation.js.map +1 -1
- package/dist/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.js +1 -0
- package/dist/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.js.map +1 -1
- package/dist/output-gateway/pid/data-access/JISInfotextRepository.js +13 -1
- package/dist/output-gateway/pid/data-access/JISInfotextRepository.js.map +1 -1
- package/dist/output-gateway/pid/domain/InfotextInterfaces.d.ts +4 -0
- package/dist/output-gateway/pid/service/facade/InfotextFacade.d.ts +1 -0
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js +25 -7
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/transformations/JISInfotextOverviewTransformation.d.ts +4 -0
- package/dist/output-gateway/pid/service/transformations/JISInfotextOverviewTransformation.js +4 -0
- package/dist/output-gateway/pid/service/transformations/JISInfotextOverviewTransformation.js.map +1 -1
- package/dist/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.js +2 -2
- package/dist/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/JISInfotextsJsonSchema.js +16 -0
- package/dist/schema-definitions/jis/datasources/JISInfotextsJsonSchema.js.map +1 -1
- package/dist/schema-definitions/jis/datasources/interfaces/IJISInfotext.d.ts +5 -0
- package/dist/schema-definitions/jis/models/JISInfotextsModel.d.ts +3 -0
- package/dist/schema-definitions/jis/models/JISInfotextsModel.js +19 -0
- package/dist/schema-definitions/jis/models/JISInfotextsModel.js.map +1 -1
- package/dist/schema-definitions/jis/models/interfaces/IJISInfotext.d.ts +3 -0
- package/dist/schema-definitions/jis/redis/interfaces/IJISInfotextDto.d.ts +3 -0
- package/dist/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.js +12 -0
- package/dist/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.js.map +1 -1
- package/docs/asyncapi.yaml +18 -0
- package/docs/openapi-input.yaml +46 -0
- package/docs/openapi-output.yaml +22 -0
- package/package.json +1 -1
|
@@ -122,3 +122,39 @@ INSERT INTO jis_infotexts(id, severity_level, display_type, active_period_start,
|
|
|
122
122
|
INSERT INTO jis_infotexts_ropidgtfs_stops(infotext_id, stop_id, created_at, updated_at)
|
|
123
123
|
VALUES ('cdcc2d15-2cdc-4205-b82a-5cc819a79738', 'U142Z301', '2024-04-19 09:00:00+02', now() + interval '1 day');
|
|
124
124
|
|
|
125
|
+
-- 16 (repeat enabled example)
|
|
126
|
+
INSERT INTO jis_infotexts(id, severity_level, display_type, active_period_start, active_period_end, repeat_enabled, repeat_time_start, repeat_time_end, description_text, created_at, updated_at)
|
|
127
|
+
VALUES ('f1a2b3c4-d5e6-4890-abcd-ef1234567890', 'INFO', 'GENERAL', '2024-04-01 00:00:00.000+02', NULL, true, '23:00:00', '04:30:00', '{"cs": "Noční omezení provozu. Část linek nejezdí mezi 23:00 a 4:30.", "en": "Night service restrictions. Some lines do not operate between 23:00 and 4:30."}', '2024-04-01 10:00:00.000', now());
|
|
128
|
+
|
|
129
|
+
INSERT INTO jis_infotexts_ropidgtfs_stops(infotext_id, stop_id, created_at, updated_at)
|
|
130
|
+
VALUES ('f1a2b3c4-d5e6-4890-abcd-ef1234567890', 'U1040Z101P', '2024-04-19 09:00:00+02', now() + interval '1 day'),
|
|
131
|
+
('f1a2b3c4-d5e6-4890-abcd-ef1234567890', 'U1040Z102P', '2024-04-19 09:00:00+02', now() + interval '1 day');
|
|
132
|
+
|
|
133
|
+
-- 17 (repeat enabled daytime - for U873Z1P; hidden at 01:36 Prague, outside 09:00–20:00)
|
|
134
|
+
INSERT INTO jis_infotexts(id, severity_level, display_type, active_period_start, active_period_end, repeat_enabled, repeat_time_start, repeat_time_end, description_text, created_at, updated_at)
|
|
135
|
+
VALUES ('a1b2c3d4-e5f6-4789-8abc-def012345678', 'SEVERE', 'INLINE', '2024-04-01 00:00:00.000+02', NULL, true, '09:00:00', '20:00:00', '{"cs": "Denní omezení provozu na lince 12.", "en": "Daytime service restriction on line 12."}', '2024-04-01 10:00:00.000', now());
|
|
136
|
+
|
|
137
|
+
INSERT INTO jis_infotexts_ropidgtfs_stops(infotext_id, stop_id, created_at, updated_at)
|
|
138
|
+
VALUES ('a1b2c3d4-e5f6-4789-8abc-def012345678', 'U873Z1P', '2024-04-19 09:00:00+02', now() + interval '1 day');
|
|
139
|
+
|
|
140
|
+
-- 18 (repeat enabled overnight - for U873Z1P; visible at 01:36 Prague, inside 23:00–05:00)
|
|
141
|
+
INSERT INTO jis_infotexts(id, severity_level, display_type, active_period_start, active_period_end, repeat_enabled, repeat_time_start, repeat_time_end, description_text, created_at, updated_at)
|
|
142
|
+
VALUES ('b2c3d4e5-f6a7-4890-9bcd-ef0123456789', 'SEVERE', 'INLINE', '2024-04-01 00:00:00.000+02', NULL, true, '23:00:00', '05:00:00', '{"cs": "Noční omezení provozu na lince 12.", "en": "Night service restriction on line 12."}', '2024-04-01 10:00:00.000', now());
|
|
143
|
+
|
|
144
|
+
INSERT INTO jis_infotexts_ropidgtfs_stops(infotext_id, stop_id, created_at, updated_at)
|
|
145
|
+
VALUES ('b2c3d4e5-f6a7-4890-9bcd-ef0123456789', 'U873Z1P', '2024-04-19 09:00:00+02', now() + interval '1 day');
|
|
146
|
+
|
|
147
|
+
-- 19 (repeat enabled overnight - for U142Z301 / Praha hl.n.; visible at 01:36 Prague, inside 23:00–05:00)
|
|
148
|
+
INSERT INTO jis_infotexts(id, severity_level, display_type, active_period_start, active_period_end, repeat_enabled, repeat_time_start, repeat_time_end, description_text, created_at, updated_at)
|
|
149
|
+
VALUES ('c3d4e5f6-a7b8-4901-acde-f01234567890', 'SEVERE', 'INLINE', '2024-04-01 00:00:00.000+02', NULL, true, '23:00:00', '05:00:00', '{"cs": "Noční omezení provozu ve stanici Praha hl.n.", "en": "Night service restriction at Praha hl.n. station."}', '2024-04-01 10:00:00.000', now());
|
|
150
|
+
|
|
151
|
+
INSERT INTO jis_infotexts_ropidgtfs_stops(infotext_id, stop_id, created_at, updated_at)
|
|
152
|
+
VALUES ('c3d4e5f6-a7b8-4901-acde-f01234567890', 'U142Z301', '2024-04-19 09:00:00+02', now() + interval '1 day');
|
|
153
|
+
|
|
154
|
+
-- 20 (repeat enabled daytime - for U142Z301 / Praha hl.n.; visible at 14:35 Prague, inside 09:00–20:00)
|
|
155
|
+
INSERT INTO jis_infotexts(id, severity_level, display_type, active_period_start, active_period_end, repeat_enabled, repeat_time_start, repeat_time_end, description_text, created_at, updated_at)
|
|
156
|
+
VALUES ('d4e5f6a7-b8c9-4012-bdef-012345678901', 'SEVERE', 'INLINE', '2024-04-01 00:00:00.000+02', NULL, true, '09:00:00', '20:00:00', '{"cs": "Denní omezení provozu ve stanici Praha hl.n.", "en": "Daytime service restriction at Praha hl.n. station."}', '2024-04-01 10:00:00.000', now());
|
|
157
|
+
|
|
158
|
+
INSERT INTO jis_infotexts_ropidgtfs_stops(infotext_id, stop_id, created_at, updated_at)
|
|
159
|
+
VALUES ('d4e5f6a7-b8c9-4012-bdef-012345678901', 'U142Z301', '2024-04-19 09:00:00+02', now() + interval '1 day');
|
|
160
|
+
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var dbm;
|
|
4
|
+
var type;
|
|
5
|
+
var seed;
|
|
6
|
+
var fs = require('fs');
|
|
7
|
+
var path = require('path');
|
|
8
|
+
var Promise;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* We receive the dbmigrate dependency from dbmigrate initially.
|
|
12
|
+
* This enables us to not have to rely on NODE_PATH.
|
|
13
|
+
*/
|
|
14
|
+
exports.setup = function(options, seedLink) {
|
|
15
|
+
dbm = options.dbmigrate;
|
|
16
|
+
type = dbm.dataType;
|
|
17
|
+
seed = seedLink;
|
|
18
|
+
Promise = options.Promise;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
exports.up = function(db) {
|
|
22
|
+
var filePath = path.join(__dirname, 'sqls', '20260317154729-add-repeat-fields-to-jis-infotexts-up.sql');
|
|
23
|
+
return new Promise( function( resolve, reject ) {
|
|
24
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
25
|
+
if (err) return reject(err);
|
|
26
|
+
console.log('received data: ' + data);
|
|
27
|
+
|
|
28
|
+
resolve(data);
|
|
29
|
+
});
|
|
30
|
+
})
|
|
31
|
+
.then(function(data) {
|
|
32
|
+
return db.runSql(data);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
exports.down = function(db) {
|
|
37
|
+
var filePath = path.join(__dirname, 'sqls', '20260317154729-add-repeat-fields-to-jis-infotexts-down.sql');
|
|
38
|
+
return new Promise( function( resolve, reject ) {
|
|
39
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
40
|
+
if (err) return reject(err);
|
|
41
|
+
console.log('received data: ' + data);
|
|
42
|
+
|
|
43
|
+
resolve(data);
|
|
44
|
+
});
|
|
45
|
+
})
|
|
46
|
+
.then(function(data) {
|
|
47
|
+
return db.runSql(data);
|
|
48
|
+
});
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
exports._meta = {
|
|
52
|
+
"version": 1
|
|
53
|
+
};
|
package/db/migrations/postgresql/sqls/20260317154729-add-repeat-fields-to-jis-infotexts-up.sql
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
ALTER TABLE jis_infotexts
|
|
2
|
+
ADD COLUMN repeat_enabled boolean DEFAULT false,
|
|
3
|
+
ADD COLUMN repeat_time_start time NULL DEFAULT NULL,
|
|
4
|
+
ADD COLUMN repeat_time_end time NULL DEFAULT NULL,
|
|
5
|
+
ADD CONSTRAINT jis_infotexts_repeat_times_required CHECK (
|
|
6
|
+
CASE
|
|
7
|
+
WHEN repeat_enabled = true THEN repeat_time_start IS NOT NULL AND repeat_time_end IS NOT NULL
|
|
8
|
+
ELSE true
|
|
9
|
+
END
|
|
10
|
+
);
|
|
@@ -48,7 +48,18 @@ export declare class DateTimeUtils {
|
|
|
48
48
|
*
|
|
49
49
|
* @param stopTime The stop time to format
|
|
50
50
|
*/
|
|
51
|
-
static
|
|
51
|
+
static toLocalTimeFormat(stopTime: Date): string;
|
|
52
|
+
/**
|
|
53
|
+
* Check whether a formatted time-of-day falls within a daily repeat time window.
|
|
54
|
+
*
|
|
55
|
+
* When start < end the window is a normal daytime range (e.g. 08:00–20:00).
|
|
56
|
+
* When start ≥ end the window wraps around midnight (e.g. 23:00–04:30).
|
|
57
|
+
*
|
|
58
|
+
* @param start Window start in HH:mm:ss (Europe/Prague); returns true when null/undefined
|
|
59
|
+
* @param end Window end in HH:mm:ss (Europe/Prague); returns true when null/undefined
|
|
60
|
+
* @param currentTime Current time of day in HH:mm:ss — obtain once via {@link toLocalTimeFormat}
|
|
61
|
+
*/
|
|
62
|
+
static isInRepeatTimeWindow(start: string | null | undefined, end: string | null | undefined, currentTime: string): boolean;
|
|
52
63
|
/**
|
|
53
64
|
* Get hours, minutes, and seconds from a given time
|
|
54
65
|
*
|
|
@@ -60,9 +60,31 @@ class DateTimeUtils {
|
|
|
60
60
|
*
|
|
61
61
|
* @param stopTime The stop time to format
|
|
62
62
|
*/
|
|
63
|
-
static
|
|
63
|
+
static toLocalTimeFormat(stopTime) {
|
|
64
64
|
return _a.stopTimeFormatter.format(stopTime);
|
|
65
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
* Check whether a formatted time-of-day falls within a daily repeat time window.
|
|
68
|
+
*
|
|
69
|
+
* When start < end the window is a normal daytime range (e.g. 08:00–20:00).
|
|
70
|
+
* When start ≥ end the window wraps around midnight (e.g. 23:00–04:30).
|
|
71
|
+
*
|
|
72
|
+
* @param start Window start in HH:mm:ss (Europe/Prague); returns true when null/undefined
|
|
73
|
+
* @param end Window end in HH:mm:ss (Europe/Prague); returns true when null/undefined
|
|
74
|
+
* @param currentTime Current time of day in HH:mm:ss — obtain once via {@link toLocalTimeFormat}
|
|
75
|
+
*/
|
|
76
|
+
static isInRepeatTimeWindow(start, end, currentTime) {
|
|
77
|
+
if (!start || !end) {
|
|
78
|
+
return true;
|
|
79
|
+
}
|
|
80
|
+
if (start < end) {
|
|
81
|
+
return currentTime >= start && currentTime <= end;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
// Overnight: window wraps around midnight
|
|
85
|
+
return currentTime >= start || currentTime <= end;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
66
88
|
/**
|
|
67
89
|
* Get hours, minutes, and seconds from a given time
|
|
68
90
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateTimeUtils.js","sourceRoot":"","sources":["../../src/helpers/DateTimeUtils.ts"],"names":[],"mappings":";;;;;;;AAAA,2DAA2D;AAC3D,gGAA+D;AAE/D,MAAa,aAAa;IActB;;OAEG;IACI,MAAM,CAAC,kBAAkB,CAAC,YAAoB;QACjD,OAAO,gBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAa,CAAC,gBAAgB,CAAC,CAAC;IACnH,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,mBAAmB,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACrE,OAAO,gBAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAa,CAAC,WAAW,CAAC,CAAC;IAC9G,CAAC;IAsBM,MAAM,CAAC,4BAA4B,CAAC,QAAyB,EAAE,mBAA2B;QAC7F,MAAM,EACF,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,eAAe,GAC3B,GAAG,EAAa,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,gBAAgB,GAAG,yBAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAa,CAAC,QAAQ,CAAC,CAAC;QACpF,MAAM,WAAW,GAAG,aAAa,IAAI,EAAE,CAAC;QACxC,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;QAC5D,MAAM,gCAAgC,GAAG,WAAW,IAAI,qBAAqB,CAAC;QAC9E,gBAAgB,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5E,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACjE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACvC,gBAAgB,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QAC7G,OAAO,gBAAgB,CAAC,MAAM,EAAE,CAAC;IACrC,CAAC;IAED;;;;;;;;;OASG;IACI,MAAM,CAAC,0BAA0B,CAAC,iBAAyB,EAAE,iBAA0B;QAC1F,IAAI,cAA6B,CAAC;QAClC,IAAI,iBAAiB,EAAE,CAAC;YACpB,cAAc,GAAG,IAAA,yBAAM,EAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAa,CAAC,QAAQ,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACJ,cAAc,GAAG,IAAA,yBAAM,GAAE,CAAC,EAAE,CAAC,EAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxE,CAAC;QACD,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/D,cAAc,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACrC,cAAc,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;QACjD,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"DateTimeUtils.js","sourceRoot":"","sources":["../../src/helpers/DateTimeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,9 @@ let JISInfotextCacheTranformation = class JISInfotextCacheTranformation extends
|
|
|
20
20
|
display_type: data.display_type,
|
|
21
21
|
active_period_start: data.active_period_start.toISOString(),
|
|
22
22
|
active_period_end: data.active_period_end?.toISOString() ?? null,
|
|
23
|
+
repeat_enabled: data.repeat_enabled ?? false,
|
|
24
|
+
repeat_time_start: data.repeat_time_start ?? null,
|
|
25
|
+
repeat_time_end: data.repeat_time_end ?? null,
|
|
23
26
|
description_text: {
|
|
24
27
|
cs: data.description_text.cs,
|
|
25
28
|
en: data.description_text.en ?? null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextCacheTranformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISInfotextCacheTranformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,+CAA0D;IAAtG;;QACI,SAAI,GAAG,+BAA+B,CAAC;QAEpC,sBAAiB,GAAG,CAAC,IAAuB,EAAmB,EAAE;YACvE,OAAO;gBACH,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBAC3D,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,IAAI;gBAChE,gBAAgB,EAAE;oBACd,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE;oBAC5B,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE,IAAI,IAAI;iBACvC;gBACD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;gBACvD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;gBACvD,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE;aACtE,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;
|
|
1
|
+
{"version":3,"file":"JISInfotextCacheTranformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISInfotextCacheTranformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,+CAA0D;IAAtG;;QACI,SAAI,GAAG,+BAA+B,CAAC;QAEpC,sBAAiB,GAAG,CAAC,IAAuB,EAAmB,EAAE;YACvE,OAAO;gBACH,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBAC3D,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,IAAI;gBAChE,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,KAAK;gBAC5C,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,IAAI,IAAI;gBACjD,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,IAAI;gBAC7C,gBAAgB,EAAE;oBACd,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE;oBAC5B,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE,IAAI,IAAI;iBACvC;gBACD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;gBACvD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;gBACvD,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE;aACtE,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AAtBY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,qBAAU,GAAE;GACA,6BAA6B,CAsBzC"}
|
|
@@ -21,6 +21,9 @@ let JISInfotextsTransformation = class JISInfotextsTransformation extends Abstra
|
|
|
21
21
|
active_period_start: new Date(data.active_period.start),
|
|
22
22
|
active_period_end: data.active_period.end ? new Date(data.active_period.end) : null,
|
|
23
23
|
description_text: data.description_text,
|
|
24
|
+
repeat_enabled: data.repeat?.enabled ?? false,
|
|
25
|
+
repeat_time_start: data.repeat?.time_start ?? null,
|
|
26
|
+
repeat_time_end: data.repeat?.time_end ?? null,
|
|
24
27
|
created_timestamp: new Date(data.created_timestamp),
|
|
25
28
|
updated_timestamp: new Date(data.last_modified_timestamp),
|
|
26
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISInfotextsTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAKA,6GAA0G;AAC1G,iEAAgE;AASzD,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,+CAAiD;IAA1F;;QACI,SAAI,GAAG,4BAA4B,CAAC;QAEjC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,MAAM,QAAQ,GAAG;gBACb,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,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,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACnD,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC;aAC5D,CAAC;YACF,MAAM,uBAAuB,GACzB,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC1C,WAAW,EAAE,IAAI,CAAC,EAAE;gBACpB,OAAO,EAAE,EAAE;aACd,CAAC,CAAC,IAAI,EAAE,CAAC;YACd,OAAO;gBACH,QAAQ;gBACR,uBAAuB;aAC1B,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;
|
|
1
|
+
{"version":3,"file":"JISInfotextsTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/jis/transformations/JISInfotextsTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAKA,6GAA0G;AAC1G,iEAAgE;AASzD,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,+CAAiD;IAA1F;;QACI,SAAI,GAAG,4BAA4B,CAAC;QAEjC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,MAAM,QAAQ,GAAG;gBACb,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,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,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,IAAI,KAAK;gBAC7C,iBAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,IAAI;gBAClD,eAAe,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,IAAI,IAAI;gBAC9C,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACnD,iBAAiB,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC;aAC5D,CAAC;YACF,MAAM,uBAAuB,GACzB,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC1C,WAAW,EAAE,IAAI,CAAC,EAAE;gBACpB,OAAO,EAAE,EAAE;aACd,CAAC,CAAC,IAAI,EAAE,CAAC;YACd,OAAO;gBACH,QAAQ;gBACR,uBAAuB;aAC1B,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AA3BY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,qBAAU,GAAE;GACA,0BAA0B,CA2BtC"}
|
|
@@ -48,6 +48,7 @@ let JISInfotextsRedisRepository = class JISInfotextsRedisRepository {
|
|
|
48
48
|
}
|
|
49
49
|
async getActiveStopsInfotexts(stopIds, timeFrom = new Date()) {
|
|
50
50
|
const infotexts = await this.getStopsInfotexts(stopIds);
|
|
51
|
+
// filter infotexts by repeat_enabled + repeat_time_start + repeat_time_end
|
|
51
52
|
return this.sortAndFilter(infotexts, timeFrom);
|
|
52
53
|
}
|
|
53
54
|
async getStopsInfotexts(stopIds) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsRedisRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"JISInfotextsRedisRepository.js","sourceRoot":"","sources":["../../../../../src/output-gateway/jis/data-access/cache/JISInfotextsRedisRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,16 @@ let JISInfotextRepository = class JISInfotextRepository extends AbstractBasicRep
|
|
|
71
71
|
async findAllForDepartureBoard(stopsIds, timeFrom = new Date()) {
|
|
72
72
|
try {
|
|
73
73
|
return await this.sequelizeModel.findAll({
|
|
74
|
-
attributes: [
|
|
74
|
+
attributes: [
|
|
75
|
+
"display_type",
|
|
76
|
+
"active_period_start",
|
|
77
|
+
"active_period_end",
|
|
78
|
+
"description_text",
|
|
79
|
+
"severity_level",
|
|
80
|
+
"repeat_enabled",
|
|
81
|
+
"repeat_time_start",
|
|
82
|
+
"repeat_time_end",
|
|
83
|
+
],
|
|
75
84
|
where: {
|
|
76
85
|
active_period_start: { [sequelize_1.Op.lte]: timeFrom },
|
|
77
86
|
active_period_end: { [sequelize_1.Op.or]: [{ [sequelize_1.Op.gte]: timeFrom }, { [sequelize_1.Op.is]: null }] },
|
|
@@ -122,6 +131,9 @@ let JISInfotextRepository = class JISInfotextRepository extends AbstractBasicRep
|
|
|
122
131
|
"active_period_end",
|
|
123
132
|
"description_text",
|
|
124
133
|
"severity_level",
|
|
134
|
+
"repeat_enabled",
|
|
135
|
+
"repeat_time_start",
|
|
136
|
+
"repeat_time_end",
|
|
125
137
|
],
|
|
126
138
|
where,
|
|
127
139
|
include: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/JISInfotextRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAoE;AACpE,6DAAuC;AACvC,gGAAsE;AAGtE,kIAA+H;AAC/H,wEAAqE;AACrE,6EAAwE;AACxE,mEAAoF;AACpF,iEAAwE;AACxE,kDAA+C;AAC/C,+FAA4F;AAGrF,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,iDAAuB;IAM9D,YAC4D,sBAA2D,EAC9E,SAA6B,EACxC,MAAe;QAEzC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAVtB,WAAM,GAAG,iBAAS,CAAC;QACnB,cAAS,GAAG,qCAAiB,CAAC,SAAS,CAAC;QAU3C,IAAI,CAAC,cAAc,GAAG,SAAS;aAC1B,aAAa,EAAE;aACf,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,qCAAiB,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAE1G,IAAI,CAAC,kBAAkB,GAAG,IAAI,6BAAa,EAAE,CAAC;QAE9C,eAAe;QACf,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;YACtE,OAAO,EAAE,sBAAsB,CAAC,cAAc;YAC9C,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,SAAS;YACnB,EAAE,EAAE,OAAO;SACd,CAAC,CAAC;QACH,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE;YACtE,OAAO,EAAE,sBAAsB,CAAC,cAAc;YAC9C,UAAU,EAAE,SAAS;YACrB,QAAQ,EAAE,aAAa;SAC1B,CAAC,CAAC;QACH,sBAAsB,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE;YACjE,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,aAAa;SAC5B,CAAC,CAAC;QACH,sBAAsB,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;YACpF,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,SAAS;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,sBAAsB,CAAC,cAAc,EAAE;YAC/D,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,aAAa;SAC5B,CAAC,CAAC;QACH,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,CAAC,sBAAsB,CAAC,cAAc,EAAE;YAClF,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,SAAS;SACxB,CAAC,CAAC;IACP,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,wBAAwB,CAAC,QAAkB,EAAE,QAAQ,GAAG,IAAI,IAAI,EAAE;QAC3E,IAAI,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACrC,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"JISInfotextRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/data-access/JISInfotextRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,4 +21,5 @@ export declare class InfotextFacade {
|
|
|
21
21
|
getInfotextsForTransferBoards(stopIds: string[], currentMoment: Moment, timeFrom: Moment | null): Promise<IInfotextTransferOutputDto[]>;
|
|
22
22
|
getInfotextsForOverview(includeFuture: boolean): Promise<IInfotextOverviewOutputDto[]>;
|
|
23
23
|
getInfotextsCache(stopIds: string[], currentMoment: Date, timeFrom: Date | null): Promise<IV4InfotextTransferOutputDto[]>;
|
|
24
|
+
private filterInfotexts;
|
|
24
25
|
}
|
|
@@ -17,6 +17,7 @@ const JISInfotextsRedisRepository_1 = require("../../../jis/data-access/cache/JI
|
|
|
17
17
|
const JISInfotextRepository_1 = require("../../data-access/JISInfotextRepository");
|
|
18
18
|
const JISInfotextStopSuppressionFilter_1 = require("../../helpers/JISInfotextStopSuppressionFilter");
|
|
19
19
|
const OgPidToken_1 = require("../../ioc/OgPidToken");
|
|
20
|
+
const DateTimeUtils_1 = require("../../../../helpers/DateTimeUtils");
|
|
20
21
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
21
22
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
22
23
|
const JISInfotextDepartureTransformation_1 = require("../transformations/JISInfotextDepartureTransformation");
|
|
@@ -35,11 +36,12 @@ let InfotextFacade = class InfotextFacade {
|
|
|
35
36
|
}
|
|
36
37
|
async getInfotextsForDepartureBoards(stopIds, currentMoment, options) {
|
|
37
38
|
try {
|
|
38
|
-
const
|
|
39
|
+
const nowDate = (options.timeFrom ?? currentMoment).toDate();
|
|
40
|
+
const infotexts = await this.infotextRepository.findAllForDepartureBoard(stopIds, nowDate);
|
|
39
41
|
if (infotexts.length === 0) {
|
|
40
42
|
return [];
|
|
41
43
|
}
|
|
42
|
-
const filteredInfotexts = this.
|
|
44
|
+
const filteredInfotexts = this.filterInfotexts(infotexts, nowDate);
|
|
43
45
|
if (filteredInfotexts.length === 0) {
|
|
44
46
|
return [];
|
|
45
47
|
}
|
|
@@ -62,11 +64,12 @@ let InfotextFacade = class InfotextFacade {
|
|
|
62
64
|
}
|
|
63
65
|
async getInfotextsForTransferBoards(stopIds, currentMoment, timeFrom) {
|
|
64
66
|
try {
|
|
65
|
-
const
|
|
67
|
+
const nowDate = (timeFrom ?? currentMoment).toDate();
|
|
68
|
+
const infotexts = await this.infotextRepository.findAllForDepartureBoard(stopIds, nowDate);
|
|
66
69
|
if (infotexts.length === 0) {
|
|
67
70
|
return [];
|
|
68
71
|
}
|
|
69
|
-
const filteredInfotexts = this.
|
|
72
|
+
const filteredInfotexts = this.filterInfotexts(infotexts, nowDate);
|
|
70
73
|
if (filteredInfotexts.length === 0) {
|
|
71
74
|
return [];
|
|
72
75
|
}
|
|
@@ -84,7 +87,7 @@ let InfotextFacade = class InfotextFacade {
|
|
|
84
87
|
if (infotexts.length === 0) {
|
|
85
88
|
return [];
|
|
86
89
|
}
|
|
87
|
-
const filteredInfotexts = this.
|
|
90
|
+
const filteredInfotexts = this.filterInfotexts(infotexts, new Date(), includeFuture);
|
|
88
91
|
if (filteredInfotexts.length === 0) {
|
|
89
92
|
return [];
|
|
90
93
|
}
|
|
@@ -99,11 +102,12 @@ let InfotextFacade = class InfotextFacade {
|
|
|
99
102
|
}
|
|
100
103
|
async getInfotextsCache(stopIds, currentMoment, timeFrom) {
|
|
101
104
|
try {
|
|
102
|
-
const
|
|
105
|
+
const nowDate = timeFrom ?? currentMoment;
|
|
106
|
+
const infotexts = await this.infotextsRedisRepository.getActiveStopsInfotexts(stopIds, nowDate);
|
|
103
107
|
if (infotexts.length === 0) {
|
|
104
108
|
return [];
|
|
105
109
|
}
|
|
106
|
-
const filteredInfotexts = this.
|
|
110
|
+
const filteredInfotexts = this.filterInfotexts(infotexts, nowDate);
|
|
107
111
|
if (filteredInfotexts.length === 0) {
|
|
108
112
|
return [];
|
|
109
113
|
}
|
|
@@ -115,6 +119,20 @@ let InfotextFacade = class InfotextFacade {
|
|
|
115
119
|
throw new golemio_errors_1.GeneralError("Failed to retrieve infotexts for V4 transfer boards", this.constructor.name, error, 500);
|
|
116
120
|
}
|
|
117
121
|
}
|
|
122
|
+
filterInfotexts(list, now, includeFuture = false) {
|
|
123
|
+
const currentTime = DateTimeUtils_1.DateTimeUtils.toLocalTimeFormat(now);
|
|
124
|
+
const repeatFiltered = list.filter((infotext) => {
|
|
125
|
+
if (!infotext.repeat_enabled) {
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
if (includeFuture) {
|
|
129
|
+
// With includeFuture=true the infotext will be shown at some point in its repeat window
|
|
130
|
+
return true;
|
|
131
|
+
}
|
|
132
|
+
return DateTimeUtils_1.DateTimeUtils.isInRepeatTimeWindow(infotext.repeat_time_start, infotext.repeat_time_end, currentTime);
|
|
133
|
+
});
|
|
134
|
+
return this.infotextStopFilter.filterBySeverityLevel(repeatFiltered);
|
|
135
|
+
}
|
|
118
136
|
};
|
|
119
137
|
exports.InfotextFacade = InfotextFacade;
|
|
120
138
|
exports.InfotextFacade = InfotextFacade = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InfotextFacade.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/facade/InfotextFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4GAAoG;AACpG,mFAAkF;AAOlF,qGAAoG;AACpG,qDAAoD;AAEpD,6EAA8F;AAE9F,iEAAwE;AACxE,8GAA2G;AAC3G,4GAAyG;AACzG,4GAAyG;AACzG,sHAAmH;AAG5G,IAAM,cAAc,GAApB,MAAM,cAAc;IACvB,YACsD,kBAAyC,EAEnF,+BAAmE,EAEnE,8BAAiE,EAEjE,8BAAiE,EACZ,kBAAoD,EACzD,wBAAqD,EAErG,2BAAmE;QAVzB,uBAAkB,GAAlB,kBAAkB,CAAuB;QAEnF,oCAA+B,GAA/B,+BAA+B,CAAoC;QAEnE,mCAA8B,GAA9B,8BAA8B,CAAmC;QAEjE,mCAA8B,GAA9B,8BAA8B,CAAmC;QACZ,uBAAkB,GAAlB,kBAAkB,CAAkC;QACzD,6BAAwB,GAAxB,wBAAwB,CAA6B;QAErG,gCAA2B,GAA3B,2BAA2B,CAAwC;IAC5E,CAAC;IAEG,KAAK,CAAC,8BAA8B,CACvC,OAAiB,EACjB,aAAqB,EACrB,OAA8B;QAE9B,IAAI,CAAC;YACD,MAAM,
|
|
1
|
+
{"version":3,"file":"InfotextFacade.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/facade/InfotextFacade.ts"],"names":[],"mappings":"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"}
|
package/dist/output-gateway/pid/service/transformations/JISInfotextOverviewTransformation.js
CHANGED
|
@@ -30,6 +30,10 @@ let JISInfotextOverviewTransformation = class JISInfotextOverviewTransformation
|
|
|
30
30
|
})),
|
|
31
31
|
valid_from: shared_1.RopidRouterUtils.formatTimestamp(inputDto.active_period_start) ?? inputDto.active_period_start.toISOString(),
|
|
32
32
|
valid_to: shared_1.RopidRouterUtils.formatTimestamp(inputDto.active_period_end),
|
|
33
|
+
repeat: {
|
|
34
|
+
time_start: inputDto.repeat_enabled ? inputDto.repeat_time_start ?? null : null,
|
|
35
|
+
time_end: inputDto.repeat_enabled ? inputDto.repeat_time_end ?? null : null,
|
|
36
|
+
},
|
|
33
37
|
id: inputDto.id,
|
|
34
38
|
};
|
|
35
39
|
};
|
package/dist/output-gateway/pid/service/transformations/JISInfotextOverviewTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextOverviewTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/transformations/JISInfotextOverviewTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,4CAA8C;AAE9C,6GAA0G;AAC1G,iEAAgE;AAChE,oEAAiE;AACjE,8DAA2D;AAGpD,IAAM,iCAAiC,GAAvC,MAAM,iCAAkC,SAAQ,+CAAqE;IAArH;;QACI,SAAI,GAAG,mCAAmC,CAAC;QAExC,sBAAiB,GAAG,CAAC,QAA2B,EAAE,EAAE;YAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;YACnC,OAAO;gBACH,QAAQ,EAAE,+BAAc,CAAC,wBAAwB,CAAC,QAAQ,CAAC,cAAc,CAAC;gBAC1E,YAAY,EAAE,qCAAiB,CAAC,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC;gBAClF,IAAI,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE;gBAClC,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,IAAI,IAAI;gBAC7C,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAChC,EAAE,EAAE,IAAI,CAAC,OAAO;oBAChB,IAAI,EAAE,IAAI,CAAC,SAAS;oBACpB,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;iBAC5C,CAAC,CAAC;gBACH,UAAU,EACN,yBAAgB,CAAC,eAAe,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBAChH,QAAQ,EAAE,yBAAgB,CAAC,eAAe,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gBACtE,EAAE,EAAE,QAAQ,CAAC,EAAE;aAClB,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;
|
|
1
|
+
{"version":3,"file":"JISInfotextOverviewTransformation.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/service/transformations/JISInfotextOverviewTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,4CAA8C;AAE9C,6GAA0G;AAC1G,iEAAgE;AAChE,oEAAiE;AACjE,8DAA2D;AAGpD,IAAM,iCAAiC,GAAvC,MAAM,iCAAkC,SAAQ,+CAAqE;IAArH;;QACI,SAAI,GAAG,mCAAmC,CAAC;QAExC,sBAAiB,GAAG,CAAC,QAA2B,EAAE,EAAE;YAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;YACnC,OAAO;gBACH,QAAQ,EAAE,+BAAc,CAAC,wBAAwB,CAAC,QAAQ,CAAC,cAAc,CAAC;gBAC1E,YAAY,EAAE,qCAAiB,CAAC,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC;gBAClF,IAAI,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE;gBAClC,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,IAAI,IAAI;gBAC7C,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAChC,EAAE,EAAE,IAAI,CAAC,OAAO;oBAChB,IAAI,EAAE,IAAI,CAAC,SAAS;oBACpB,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;iBAC5C,CAAC,CAAC;gBACH,UAAU,EACN,yBAAgB,CAAC,eAAe,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBAChH,QAAQ,EAAE,yBAAgB,CAAC,eAAe,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gBACtE,MAAM,EAAE;oBACJ,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,iBAAiB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI;oBAC/E,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI;iBAC9E;gBACD,EAAE,EAAE,QAAQ,CAAC,EAAE;aAClB,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AAzBY,8EAAiC;4CAAjC,iCAAiC;IAD7C,IAAA,qBAAU,GAAE;GACA,iCAAiC,CAyB7C"}
|
|
@@ -17,8 +17,8 @@ class PublicVPTripStopTimesTransformation extends AbstractTransformation_1.Abstr
|
|
|
17
17
|
zone_id: stop.zone_id,
|
|
18
18
|
is_wheelchair_accessible: this.isStopWheelchairAccessible(stop),
|
|
19
19
|
shape_dist_traveled: stopTime.shape_dist_traveled,
|
|
20
|
-
arrival_time: DateTimeUtils_1.DateTimeUtils.
|
|
21
|
-
departure_time: DateTimeUtils_1.DateTimeUtils.
|
|
20
|
+
arrival_time: DateTimeUtils_1.DateTimeUtils.toLocalTimeFormat(DateTimeUtils_1.DateTimeUtils.getStopDateTimeForTripOrigin(stopTime.arrival_time_seconds, vehiclePosition.detailed_info.origin_timestamp)),
|
|
21
|
+
departure_time: DateTimeUtils_1.DateTimeUtils.toLocalTimeFormat(DateTimeUtils_1.DateTimeUtils.getStopDateTimeForTripOrigin(stopTime.departure_time_seconds, vehiclePosition.detailed_info.origin_timestamp)),
|
|
22
22
|
realtime_arrival_time: null, // later filled by realtime data
|
|
23
23
|
realtime_departure_time: null, // later filled by realtime data
|
|
24
24
|
lng: stop.stop_lon,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicVPTripStopTimesTransformation.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.ts"],"names":[],"mappings":";;;AAAA,kFAA6E;AAC7E,wEAAuD;AAIvD,6GAA0G;AAC1G,sEAAyF;AAOzF,MAAa,mCAAoC,SAAQ,+CAAoD;IAA7G;;QACW,SAAI,GAAG,6BAA6B,CAAC;QAElC,sBAAiB,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAe,EAAE,EAAE;YACzE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;YAC1B,MAAM,UAAU,GAA6E;gBACzF,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,wBAAwB,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBAC/D,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB;gBACjD,YAAY,EAAE,6BAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"PublicVPTripStopTimesTransformation.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.ts"],"names":[],"mappings":";;;AAAA,kFAA6E;AAC7E,wEAAuD;AAIvD,6GAA0G;AAC1G,sEAAyF;AAOzF,MAAa,mCAAoC,SAAQ,+CAAoD;IAA7G;;QACW,SAAI,GAAG,6BAA6B,CAAC;QAElC,sBAAiB,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAe,EAAE,EAAE;YACzE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;YAC1B,MAAM,UAAU,GAA6E;gBACzF,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,wBAAwB,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBAC/D,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB;gBACjD,YAAY,EAAE,6BAAa,CAAC,iBAAiB,CACzC,6BAAa,CAAC,4BAA4B,CACtC,QAAQ,CAAC,oBAAoB,EAC7B,eAAe,CAAC,aAAa,CAAC,gBAAgB,CACjD,CACJ;gBACD,cAAc,EAAE,6BAAa,CAAC,iBAAiB,CAC3C,6BAAa,CAAC,4BAA4B,CACtC,QAAQ,CAAC,sBAAsB,EAC/B,eAAe,CAAC,aAAa,CAAC,gBAAgB,CACjD,CACJ;gBAED,qBAAqB,EAAE,IAAI,EAAE,gCAAgC;gBAC7D,uBAAuB,EAAE,IAAI,EAAE,gCAAgC;gBAC/D,GAAG,EAAE,IAAI,CAAC,QAAQ;gBAClB,GAAG,EAAE,IAAI,CAAC,QAAQ;aACrB,CAAC;YAEF,OAAO,IAAA,oCAAmB,EAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC/D,CAAC,CAAC;QAEM,+BAA0B,GAAG,CAAC,EAAE,mBAAmB,EAAS,EAAkB,EAAE;YACpF,IAAI,mBAAmB,KAAK,IAAI,IAAI,mBAAmB,KAAK,mDAA8B,CAAC,aAAa,EAAE,CAAC;gBACvG,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,OAAO,mBAAmB,KAAK,mDAA8B,CAAC,iBAAiB,CAAC;QACpF,CAAC,CAAC;IACN,CAAC;CAAA;AAxCD,kFAwCC"}
|
|
@@ -33,6 +33,22 @@ exports.jisInfotextsJsonSchema = {
|
|
|
33
33
|
additionalProperties: false,
|
|
34
34
|
required: ["cs"],
|
|
35
35
|
},
|
|
36
|
+
repeat: {
|
|
37
|
+
nullable: true,
|
|
38
|
+
oneOf: [
|
|
39
|
+
{ type: "null", nullable: true },
|
|
40
|
+
{
|
|
41
|
+
type: "object",
|
|
42
|
+
properties: {
|
|
43
|
+
enabled: { type: "boolean" },
|
|
44
|
+
time_start: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
|
|
45
|
+
time_end: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
|
|
46
|
+
},
|
|
47
|
+
required: ["enabled"],
|
|
48
|
+
additionalProperties: false,
|
|
49
|
+
},
|
|
50
|
+
],
|
|
51
|
+
},
|
|
36
52
|
informed_entity: {
|
|
37
53
|
type: "object",
|
|
38
54
|
nullable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/datasources/JISInfotextsJsonSchema.ts"],"names":[],"mappings":";;;AAAA,oGAAqF;AAIxE,QAAA,sBAAsB,GAAmC;IAClE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,uDAAwB,CAAC,EAAE;YACjF,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;YAC7D,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,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACtB,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;iBACxE;gBACD,oBAAoB,EAAE,KAAK;gBAC3B,QAAQ,EAAE,CAAC,IAAI,CAAC;aACnB;YACD,eAAe,EAAE;gBACb,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,UAAU,EAAE;oBACR,KAAK,EAAE;wBACH,IAAI,EAAE,OAAO;wBACb,QAAQ,EAAE,IAAI;wBACd,KAAK,EAAE;4BACH,IAAI,EAAE,QAAQ;4BACd,UAAU,EAAE;gCACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;6BACzB;4BACD,oBAAoB,EAAE,KAAK;4BAC3B,QAAQ,EAAE,CAAC,IAAI,CAAC;yBACnB;qBACJ;iBACJ;gBACD,oBAAoB,EAAE,KAAK;aAC9B;YACD,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC1D,uBAAuB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;SACnE;QACD,QAAQ,EAAE;YACN,IAAI;YACJ,gBAAgB;YAChB,cAAc;YACd,eAAe;YACf,kBAAkB;YAClB,mBAAmB;YACnB,yBAAyB;SAC5B;KACJ;CACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"JISInfotextsJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/datasources/JISInfotextsJsonSchema.ts"],"names":[],"mappings":";;;AAAA,oGAAqF;AAIxE,QAAA,sBAAsB,GAAmC;IAClE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,uDAAwB,CAAC,EAAE;YACjF,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;YAC7D,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,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACtB,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;iBACxE;gBACD,oBAAoB,EAAE,KAAK;gBAC3B,QAAQ,EAAE,CAAC,IAAI,CAAC;aACnB;YACD,MAAM,EAAE;gBACJ,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE;oBACH,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAChC;wBACI,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACR,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;4BAC5B,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;4BAC7E,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;yBAC9E;wBACD,QAAQ,EAAE,CAAC,SAAS,CAAC;wBACrB,oBAAoB,EAAE,KAAK;qBAC9B;iBACJ;aACJ;YACD,eAAe,EAAE;gBACb,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,UAAU,EAAE;oBACR,KAAK,EAAE;wBACH,IAAI,EAAE,OAAO;wBACb,QAAQ,EAAE,IAAI;wBACd,KAAK,EAAE;4BACH,IAAI,EAAE,QAAQ;4BACd,UAAU,EAAE;gCACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;6BACzB;4BACD,oBAAoB,EAAE,KAAK;4BAC3B,QAAQ,EAAE,CAAC,IAAI,CAAC;yBACnB;qBACJ;iBACJ;gBACD,oBAAoB,EAAE,KAAK;aAC9B;YACD,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC1D,uBAAuB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;SACnE;QACD,QAAQ,EAAE;YACN,IAAI;YACJ,gBAAgB;YAChB,cAAc;YACd,eAAe;YACf,kBAAkB;YAClB,mBAAmB;YACnB,yBAAyB;SAC5B;KACJ;CACJ,CAAC"}
|
|
@@ -10,6 +10,11 @@ export interface IJISInfotext {
|
|
|
10
10
|
end: string | null;
|
|
11
11
|
};
|
|
12
12
|
description_text: IJISTranslationText;
|
|
13
|
+
repeat?: {
|
|
14
|
+
enabled: boolean;
|
|
15
|
+
time_start: string | null;
|
|
16
|
+
time_end: string | null;
|
|
17
|
+
} | null;
|
|
13
18
|
informed_entity?: {
|
|
14
19
|
stops?: IJISInfotextStop[] | null;
|
|
15
20
|
} | null;
|
|
@@ -11,6 +11,9 @@ export declare class JISInfotextsModel extends Model<InferAttributes<JISInfotext
|
|
|
11
11
|
active_period_start: Date;
|
|
12
12
|
active_period_end: Date | null;
|
|
13
13
|
description_text: IJISTranslationText;
|
|
14
|
+
repeat_enabled: boolean;
|
|
15
|
+
repeat_time_start: string | null;
|
|
16
|
+
repeat_time_end: string | null;
|
|
14
17
|
created_timestamp: Date;
|
|
15
18
|
updated_timestamp: Date;
|
|
16
19
|
created_at: CreationOptional<Date>;
|
|
@@ -32,6 +32,18 @@ JISInfotextsModel.attributeModel = {
|
|
|
32
32
|
type: sequelize_1.DataTypes.JSONB,
|
|
33
33
|
allowNull: false,
|
|
34
34
|
},
|
|
35
|
+
repeat_enabled: {
|
|
36
|
+
type: sequelize_1.DataTypes.BOOLEAN,
|
|
37
|
+
defaultValue: false,
|
|
38
|
+
},
|
|
39
|
+
repeat_time_start: {
|
|
40
|
+
type: sequelize_1.DataTypes.TIME,
|
|
41
|
+
allowNull: true,
|
|
42
|
+
},
|
|
43
|
+
repeat_time_end: {
|
|
44
|
+
type: sequelize_1.DataTypes.TIME,
|
|
45
|
+
allowNull: true,
|
|
46
|
+
},
|
|
35
47
|
created_timestamp: {
|
|
36
48
|
type: sequelize_1.DataTypes.DATE,
|
|
37
49
|
allowNull: false,
|
|
@@ -65,6 +77,13 @@ JISInfotextsModel.jsonSchema = {
|
|
|
65
77
|
],
|
|
66
78
|
},
|
|
67
79
|
description_text: { $ref: "#/definitions/Translation" },
|
|
80
|
+
repeat_enabled: { type: "boolean" },
|
|
81
|
+
repeat_time_start: {
|
|
82
|
+
oneOf: [{ type: "string" }, { type: "null", nullable: true }],
|
|
83
|
+
},
|
|
84
|
+
repeat_time_end: {
|
|
85
|
+
oneOf: [{ type: "string" }, { type: "null", nullable: true }],
|
|
86
|
+
},
|
|
68
87
|
created_timestamp: { type: "object", required: ["toISOString"] },
|
|
69
88
|
updated_timestamp: { type: "object", required: ["toISOString"] },
|
|
70
89
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/models/JISInfotextsModel.ts"],"names":[],"mappings":";;;AAAA,oGAAqF;AAGrF,mEAO6C;AAG7C,MAAa,iBACT,SAAQ,iBAAqF;;AADjG,
|
|
1
|
+
{"version":3,"file":"JISInfotextsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/jis/models/JISInfotextsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,9 @@ export interface IJISInfotext {
|
|
|
7
7
|
active_period_start: Date;
|
|
8
8
|
active_period_end: Date | null;
|
|
9
9
|
description_text: IJISTranslationText;
|
|
10
|
+
repeat_enabled: boolean;
|
|
11
|
+
repeat_time_start: string | null;
|
|
12
|
+
repeat_time_end: string | null;
|
|
10
13
|
created_timestamp: Date;
|
|
11
14
|
updated_timestamp: Date;
|
|
12
15
|
}
|
|
@@ -5,6 +5,9 @@ export interface IJISInfotextDto {
|
|
|
5
5
|
display_type: string;
|
|
6
6
|
active_period_start: string;
|
|
7
7
|
active_period_end: string | null;
|
|
8
|
+
repeat_enabled?: boolean | null;
|
|
9
|
+
repeat_time_start?: string | null;
|
|
10
|
+
repeat_time_end?: string | null;
|
|
8
11
|
description_text: {
|
|
9
12
|
cs: string;
|
|
10
13
|
en: string | null;
|
|
@@ -29,6 +29,18 @@ exports.JISInfotextDtoSchema = {
|
|
|
29
29
|
required: ["cs", "en"],
|
|
30
30
|
additionalProperties: false,
|
|
31
31
|
},
|
|
32
|
+
repeat_enabled: {
|
|
33
|
+
oneOf: [{ type: "boolean" }, { type: "null", nullable: true }],
|
|
34
|
+
nullable: true,
|
|
35
|
+
},
|
|
36
|
+
repeat_time_start: {
|
|
37
|
+
oneOf: [{ type: "string" }, { type: "null", nullable: true }],
|
|
38
|
+
nullable: true,
|
|
39
|
+
},
|
|
40
|
+
repeat_time_end: {
|
|
41
|
+
oneOf: [{ type: "string" }, { type: "null", nullable: true }],
|
|
42
|
+
nullable: true,
|
|
43
|
+
},
|
|
32
44
|
created_timestamp: { type: "string", format: "date-time" },
|
|
33
45
|
updated_timestamp: { type: "string", format: "date-time" },
|
|
34
46
|
stops: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,oBAAoB,GAAsC;IACnE,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC5D,iBAAiB,EAAE;gBACf,KAAK,EAAE;oBACH,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;oBACvC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACtB,EAAE,EAAE;wBACA,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;qBAChE;iBACJ;gBACD,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;gBACtB,oBAAoB,EAAE,KAAK;aAC9B;YACD,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC1D,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC1D,KAAK,EAAE;gBACH,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;qBAC9B;oBACD,QAAQ,EAAE,CAAC,SAAS,CAAC;oBACrB,oBAAoB,EAAE,KAAK;iBAC9B;aACJ;SACJ;QACD,QAAQ,EAAE;YACN,IAAI;YACJ,gBAAgB;YAChB,cAAc;YACd,qBAAqB;YACrB,kBAAkB;YAClB,mBAAmB;YACnB,mBAAmB;YACnB,OAAO;SACV;QACD,oBAAoB,EAAE,KAAK;KAC9B;CACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"JISInfotextDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/jis/redis/schemas/JISInfotextDtoSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,oBAAoB,GAAsC;IACnE,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC5D,iBAAiB,EAAE;gBACf,KAAK,EAAE;oBACH,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;oBACvC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBACnC;aACJ;YACD,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACtB,EAAE,EAAE;wBACA,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;qBAChE;iBACJ;gBACD,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;gBACtB,oBAAoB,EAAE,KAAK;aAC9B;YACD,cAAc,EAAE;gBACZ,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBAC9D,QAAQ,EAAE,IAAI;aACjB;YACD,iBAAiB,EAAE;gBACf,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBAC7D,QAAQ,EAAE,IAAI;aACjB;YACD,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBAC7D,QAAQ,EAAE,IAAI;aACjB;YACD,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC1D,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE;YAC1D,KAAK,EAAE;gBACH,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;qBAC9B;oBACD,QAAQ,EAAE,CAAC,SAAS,CAAC;oBACrB,oBAAoB,EAAE,KAAK;iBAC9B;aACJ;SACJ;QACD,QAAQ,EAAE;YACN,IAAI;YACJ,gBAAgB;YAChB,cAAc;YACd,qBAAqB;YACrB,kBAAkB;YAClB,mBAAmB;YACnB,mBAAmB;YACnB,OAAO;SACV;QACD,oBAAoB,EAAE,KAAK;KAC9B;CACJ,CAAC"}
|
package/docs/asyncapi.yaml
CHANGED
|
@@ -1892,6 +1892,24 @@ components:
|
|
|
1892
1892
|
- start
|
|
1893
1893
|
- end
|
|
1894
1894
|
description: The period during which the infotext is active
|
|
1895
|
+
repeat:
|
|
1896
|
+
type: object
|
|
1897
|
+
nullable: true
|
|
1898
|
+
description: Optional daily repeat schedule for the infotext
|
|
1899
|
+
properties:
|
|
1900
|
+
enabled:
|
|
1901
|
+
type: boolean
|
|
1902
|
+
description: Whether the infotext repeats on a daily schedule
|
|
1903
|
+
time_start:
|
|
1904
|
+
type: string
|
|
1905
|
+
nullable: true
|
|
1906
|
+
description: Daily repeat start time (HH:MM:SS)
|
|
1907
|
+
time_end:
|
|
1908
|
+
type: string
|
|
1909
|
+
nullable: true
|
|
1910
|
+
description: Daily repeat end time (HH:MM:SS)
|
|
1911
|
+
required:
|
|
1912
|
+
- enabled
|
|
1895
1913
|
description_text:
|
|
1896
1914
|
type: object
|
|
1897
1915
|
properties:
|
package/docs/openapi-input.yaml
CHANGED
|
@@ -753,6 +753,24 @@ components:
|
|
|
753
753
|
- start
|
|
754
754
|
- end
|
|
755
755
|
description: The period during which the infotext is active
|
|
756
|
+
repeat:
|
|
757
|
+
type: object
|
|
758
|
+
nullable: true
|
|
759
|
+
description: Optional daily repeat schedule for the infotext
|
|
760
|
+
properties:
|
|
761
|
+
enabled:
|
|
762
|
+
type: boolean
|
|
763
|
+
description: Whether the infotext repeats on a daily schedule
|
|
764
|
+
time_start:
|
|
765
|
+
type: string
|
|
766
|
+
nullable: true
|
|
767
|
+
description: Daily repeat start time (HH:MM:SS)
|
|
768
|
+
time_end:
|
|
769
|
+
type: string
|
|
770
|
+
nullable: true
|
|
771
|
+
description: Daily repeat end time (HH:MM:SS)
|
|
772
|
+
required:
|
|
773
|
+
- enabled
|
|
756
774
|
description_text:
|
|
757
775
|
type: object
|
|
758
776
|
properties:
|
|
@@ -919,6 +937,7 @@ components:
|
|
|
919
937
|
"start": "2024-12-05T11:12:00.000Z",
|
|
920
938
|
"end": "2025-01-30T23:00:00.000Z"
|
|
921
939
|
},
|
|
940
|
+
"repeat": null,
|
|
922
941
|
"description_text": {
|
|
923
942
|
"cs": "Test po aktualizaci Node.js",
|
|
924
943
|
"en": "This is a test"
|
|
@@ -960,5 +979,32 @@ components:
|
|
|
960
979
|
},
|
|
961
980
|
"created_timestamp": "2024-11-08T10:44:34.701Z",
|
|
962
981
|
"last_modified_timestamp": "2024-11-08T10:44:34.701Z"
|
|
982
|
+
},
|
|
983
|
+
{
|
|
984
|
+
"id": "a3f7c912-1e4b-4d8a-b6f0-9c2d7e5a0b3f",
|
|
985
|
+
"severity_level": "WARNING",
|
|
986
|
+
"display_type": "GENERAL",
|
|
987
|
+
"active_period": {
|
|
988
|
+
"start": "2024-12-01T00:00:00.000Z",
|
|
989
|
+
"end": null
|
|
990
|
+
},
|
|
991
|
+
"repeat": {
|
|
992
|
+
"enabled": true,
|
|
993
|
+
"time_start": "23:00:00",
|
|
994
|
+
"time_end": "04:30:00"
|
|
995
|
+
},
|
|
996
|
+
"description_text": {
|
|
997
|
+
"cs": "V nočních hodinách omezený provoz.",
|
|
998
|
+
"en": "Limited service during night hours."
|
|
999
|
+
},
|
|
1000
|
+
"informed_entity": {
|
|
1001
|
+
"stops": [
|
|
1002
|
+
{
|
|
1003
|
+
"id": "U72Z1P"
|
|
1004
|
+
}
|
|
1005
|
+
]
|
|
1006
|
+
},
|
|
1007
|
+
"created_timestamp": "2024-12-01T00:00:00.000Z",
|
|
1008
|
+
"last_modified_timestamp": "2024-12-01T00:00:00.000Z"
|
|
963
1009
|
}
|
|
964
1010
|
]
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -1232,6 +1232,7 @@ paths:
|
|
|
1232
1232
|
- priority
|
|
1233
1233
|
- related_stops
|
|
1234
1234
|
- id
|
|
1235
|
+
- repeat
|
|
1235
1236
|
properties:
|
|
1236
1237
|
priority:
|
|
1237
1238
|
type: string
|
|
@@ -1274,6 +1275,8 @@ paths:
|
|
|
1274
1275
|
format: uuid
|
|
1275
1276
|
description: VYMI (JIS) Infotexts identifier.
|
|
1276
1277
|
example: 40507cee-6468-488e-ba78-e36d9c20e67c
|
|
1278
|
+
repeat:
|
|
1279
|
+
$ref: "#/components/schemas/RepeatOnlyTimes"
|
|
1277
1280
|
"401":
|
|
1278
1281
|
$ref: "#/components/responses/UnauthorizedError"
|
|
1279
1282
|
"404":
|
|
@@ -2059,6 +2062,25 @@ components:
|
|
|
2059
2062
|
|
|
2060
2063
|
|
|
2061
2064
|
schemas:
|
|
2065
|
+
RepeatOnlyTimes:
|
|
2066
|
+
title: Repeat Only Times
|
|
2067
|
+
type: object
|
|
2068
|
+
description: Daily repeat schedule for the infotext.
|
|
2069
|
+
required:
|
|
2070
|
+
- time_start
|
|
2071
|
+
- time_end
|
|
2072
|
+
properties:
|
|
2073
|
+
time_start:
|
|
2074
|
+
type: string
|
|
2075
|
+
nullable: true
|
|
2076
|
+
description: Daily repeat window start time (HH:MM:SS, Europe/Prague). Null when repeat is disabled.
|
|
2077
|
+
example: "23:00:00"
|
|
2078
|
+
time_end:
|
|
2079
|
+
type: string
|
|
2080
|
+
nullable: true
|
|
2081
|
+
description: Daily repeat window end time (HH:MM:SS, Europe/Prague). When start >= end the window wraps around midnight. Null when repeat is disabled.
|
|
2082
|
+
example: "04:30:00"
|
|
2083
|
+
|
|
2062
2084
|
GTFSService:
|
|
2063
2085
|
title: GTFS Service
|
|
2064
2086
|
type: object
|