@golemio/parkings 1.9.1 → 1.9.2-dev.1316199842
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/helpers/data-access/CachedParkingSourcesRepository.d.ts +29 -9
- package/dist/helpers/data-access/CachedParkingSourcesRepository.js +51 -24
- package/dist/helpers/data-access/CachedParkingSourcesRepository.js.map +1 -1
- package/dist/integration-engine/workers/tasks/GenerateIptOictEntrancesJobsTask.js +3 -1
- package/dist/integration-engine/workers/tasks/GenerateIptOictEntrancesJobsTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/GenerateIptOictParkingJobsTask.js +3 -1
- package/dist/integration-engine/workers/tasks/GenerateIptOictParkingJobsTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/GenerateIptOictPaymentJobsTask.js +3 -1
- package/dist/integration-engine/workers/tasks/GenerateIptOictPaymentJobsTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictEntrancesDataTask.js +3 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictEntrancesDataTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictParkingDataTask.js +3 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictParkingDataTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictPaymentsDataTask.js +3 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictPaymentsDataTask.js.map +1 -1
- package/dist/output-gateway/controllers/v3/AbstractV3ParkingController.d.ts +11 -0
- package/dist/output-gateway/controllers/v3/AbstractV3ParkingController.js +38 -0
- package/dist/output-gateway/controllers/v3/AbstractV3ParkingController.js.map +1 -0
- package/dist/output-gateway/controllers/v3/V3ParkingController.d.ts +2 -2
- package/dist/output-gateway/controllers/v3/V3ParkingController.js +39 -35
- package/dist/output-gateway/controllers/v3/V3ParkingController.js.map +1 -1
- package/dist/output-gateway/controllers/v3/V3ParkingMachinesController.d.ts +3 -2
- package/dist/output-gateway/controllers/v3/V3ParkingMachinesController.js +30 -28
- package/dist/output-gateway/controllers/v3/V3ParkingMachinesController.js.map +1 -1
- package/dist/output-gateway/controllers/v3/V3ParkingMeasurementsController.d.ts +2 -2
- package/dist/output-gateway/controllers/v3/V3ParkingMeasurementsController.js +5 -7
- package/dist/output-gateway/controllers/v3/V3ParkingMeasurementsController.js.map +1 -1
- package/dist/output-gateway/controllers/v3/V3ParkingTariffsController.d.ts +2 -1
- package/dist/output-gateway/controllers/v3/V3ParkingTariffsController.js +21 -19
- package/dist/output-gateway/controllers/v3/V3ParkingTariffsController.js.map +1 -1
- package/dist/output-gateway/data-access/ParkingLatestMeasurementRepository.js +3 -0
- package/dist/output-gateway/data-access/ParkingLatestMeasurementRepository.js.map +1 -1
- package/dist/output-gateway/data-access/ParkingMachinesRepository.js +1 -1
- package/dist/output-gateway/data-access/ParkingMachinesRepository.js.map +1 -1
- package/dist/output-gateway/data-access/ParkingRepository.d.ts +3 -5
- package/dist/output-gateway/data-access/ParkingRepository.js +13 -12
- package/dist/output-gateway/data-access/ParkingRepository.js.map +1 -1
- package/dist/output-gateway/data-access/ParkingsFilteredRepository.js +1 -1
- package/dist/output-gateway/data-access/ParkingsFilteredRepository.js.map +1 -1
- package/dist/output-gateway/data-access/TariffRepository.d.ts +2 -4
- package/dist/output-gateway/data-access/TariffRepository.js +10 -12
- package/dist/output-gateway/data-access/TariffRepository.js.map +1 -1
- package/dist/output-gateway/helpers/OpenDataHelper.d.ts +6 -0
- package/dist/output-gateway/helpers/OpenDataHelper.js +25 -0
- package/dist/output-gateway/helpers/OpenDataHelper.js.map +1 -0
- package/dist/output-gateway/helpers/params/IParkingParams.d.ts +1 -0
- package/dist/output-gateway/models/ParkingsModel.js +7 -4
- package/dist/output-gateway/models/ParkingsModel.js.map +1 -1
- package/dist/output-gateway/models/ParkingsTariffsModel.js +2 -2
- package/dist/output-gateway/models/ParkingsTariffsModel.js.map +1 -1
- package/dist/output-gateway/routers/v2/V2ParkingRouter.js +3 -1
- package/dist/output-gateway/routers/v2/V2ParkingRouter.js.map +1 -1
- package/dist/output-gateway/routers/v3/V3ParkingRouter.js +3 -2
- package/dist/output-gateway/routers/v3/V3ParkingRouter.js.map +1 -1
- package/dist/output-gateway/routers/v3/helpers/PrimarySourceValidator.js +2 -2
- package/dist/output-gateway/routers/v3/helpers/PrimarySourceValidator.js.map +1 -1
- package/docs/openapi-output.yaml +49 -1
- package/package.json +2 -2
|
@@ -14,11 +14,13 @@ const Di_1 = require("../../ioc/Di");
|
|
|
14
14
|
const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
|
|
15
15
|
const ParkingMachinesDtoTransformation_1 = require("../../transformations/v3/ParkingMachinesDtoTransformation");
|
|
16
16
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
17
|
-
|
|
17
|
+
const AbstractV3ParkingController_1 = require("./AbstractV3ParkingController");
|
|
18
|
+
class V3ParkingMachinesController extends AbstractV3ParkingController_1.AbstractV3ParkingController {
|
|
18
19
|
constructor() {
|
|
20
|
+
super();
|
|
19
21
|
this.getAll = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
20
22
|
try {
|
|
21
|
-
const params = this.
|
|
23
|
+
const params = yield this.parseParams(req);
|
|
22
24
|
const result = yield this.repository.GetAll(params);
|
|
23
25
|
const transformedResult = this.transformation.transformToFeatureCollection(result);
|
|
24
26
|
res.json(transformedResult);
|
|
@@ -29,9 +31,10 @@ class V3ParkingMachinesController {
|
|
|
29
31
|
});
|
|
30
32
|
this.getOne = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
31
33
|
try {
|
|
34
|
+
const { allowedSources } = yield this.getAllowedScope(req);
|
|
32
35
|
const id = req.params.id;
|
|
33
36
|
const result = yield this.repository.GetOne(id);
|
|
34
|
-
if (result === null) {
|
|
37
|
+
if (result === null || !allowedSources.includes(result.source)) {
|
|
35
38
|
throw new golemio_errors_1.GeneralError("not_found", "V3ParkingMachinesController", undefined, 404);
|
|
36
39
|
}
|
|
37
40
|
else {
|
|
@@ -46,31 +49,30 @@ class V3ParkingMachinesController {
|
|
|
46
49
|
this.repository = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingMachinesRepository);
|
|
47
50
|
this.transformation = new ParkingMachinesDtoTransformation_1.ParkingMachinesDtoTransformation();
|
|
48
51
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
:
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
:
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
52
|
+
parseParams(req) {
|
|
53
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
try {
|
|
55
|
+
const { isRestrictedToOpenData, allowedSources } = yield this.getAllowedScope(req);
|
|
56
|
+
return {
|
|
57
|
+
primarySource: allowedSources,
|
|
58
|
+
validFrom: req.query.validFrom ? req.query.validFrom : undefined,
|
|
59
|
+
type: req.query.type
|
|
60
|
+
? req.query.type instanceof Array
|
|
61
|
+
? req.query.type
|
|
62
|
+
: [req.query.type]
|
|
63
|
+
: undefined,
|
|
64
|
+
boundingBox: req.query.boundingBox
|
|
65
|
+
? req.query.boundingBox.split(",").map((x) => parseFloat(x))
|
|
66
|
+
: undefined,
|
|
67
|
+
codeMask: req.query.codeMask ? req.query.codeMask : undefined,
|
|
68
|
+
limit: req.query.limit ? parseInt(req.query.limit) : 1000,
|
|
69
|
+
offset: req.query.offset ? parseInt(req.query.offset) : undefined,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
catch (err) {
|
|
73
|
+
throw new golemio_errors_1.GeneralError("Param parsing error", "V3ParkingMachinesController", err, 500);
|
|
74
|
+
}
|
|
75
|
+
});
|
|
74
76
|
}
|
|
75
77
|
}
|
|
76
78
|
exports.V3ParkingMachinesController = V3ParkingMachinesController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V3ParkingMachinesController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v3/V3ParkingMachinesController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,qCAA+C;AAC/C,yEAAoE;AACpE,gHAA2G;AAE3G,6EAAwE;
|
|
1
|
+
{"version":3,"file":"V3ParkingMachinesController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v3/V3ParkingMachinesController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="express" />
|
|
2
2
|
import { NextFunction, Request, Response } from "@golemio/core/dist/shared/express";
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import { AbstractV3ParkingController } from "./AbstractV3ParkingController";
|
|
4
|
+
export declare class V3ParkingMeasurementsController extends AbstractV3ParkingController {
|
|
5
5
|
private latestMeasurementRepository;
|
|
6
6
|
private transformation;
|
|
7
7
|
constructor();
|
|
@@ -14,8 +14,10 @@ const Di_1 = require("../../ioc/Di");
|
|
|
14
14
|
const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
|
|
15
15
|
const ParkingMeasurementDtoTransformation_1 = require("../../transformations/v3/ParkingMeasurementDtoTransformation");
|
|
16
16
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
17
|
-
|
|
17
|
+
const AbstractV3ParkingController_1 = require("./AbstractV3ParkingController");
|
|
18
|
+
class V3ParkingMeasurementsController extends AbstractV3ParkingController_1.AbstractV3ParkingController {
|
|
18
19
|
constructor() {
|
|
20
|
+
super();
|
|
19
21
|
this.getAllLatest = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
20
22
|
try {
|
|
21
23
|
const params = yield this.getAllLatestParams(req);
|
|
@@ -26,19 +28,15 @@ class V3ParkingMeasurementsController {
|
|
|
26
28
|
next(err);
|
|
27
29
|
}
|
|
28
30
|
});
|
|
29
|
-
this.cachedParkingSourcesRepository = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.CachedParkingSourcesRepository);
|
|
30
31
|
this.latestMeasurementRepository = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingLatestMeasurementRepository);
|
|
31
32
|
this.transformation = new ParkingMeasurementDtoTransformation_1.ParkingMeasurementDtoTransformation();
|
|
32
33
|
}
|
|
33
34
|
getAllLatestParams(req) {
|
|
34
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
36
|
+
const { allowedSources } = yield this.getAllowedScope(req);
|
|
35
37
|
try {
|
|
36
38
|
return {
|
|
37
|
-
primarySource:
|
|
38
|
-
? req.query.primarySource instanceof Array
|
|
39
|
-
? req.query.primarySource
|
|
40
|
-
: [req.query.primarySource]
|
|
41
|
-
: yield this.cachedParkingSourcesRepository.getV3Sources(),
|
|
39
|
+
primarySource: allowedSources,
|
|
42
40
|
parkingId: req.query.parkingId
|
|
43
41
|
? req.query.parkingId instanceof Array
|
|
44
42
|
? req.query.parkingId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V3ParkingMeasurementsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v3/V3ParkingMeasurementsController.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"V3ParkingMeasurementsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v3/V3ParkingMeasurementsController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,qCAA+C;AAC/C,yEAAoE;AACpE,sHAAiH;AAEjH,6EAAwE;AACxE,+EAA4E;AAE5E,MAAa,+BAAgC,SAAQ,yDAA2B;IAI5E;QACI,KAAK,EAAE,CAAC;QAQL,iBAAY,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAC5E,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;gBAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAErE,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;aAC/D;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QAfE,IAAI,CAAC,2BAA2B,GAAG,sBAAiB,CAAC,OAAO,CACxD,2CAAoB,CAAC,kCAAkC,CAC1D,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,yEAAmC,EAAE,CAAC;IACpE,CAAC;IAaa,kBAAkB,CAAC,GAAY;;YACzC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAE3D,IAAI;gBACA,OAAO;oBACH,aAAa,EAAE,cAAc;oBAC7B,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS;wBAC1B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,YAAY,KAAK;4BAClC,CAAC,CAAE,GAAG,CAAC,KAAK,CAAC,SAAsB;4BACnC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,SAAmB,CAAC;wBACrC,CAAC,CAAC,SAAS;oBACf,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;oBAC5D,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC1D,CAAC;aACL;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,qBAAqB,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAClF;QACL,CAAC;KAAA;CACJ;AA1CD,0EA0CC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { NextFunction, Request, Response } from "@golemio/core/dist/shared/express";
|
|
2
|
-
|
|
2
|
+
import { AbstractV3ParkingController } from "./AbstractV3ParkingController";
|
|
3
|
+
export declare class V3ParkingTariffsController extends AbstractV3ParkingController {
|
|
3
4
|
private repository;
|
|
4
5
|
private transformation;
|
|
5
6
|
constructor();
|
|
@@ -14,11 +14,13 @@ const Di_1 = require("../../ioc/Di");
|
|
|
14
14
|
const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
|
|
15
15
|
const ParkingTariffDtoTransformation_1 = require("../../transformations/v3/ParkingTariffDtoTransformation");
|
|
16
16
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
17
|
-
|
|
17
|
+
const AbstractV3ParkingController_1 = require("./AbstractV3ParkingController");
|
|
18
|
+
class V3ParkingTariffsController extends AbstractV3ParkingController_1.AbstractV3ParkingController {
|
|
18
19
|
constructor() {
|
|
20
|
+
super();
|
|
19
21
|
this.getAll = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
20
22
|
try {
|
|
21
|
-
const params = this.parseParams(req);
|
|
23
|
+
const params = yield this.parseParams(req);
|
|
22
24
|
const result = yield this.repository.GetAll(params);
|
|
23
25
|
const transformedResult = this.transformation.transformElement(result);
|
|
24
26
|
res.json(transformedResult);
|
|
@@ -29,8 +31,9 @@ class V3ParkingTariffsController {
|
|
|
29
31
|
});
|
|
30
32
|
this.getOne = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
31
33
|
try {
|
|
34
|
+
const { allowedSources } = yield this.getAllowedScope(req);
|
|
32
35
|
const id = req.params.id;
|
|
33
|
-
const result = yield this.repository.GetOne(id);
|
|
36
|
+
const result = yield this.repository.GetOne(id, allowedSources);
|
|
34
37
|
if (result === null) {
|
|
35
38
|
throw new golemio_errors_1.GeneralError("not_found", "V3ParkingTariffsController", undefined, 404);
|
|
36
39
|
}
|
|
@@ -52,22 +55,21 @@ class V3ParkingTariffsController {
|
|
|
52
55
|
this.transformation = new ParkingTariffDtoTransformation_1.ParkingTariffDtoTransformation();
|
|
53
56
|
}
|
|
54
57
|
parseParams(req) {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
: undefined,
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
58
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
59
|
+
try {
|
|
60
|
+
const { allowedSources } = yield this.getAllowedScope(req);
|
|
61
|
+
return {
|
|
62
|
+
primarySource: allowedSources,
|
|
63
|
+
validFrom: req.query.validFrom ? req.query.validFrom : undefined,
|
|
64
|
+
validTo: req.query.validTo ? req.query.validTo : undefined,
|
|
65
|
+
limit: req.query.limit ? parseInt(req.query.limit) : 1000,
|
|
66
|
+
offset: req.query.offset ? parseInt(req.query.offset) : undefined,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
throw new golemio_errors_1.GeneralError("Param parsing error", "V3ParkingTariffsController", err, 500);
|
|
71
|
+
}
|
|
72
|
+
});
|
|
71
73
|
}
|
|
72
74
|
}
|
|
73
75
|
exports.V3ParkingTariffsController = V3ParkingTariffsController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V3ParkingTariffsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v3/V3ParkingTariffsController.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"V3ParkingTariffsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v3/V3ParkingTariffsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,9 @@ let ParkingLatestMeasurementRepository = exports.ParkingLatestMeasurementReposit
|
|
|
36
36
|
GetAll(params) {
|
|
37
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
38
|
try {
|
|
39
|
+
if (!params.primarySource) {
|
|
40
|
+
throw new golemio_errors_1.GeneralError("List of sources must be provided! ", this.name, undefined, 500);
|
|
41
|
+
}
|
|
39
42
|
let where = {
|
|
40
43
|
source: { [sequelize_1.default.Op.in]: params.primarySource },
|
|
41
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingLatestMeasurementRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingLatestMeasurementRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,mDAAgC;AAChC,4FAAyF;
|
|
1
|
+
{"version":3,"file":"ParkingLatestMeasurementRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingLatestMeasurementRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,mDAAgC;AAChC,4FAAyF;AAEzF,6EAAwE;AACxE,oFAA4D;AAC5D,iEAAgE;AAGzD,IAAM,kCAAkC,gDAAxC,MAAM,kCAAmC,SAAQ,+BAAc;IAClE;QACI,KAAK,CACD,oCAAoC,EACpC,eAAQ,CAAC,kBAAkB,CAAC,WAAW,EACvC,eAAQ,CAAC,kBAAkB,CAAC,yBAAyB,EACrD;YACI,MAAM,EAAE,eAAQ,CAAC,QAAQ;SAC5B,CACJ,CAAC;IACN,CAAC;IAEY,MAAM,CAAC,MAAkC;;YAClD,IAAI;gBACA,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;oBACvB,MAAM,IAAI,6BAAY,CAAC,oCAAoC,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;iBAC3F;gBAED,IAAI,KAAK,GAAuD;oBAC5D,MAAM,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,aAAa,EAAE;iBACtD,CAAC;gBAEF,IAAI,MAAM,CAAC,SAAS,EAAE;oBAClB,KAAK,CAAC,UAAU,GAAG,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;iBAC9D;gBAED,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,UAAU,EAAE;wBACR,OAAO,EAAE,CAAC,YAAY,CAAC;qBAC1B;oBACD,KAAK;oBACL,KAAK,EAAE;wBACH,CAAC,QAAQ,EAAE,KAAK,CAAC;wBACjB,CAAC,WAAW,EAAE,KAAK,CAAC;wBACpB,CAAC,eAAe,EAAE,MAAM,CAAC;qBAC5B;oBACD,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;iBACxB,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,wBAAwB,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACzE;QACL,CAAC;KAAA;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ,CAAA;6CA/CY,kCAAkC;IAD9C,IAAA,qBAAU,GAAE;;GACA,kCAAkC,CA+C9C"}
|
|
@@ -46,7 +46,7 @@ let ParkingMachinesRepository = exports.ParkingMachinesRepository = class Parkin
|
|
|
46
46
|
where.source = { [sequelize_1.Op.in]: params.primarySource };
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
|
-
|
|
49
|
+
throw new golemio_errors_1.GeneralError("List of sources must be provided! ", this.name, undefined, 500);
|
|
50
50
|
}
|
|
51
51
|
if (params.validFrom) {
|
|
52
52
|
where.validFrom = { [sequelize_1.Op.gte]: params.validFrom };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingMachinesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,6GAAqG;AAErG,sEAAoE;AACpE,mDAAgC;AAChC,+FAAwE;AAExE,4FAAyF;AACzF,6EAAwE;AACxE,mEAA6E;AAC7E,iEAAwE;AAGjE,IAAM,yBAAyB,uCAA/B,MAAM,yBAA0B,SAAQ,+BAAc;IACzD,YAEY,8BAA8D;QAEtE,KAAK,CAAC,6BAA6B,EAAE,2CAAoB,CAAC,SAAS,EAAE,2CAAoB,CAAC,cAAc,EAAE;YACtG,MAAM,EAAE,eAAQ,CAAC,QAAQ;YACzB,WAAW,EAAE,IAAI;SACpB,CAAC,CAAC;QALK,mCAA8B,GAA9B,8BAA8B,CAAgC;IAM1E,CAAC;IAEY,MAAM,CAAC,MAA8B;;YAC9C,IAAI;gBACA,IAAI,KAAK,GAA4C,EAAE,CAAC;gBAExD,IAAI,MAAM,CAAC,aAAa,EAAE;oBACtB,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;iBACpD;qBAAM;oBACH,
|
|
1
|
+
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingMachinesRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { CachedParkingSourcesRepository } from "../../helpers/data-access/CachedParkingSourcesRepository";
|
|
2
1
|
import { ParkingAverageOccupancyRepository } from "./ParkingAverageOccupancyRepository";
|
|
3
2
|
import { ParkingEntrancesRepository } from "./ParkingEntrancesRepository";
|
|
4
3
|
import { ParkingPaymentsRepository } from "./ParkingPaymentsRepository";
|
|
@@ -11,17 +10,16 @@ import { ParkingOpeningHoursRepository } from "./ParkingOpeningHoursRepository";
|
|
|
11
10
|
import { IRepositorySetup } from "./interfaces/IRepositorySetup";
|
|
12
11
|
export declare class ParkingRepository extends SequelizeModel {
|
|
13
12
|
protected locationModel: ParkingsLocationModel;
|
|
14
|
-
|
|
15
|
-
protected cachedParkingSourcesRepository: CachedParkingSourcesRepository;
|
|
13
|
+
private averageOccupancyRepository;
|
|
16
14
|
protected parkingOpeningHoursRepository: ParkingOpeningHoursRepository;
|
|
17
15
|
protected entrancesRepository: ParkingEntrancesRepository;
|
|
18
16
|
protected paymentsRepository: ParkingPaymentsRepository;
|
|
19
17
|
protected parkingProhibitionsRepository: ParkingProhibitionsRepository;
|
|
20
18
|
static readonly defaultSetup: IRepositorySetup;
|
|
21
19
|
protected readonly shouldHideSecondarySourcesFromPrimaryData: boolean;
|
|
22
|
-
constructor(setup: IRepositorySetup, locationModel: ParkingsLocationModel, averageOccupancyRepository: ParkingAverageOccupancyRepository,
|
|
20
|
+
constructor(setup: IRepositorySetup, locationModel: ParkingsLocationModel, averageOccupancyRepository: ParkingAverageOccupancyRepository, parkingOpeningHoursRepository: ParkingOpeningHoursRepository, entrancesRepository: ParkingEntrancesRepository, paymentsRepository: ParkingPaymentsRepository, parkingProhibitionsRepository: ParkingProhibitionsRepository);
|
|
23
21
|
associate(): void;
|
|
24
22
|
GetAll(params: IParkingParams): Promise<IParkingWithLocationAndOccupancyInfo[]>;
|
|
25
|
-
GetOne(id: string): Promise<IParkingWithLocationAndOccupancyInfo | null>;
|
|
23
|
+
GetOne(id: string, sources?: string[]): Promise<IParkingWithLocationAndOccupancyInfo | null>;
|
|
26
24
|
private prepareWhereConditions;
|
|
27
25
|
}
|
|
@@ -23,7 +23,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
23
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
24
|
exports.ParkingRepository = void 0;
|
|
25
25
|
const SourceEnum_1 = require("../../helpers/constants/SourceEnum");
|
|
26
|
-
const CachedParkingSourcesRepository_1 = require("../../helpers/data-access/CachedParkingSourcesRepository");
|
|
27
26
|
const ParkingAverageOccupancyRepository_1 = require("./ParkingAverageOccupancyRepository");
|
|
28
27
|
const ParkingEntrancesRepository_1 = require("./ParkingEntrancesRepository");
|
|
29
28
|
const ParkingPaymentsRepository_1 = require("./ParkingPaymentsRepository");
|
|
@@ -37,11 +36,10 @@ const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
|
37
36
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
38
37
|
const ParkingOpeningHoursRepository_1 = require("./ParkingOpeningHoursRepository");
|
|
39
38
|
let ParkingRepository = exports.ParkingRepository = class ParkingRepository extends output_gateway_1.SequelizeModel {
|
|
40
|
-
constructor(setup, locationModel, averageOccupancyRepository,
|
|
39
|
+
constructor(setup, locationModel, averageOccupancyRepository, parkingOpeningHoursRepository, entrancesRepository, paymentsRepository, parkingProhibitionsRepository) {
|
|
41
40
|
super(setup.name, setup.tableName, setup.attributes, setup.options);
|
|
42
41
|
this.locationModel = locationModel;
|
|
43
42
|
this.averageOccupancyRepository = averageOccupancyRepository;
|
|
44
|
-
this.cachedParkingSourcesRepository = cachedParkingSourcesRepository;
|
|
45
43
|
this.parkingOpeningHoursRepository = parkingOpeningHoursRepository;
|
|
46
44
|
this.entrancesRepository = entrancesRepository;
|
|
47
45
|
this.paymentsRepository = paymentsRepository;
|
|
@@ -182,9 +180,12 @@ let ParkingRepository = exports.ParkingRepository = class ParkingRepository exte
|
|
|
182
180
|
}
|
|
183
181
|
});
|
|
184
182
|
}
|
|
185
|
-
GetOne(id) {
|
|
183
|
+
GetOne(id, sources) {
|
|
186
184
|
return __awaiter(this, void 0, void 0, function* () {
|
|
187
185
|
try {
|
|
186
|
+
if (!sources) {
|
|
187
|
+
throw new golemio_errors_1.GeneralError("List of sources must be provided!", this.name, undefined, 500);
|
|
188
|
+
}
|
|
188
189
|
const result = yield this.sequelizeModel.findOne({
|
|
189
190
|
attributes: { include: ["updated_at"] },
|
|
190
191
|
include: [
|
|
@@ -255,7 +256,9 @@ let ParkingRepository = exports.ParkingRepository = class ParkingRepository exte
|
|
|
255
256
|
],
|
|
256
257
|
where: {
|
|
257
258
|
id,
|
|
258
|
-
source: {
|
|
259
|
+
source: {
|
|
260
|
+
[sequelize_1.Op.in]: sources,
|
|
261
|
+
},
|
|
259
262
|
},
|
|
260
263
|
order: [[{ model: this.locationModel.sequelizeModel, as: "parking_locations" }, "id", "ASC"]],
|
|
261
264
|
});
|
|
@@ -281,7 +284,7 @@ let ParkingRepository = exports.ParkingRepository = class ParkingRepository exte
|
|
|
281
284
|
primarySources = params.primarySource;
|
|
282
285
|
}
|
|
283
286
|
else {
|
|
284
|
-
|
|
287
|
+
throw new golemio_errors_1.GeneralError("List of sources must be provided! ", this.name, undefined, 500);
|
|
285
288
|
}
|
|
286
289
|
// DO NOT SHOW OSM PARKINGS IF THERE ARE OTHER SOURCES
|
|
287
290
|
if (this.shouldHideSecondarySourcesFromPrimaryData && primarySources.length > 1) {
|
|
@@ -330,14 +333,12 @@ exports.ParkingRepository = ParkingRepository = __decorate([
|
|
|
330
333
|
__param(0, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingRepositorySetup)),
|
|
331
334
|
__param(1, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingsLocationModel)),
|
|
332
335
|
__param(2, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingAverageOccupancyRepository)),
|
|
333
|
-
__param(3, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.
|
|
334
|
-
__param(4, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.
|
|
335
|
-
__param(5, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.
|
|
336
|
-
__param(6, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.
|
|
337
|
-
__param(7, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingProhibitionsRepository)),
|
|
336
|
+
__param(3, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingOpeningHoursRepository)),
|
|
337
|
+
__param(4, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingEntrancesRepository)),
|
|
338
|
+
__param(5, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingPaymentsRepository)),
|
|
339
|
+
__param(6, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingProhibitionsRepository)),
|
|
338
340
|
__metadata("design:paramtypes", [Object, ParkingsLocationModel_1.ParkingsLocationModel,
|
|
339
341
|
ParkingAverageOccupancyRepository_1.ParkingAverageOccupancyRepository,
|
|
340
|
-
CachedParkingSourcesRepository_1.CachedParkingSourcesRepository,
|
|
341
342
|
ParkingOpeningHoursRepository_1.ParkingOpeningHoursRepository,
|
|
342
343
|
ParkingEntrancesRepository_1.ParkingEntrancesRepository,
|
|
343
344
|
ParkingPaymentsRepository_1.ParkingPaymentsRepository,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAA2D;
|
|
1
|
+
{"version":3,"file":"ParkingRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ let ParkingsFilteredRepository = exports.ParkingsFilteredRepository = class Park
|
|
|
33
33
|
options: {
|
|
34
34
|
schema: _sch_1.Parkings.pgSchema,
|
|
35
35
|
},
|
|
36
|
-
}, locationModel, averageOccupancyRepository,
|
|
36
|
+
}, locationModel, averageOccupancyRepository, parkingOpeningHoursRepository, entrancesRepository, paymentsRepository, parkingProhibitionsRepository);
|
|
37
37
|
this.shouldHideSecondarySourcesFromPrimaryData = false;
|
|
38
38
|
}
|
|
39
39
|
GetOne() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingsFilteredRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingsFilteredRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6GAAqG;AACrG,2FAAsG;AACtG,6EAAwF;AACxF,2EAAsF;AACtF,mFAA8F;AAC9F,sEAAoE;AACpE,2EAAyE;AACzE,mDAAgC;AAChC,iEAAwE;AACxE,mFAAgF;AAChF,2DAAwD;AAGjD,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,qCAAiB;IAG7D,YACwD,aAAoC,EAExF,0BAA6D,EAE7D,8BAA8D,EAE9D,6BAA4D,EAE5D,mBAA+C,EAE/C,kBAA6C,EAE7C,6BAA4D;QAE5D,KAAK,CACD;YACI,IAAI,EAAE,4BAA4B;YAClC,SAAS,EAAE,eAAQ,CAAC,gBAAgB,CAAC,WAAW;YAChD,UAAU,EAAE,eAAQ,CAAC,gBAAgB,CAAC,yBAAyB;YAC/D,OAAO,EAAE;gBACL,MAAM,EAAE,eAAQ,CAAC,QAAQ;aAC5B;SACJ,EACD,aAAa,EACb,0BAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"ParkingsFilteredRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingsFilteredRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6GAAqG;AACrG,2FAAsG;AACtG,6EAAwF;AACxF,2EAAsF;AACtF,mFAA8F;AAC9F,sEAAoE;AACpE,2EAAyE;AACzE,mDAAgC;AAChC,iEAAwE;AACxE,mFAAgF;AAChF,2DAAwD;AAGjD,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,qCAAiB;IAG7D,YACwD,aAAoC,EAExF,0BAA6D,EAE7D,8BAA8D,EAE9D,6BAA4D,EAE5D,mBAA+C,EAE/C,kBAA6C,EAE7C,6BAA4D;QAE5D,KAAK,CACD;YACI,IAAI,EAAE,4BAA4B;YAClC,SAAS,EAAE,eAAQ,CAAC,gBAAgB,CAAC,WAAW;YAChD,UAAU,EAAE,eAAQ,CAAC,gBAAgB,CAAC,yBAAyB;YAC/D,OAAO,EAAE;gBACL,MAAM,EAAE,eAAQ,CAAC,QAAQ;aAC5B;SACJ,EACD,aAAa,EACb,0BAA0B,EAC1B,6BAA6B,EAC7B,mBAAmB,EACnB,kBAAkB,EAClB,6BAA6B,CAChC,CAAC;QAhCsB,8CAAyC,GAAY,KAAK,CAAC;IAiCvF,CAAC;IAEe,MAAM;QAClB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ,CAAA;qCAvCY,0BAA0B;IADtC,IAAA,qBAAU,GAAE;IAKJ,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qBAAqB,CAAC,CAAA;IAClD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,iCAAiC,CAAC,CAAA;IAE9D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,8BAA8B,CAAC,CAAA;IAE3D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;IAE1D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,0BAA0B,CAAC,CAAA;IAEvD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,yBAAyB,CAAC,CAAA;IAEtD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;qCAXQ,6CAAqB;QAE5D,qEAAiC;QAE7B,+DAA8B;QAE/B,6DAA6B;QAEvC,uDAA0B;QAE3B,qDAAyB;QAEd,6DAA6B;GAhBvD,0BAA0B,CAuCtC"}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
|
-
import { CachedParkingSourcesRepository } from "../../helpers/data-access/CachedParkingSourcesRepository";
|
|
2
1
|
import { IParkingTariffsParams } from "../helpers/params/IParkingTariffsParams";
|
|
3
2
|
import { IParkingTariffDto } from "../../schema-definitions/models/interfaces/IParkingTariffDto";
|
|
4
3
|
import { SequelizeModel } from "@golemio/core/dist/output-gateway/models/SequelizeModel";
|
|
5
4
|
export declare class TariffRepository extends SequelizeModel {
|
|
6
|
-
|
|
7
|
-
constructor(cachedParkingSourcesRepository: CachedParkingSourcesRepository);
|
|
5
|
+
constructor();
|
|
8
6
|
private associate;
|
|
9
7
|
GetAll(params: IParkingTariffsParams): Promise<Array<{
|
|
10
8
|
tariff_id: string;
|
|
11
9
|
parking_tariffs: IParkingTariffDto[];
|
|
12
10
|
}>>;
|
|
13
|
-
GetOne(id: string): Promise<IParkingTariffDto[] | null>;
|
|
11
|
+
GetOne(id: string, sources?: string[]): Promise<IParkingTariffDto[] | null>;
|
|
14
12
|
}
|
|
@@ -31,9 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
31
31
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
32
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
33
|
};
|
|
34
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
35
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
36
|
-
};
|
|
37
34
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
38
35
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
39
36
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -45,19 +42,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
45
42
|
};
|
|
46
43
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
47
44
|
exports.TariffRepository = void 0;
|
|
48
|
-
const CachedParkingSourcesRepository_1 = require("../../helpers/data-access/CachedParkingSourcesRepository");
|
|
49
|
-
const ModuleContainerToken_1 = require("../ioc/ModuleContainerToken");
|
|
50
45
|
const _sch_1 = require("../../schema-definitions");
|
|
51
46
|
const SequelizeModel_1 = require("@golemio/core/dist/output-gateway/models/SequelizeModel");
|
|
52
47
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
53
48
|
const sequelize_1 = __importStar(require("@golemio/core/dist/shared/sequelize"));
|
|
54
49
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
55
50
|
let TariffRepository = exports.TariffRepository = class TariffRepository extends SequelizeModel_1.SequelizeModel {
|
|
56
|
-
constructor(
|
|
51
|
+
constructor() {
|
|
57
52
|
super("OGParkingTariffRepository", _sch_1.Parkings.tariffs.pgTableName, _sch_1.Parkings.tariffs.outputSequelizeAttributes, {
|
|
58
53
|
schema: _sch_1.Parkings.pgSchema,
|
|
59
54
|
});
|
|
60
|
-
this.cachedParkingSourcesRepository = cachedParkingSourcesRepository;
|
|
61
55
|
this.associate();
|
|
62
56
|
}
|
|
63
57
|
associate() {
|
|
@@ -79,7 +73,7 @@ let TariffRepository = exports.TariffRepository = class TariffRepository extends
|
|
|
79
73
|
where.source = { [sequelize_1.Op.in]: params.primarySource };
|
|
80
74
|
}
|
|
81
75
|
else {
|
|
82
|
-
|
|
76
|
+
throw new golemio_errors_1.GeneralError("List of sources must be provided! ", this.name, undefined, 500);
|
|
83
77
|
}
|
|
84
78
|
if (params.validFrom) {
|
|
85
79
|
where.valid_from = { [sequelize_1.Op.gte]: params.validFrom };
|
|
@@ -112,14 +106,19 @@ let TariffRepository = exports.TariffRepository = class TariffRepository extends
|
|
|
112
106
|
}
|
|
113
107
|
});
|
|
114
108
|
}
|
|
115
|
-
GetOne(id) {
|
|
109
|
+
GetOne(id, sources) {
|
|
116
110
|
return __awaiter(this, void 0, void 0, function* () {
|
|
117
111
|
try {
|
|
112
|
+
if (!sources) {
|
|
113
|
+
throw new golemio_errors_1.GeneralError("List of sources must be provided!", this.name, undefined, 500);
|
|
114
|
+
}
|
|
118
115
|
const results = yield this.sequelizeModel.findAll({
|
|
119
116
|
attributes: { include: ["updated_at"] },
|
|
120
117
|
where: {
|
|
121
118
|
tariff_id: id,
|
|
122
|
-
source: {
|
|
119
|
+
source: {
|
|
120
|
+
[sequelize_1.Op.in]: sources,
|
|
121
|
+
},
|
|
123
122
|
},
|
|
124
123
|
raw: true,
|
|
125
124
|
});
|
|
@@ -136,7 +135,6 @@ let TariffRepository = exports.TariffRepository = class TariffRepository extends
|
|
|
136
135
|
};
|
|
137
136
|
exports.TariffRepository = TariffRepository = __decorate([
|
|
138
137
|
(0, tsyringe_1.injectable)(),
|
|
139
|
-
|
|
140
|
-
__metadata("design:paramtypes", [CachedParkingSourcesRepository_1.CachedParkingSourcesRepository])
|
|
138
|
+
__metadata("design:paramtypes", [])
|
|
141
139
|
], TariffRepository);
|
|
142
140
|
//# sourceMappingURL=TariffRepository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TariffRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/TariffRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TariffRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/TariffRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/// <reference types="express" />
|
|
2
|
+
import { Request } from "@golemio/core/dist/shared/express";
|
|
3
|
+
export default class OpenDataHelper {
|
|
4
|
+
static parseOpenDataParam(req: Request): boolean;
|
|
5
|
+
static getIntersectionOfAllowedSources(requestedSources: string[] | undefined, accessibleSources: string[]): string[];
|
|
6
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const Logger_1 = require("@golemio/core/dist/output-gateway/Logger");
|
|
4
|
+
class OpenDataHelper {
|
|
5
|
+
static parseOpenDataParam(req) {
|
|
6
|
+
if (req.query["isRestrictedToOpenData"] === "false") {
|
|
7
|
+
Logger_1.log.debug("Showing also private data");
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
10
|
+
Logger_1.log.debug("Showing only public data");
|
|
11
|
+
return true;
|
|
12
|
+
}
|
|
13
|
+
static getIntersectionOfAllowedSources(requestedSources, accessibleSources) {
|
|
14
|
+
let intersection;
|
|
15
|
+
if (requestedSources) {
|
|
16
|
+
intersection = requestedSources.filter((item) => accessibleSources.includes(item));
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
intersection = accessibleSources;
|
|
20
|
+
}
|
|
21
|
+
return intersection;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
exports.default = OpenDataHelper;
|
|
25
|
+
//# sourceMappingURL=OpenDataHelper.js.map
|