@golemio/pid 2.0.13-dev.386043250 → 2.0.13-dev.386644271
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/ropidvymi_example.sql +1 -1
- package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.d.ts +3 -3
- package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.js +7 -4
- package/dist/output-gateway/pid/models/RopidVYMIEventsStopsModel.js.map +1 -1
- package/package.json +1 -1
|
@@ -27,7 +27,7 @@ VALUES
|
|
|
27
27
|
|
|
28
28
|
INSERT INTO "public"."ropidvymi_events_stops"("id","event_id","gtfs_stop_id","vymi_id","vymi_id_dtb","node_number","stop_number","stop_type","valid_from","valid_to","text","create_batch_id","created_at","created_by","update_batch_id","updated_at","updated_by")
|
|
29
29
|
VALUES
|
|
30
|
-
(36204,583306,E'U663Z2P',1,3,663,2,
|
|
30
|
+
(36204,583306,E'U663Z2P',1,3,663,2,9,NULL,NULL,E'text sample',NULL,E'2021-07-07 13:48:06.521+02',NULL,NULL,E'2021-07-27 14:44:09.529+02',NULL),
|
|
31
31
|
(36203,583305,E'U21Z1P',1,3,21,1,11,NULL,NULL,E'text sample',NULL,E'2021-07-07 13:48:06.382+02',NULL,NULL,E'2021-07-31 18:44:07.943+02',NULL),
|
|
32
32
|
(36202,583305,E'U21Z2P',2,3,21,2,11,NULL,NULL,E'text sample',NULL,E'2021-07-07 13:48:06.381+02',NULL,NULL,E'2021-07-31 18:44:07.942+02',NULL);
|
|
33
33
|
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { SequelizeModel } from "@golemio/core/dist/output-gateway";
|
|
2
2
|
import { Moment } from "@golemio/core/dist/shared/moment-timezone";
|
|
3
|
-
declare enum InfotextsDisplayTypeEnum {
|
|
4
|
-
INLINE = "inline"
|
|
3
|
+
export declare enum InfotextsDisplayTypeEnum {
|
|
4
|
+
INLINE = "inline",
|
|
5
|
+
GENERAL = "general"
|
|
5
6
|
}
|
|
6
7
|
export interface IInfotextsStopsOutputModel {
|
|
7
8
|
display_type: InfotextsDisplayTypeEnum;
|
|
@@ -38,4 +39,3 @@ export declare class RopidVYMIEventsStopsModel extends SequelizeModel {
|
|
|
38
39
|
*/
|
|
39
40
|
GetAllDistinctWithEvents: (stopsIds: string[], timeFrom?: Moment) => Promise<IInfotextsStopsOutputModel[]>;
|
|
40
41
|
}
|
|
41
|
-
export {};
|
|
@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
23
23
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.RopidVYMIEventsStopsModel = void 0;
|
|
26
|
+
exports.RopidVYMIEventsStopsModel = exports.InfotextsDisplayTypeEnum = void 0;
|
|
27
27
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
28
28
|
const ropid_vymi_1 = require("../../../schema-definitions/ropid-vymi");
|
|
29
29
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
@@ -38,7 +38,8 @@ var InfotextsRecordTypeEnum;
|
|
|
38
38
|
var InfotextsDisplayTypeEnum;
|
|
39
39
|
(function (InfotextsDisplayTypeEnum) {
|
|
40
40
|
InfotextsDisplayTypeEnum["INLINE"] = "inline";
|
|
41
|
-
|
|
41
|
+
InfotextsDisplayTypeEnum["GENERAL"] = "general";
|
|
42
|
+
})(InfotextsDisplayTypeEnum = exports.InfotextsDisplayTypeEnum || (exports.InfotextsDisplayTypeEnum = {}));
|
|
42
43
|
/**
|
|
43
44
|
* Custom Postgres model for Ropid VYMI Events
|
|
44
45
|
*/
|
|
@@ -52,8 +53,9 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
|
|
|
52
53
|
*/
|
|
53
54
|
this.convertItem = (item) => {
|
|
54
55
|
// excluding event.id from result
|
|
56
|
+
// stop type 1 and 9 leads to general infotext type
|
|
55
57
|
const { "event.id": eventId } = item, infotextsStopModel = __rest(item, ["event.id"]);
|
|
56
|
-
return Object.assign({ display_type: InfotextsDisplayTypeEnum.INLINE, text_en: null }, infotextsStopModel);
|
|
58
|
+
return Object.assign({ display_type: item.stop_type === 1 || item.stop_type === 9 ? InfotextsDisplayTypeEnum.GENERAL : InfotextsDisplayTypeEnum.INLINE, text_en: null }, infotextsStopModel);
|
|
57
59
|
};
|
|
58
60
|
/** Converts each item one by one
|
|
59
61
|
*
|
|
@@ -78,6 +80,7 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
|
|
|
78
80
|
"valid_from",
|
|
79
81
|
"valid_to",
|
|
80
82
|
"text",
|
|
83
|
+
"stop_type",
|
|
81
84
|
[sequelize_1.default.fn("ARRAY_AGG", sequelize_1.default.col("gtfs_stop_id")), "related_stops"],
|
|
82
85
|
],
|
|
83
86
|
include: {
|
|
@@ -99,7 +102,7 @@ class RopidVYMIEventsStopsModel extends output_gateway_1.SequelizeModel {
|
|
|
99
102
|
[sequelize_1.default.Op.and]: [{ [sequelize_1.default.Op.ne]: null }, { [sequelize_1.default.Op.ne]: "" }],
|
|
100
103
|
},
|
|
101
104
|
},
|
|
102
|
-
group: ["valid_from", "valid_to", "text", "event.id"],
|
|
105
|
+
group: ["valid_from", "valid_to", "text", "stop_type", "event.id"],
|
|
103
106
|
raw: true,
|
|
104
107
|
})));
|
|
105
108
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidVYMIEventsStopsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/RopidVYMIEventsStopsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAwF;AACxF,uEAA4C;AAC5C,gGAA2E;AAC3E,oFAA4D;AAC5D,oDAAuB;AAEvB,IAAK,uBAIJ;AAJD,WAAK,uBAAuB;IACxB,+EAAa,CAAA;IACb,mGAAuB,CAAA;IACvB,6FAAoB,CAAA;AACxB,CAAC,EAJI,uBAAuB,KAAvB,uBAAuB,QAI3B;AAED,
|
|
1
|
+
{"version":3,"file":"RopidVYMIEventsStopsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/RopidVYMIEventsStopsModel.ts"],"names":[],"mappings":"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"}
|