@golemio/parkings 1.0.12 → 1.0.13-dev.530871784
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/sql_dump.sql +13 -7
- package/dist/integration-engine/KoridParkingConfigTransformation.js +23 -0
- package/dist/integration-engine/KoridParkingConfigTransformation.js.map +1 -1
- package/dist/integration-engine/ParkingInterface.d.ts +8 -2
- package/dist/integration-engine/ParkingLotsTransformation.js +7 -1
- package/dist/integration-engine/ParkingLotsTransformation.js.map +1 -1
- package/dist/integration-engine/ParkingsWorker.d.ts +1 -0
- package/dist/integration-engine/ParkingsWorker.js +48 -12
- package/dist/integration-engine/ParkingsWorker.js.map +1 -1
- package/dist/integration-engine/TSKParkingTariffTransformation.js +2 -2
- package/dist/integration-engine/TSKParkingTariffTransformation.js.map +1 -1
- package/dist/integration-engine/TSKParkingTransformation.js +4 -1
- package/dist/integration-engine/TSKParkingTransformation.js.map +1 -1
- package/dist/output-gateway/ParkingsRouter.d.ts +7 -35
- package/dist/output-gateway/ParkingsRouter.js +63 -49
- package/dist/output-gateway/ParkingsRouter.js.map +1 -1
- package/dist/output-gateway/helpers/PaginationHelper.d.ts +4 -0
- package/dist/output-gateway/helpers/PaginationHelper.js +28 -0
- package/dist/output-gateway/helpers/PaginationHelper.js.map +1 -0
- package/dist/output-gateway/models/ParkingsMeasurementsActualModel.d.ts +7 -0
- package/dist/output-gateway/models/ParkingsMeasurementsActualModel.js +63 -0
- package/dist/output-gateway/models/ParkingsMeasurementsActualModel.js.map +1 -0
- package/dist/output-gateway/models/ParkingsMeasurementsModel.d.ts +9 -2
- package/dist/output-gateway/models/ParkingsMeasurementsModel.js +40 -8
- package/dist/output-gateway/models/ParkingsMeasurementsModel.js.map +1 -1
- package/dist/output-gateway/models/ParkingsModel.d.ts +14 -2
- package/dist/output-gateway/models/ParkingsModel.js +35 -2
- package/dist/output-gateway/models/ParkingsModel.js.map +1 -1
- package/dist/output-gateway/models/ParkingsTariffsModel.d.ts +1 -0
- package/dist/output-gateway/models/ParkingsTariffsModel.js.map +1 -1
- package/dist/output-gateway/models/index.d.ts +2 -0
- package/dist/output-gateway/models/index.js +2 -0
- package/dist/output-gateway/models/index.js.map +1 -1
- package/dist/output-gateway/models/interfaces/ICentroidPg.d.ts +9 -0
- package/dist/output-gateway/models/interfaces/ICentroidPg.js +3 -0
- package/dist/output-gateway/models/interfaces/ICentroidPg.js.map +1 -0
- package/dist/output-gateway/transformations/ParkingsTransformationFabric.d.ts +11 -0
- package/dist/output-gateway/transformations/ParkingsTransformationFabric.js +84 -0
- package/dist/output-gateway/transformations/ParkingsTransformationFabric.js.map +1 -0
- package/dist/output-gateway/transformations/interfaces/IOutputParkingTariffsDto.d.ts +18 -0
- package/dist/output-gateway/transformations/interfaces/IOutputParkingTariffsDto.js +3 -0
- package/dist/output-gateway/transformations/interfaces/IOutputParkingTariffsDto.js.map +1 -0
- package/dist/output-gateway/transformations/interfaces/IParkingFeature.d.ts +29 -0
- package/dist/output-gateway/transformations/interfaces/IParkingFeature.js +3 -0
- package/dist/output-gateway/transformations/interfaces/IParkingFeature.js.map +1 -0
- package/dist/output-gateway/transformations/interfaces/IParkingsTariffChargeNormalized.d.ts +10 -0
- package/dist/output-gateway/transformations/interfaces/IParkingsTariffChargeNormalized.js +3 -0
- package/dist/output-gateway/transformations/interfaces/IParkingsTariffChargeNormalized.js.map +1 -0
- package/dist/output-gateway/transformations/interfaces/PaymentMethodTypes.d.ts +1 -0
- package/dist/output-gateway/transformations/interfaces/PaymentMethodTypes.js +3 -0
- package/dist/output-gateway/transformations/interfaces/PaymentMethodTypes.js.map +1 -0
- package/dist/schema-definitions/index.d.ts +11 -3
- package/dist/schema-definitions/index.js +53 -2
- package/dist/schema-definitions/index.js.map +1 -1
- package/package.json +72 -72
|
@@ -8,39 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var
|
|
12
|
-
|
|
13
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
-
t[p] = s[p];
|
|
15
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
-
t[p[i]] = s[p[i]];
|
|
19
|
-
}
|
|
20
|
-
return t;
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
21
13
|
};
|
|
22
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
15
|
exports.parkingsRouter = exports.ParkingsRouter = void 0;
|
|
24
|
-
const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
|
|
25
|
-
const BaseRouter_1 = require("@golemio/core/dist/output-gateway/routes/BaseRouter");
|
|
26
|
-
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
27
16
|
const models_1 = require("./models");
|
|
17
|
+
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
18
|
+
const BaseRouter_1 = require("@golemio/core/dist/output-gateway/routes/BaseRouter");
|
|
19
|
+
const express_validator_1 = require("@golemio/core/dist/shared/express-validator");
|
|
28
20
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
21
|
+
const PaginationHelper_1 = __importDefault(require("./helpers/PaginationHelper"));
|
|
22
|
+
const ParkingsTransformationFabric_1 = require("./transformations/ParkingsTransformationFabric");
|
|
29
23
|
class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
30
24
|
constructor() {
|
|
31
25
|
super();
|
|
32
|
-
this.buildFeatureItem = (location) => {
|
|
33
|
-
const { distance } = location, obj = __rest(location, ["distance"]);
|
|
34
|
-
obj.date_modified = obj.date_modified ? new Date(Number(obj.date_modified)).toISOString() : null;
|
|
35
|
-
return (0, output_gateway_1.buildGeojsonFeatureType)("location", obj);
|
|
36
|
-
};
|
|
37
|
-
this.buildFeatureCollection = (locations) => {
|
|
38
|
-
const normData = [];
|
|
39
|
-
locations.forEach((location) => {
|
|
40
|
-
normData.push(this.buildFeatureItem(location));
|
|
41
|
-
});
|
|
42
|
-
return (0, output_gateway_1.buildGeojsonFeatureCollection)(normData);
|
|
43
|
-
};
|
|
44
26
|
this.getLocations = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
45
27
|
try {
|
|
46
28
|
const { latlng, range, limit, offset, source, sourceId, category } = req.query;
|
|
@@ -49,7 +31,7 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
49
31
|
sourceId,
|
|
50
32
|
category, limit: limit ? Number(limit) : undefined, offset: offset ? Number(offset) : 0 });
|
|
51
33
|
const data = yield this.ParkingsModel.GetAll(options);
|
|
52
|
-
const collection = this.buildFeatureCollection(data);
|
|
34
|
+
const collection = yield this.ParkingsTransformationFabric.buildFeatureCollection(data);
|
|
53
35
|
res.status(200).send(collection);
|
|
54
36
|
}
|
|
55
37
|
catch (err) {
|
|
@@ -62,7 +44,8 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
62
44
|
if (!data) {
|
|
63
45
|
throw new golemio_errors_1.CustomError(`Id ${req.params.id} not found`, true, "ParkingsRouter", 404);
|
|
64
46
|
}
|
|
65
|
-
|
|
47
|
+
const resultFeature = yield this.ParkingsTransformationFabric.buildFeatureItem(data);
|
|
48
|
+
res.status(200).send(resultFeature);
|
|
66
49
|
}
|
|
67
50
|
catch (err) {
|
|
68
51
|
next(err);
|
|
@@ -80,22 +63,21 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
80
63
|
next(err);
|
|
81
64
|
}
|
|
82
65
|
});
|
|
83
|
-
this.getChargeData = (data) => ({
|
|
84
|
-
charge: +data.charge,
|
|
85
|
-
charge_type: data.charge_type,
|
|
86
|
-
charge_order_index: data.charge_order_index,
|
|
87
|
-
charge_interval: data.charge_interval,
|
|
88
|
-
max_iterations_of_charge: data.max_iterations_of_charge,
|
|
89
|
-
min_iterations_of_charge: data.min_iterations_of_charge,
|
|
90
|
-
start_time_of_period: data.start_time_of_period,
|
|
91
|
-
end_time_of_period: data.end_time_of_period,
|
|
92
|
-
});
|
|
93
66
|
this.normalizeTariff = (data) => {
|
|
94
67
|
const charges = [];
|
|
95
68
|
for (const element of data) {
|
|
96
|
-
charges.push(this.getChargeData(element));
|
|
69
|
+
charges.push(this.ParkingsTransformationFabric.getChargeData(element));
|
|
97
70
|
}
|
|
98
|
-
|
|
71
|
+
const paymentMethods = [];
|
|
72
|
+
if (data[0].accepts_payment_card)
|
|
73
|
+
paymentMethods.push("card_offline");
|
|
74
|
+
if (data[0].accepts_cash)
|
|
75
|
+
paymentMethods.push("cash");
|
|
76
|
+
if (data[0].accepts_mobile_payment)
|
|
77
|
+
paymentMethods.push("mobile_app");
|
|
78
|
+
if (data[0].accepts_litacka)
|
|
79
|
+
paymentMethods.push("litacka");
|
|
80
|
+
let tariffNormalized = {
|
|
99
81
|
tariff_id: data[0].tariff_id,
|
|
100
82
|
source: data[0].source,
|
|
101
83
|
last_updated: data[0].last_updated,
|
|
@@ -104,14 +86,15 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
104
86
|
free_of_charge: data[0].free_of_charge,
|
|
105
87
|
url_link_address: data[0].url_link_address,
|
|
106
88
|
charge_band_name: data[0].charge_band_name,
|
|
107
|
-
|
|
108
|
-
accepts_cash: data[0].accepts_cash,
|
|
109
|
-
accepts_mobile_payment: data[0].accepts_mobile_payment,
|
|
89
|
+
payment_methods: paymentMethods,
|
|
110
90
|
charge_currency: data[0].charge_currency,
|
|
111
91
|
allowed_vehicle_type: data[0].allowed_vehicle_type,
|
|
112
92
|
allowed_fuel_type: data[0].allowed_fuel_type,
|
|
113
93
|
charges,
|
|
94
|
+
// For future integration MPLA:
|
|
95
|
+
reservation_url: null,
|
|
114
96
|
};
|
|
97
|
+
return tariffNormalized;
|
|
115
98
|
};
|
|
116
99
|
this.normalizeTariffs = (data) => {
|
|
117
100
|
const tariffGroups = data.reduce((acc, item) => {
|
|
@@ -140,21 +123,46 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
140
123
|
});
|
|
141
124
|
this.getMeasurements = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
142
125
|
try {
|
|
143
|
-
const
|
|
144
|
-
const measureFrom = from ? new Date(from).getTime() : undefined;
|
|
145
|
-
const measureTo = to ? new Date(to).getTime() : undefined;
|
|
126
|
+
const filterParams = req.query;
|
|
127
|
+
const measureFrom = filterParams.from ? new Date(filterParams.from).getTime() : undefined;
|
|
128
|
+
const measureTo = filterParams.to ? new Date(filterParams.to).getTime() : undefined;
|
|
129
|
+
let requestedPage = filterParams.page ? Number(filterParams.page) : 1;
|
|
130
|
+
let requestedPageSize = filterParams.pageSize ? Number(filterParams.pageSize) : 10000;
|
|
131
|
+
// Get request total count of raws
|
|
132
|
+
const countOptions = {
|
|
133
|
+
source: filterParams.source,
|
|
134
|
+
sourceId: filterParams.sourceId,
|
|
135
|
+
measureFrom,
|
|
136
|
+
measureTo,
|
|
137
|
+
};
|
|
138
|
+
const count = yield this.ParkingsMeasurementsModel.CountAll(countOptions);
|
|
139
|
+
// Define query limit and offset from requestedPageSize and requestedPage
|
|
140
|
+
const limit = requestedPageSize;
|
|
141
|
+
const offset = (requestedPage - 1) * requestedPageSize;
|
|
142
|
+
if (offset > count) {
|
|
143
|
+
res.status(400).send(`pageSize param error - page ${requestedPage} with pageSize ${requestedPageSize} does not exist`);
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
// Get data from DB
|
|
146
147
|
const options = {
|
|
147
|
-
source,
|
|
148
|
-
sourceId,
|
|
148
|
+
source: filterParams.source,
|
|
149
|
+
sourceId: filterParams.sourceId,
|
|
149
150
|
measureFrom,
|
|
150
151
|
measureTo,
|
|
151
|
-
limit
|
|
152
|
-
offset
|
|
152
|
+
limit,
|
|
153
|
+
offset,
|
|
153
154
|
};
|
|
154
155
|
const data = yield this.ParkingsMeasurementsModel.GetAll(options);
|
|
155
156
|
data.forEach((el) => {
|
|
156
157
|
el.date_modified = new Date(parseInt(el.date_modified, 10)).toISOString();
|
|
157
158
|
});
|
|
159
|
+
// Prepare paging Links for header
|
|
160
|
+
let pagingLinksDefinition = PaginationHelper_1.default.generatePagingUrl(filterParams, count, offset, requestedPage, requestedPageSize);
|
|
161
|
+
// Set headers X-Total-Count and Link
|
|
162
|
+
res.setHeader("X-Total-Count", `${count}`);
|
|
163
|
+
if (pagingLinksDefinition) {
|
|
164
|
+
res.setHeader("Link", `${pagingLinksDefinition}`);
|
|
165
|
+
}
|
|
158
166
|
res.status(200).send(data);
|
|
159
167
|
}
|
|
160
168
|
catch (err) {
|
|
@@ -169,6 +177,11 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
169
177
|
(0, express_validator_1.query)("sourceId").optional().isString(),
|
|
170
178
|
(0, express_validator_1.query)("from").optional().isISO8601(),
|
|
171
179
|
(0, express_validator_1.query)("to").optional().isISO8601(),
|
|
180
|
+
(0, express_validator_1.query)("page").optional().isInt({ min: 1 }).withMessage("pageSize should be a positive int"),
|
|
181
|
+
(0, express_validator_1.query)("pageSize")
|
|
182
|
+
.optional()
|
|
183
|
+
.isInt({ min: 1, max: 10000 })
|
|
184
|
+
.withMessage("pageSize should be a positive int and should not exceed 10,000"),
|
|
172
185
|
], output_gateway_1.pagination, output_gateway_1.checkErrors, (0, output_gateway_1.paginationLimitMiddleware)("ParkingsRouter"), (0, output_gateway_1.useCacheMiddleware)(), this.getMeasurements);
|
|
173
186
|
this.router.get("/:id", [(0, express_validator_1.param)("id").optional().isNumeric()], output_gateway_1.checkErrors, (0, output_gateway_1.useCacheMiddleware)("3 hours"), this.getLocationById);
|
|
174
187
|
this.router.get("/", [
|
|
@@ -187,6 +200,7 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
187
200
|
this.ParkingsModel = models_1.models.ParkingsModel;
|
|
188
201
|
this.ParkingsMeasurementsModel = models_1.models.ParkingsMeasurementsModel;
|
|
189
202
|
this.ParkingsTariffsModel = models_1.models.ParkingsTariffsModel;
|
|
203
|
+
this.ParkingsTransformationFabric = new ParkingsTransformationFabric_1.ParkingsTransformationFabric();
|
|
190
204
|
this.initRoutes();
|
|
191
205
|
}
|
|
192
206
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingsRouter.js","sourceRoot":"","sources":["../../src/output-gateway/ParkingsRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ParkingsRouter.js","sourceRoot":"","sources":["../../src/output-gateway/ParkingsRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
class PaginationHelper {
|
|
4
|
+
static generatePagingUrl(filterParams, count, offset, requestedPage, requestedPageSize) {
|
|
5
|
+
let pagingLinksDefinition = "";
|
|
6
|
+
let requestUrl = "/parking/measurements?";
|
|
7
|
+
requestUrl += `pageSize=${requestedPageSize}`;
|
|
8
|
+
if (filterParams.from)
|
|
9
|
+
requestUrl += `&from=${filterParams.from}`;
|
|
10
|
+
if (filterParams.to)
|
|
11
|
+
requestUrl += `&to=${filterParams.to}`;
|
|
12
|
+
if (filterParams.source)
|
|
13
|
+
requestUrl += `&source=${filterParams.source}`;
|
|
14
|
+
if (filterParams.sourceId)
|
|
15
|
+
requestUrl += `&sourceId=${filterParams.sourceId}`;
|
|
16
|
+
if (requestedPage > 1) {
|
|
17
|
+
pagingLinksDefinition += `<${requestUrl}&page=${requestedPage - 1}>; rel=previous`;
|
|
18
|
+
}
|
|
19
|
+
if (count > offset + requestedPageSize) {
|
|
20
|
+
if (pagingLinksDefinition)
|
|
21
|
+
pagingLinksDefinition += ", ";
|
|
22
|
+
pagingLinksDefinition += `<${requestUrl}&page=${requestedPage + 1}>; rel=next`;
|
|
23
|
+
}
|
|
24
|
+
return pagingLinksDefinition;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
exports.default = PaginationHelper;
|
|
28
|
+
//# sourceMappingURL=PaginationHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PaginationHelper.js","sourceRoot":"","sources":["../../../src/output-gateway/helpers/PaginationHelper.ts"],"names":[],"mappings":";;AAEA,MAAqB,gBAAgB;IAC1B,MAAM,CAAC,iBAAiB,CAC3B,YAAmC,EACnC,KAAa,EACb,MAAc,EACd,aAAqB,EACrB,iBAAyB;QAEzB,IAAI,qBAAqB,GAAG,EAAE,CAAC;QAC/B,IAAI,UAAU,GAAG,wBAAwB,CAAC;QAC1C,UAAU,IAAI,YAAY,iBAAiB,EAAE,CAAC;QAC9C,IAAI,YAAY,CAAC,IAAI;YAAE,UAAU,IAAI,SAAS,YAAY,CAAC,IAAI,EAAE,CAAC;QAClE,IAAI,YAAY,CAAC,EAAE;YAAE,UAAU,IAAI,OAAO,YAAY,CAAC,EAAE,EAAE,CAAC;QAC5D,IAAI,YAAY,CAAC,MAAM;YAAE,UAAU,IAAI,WAAW,YAAY,CAAC,MAAM,EAAE,CAAC;QACxE,IAAI,YAAY,CAAC,QAAQ;YAAE,UAAU,IAAI,aAAa,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC9E,IAAI,aAAa,GAAG,CAAC,EAAE;YACnB,qBAAqB,IAAI,IAAI,UAAU,SAAS,aAAa,GAAG,CAAC,iBAAiB,CAAC;SACtF;QACD,IAAI,KAAK,GAAG,MAAM,GAAG,iBAAiB,EAAE;YACpC,IAAI,qBAAqB;gBAAE,qBAAqB,IAAI,IAAI,CAAC;YACzD,qBAAqB,IAAI,IAAI,UAAU,SAAS,aAAa,GAAG,CAAC,aAAa,CAAC;SAClF;QAED,OAAO,qBAAqB,CAAC;IACjC,CAAC;CACJ;AAzBD,mCAyBC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { SequelizeModel } from "@golemio/core/dist/output-gateway";
|
|
2
|
+
import { IGetMeasurementsFilterParams, IParkingsMeasurement } from "./ParkingsMeasurementsModel";
|
|
3
|
+
export declare class ParkingsMeasurementsActualModel extends SequelizeModel {
|
|
4
|
+
constructor();
|
|
5
|
+
GetAll: (options?: IGetMeasurementsFilterParams) => Promise<IParkingsMeasurement[]>;
|
|
6
|
+
GetOne: () => Promise<void>;
|
|
7
|
+
}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.ParkingsMeasurementsActualModel = void 0;
|
|
16
|
+
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
17
|
+
const index_1 = require("../../schema-definitions/index");
|
|
18
|
+
const errors_1 = require("@golemio/errors");
|
|
19
|
+
const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
|
|
20
|
+
class ParkingsMeasurementsActualModel extends output_gateway_1.SequelizeModel {
|
|
21
|
+
constructor() {
|
|
22
|
+
super(index_1.Parkings.pg.measurementsActual.name, index_1.Parkings.pg.measurementsActual.pgTableName, index_1.Parkings.pg.measurementsActual.outputSequelizeAttributes);
|
|
23
|
+
this.GetAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
|
|
24
|
+
const { measureFrom, measureTo, limit, offset, source, sourceId } = options;
|
|
25
|
+
const order = [];
|
|
26
|
+
let where = {};
|
|
27
|
+
let attributes = { include: [], exclude: [] };
|
|
28
|
+
if (source) {
|
|
29
|
+
where.source = source;
|
|
30
|
+
}
|
|
31
|
+
if (sourceId) {
|
|
32
|
+
where.source_id = sourceId;
|
|
33
|
+
}
|
|
34
|
+
if (measureFrom) {
|
|
35
|
+
where.date_modified = measureTo
|
|
36
|
+
? { [sequelize_1.default.Op.between]: [measureFrom, measureTo] }
|
|
37
|
+
: { [sequelize_1.default.Op.gte]: measureFrom };
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
if (measureTo) {
|
|
41
|
+
where.date_modified = { [sequelize_1.default.Op.lte]: measureTo };
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
order.push(["date_modified", "desc"]);
|
|
45
|
+
try {
|
|
46
|
+
return yield this.sequelizeModel.findAll({
|
|
47
|
+
attributes,
|
|
48
|
+
limit,
|
|
49
|
+
offset,
|
|
50
|
+
order,
|
|
51
|
+
raw: true,
|
|
52
|
+
where,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
catch (err) {
|
|
56
|
+
throw new errors_1.CustomError("Database error", true, "ParkingMeasurementsModel", 500, err);
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
this.GetOne = () => __awaiter(this, void 0, void 0, function* () { });
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
exports.ParkingsMeasurementsActualModel = ParkingsMeasurementsActualModel;
|
|
63
|
+
//# sourceMappingURL=ParkingsMeasurementsActualModel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ParkingsMeasurementsActualModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsMeasurementsActualModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sEAAmE;AACnE,0DAAsC;AACtC,4CAA8C;AAC9C,oFAA4D;AAI5D,MAAa,+BAAgC,SAAQ,+BAAc;IAC/D;QACI,KAAK,CACD,gBAAQ,CAAC,EAAE,CAAC,kBAAkB,CAAC,IAAI,EACnC,gBAAQ,CAAC,EAAE,CAAC,kBAAkB,CAAC,WAAW,EAC1C,gBAAQ,CAAC,EAAE,CAAC,kBAAkB,CAAC,yBAAyB,CAC3D,CAAC;QAGC,WAAM,GAAG,CAAO,UAAwC,EAAE,EAAmC,EAAE;YAClG,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;YAC5E,MAAM,KAAK,GAAoB,EAAE,CAAC;YAClC,IAAI,KAAK,GAA2B,EAAE,CAAC;YACvC,IAAI,UAAU,GAAmC,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAE9E,IAAI,MAAM,EAAE;gBACR,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;aACzB;YAED,IAAI,QAAQ,EAAE;gBACV,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC;aAC9B;YAED,IAAI,WAAW,EAAE;gBACb,KAAK,CAAC,aAAa,GAAG,SAAS;oBAC3B,CAAC,CAAC,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE;oBACtD,CAAC,CAAC,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,CAAC;aAC7C;iBAAM;gBACH,IAAI,SAAS,EAAE;oBACX,KAAK,CAAC,aAAa,GAAG,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC;iBAC3D;aACJ;YAED,KAAK,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;YAEtC,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,UAAU;oBACV,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,GAAG,EAAE,IAAI;oBACT,KAAK;iBACR,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,oBAAW,CAAC,gBAAgB,EAAE,IAAI,EAAE,0BAA0B,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACvF;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,GAAwB,EAAE,gDAAE,CAAC,CAAA,CAAC;IA1C9C,CAAC;CA2CJ;AAlDD,0EAkDC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SequelizeModel } from "@golemio/core/dist/output-gateway";
|
|
2
|
-
export interface
|
|
2
|
+
export interface IGetMeasurementsFilterParams {
|
|
3
3
|
source?: string;
|
|
4
4
|
sourceId?: string;
|
|
5
5
|
measureTo?: number;
|
|
@@ -7,6 +7,12 @@ export interface IGetMeasurementsOptions {
|
|
|
7
7
|
limit?: number;
|
|
8
8
|
offset?: number;
|
|
9
9
|
}
|
|
10
|
+
export interface ICountMeasurementsFilterParams {
|
|
11
|
+
source?: string;
|
|
12
|
+
sourceId?: string;
|
|
13
|
+
measureTo?: number;
|
|
14
|
+
measureFrom?: number;
|
|
15
|
+
}
|
|
10
16
|
export interface IParkingsMeasurement {
|
|
11
17
|
source: string;
|
|
12
18
|
source_id: string;
|
|
@@ -18,6 +24,7 @@ export interface IParkingsMeasurement {
|
|
|
18
24
|
}
|
|
19
25
|
export declare class ParkingsMeasurementsModel extends SequelizeModel {
|
|
20
26
|
constructor();
|
|
21
|
-
GetAll: (options?:
|
|
27
|
+
GetAll: (options?: IGetMeasurementsFilterParams) => Promise<IParkingsMeasurement[]>;
|
|
28
|
+
CountAll: (options?: ICountMeasurementsFilterParams) => Promise<number>;
|
|
22
29
|
GetOne: () => Promise<void>;
|
|
23
30
|
}
|
|
@@ -31,14 +31,16 @@ class ParkingsMeasurementsModel extends output_gateway_1.SequelizeModel {
|
|
|
31
31
|
if (sourceId) {
|
|
32
32
|
where.source_id = sourceId;
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
:
|
|
34
|
+
if (measureFrom) {
|
|
35
|
+
where.date_modified = measureTo
|
|
36
|
+
? { [sequelize_1.default.Op.between]: [measureFrom, measureTo] }
|
|
37
|
+
: { [sequelize_1.default.Op.gte]: measureFrom };
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
if (measureTo) {
|
|
41
|
+
where.date_modified = { [sequelize_1.default.Op.lte]: measureTo };
|
|
42
|
+
}
|
|
43
|
+
}
|
|
42
44
|
order.push(["date_modified", "desc"]);
|
|
43
45
|
try {
|
|
44
46
|
return yield this.sequelizeModel.findAll({
|
|
@@ -54,6 +56,36 @@ class ParkingsMeasurementsModel extends output_gateway_1.SequelizeModel {
|
|
|
54
56
|
throw new errors_1.CustomError("Database error", true, "ParkingMeasurementsModel", 500, err);
|
|
55
57
|
}
|
|
56
58
|
});
|
|
59
|
+
this.CountAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
|
|
60
|
+
const { measureFrom, measureTo, source, sourceId } = options;
|
|
61
|
+
let where = {};
|
|
62
|
+
let attributes = { include: [], exclude: [] };
|
|
63
|
+
if (source) {
|
|
64
|
+
where.source = source;
|
|
65
|
+
}
|
|
66
|
+
if (sourceId) {
|
|
67
|
+
where.source_id = sourceId;
|
|
68
|
+
}
|
|
69
|
+
if (measureFrom) {
|
|
70
|
+
where.date_modified = measureTo
|
|
71
|
+
? { [sequelize_1.default.Op.between]: [measureFrom, measureTo] }
|
|
72
|
+
: { [sequelize_1.default.Op.gte]: measureFrom };
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
if (measureTo) {
|
|
76
|
+
where.date_modified = { [sequelize_1.default.Op.lte]: measureTo };
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
try {
|
|
80
|
+
return yield this.sequelizeModel.count({
|
|
81
|
+
attributes,
|
|
82
|
+
where,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
catch (err) {
|
|
86
|
+
throw new errors_1.CustomError("Database error", true, "ParkingMeasurementsModel", 500, err);
|
|
87
|
+
}
|
|
88
|
+
});
|
|
57
89
|
this.GetOne = () => __awaiter(this, void 0, void 0, function* () { });
|
|
58
90
|
}
|
|
59
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingsMeasurementsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsMeasurementsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sEAAmE;AACnE,0DAAsC;AACtC,4CAA8C;AAC9C,oFAA4D;
|
|
1
|
+
{"version":3,"file":"ParkingsMeasurementsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsMeasurementsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { SequelizeModel } from "@golemio/core/dist/output-gateway";
|
|
2
2
|
import { TGeoCoordinates } from "@golemio/core/dist/output-gateway/Geo";
|
|
3
|
+
import { IParkingsModels } from ".";
|
|
4
|
+
import { IPostalAddress } from "@golemio/core/dist/integration-engine/helpers/GeocodeApi";
|
|
5
|
+
import ICentroidPg from "./interfaces/ICentroidPg";
|
|
3
6
|
export interface IGetLocationsOptions {
|
|
4
7
|
lat?: number;
|
|
5
8
|
lng?: number;
|
|
@@ -18,18 +21,27 @@ export interface IParkingsLocation {
|
|
|
18
21
|
name: string;
|
|
19
22
|
category: string | null;
|
|
20
23
|
date_modified: string | null;
|
|
21
|
-
address:
|
|
24
|
+
address: IPostalAddress | null;
|
|
22
25
|
location: TGeoCoordinates;
|
|
23
26
|
area_served: string | null;
|
|
24
|
-
|
|
27
|
+
web_app_payment_url: string | null;
|
|
28
|
+
android_app_payment_url: string | null;
|
|
29
|
+
ios_app_payment_url: string | null;
|
|
25
30
|
total_spot_number: number;
|
|
26
31
|
tariff_id: string | null;
|
|
27
32
|
valid_from: string | null;
|
|
28
33
|
valid_to: string | null;
|
|
29
34
|
distance?: number;
|
|
35
|
+
parking_type: string | null;
|
|
36
|
+
zone_type: string | null;
|
|
37
|
+
centroid: ICentroidPg;
|
|
38
|
+
"measurementsActual.available_spots_last_updated": string;
|
|
39
|
+
"measurementsActual.available_spots_number": number;
|
|
30
40
|
}
|
|
31
41
|
export declare class ParkingsModel extends SequelizeModel {
|
|
42
|
+
static MODEL_RELATION_ACTUALMEASUREMENTS: string;
|
|
32
43
|
constructor();
|
|
44
|
+
Associate: (m: IParkingsModels) => void;
|
|
33
45
|
GetAll: (options?: IGetLocationsOptions) => Promise<IParkingsLocation[]>;
|
|
34
46
|
GetOne: (id: string) => Promise<IParkingsLocation>;
|
|
35
47
|
}
|
|
@@ -17,9 +17,17 @@ const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
|
17
17
|
const index_1 = require("../../schema-definitions/index");
|
|
18
18
|
const errors_1 = require("@golemio/errors");
|
|
19
19
|
const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
|
|
20
|
+
const database_1 = require("@golemio/core/dist/output-gateway/database");
|
|
20
21
|
class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
21
22
|
constructor() {
|
|
22
23
|
super(index_1.Parkings.name, index_1.Parkings.pg.pgTableName, index_1.Parkings.pg.outputSequelizeAttributes);
|
|
24
|
+
this.Associate = (m) => {
|
|
25
|
+
this.sequelizeModel.hasOne(m.ParkingsMeasurementsActualModel.sequelizeModel, {
|
|
26
|
+
as: ParkingsModel.MODEL_RELATION_ACTUALMEASUREMENTS,
|
|
27
|
+
foreignKey: "source_id",
|
|
28
|
+
sourceKey: "source_id",
|
|
29
|
+
});
|
|
30
|
+
};
|
|
23
31
|
this.GetAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
|
|
24
32
|
const { lat, lng, range, source, sourceId, category, limit, offset } = options;
|
|
25
33
|
const order = [];
|
|
@@ -27,7 +35,7 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
27
35
|
let attributes = { include: [], exclude: [] };
|
|
28
36
|
try {
|
|
29
37
|
if (lat && lng) {
|
|
30
|
-
const location = sequelize_1.default.fn("ST_SetSRID", sequelize_1.default.literal(`ST_GeomFromText('POINT(
|
|
38
|
+
const location = sequelize_1.default.fn("ST_SetSRID", sequelize_1.default.literal(`ST_GeomFromText('POINT(:lng :lat)')`), 4326);
|
|
31
39
|
const distance = sequelize_1.default.fn("ST_Distance", sequelize_1.default.literal("location"), location, true);
|
|
32
40
|
attributes.include.push([distance, "distance"]);
|
|
33
41
|
order.push([sequelize_1.default.literal("distance"), "asc"]);
|
|
@@ -48,6 +56,17 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
48
56
|
}
|
|
49
57
|
return yield this.sequelizeModel.findAll({
|
|
50
58
|
attributes,
|
|
59
|
+
include: [
|
|
60
|
+
{
|
|
61
|
+
as: ParkingsModel.MODEL_RELATION_ACTUALMEASUREMENTS,
|
|
62
|
+
model: database_1.sequelizeConnection.models[index_1.Parkings.pg.measurementsActual.pgTableName],
|
|
63
|
+
attributes: [
|
|
64
|
+
[sequelize_1.default.col("date_modified"), "available_spots_last_updated"],
|
|
65
|
+
[sequelize_1.default.col("available_spot_number"), "available_spots_number"],
|
|
66
|
+
],
|
|
67
|
+
},
|
|
68
|
+
],
|
|
69
|
+
replacements: { lng: lng, lat: lat },
|
|
51
70
|
limit,
|
|
52
71
|
offset,
|
|
53
72
|
order,
|
|
@@ -60,9 +79,23 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
60
79
|
}
|
|
61
80
|
});
|
|
62
81
|
this.GetOne = (id) => __awaiter(this, void 0, void 0, function* () {
|
|
63
|
-
return yield this.sequelizeModel.findOne({
|
|
82
|
+
return yield this.sequelizeModel.findOne({
|
|
83
|
+
include: [
|
|
84
|
+
{
|
|
85
|
+
as: ParkingsModel.MODEL_RELATION_ACTUALMEASUREMENTS,
|
|
86
|
+
model: database_1.sequelizeConnection.models[index_1.Parkings.pg.measurementsActual.pgTableName],
|
|
87
|
+
attributes: [
|
|
88
|
+
[sequelize_1.default.col("date_modified"), "available_spots_last_updated"],
|
|
89
|
+
[sequelize_1.default.col("available_spot_number"), "available_spots_number"],
|
|
90
|
+
],
|
|
91
|
+
},
|
|
92
|
+
],
|
|
93
|
+
where: { id },
|
|
94
|
+
raw: true,
|
|
95
|
+
});
|
|
64
96
|
});
|
|
65
97
|
}
|
|
66
98
|
}
|
|
67
99
|
exports.ParkingsModel = ParkingsModel;
|
|
100
|
+
ParkingsModel.MODEL_RELATION_ACTUALMEASUREMENTS = "measurementsActual";
|
|
68
101
|
//# sourceMappingURL=ParkingsModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sEAAmE;AACnE,0DAAsC;AACtC,4CAA8C;AAC9C,oFAA4D;
|
|
1
|
+
{"version":3,"file":"ParkingsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ export interface IParkingsTariffDescription {
|
|
|
24
24
|
accepts_payment_card: boolean | null;
|
|
25
25
|
accepts_cash: boolean | null;
|
|
26
26
|
accepts_mobile_payment: boolean | null;
|
|
27
|
+
accepts_litacka: boolean | null;
|
|
27
28
|
charge_currency: string;
|
|
28
29
|
allowed_vehicle_type: string | null;
|
|
29
30
|
allowed_fuel_type: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingsTariffsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsTariffsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAAmE;AACnE,0DAAsC;AACtC,4CAA8C;
|
|
1
|
+
{"version":3,"file":"ParkingsTariffsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsTariffsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAAmE;AACnE,0DAAsC;AACtC,4CAA8C;AAsC9C,MAAa,oBAAqB,SAAQ,+BAAc;IACpD;QACI,KAAK,CAAC,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QAG7G,WAAM,GAAG,CAAO,UAA8B,EAAE,EAA8B,EAAE;YACnF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAE3B,IAAI,KAAK,GAA2B,EAAE,CAAC;YACvC,IAAI,UAAU,GAAmC,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAE9E,IAAI,MAAM,EAAE;gBACR,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;aACzB;YAED,MAAM,KAAK,GAAoB,EAAE,CAAC;YAClC,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC,CAAC;YAEhE,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,UAAU;oBACV,KAAK;oBACL,GAAG,EAAE,IAAI;oBACT,KAAK;iBACR,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,oBAAW,CAAC,gBAAgB,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAClF;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAO,QAAgB,EAA8B,EAAE;YACnE,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5F,CAAC,CAAA,CAAC;IA7BF,CAAC;CA8BJ;AAjCD,oDAiCC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { ParkingsMeasurementsModel } from "./ParkingsMeasurementsModel";
|
|
2
|
+
import { ParkingsMeasurementsActualModel } from "./ParkingsMeasurementsActualModel";
|
|
2
3
|
import { ParkingsModel } from "./ParkingsModel";
|
|
3
4
|
import { ParkingsTariffsModel } from "./ParkingsTariffsModel";
|
|
4
5
|
export interface IParkingsModels {
|
|
5
6
|
ParkingsModel: ParkingsModel;
|
|
6
7
|
ParkingsMeasurementsModel: ParkingsMeasurementsModel;
|
|
8
|
+
ParkingsMeasurementsActualModel: ParkingsMeasurementsActualModel;
|
|
7
9
|
ParkingsTariffsModel: ParkingsTariffsModel;
|
|
8
10
|
}
|
|
9
11
|
declare const models: IParkingsModels;
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.models = void 0;
|
|
4
4
|
const ParkingsMeasurementsModel_1 = require("./ParkingsMeasurementsModel");
|
|
5
|
+
const ParkingsMeasurementsActualModel_1 = require("./ParkingsMeasurementsActualModel");
|
|
5
6
|
const ParkingsModel_1 = require("./ParkingsModel");
|
|
6
7
|
const ParkingsTariffsModel_1 = require("./ParkingsTariffsModel");
|
|
7
8
|
const models = {
|
|
8
9
|
ParkingsModel: new ParkingsModel_1.ParkingsModel(),
|
|
9
10
|
ParkingsMeasurementsModel: new ParkingsMeasurementsModel_1.ParkingsMeasurementsModel(),
|
|
11
|
+
ParkingsMeasurementsActualModel: new ParkingsMeasurementsActualModel_1.ParkingsMeasurementsActualModel(),
|
|
10
12
|
ParkingsTariffsModel: new ParkingsTariffsModel_1.ParkingsTariffsModel(),
|
|
11
13
|
};
|
|
12
14
|
exports.models = models;
|