@golemio/parkings 1.19.0 → 1.19.1-dev.1752705002
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/00_clear_test_data.sql +1 -0
- package/db/example/01_sql_dump.sql +15 -9
- package/db/example/02_ztp_updated_recently.sql +0 -2
- package/db/example/03_tsk_measurements_for_legacy_endpoints.sql +2 -2
- package/db/example/04_tsk_parking_v2.sql +5 -2
- package/db/example/08_isphk_data.sql +6 -6
- package/db/example/09_korid_data.sql +17 -8
- package/db/example/10_osm_data.sql +12 -12
- package/db/example/11_parking_machines.sql +24 -14
- package/db/example/12_pmdp_data.sql +3 -3
- package/db/example/13_data_new_filter.sql +2 -2
- package/db/example/14_greencenter_data.sql +2 -2
- package/db/migrations/postgresql/20250328122412-tariff-ids.js +53 -0
- package/db/migrations/postgresql/sqls/20241029121711-create-area-column-down.sql +4 -2
- package/db/migrations/postgresql/sqls/20241106090940-address-updated-down.sql +4 -1
- package/db/migrations/postgresql/sqls/20241202123008-active-down.sql +3 -0
- package/db/migrations/postgresql/sqls/20250328122412-tariff-ids-down.sql +70 -0
- package/db/migrations/postgresql/sqls/20250328122412-tariff-ids-up.sql +110 -0
- package/dist/integration-engine/ParkingInterface.d.ts +0 -1
- package/dist/integration-engine/ParkingsWorker.d.ts +1 -0
- package/dist/integration-engine/ParkingsWorker.js +2 -0
- package/dist/integration-engine/ParkingsWorker.js.map +1 -1
- package/dist/integration-engine/ZtpParkingZones/ZtpParkingZonesWorker.js +7 -6
- package/dist/integration-engine/ZtpParkingZones/ZtpParkingZonesWorker.js.map +1 -1
- package/dist/integration-engine/ioc/Di.js +2 -0
- package/dist/integration-engine/ioc/Di.js.map +1 -1
- package/dist/integration-engine/ioc/ModuleContainerToken.d.ts +1 -0
- package/dist/integration-engine/ioc/ModuleContainerToken.js +1 -0
- package/dist/integration-engine/ioc/ModuleContainerToken.js.map +1 -1
- package/dist/integration-engine/repositories/ParkingTariffRelationsRepository.d.ts +10 -0
- package/dist/integration-engine/repositories/ParkingTariffRelationsRepository.js +88 -0
- package/dist/integration-engine/repositories/ParkingTariffRelationsRepository.js.map +1 -0
- package/dist/integration-engine/repositories/ParkingTariffsRepository.d.ts +1 -12
- package/dist/integration-engine/repositories/ParkingTariffsRepository.js +2 -59
- package/dist/integration-engine/repositories/ParkingTariffsRepository.js.map +1 -1
- package/dist/integration-engine/repositories/ParkingsRepository.d.ts +8 -2
- package/dist/integration-engine/repositories/ParkingsRepository.js +19 -3
- package/dist/integration-engine/repositories/ParkingsRepository.js.map +1 -1
- package/dist/integration-engine/repositories/ParkingsSecondaryRepository.js +3 -1
- package/dist/integration-engine/repositories/ParkingsSecondaryRepository.js.map +1 -1
- package/dist/integration-engine/transformations/IptOictTariffsTransformation.d.ts +2 -6
- package/dist/integration-engine/transformations/IptOictTariffsTransformation.js +3 -4
- package/dist/integration-engine/transformations/IptOictTariffsTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/KoridParkingConfigTransformation.d.ts +4 -1
- package/dist/integration-engine/transformations/KoridParkingConfigTransformation.js +17 -4
- package/dist/integration-engine/transformations/KoridParkingConfigTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/MrParkitGarageTransformation.d.ts +1 -0
- package/dist/integration-engine/transformations/MrParkitGarageTransformation.js +11 -4
- package/dist/integration-engine/transformations/MrParkitGarageTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/StaticTariffsMatcher.d.ts +4 -4
- package/dist/integration-engine/transformations/StaticTariffsMatcher.js +11 -8
- package/dist/integration-engine/transformations/StaticTariffsMatcher.js.map +1 -1
- package/dist/integration-engine/transformations/TSKParkingTransformation.d.ts +3 -1
- package/dist/integration-engine/transformations/TSKParkingTransformation.js +14 -3
- package/dist/integration-engine/transformations/TSKParkingTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/TskParkingMachinesTransformation.d.ts +2 -0
- package/dist/integration-engine/transformations/TskParkingMachinesTransformation.js +11 -1
- package/dist/integration-engine/transformations/TskParkingMachinesTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/TskParkingSectionTransformation.d.ts +2 -0
- package/dist/integration-engine/transformations/TskParkingSectionTransformation.js +13 -1
- package/dist/integration-engine/transformations/TskParkingSectionTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/interfaces/IMrParkitGarageTransformation.d.ts +2 -0
- package/dist/integration-engine/transformations/iptoict/IptOictParkingMachinesTransformation.js +0 -1
- package/dist/integration-engine/transformations/iptoict/IptOictParkingMachinesTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/osm/OsmParkingMachinesTransformation.js +0 -1
- package/dist/integration-engine/transformations/osm/OsmParkingMachinesTransformation.js.map +1 -1
- package/dist/integration-engine/workers/StaticTariffsWorker.js +3 -5
- package/dist/integration-engine/workers/StaticTariffsWorker.js.map +1 -1
- package/dist/integration-engine/workers/TskParkingWorker.js +5 -5
- package/dist/integration-engine/workers/TskParkingWorker.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveIptOictTariffsDataTask.d.ts +3 -3
- package/dist/integration-engine/workers/tasks/SaveIptOictTariffsDataTask.js +7 -7
- package/dist/integration-engine/workers/tasks/SaveIptOictTariffsDataTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveMrParkitDataTask.d.ts +3 -1
- package/dist/integration-engine/workers/tasks/SaveMrParkitDataTask.js +11 -4
- package/dist/integration-engine/workers/tasks/SaveMrParkitDataTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveParkingZonesPrague.d.ts +2 -0
- package/dist/integration-engine/workers/tasks/SaveParkingZonesPrague.js +7 -0
- package/dist/integration-engine/workers/tasks/SaveParkingZonesPrague.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveTskParkingMachinesTask.d.ts +3 -1
- package/dist/integration-engine/workers/tasks/SaveTskParkingMachinesTask.js +6 -3
- package/dist/integration-engine/workers/tasks/SaveTskParkingMachinesTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/SaveTskParkingSectionsTask.d.ts +3 -1
- package/dist/integration-engine/workers/tasks/SaveTskParkingSectionsTask.js +4 -1
- package/dist/integration-engine/workers/tasks/SaveTskParkingSectionsTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/UpdateStaticTariffsTask.d.ts +7 -7
- package/dist/integration-engine/workers/tasks/UpdateStaticTariffsTask.js +6 -5
- package/dist/integration-engine/workers/tasks/UpdateStaticTariffsTask.js.map +1 -1
- package/dist/output-gateway/data-access/ParkingMachinesRepository.d.ts +5 -3
- package/dist/output-gateway/data-access/ParkingMachinesRepository.js +32 -1
- package/dist/output-gateway/data-access/ParkingMachinesRepository.js.map +1 -1
- package/dist/output-gateway/data-access/ParkingRepository.d.ts +3 -1
- package/dist/output-gateway/data-access/ParkingRepository.js +31 -5
- package/dist/output-gateway/data-access/ParkingRepository.js.map +1 -1
- package/dist/output-gateway/data-access/ParkingTariffRelationsRepository.d.ts +6 -0
- package/dist/output-gateway/data-access/ParkingTariffRelationsRepository.js +34 -0
- package/dist/output-gateway/data-access/ParkingTariffRelationsRepository.js.map +1 -0
- package/dist/output-gateway/data-access/ParkingsFilteredRepository.d.ts +2 -1
- package/dist/output-gateway/data-access/ParkingsFilteredRepository.js +6 -3
- package/dist/output-gateway/data-access/ParkingsFilteredRepository.js.map +1 -1
- package/dist/output-gateway/ioc/Di.js +2 -0
- package/dist/output-gateway/ioc/Di.js.map +1 -1
- package/dist/output-gateway/ioc/ModuleContainerToken.d.ts +1 -0
- package/dist/output-gateway/ioc/ModuleContainerToken.js +1 -0
- package/dist/output-gateway/ioc/ModuleContainerToken.js.map +1 -1
- package/dist/output-gateway/models/ParkingsModel.d.ts +5 -1
- package/dist/output-gateway/models/ParkingsModel.js +27 -0
- package/dist/output-gateway/models/ParkingsModel.js.map +1 -1
- package/dist/output-gateway/models/helpers/DetailAttributesHelper.js +0 -1
- package/dist/output-gateway/models/helpers/DetailAttributesHelper.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/routers/v2/V2ParkingRouter.js +4 -2
- package/dist/output-gateway/routers/v2/V2ParkingRouter.js.map +1 -1
- package/dist/output-gateway/transformations/ParkingsTransformationFabric.d.ts +3 -3
- package/dist/output-gateway/transformations/ParkingsTransformationFabric.js +4 -4
- package/dist/output-gateway/transformations/ParkingsTransformationFabric.js.map +1 -1
- package/dist/output-gateway/transformations/v3/ParkingMachinesDtoTransformation.d.ts +4 -4
- package/dist/output-gateway/transformations/v3/ParkingMachinesDtoTransformation.js +1 -1
- package/dist/output-gateway/transformations/v3/ParkingMachinesDtoTransformation.js.map +1 -1
- package/dist/schema-definitions/index.js +0 -1
- package/dist/schema-definitions/index.js.map +1 -1
- package/dist/schema-definitions/models/ParkingMachinesModel.d.ts +0 -1
- package/dist/schema-definitions/models/ParkingMachinesModel.js +0 -1
- package/dist/schema-definitions/models/ParkingMachinesModel.js.map +1 -1
- package/dist/schema-definitions/models/ParkingModel.d.ts +0 -2
- package/dist/schema-definitions/models/ParkingModel.js +0 -2
- package/dist/schema-definitions/models/ParkingModel.js.map +1 -1
- package/dist/schema-definitions/models/ParkingTariffsRelationModel.d.ts +12 -0
- package/dist/schema-definitions/models/ParkingTariffsRelationModel.js +36 -0
- package/dist/schema-definitions/models/ParkingTariffsRelationModel.js.map +1 -0
- package/dist/schema-definitions/models/interfaces/IParking.d.ts +1 -1
- package/dist/schema-definitions/models/interfaces/IParkingMachine.d.ts +5 -1
- package/dist/schema-definitions/models/interfaces/IParkingTariffRelation.d.ts +5 -0
- package/dist/schema-definitions/models/interfaces/IParkingTariffRelation.js +3 -0
- package/dist/schema-definitions/models/interfaces/IParkingTariffRelation.js.map +1 -0
- package/package.json +2 -2
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TskParkingWorker = void 0;
|
|
4
|
-
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
5
4
|
const Di_1 = require("../ioc/Di");
|
|
6
5
|
const ModuleContainerToken_1 = require("../ioc/ModuleContainerToken");
|
|
6
|
+
const TskParkingSectionLevelTransformation_1 = require("../transformations/TskParkingSectionLevelTransformation");
|
|
7
7
|
const SaveTskParkingMachinesTask_1 = require("./tasks/SaveTskParkingMachinesTask");
|
|
8
8
|
const SaveTskParkingSectionLevelTask_1 = require("./tasks/SaveTskParkingSectionLevelTask");
|
|
9
9
|
const SaveTskParkingSectionsTask_1 = require("./tasks/SaveTskParkingSectionsTask");
|
|
10
|
-
const TskParkingSectionLevelTransformation_1 = require("../transformations/TskParkingSectionLevelTransformation");
|
|
11
10
|
const SaveTskParkingZonesTariffsTask_1 = require("./tasks/SaveTskParkingZonesTariffsTask");
|
|
12
|
-
const ioc_1 = require("@golemio/core/dist/integration-engine/ioc");
|
|
13
11
|
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
12
|
+
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
13
|
+
const ioc_1 = require("@golemio/core/dist/integration-engine/ioc");
|
|
14
14
|
class TskParkingWorker extends integration_engine_1.AbstractWorker {
|
|
15
15
|
constructor() {
|
|
16
16
|
super();
|
|
17
17
|
this.name = "TskParkingWorker";
|
|
18
|
-
const saveTskParkingSectionsTask = new SaveTskParkingSectionsTask_1.SaveTskParkingSectionsTask(this.getQueuePrefix(), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingSectionsDataSource), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingsRepository), ioc_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.SimpleConfig));
|
|
18
|
+
const saveTskParkingSectionsTask = new SaveTskParkingSectionsTask_1.SaveTskParkingSectionsTask(this.getQueuePrefix(), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingSectionsDataSource), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingsRepository), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffRelationsRepository), ioc_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.SimpleConfig));
|
|
19
19
|
const saveTskParkingSectionLevel251Task = new SaveTskParkingSectionLevelTask_1.SaveTskParkingSectionLevelTask("saveTskParkingSectionLevel251", this.getQueuePrefix(), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingSectionLevel251DataSource), new TskParkingSectionLevelTransformation_1.TskParkingSectionLevelTransformation(), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingsLocationRepository), ioc_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.SimpleConfig));
|
|
20
20
|
const saveTskParkingSectionLevel253Task = new SaveTskParkingSectionLevelTask_1.SaveTskParkingSectionLevelTask("saveTskParkingSectionLevel253", this.getQueuePrefix(), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingSectionLevel253DataSource), new TskParkingSectionLevelTransformation_1.TskParkingSectionLevelTransformation("disabled"), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingsLocationRepository), ioc_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.SimpleConfig));
|
|
21
|
-
const saveTskParkingMachinesTask = new SaveTskParkingMachinesTask_1.SaveTskParkingMachinesTask(this.getQueuePrefix(), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingMachinesDataSource), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingMachinesTransformation), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingMachinesRepository));
|
|
21
|
+
const saveTskParkingMachinesTask = new SaveTskParkingMachinesTask_1.SaveTskParkingMachinesTask(this.getQueuePrefix(), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingMachinesDataSource), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingMachinesTransformation), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingMachinesRepository), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffRelationsRepository));
|
|
22
22
|
const saveTskParkingZonesTariffsTask = new SaveTskParkingZonesTariffsTask_1.SaveTskParkingZonesTariffsTask(this.getQueuePrefix(), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.TskParkingZonesTariffsDataSource), Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffsRepository));
|
|
23
23
|
this.registerTask(saveTskParkingSectionsTask);
|
|
24
24
|
this.registerTask(saveTskParkingSectionLevel251Task);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TskParkingWorker.js","sourceRoot":"","sources":["../../../src/integration-engine/workers/TskParkingWorker.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"TskParkingWorker.js","sourceRoot":"","sources":["../../../src/integration-engine/workers/TskParkingWorker.ts"],"names":[],"mappings":";;;AAAA,kCAA+C;AAC/C,sEAAoE;AACpE,kHAAgH;AAChH,mFAA0F;AAC1F,2FAAkG;AAClG,mFAA0F;AAC1F,2FAAkG;AAElG,wEAAqE;AACrE,8EAAuE;AACvE,mEAAuF;AAEvF,MAAa,gBAAiB,SAAQ,mCAAc;IAGhD;QACI,KAAK,EAAE,CAAC;QAHO,SAAI,GAAW,kBAAkB,CAAC;QAKjD,MAAM,0BAA0B,GAAG,IAAI,uDAA0B,CAC7D,IAAI,CAAC,cAAc,EAAE,EACrB,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,4BAA4B,CAAC,EAC5E,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,kBAAkB,CAAC,EAClE,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,gCAAgC,CAAC,EAChF,gCAA0B,CAAC,OAAO,CAAgB,qBAAS,CAAC,YAAY,CAAC,CAC5E,CAAC;QAEF,MAAM,iCAAiC,GAAG,IAAI,+DAA8B,CACxE,+BAA+B,EAC/B,IAAI,CAAC,cAAc,EAAE,EACrB,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,mCAAmC,CAAC,EACnF,IAAI,2EAAoC,EAAE,EAC1C,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,0BAA0B,CAAC,EAC1E,gCAA0B,CAAC,OAAO,CAAgB,qBAAS,CAAC,YAAY,CAAC,CAC5E,CAAC;QAEF,MAAM,iCAAiC,GAAG,IAAI,+DAA8B,CACxE,+BAA+B,EAC/B,IAAI,CAAC,cAAc,EAAE,EACrB,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,mCAAmC,CAAC,EACnF,IAAI,2EAAoC,CAAC,UAAU,CAAC,EACpD,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,0BAA0B,CAAC,EAC1E,gCAA0B,CAAC,OAAO,CAAgB,qBAAS,CAAC,YAAY,CAAC,CAC5E,CAAC;QAEF,MAAM,0BAA0B,GAAG,IAAI,uDAA0B,CAC7D,IAAI,CAAC,cAAc,EAAE,EACrB,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,4BAA4B,CAAC,EAC5E,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,gCAAgC,CAAC,EAChF,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,yBAAyB,CAAC,EACzE,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,gCAAgC,CAAC,CACnF,CAAC;QAEF,MAAM,8BAA8B,GAAG,IAAI,+DAA8B,CACrE,IAAI,CAAC,cAAc,EAAE,EACrB,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,gCAAgC,CAAC,EAChF,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,wBAAwB,CAAC,CAC3E,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,8BAA8B,CAAC,CAAC;IACtD,CAAC;CACJ;AApDD,4CAoDC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { CachedParkingSourcesRepository } from "../../../helpers/data-access/CachedParkingSourcesRepository";
|
|
2
2
|
import { IptOictTariffsDataSource } from "../../datasources/iptoict/IptOictTariffsDataSource";
|
|
3
|
-
import {
|
|
3
|
+
import { ParkingTariffRelationsRepository } from "../../repositories/ParkingTariffRelationsRepository";
|
|
4
4
|
import { IIptOictTaskTypeInput, IptOictTaskTypeValidationSchema } from "../schemas/IptOictTaskTypeSchema";
|
|
5
5
|
import { AbstractTask } from "@golemio/core/dist/integration-engine";
|
|
6
6
|
export declare class SaveIptOictTariffsDataTask extends AbstractTask<IIptOictTaskTypeInput> {
|
|
7
7
|
private iptOictTariffsDataSource;
|
|
8
|
-
private
|
|
8
|
+
private parkingTariffRelationsRepository;
|
|
9
9
|
private cachedParkingSourcesRepository;
|
|
10
10
|
readonly queueName = "saveIptOictTariffsData";
|
|
11
11
|
readonly queueTtl: number;
|
|
12
12
|
readonly schema: typeof IptOictTaskTypeValidationSchema;
|
|
13
|
-
constructor(iptOictTariffsDataSource: IptOictTariffsDataSource,
|
|
13
|
+
constructor(iptOictTariffsDataSource: IptOictTariffsDataSource, parkingTariffRelationsRepository: ParkingTariffRelationsRepository, cachedParkingSourcesRepository: CachedParkingSourcesRepository);
|
|
14
14
|
execute(data: IIptOictTaskTypeInput): Promise<void>;
|
|
15
15
|
private updateTariffsData;
|
|
16
16
|
private getSourceConfig;
|
|
@@ -16,7 +16,7 @@ exports.SaveIptOictTariffsDataTask = void 0;
|
|
|
16
16
|
const CachedParkingSourcesRepository_1 = require("../../../helpers/data-access/CachedParkingSourcesRepository");
|
|
17
17
|
const IptOictTariffsDataSource_1 = require("../../datasources/iptoict/IptOictTariffsDataSource");
|
|
18
18
|
const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
|
|
19
|
-
const
|
|
19
|
+
const ParkingTariffRelationsRepository_1 = require("../../repositories/ParkingTariffRelationsRepository");
|
|
20
20
|
const IptOictTariffsTransformation_1 = require("../../transformations/IptOictTariffsTransformation");
|
|
21
21
|
const IptOictTaskTypeSchema_1 = require("../schemas/IptOictTaskTypeSchema");
|
|
22
22
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
@@ -24,10 +24,10 @@ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
|
24
24
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
25
25
|
const constants_1 = require("../constants");
|
|
26
26
|
let SaveIptOictTariffsDataTask = exports.SaveIptOictTariffsDataTask = class SaveIptOictTariffsDataTask extends integration_engine_1.AbstractTask {
|
|
27
|
-
constructor(iptOictTariffsDataSource,
|
|
27
|
+
constructor(iptOictTariffsDataSource, parkingTariffRelationsRepository, cachedParkingSourcesRepository) {
|
|
28
28
|
super(constants_1.NEW_PARKINGS_WORKER_NAME);
|
|
29
29
|
this.iptOictTariffsDataSource = iptOictTariffsDataSource;
|
|
30
|
-
this.
|
|
30
|
+
this.parkingTariffRelationsRepository = parkingTariffRelationsRepository;
|
|
31
31
|
this.cachedParkingSourcesRepository = cachedParkingSourcesRepository;
|
|
32
32
|
this.queueName = "saveIptOictTariffsData";
|
|
33
33
|
this.queueTtl = 60 * 60 * 1000; // 1 hour
|
|
@@ -50,8 +50,8 @@ let SaveIptOictTariffsDataTask = exports.SaveIptOictTariffsDataTask = class Save
|
|
|
50
50
|
const data = await this.iptOictTariffsDataSource.getTariffsData(sourceUrl);
|
|
51
51
|
const transformation = new IptOictTariffsTransformation_1.IptOictTariffsTransformation(source, processingDate);
|
|
52
52
|
const transformedTariffData = transformation.transformArray(data);
|
|
53
|
-
const
|
|
54
|
-
await this.
|
|
53
|
+
const transformedParkingTariffsRelationData = transformation.transformParkingTariffsRelation(source, data);
|
|
54
|
+
await this.parkingTariffRelationsRepository.replaceTariffs(transformedTariffData.flat(), transformedParkingTariffsRelationData, source, processingDate);
|
|
55
55
|
}
|
|
56
56
|
async getSourceConfig(source) {
|
|
57
57
|
const sources = await this.cachedParkingSourcesRepository.getParkingTariffDataSourceConfig({
|
|
@@ -70,10 +70,10 @@ let SaveIptOictTariffsDataTask = exports.SaveIptOictTariffsDataTask = class Save
|
|
|
70
70
|
exports.SaveIptOictTariffsDataTask = SaveIptOictTariffsDataTask = __decorate([
|
|
71
71
|
(0, tsyringe_1.injectable)(),
|
|
72
72
|
__param(0, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.IptOictTariffsDataSource)),
|
|
73
|
-
__param(1, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.
|
|
73
|
+
__param(1, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffRelationsRepository)),
|
|
74
74
|
__param(2, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.CachedParkingSourcesRepository)),
|
|
75
75
|
__metadata("design:paramtypes", [IptOictTariffsDataSource_1.IptOictTariffsDataSource,
|
|
76
|
-
|
|
76
|
+
ParkingTariffRelationsRepository_1.ParkingTariffRelationsRepository,
|
|
77
77
|
CachedParkingSourcesRepository_1.CachedParkingSourcesRepository])
|
|
78
78
|
], SaveIptOictTariffsDataTask);
|
|
79
79
|
//# sourceMappingURL=SaveIptOictTariffsDataTask.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveIptOictTariffsDataTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveIptOictTariffsDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gHAAqG;AACrG,iGAA4F;AAC5F,yEAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"SaveIptOictTariffsDataTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveIptOictTariffsDataTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { IParkingProviderDataSourceFactory } from "../../datasources/interfaces/IParkingProviderDataSourceFactory";
|
|
2
2
|
import { ParkingsLocationRepository } from "../../repositories/ParkingsLocationRepository";
|
|
3
3
|
import { ParkingsRepository } from "../../repositories/ParkingsRepository";
|
|
4
|
+
import { ParkingTariffRelationsRepository } from "../../repositories/ParkingTariffRelationsRepository";
|
|
4
5
|
import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine/workers/AbstractEmptyTask";
|
|
5
6
|
import { ParkingTariffsRepository } from "../../repositories/ParkingTariffsRepository";
|
|
6
7
|
import { ParkingsProhibitionsRepository } from "../../repositories/ParkingsProhibitionsRepository";
|
|
@@ -10,11 +11,12 @@ export declare class SaveMrParkitDataTask extends AbstractEmptyTask {
|
|
|
10
11
|
private parkingRepository;
|
|
11
12
|
private parkingLocationRepository;
|
|
12
13
|
private parkingsTariffsRepository;
|
|
14
|
+
private parkingTariffRelationsRepository;
|
|
13
15
|
private parkingsProhibitionsRepository;
|
|
14
16
|
private config;
|
|
15
17
|
readonly queueName = "saveMrParkitData";
|
|
16
18
|
readonly queueTtl: number;
|
|
17
19
|
private measurementsRepository;
|
|
18
|
-
constructor(dataSourceFactory: IParkingProviderDataSourceFactory, parkingRepository: ParkingsRepository, parkingLocationRepository: ParkingsLocationRepository, parkingsTariffsRepository: ParkingTariffsRepository, parkingsProhibitionsRepository: ParkingsProhibitionsRepository, config: ISimpleConfig);
|
|
20
|
+
constructor(dataSourceFactory: IParkingProviderDataSourceFactory, parkingRepository: ParkingsRepository, parkingLocationRepository: ParkingsLocationRepository, parkingsTariffsRepository: ParkingTariffsRepository, parkingTariffRelationsRepository: ParkingTariffRelationsRepository, parkingsProhibitionsRepository: ParkingsProhibitionsRepository, config: ISimpleConfig);
|
|
19
21
|
protected execute(): Promise<void>;
|
|
20
22
|
}
|
|
@@ -17,6 +17,7 @@ const ParkingProviderEnum_1 = require("../../datasources/helpers/ParkingProvider
|
|
|
17
17
|
const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
|
|
18
18
|
const ParkingsLocationRepository_1 = require("../../repositories/ParkingsLocationRepository");
|
|
19
19
|
const ParkingsRepository_1 = require("../../repositories/ParkingsRepository");
|
|
20
|
+
const ParkingTariffRelationsRepository_1 = require("../../repositories/ParkingTariffRelationsRepository");
|
|
20
21
|
const MrParkitGarageTransformation_1 = require("../../transformations/MrParkitGarageTransformation");
|
|
21
22
|
const _sch_1 = require("../../../schema-definitions");
|
|
22
23
|
const ParkingMeasurementsDtoSchema_1 = require("../../../schema-definitions/datasources/ParkingMeasurementsDtoSchema");
|
|
@@ -32,12 +33,13 @@ const UpdateAddressWorker_1 = require("../UpdateAddressWorker");
|
|
|
32
33
|
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
33
34
|
const SourceEnum_1 = require("../../../helpers/constants/SourceEnum");
|
|
34
35
|
let SaveMrParkitDataTask = exports.SaveMrParkitDataTask = class SaveMrParkitDataTask extends AbstractEmptyTask_1.AbstractEmptyTask {
|
|
35
|
-
constructor(dataSourceFactory, parkingRepository, parkingLocationRepository, parkingsTariffsRepository, parkingsProhibitionsRepository, config) {
|
|
36
|
+
constructor(dataSourceFactory, parkingRepository, parkingLocationRepository, parkingsTariffsRepository, parkingTariffRelationsRepository, parkingsProhibitionsRepository, config) {
|
|
36
37
|
super(constants_1.NEW_PARKINGS_WORKER_NAME);
|
|
37
38
|
this.dataSourceFactory = dataSourceFactory;
|
|
38
39
|
this.parkingRepository = parkingRepository;
|
|
39
40
|
this.parkingLocationRepository = parkingLocationRepository;
|
|
40
41
|
this.parkingsTariffsRepository = parkingsTariffsRepository;
|
|
42
|
+
this.parkingTariffRelationsRepository = parkingTariffRelationsRepository;
|
|
41
43
|
this.parkingsProhibitionsRepository = parkingsProhibitionsRepository;
|
|
42
44
|
this.config = config;
|
|
43
45
|
this.queueName = "saveMrParkitData";
|
|
@@ -67,14 +69,16 @@ let SaveMrParkitDataTask = exports.SaveMrParkitDataTask = class SaveMrParkitData
|
|
|
67
69
|
let transformedLocations = [];
|
|
68
70
|
let transformedMeasurements = [];
|
|
69
71
|
let transformedTariffs = [];
|
|
72
|
+
let transformedParkingTariffsRelations = [];
|
|
70
73
|
let transformedParkingProhibitions = [];
|
|
71
74
|
try {
|
|
72
75
|
for (const garage of garageResult) {
|
|
73
|
-
const { parkingLocation, parkingMeasurement, tariffs, parkingProhibitions, ...parking } = garageTransformation.transformElement(garage);
|
|
76
|
+
const { parkingLocation, parkingMeasurement, tariffs, parkingProhibitions, parkingTariffsRelations, ...parking } = garageTransformation.transformElement(garage);
|
|
74
77
|
transformedGarages.push(parking);
|
|
75
78
|
transformedLocations.push(parkingLocation);
|
|
76
79
|
transformedMeasurements.push(parkingMeasurement);
|
|
77
80
|
transformedTariffs.push(...tariffs);
|
|
81
|
+
transformedParkingTariffsRelations.push(parkingTariffsRelations);
|
|
78
82
|
transformedParkingProhibitions.push(parkingProhibitions);
|
|
79
83
|
}
|
|
80
84
|
}
|
|
@@ -89,6 +93,7 @@ let SaveMrParkitDataTask = exports.SaveMrParkitDataTask = class SaveMrParkitData
|
|
|
89
93
|
await this.parkingLocationRepository.saveWithoutAddress(transformedLocations);
|
|
90
94
|
await this.parkingRepository.saveActiveParkingsWithoutAddress(transformedGarages, SourceEnum_1.SourceEnum.Mr_Parkit);
|
|
91
95
|
await this.parkingsTariffsRepository.bulkSave(transformedTariffs);
|
|
96
|
+
await this.parkingTariffRelationsRepository.saveTariffsRelations(transformedParkingTariffsRelations, SourceEnum_1.SourceEnum.Mr_Parkit);
|
|
92
97
|
await this.parkingsProhibitionsRepository.bulkSave(transformedParkingProhibitions);
|
|
93
98
|
const exchange = this.config.getValue("env.RABBIT_EXCHANGE_NAME");
|
|
94
99
|
await integration_engine_1.QueueManager.sendMessageToExchange(exchange + "." + UpdateAddressWorker_1.UpdateAddressWorker.workerName.toLowerCase(), "updateMissingParkingsAddresses", {});
|
|
@@ -105,11 +110,13 @@ exports.SaveMrParkitDataTask = SaveMrParkitDataTask = __decorate([
|
|
|
105
110
|
__param(1, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingsRepository)),
|
|
106
111
|
__param(2, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingsLocationRepository)),
|
|
107
112
|
__param(3, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffsRepository)),
|
|
108
|
-
__param(4, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.
|
|
109
|
-
__param(5, (0, tsyringe_1.inject)(
|
|
113
|
+
__param(4, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffRelationsRepository)),
|
|
114
|
+
__param(5, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingsProhibitionsRepository)),
|
|
115
|
+
__param(6, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.SimpleConfig)),
|
|
110
116
|
__metadata("design:paramtypes", [Object, ParkingsRepository_1.ParkingsRepository,
|
|
111
117
|
ParkingsLocationRepository_1.ParkingsLocationRepository,
|
|
112
118
|
ParkingTariffsRepository_1.ParkingTariffsRepository,
|
|
119
|
+
ParkingTariffRelationsRepository_1.ParkingTariffRelationsRepository,
|
|
113
120
|
ParkingsProhibitionsRepository_1.ParkingsProhibitionsRepository, Object])
|
|
114
121
|
], SaveMrParkitDataTask);
|
|
115
122
|
//# sourceMappingURL=SaveMrParkitDataTask.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveMrParkitDataTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveMrParkitDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uFAA8E;AAE9E,yEAAoE;AACpE,8FAAyF;AACzF,8EAAyE;AACzE,qGAAgG;AAChG,sDAAgC;AAChC,uHAA6F;
|
|
1
|
+
{"version":3,"file":"SaveMrParkitDataTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveMrParkitDataTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export declare class SaveParkingZonesPrague extends AbstractEmptyTask {
|
|
|
10
10
|
private readonly ftpTSKSettings;
|
|
11
11
|
private parkingsModel;
|
|
12
12
|
private parkingsTariffsModel;
|
|
13
|
+
private parkingTariffRelationsRepository;
|
|
13
14
|
private parkingPaymentRepository;
|
|
14
15
|
private parkingsBusinessErrorsRepository;
|
|
15
16
|
private config;
|
|
@@ -27,6 +28,7 @@ export declare class SaveParkingZonesPrague extends AbstractEmptyTask {
|
|
|
27
28
|
*/
|
|
28
29
|
private saveParkingZonesLocationsPrague;
|
|
29
30
|
private transformTskData;
|
|
31
|
+
private transformTskRelationsData;
|
|
30
32
|
/**
|
|
31
33
|
* Parking zones Prague
|
|
32
34
|
* - store tariff data for parking zones in Prague.
|
|
@@ -74,8 +74,10 @@ class SaveParkingZonesPrague extends AbstractEmptyTask_1.AbstractEmptyTask {
|
|
|
74
74
|
const dataIPR = await this.dataSourceIPR.getAll();
|
|
75
75
|
const transformedIPRData = await this.iprTransformation.transform(dataIPR);
|
|
76
76
|
const result = await (0, LocationBuilderHelper_1.mergeParkingZoneDataSets)(transformedTSKData.parking, transformedIPRData);
|
|
77
|
+
const transformedParkingTariffsRelationData = await this.transformTskRelationsData(currentDate.toISOString(), filteredTSKRecords);
|
|
77
78
|
await this.parkingsModel.saveActiveParkingsWithoutAddress(result.parking, SourceEnum_1.SourceEnum.TSK);
|
|
78
79
|
await this.parkingsLocationModel.saveWithoutAddress(result.locations);
|
|
80
|
+
await this.parkingTariffRelationsRepository.saveTariffsRelations(transformedParkingTariffsRelationData, SourceEnum_1.SourceEnum.TSK_V2);
|
|
79
81
|
await this.parkingPaymentRepository.updatePaymentsBySource(transformedTSKData.payment, SourceEnum_1.SourceEnum.TSK, processingDate);
|
|
80
82
|
await integration_engine_1.QueueManager.sendMessageToExchange(this.config.RABBIT_EXCHANGE_NAME + "." + UpdateAddressWorker_1.UpdateAddressWorker.workerName.toLowerCase(), "updateMissingParkingsAddresses", {});
|
|
81
83
|
await integration_engine_1.QueueManager.sendMessageToExchange(this.config.RABBIT_EXCHANGE_NAME + "." + UpdateAddressWorker_1.UpdateAddressWorker.workerName.toLowerCase(), "updateMissingParkingsLocationAddresses", {});
|
|
@@ -127,6 +129,7 @@ class SaveParkingZonesPrague extends AbstractEmptyTask_1.AbstractEmptyTask {
|
|
|
127
129
|
this.parkingsLocationModel = new ParkingsLocationRepository_1.ParkingsLocationRepository();
|
|
128
130
|
this.parkingsModel = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingsRepository);
|
|
129
131
|
this.parkingsTariffsModel = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffsRepository);
|
|
132
|
+
this.parkingTariffRelationsRepository = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffRelationsRepository);
|
|
130
133
|
this.parkingPaymentRepository = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingPaymentsRepository);
|
|
131
134
|
this.parkingsBusinessErrorsRepository = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingsBusinessErrorsRepository);
|
|
132
135
|
this.tskParkingFilter = new TskParkingFilter_1.TskParkingFilter();
|
|
@@ -135,6 +138,10 @@ class SaveParkingZonesPrague extends AbstractEmptyTask_1.AbstractEmptyTask {
|
|
|
135
138
|
const tskTransformation = new TSKParkingTransformation_1.TSKParkingTransformation(currentDate);
|
|
136
139
|
return await tskTransformation.transform(dataTSK);
|
|
137
140
|
}
|
|
141
|
+
async transformTskRelationsData(currentDate, dataTSK) {
|
|
142
|
+
const tskTransformation = new TSKParkingTransformation_1.TSKParkingTransformation(currentDate);
|
|
143
|
+
return tskTransformation.transformParkingTariffsRelation(dataTSK);
|
|
144
|
+
}
|
|
138
145
|
checkBusinessRules(dataRecords) {
|
|
139
146
|
const tariffChecker = TariffCheckerFactory_1.default.get(TariffCheckerFactory_1.TariffCheckerEnum.TSK);
|
|
140
147
|
const checkedTariffs = dataRecords?.map((tariff) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveParkingZonesPrague.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveParkingZonesPrague.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAA2D;AAG3D,iGAAiG;AACjG,+EAA6E;AAC7E,qCAA+C;AAC/C,yEAAoE;AAGpE,8FAAyF;
|
|
1
|
+
{"version":3,"file":"SaveParkingZonesPrague.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveParkingZonesPrague.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ParkingMachinesRepository } from "../../repositories/ParkingMachinesRepository";
|
|
2
|
+
import { ParkingTariffRelationsRepository } from "../../repositories/ParkingTariffRelationsRepository";
|
|
2
3
|
import { TskParkingMachinesTransformation } from "../../transformations/TskParkingMachinesTransformation";
|
|
3
4
|
import { ITskParkingMachine } from "../../../schema-definitions/datasources/interfaces/ITskParkingMachine";
|
|
4
5
|
import { DataSource } from "@golemio/core/dist/integration-engine/datasources";
|
|
@@ -7,7 +8,8 @@ export declare class SaveTskParkingMachinesTask extends AbstractEmptyTask {
|
|
|
7
8
|
private dataSource;
|
|
8
9
|
private transformation;
|
|
9
10
|
private repository;
|
|
11
|
+
private parkingTariffRelationsRepository;
|
|
10
12
|
queueName: string;
|
|
11
|
-
constructor(queuePrefix: string, dataSource: DataSource<ITskParkingMachine[]>, transformation: TskParkingMachinesTransformation, repository: ParkingMachinesRepository);
|
|
13
|
+
constructor(queuePrefix: string, dataSource: DataSource<ITskParkingMachine[]>, transformation: TskParkingMachinesTransformation, repository: ParkingMachinesRepository, parkingTariffRelationsRepository: ParkingTariffRelationsRepository);
|
|
12
14
|
protected execute(): Promise<void>;
|
|
13
15
|
}
|
|
@@ -4,18 +4,21 @@ exports.SaveTskParkingMachinesTask = void 0;
|
|
|
4
4
|
const SourceEnum_1 = require("../../../helpers/constants/SourceEnum");
|
|
5
5
|
const AbstractEmptyTask_1 = require("@golemio/core/dist/integration-engine/workers/AbstractEmptyTask");
|
|
6
6
|
class SaveTskParkingMachinesTask extends AbstractEmptyTask_1.AbstractEmptyTask {
|
|
7
|
-
constructor(queuePrefix, dataSource, transformation, repository) {
|
|
7
|
+
constructor(queuePrefix, dataSource, transformation, repository, parkingTariffRelationsRepository) {
|
|
8
8
|
super(queuePrefix);
|
|
9
9
|
this.dataSource = dataSource;
|
|
10
10
|
this.transformation = transformation;
|
|
11
11
|
this.repository = repository;
|
|
12
|
+
this.parkingTariffRelationsRepository = parkingTariffRelationsRepository;
|
|
12
13
|
this.queueName = "saveTskParkingMachines";
|
|
13
14
|
}
|
|
14
15
|
async execute() {
|
|
15
|
-
const
|
|
16
|
+
const currentDate = new Date();
|
|
16
17
|
const data = await this.dataSource.getAll();
|
|
17
18
|
const transformedData = this.transformation.transformArray(data);
|
|
18
|
-
|
|
19
|
+
const transformedTariffsRelationsData = this.transformation.transformParkingTariffsRelation(data);
|
|
20
|
+
await this.repository.bulkSaveMarkInactive(SourceEnum_1.SourceEnum.TSK_V2, transformedData, undefined, currentDate);
|
|
21
|
+
await this.parkingTariffRelationsRepository.saveTariffsRelations(transformedTariffsRelationsData, SourceEnum_1.SourceEnum.TSK_V2);
|
|
19
22
|
}
|
|
20
23
|
}
|
|
21
24
|
exports.SaveTskParkingMachinesTask = SaveTskParkingMachinesTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveTskParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveTskParkingMachinesTask.ts"],"names":[],"mappings":";;;AAAA,sEAA2D;
|
|
1
|
+
{"version":3,"file":"SaveTskParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveTskParkingMachinesTask.ts"],"names":[],"mappings":";;;AAAA,sEAA2D;AAQ3D,uGAAoG;AAEpG,MAAa,0BAA2B,SAAQ,qCAAiB;IAG7D,YACI,WAAmB,EACX,UAA4C,EAC5C,cAAgD,EAChD,UAAqC,EACrC,gCAAkE;QAE1E,KAAK,CAAC,WAAW,CAAC,CAAC;QALX,eAAU,GAAV,UAAU,CAAkC;QAC5C,mBAAc,GAAd,cAAc,CAAkC;QAChD,eAAU,GAAV,UAAU,CAA2B;QACrC,qCAAgC,GAAhC,gCAAgC,CAAkC;QAPvE,cAAS,GAAW,wBAAwB,CAAC;IAUpD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAyB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAClE,MAAM,eAAe,GAAsB,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACpF,MAAM,+BAA+B,GACjC,IAAI,CAAC,cAAc,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,uBAAU,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QACvG,MAAM,IAAI,CAAC,gCAAgC,CAAC,oBAAoB,CAAC,+BAA+B,EAAE,uBAAU,CAAC,MAAM,CAAC,CAAC;IACzH,CAAC;CACJ;AAtBD,gEAsBC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ParkingTariffRelationsRepository } from "../../repositories/ParkingTariffRelationsRepository";
|
|
1
2
|
import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine";
|
|
2
3
|
import { DataSource } from "@golemio/core/dist/integration-engine/datasources";
|
|
3
4
|
import { ParkingsRepository } from "../../repositories/ParkingsRepository";
|
|
@@ -6,8 +7,9 @@ import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleC
|
|
|
6
7
|
export declare class SaveTskParkingSectionsTask extends AbstractEmptyTask {
|
|
7
8
|
private dataSource;
|
|
8
9
|
private parkingsRepository;
|
|
10
|
+
private parkingTariffRelationsRepository;
|
|
9
11
|
private config;
|
|
10
12
|
readonly queueName = "saveTskParkingSections";
|
|
11
|
-
constructor(queuePrefix: string, dataSource: DataSource<ITskParkingSection[]>, parkingsRepository: ParkingsRepository, config: ISimpleConfig);
|
|
13
|
+
constructor(queuePrefix: string, dataSource: DataSource<ITskParkingSection[]>, parkingsRepository: ParkingsRepository, parkingTariffRelationsRepository: ParkingTariffRelationsRepository, config: ISimpleConfig);
|
|
12
14
|
execute(): Promise<void>;
|
|
13
15
|
}
|
|
@@ -6,10 +6,11 @@ const TskParkingSectionTransformation_1 = require("../../transformations/TskPark
|
|
|
6
6
|
const UpdateAddressWorker_1 = require("../UpdateAddressWorker");
|
|
7
7
|
const SourceEnum_1 = require("../../../helpers/constants/SourceEnum");
|
|
8
8
|
class SaveTskParkingSectionsTask extends integration_engine_1.AbstractEmptyTask {
|
|
9
|
-
constructor(queuePrefix, dataSource, parkingsRepository, config) {
|
|
9
|
+
constructor(queuePrefix, dataSource, parkingsRepository, parkingTariffRelationsRepository, config) {
|
|
10
10
|
super(queuePrefix);
|
|
11
11
|
this.dataSource = dataSource;
|
|
12
12
|
this.parkingsRepository = parkingsRepository;
|
|
13
|
+
this.parkingTariffRelationsRepository = parkingTariffRelationsRepository;
|
|
13
14
|
this.config = config;
|
|
14
15
|
this.queueName = "saveTskParkingSections";
|
|
15
16
|
}
|
|
@@ -18,6 +19,8 @@ class SaveTskParkingSectionsTask extends integration_engine_1.AbstractEmptyTask
|
|
|
18
19
|
const transformation = new TskParkingSectionTransformation_1.TskParkingSectionTransformation(new Date());
|
|
19
20
|
const transformedParkings = transformation.transformArray(sourceData);
|
|
20
21
|
await this.parkingsRepository.saveActiveParkingsWithoutAddress(transformedParkings, SourceEnum_1.SourceEnum.TSK_V2);
|
|
22
|
+
const transformedParkingTariffsRelationData = transformation.transformParkingTariffsRelation(sourceData);
|
|
23
|
+
await this.parkingTariffRelationsRepository.saveTariffsRelations(transformedParkingTariffsRelationData, SourceEnum_1.SourceEnum.TSK_V2);
|
|
21
24
|
const exchange = this.config.getValue("env.RABBIT_EXCHANGE_NAME");
|
|
22
25
|
await integration_engine_1.QueueManager.sendMessageToExchange(exchange + "." + UpdateAddressWorker_1.UpdateAddressWorker.workerName.toLowerCase(), "updateMissingParkingsAddresses", {});
|
|
23
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveTskParkingSectionsTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveTskParkingSectionsTask.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"SaveTskParkingSectionsTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveTskParkingSectionsTask.ts"],"names":[],"mappings":";;;AACA,8EAAwF;AAIxF,2GAAsG;AACtG,gEAAsE;AAEtE,sEAA2D;AAE3D,MAAa,0BAA2B,SAAQ,sCAAiB;IAG7D,YACI,WAAmB,EACX,UAA4C,EAC5C,kBAAsC,EACtC,gCAAkE,EAClE,MAAqB;QAE7B,KAAK,CAAC,WAAW,CAAC,CAAC;QALX,eAAU,GAAV,UAAU,CAAkC;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qCAAgC,GAAhC,gCAAgC,CAAkC;QAClE,WAAM,GAAN,MAAM,CAAe;QAPjB,cAAS,GAAG,wBAAwB,CAAC;IAUrD,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,MAAM,UAAU,GAAyB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACxE,MAAM,cAAc,GAAG,IAAI,iEAA+B,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACvE,MAAM,mBAAmB,GAAG,cAAc,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,IAAI,CAAC,kBAAkB,CAAC,gCAAgC,CAAC,mBAAmB,EAAE,uBAAU,CAAC,MAAM,CAAC,CAAC;QACvG,MAAM,qCAAqC,GAAG,cAAc,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;QACzG,MAAM,IAAI,CAAC,gCAAgC,CAAC,oBAAoB,CAC5D,qCAAqC,EACrC,uBAAU,CAAC,MAAM,CACpB,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,0BAA0B,CAAC,CAAC;QAC1E,MAAM,iCAAY,CAAC,qBAAqB,CACpC,QAAQ,GAAG,GAAG,GAAG,yCAAmB,CAAC,UAAU,CAAC,WAAW,EAAE,EAC7D,gCAAgC,EAChC,EAAE,CACL,CAAC;IACN,CAAC;CACJ;AA/BD,gEA+BC"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { DataSource } from "@golemio/core/dist/integration-engine/datasources";
|
|
3
|
-
import { StaticTariffsTransformation } from "../../transformations/StaticTariffsTransformation";
|
|
1
|
+
import { ParkingTariffRelationsRepository } from "../../repositories/ParkingTariffRelationsRepository";
|
|
4
2
|
import { ParkingTariffsRepository } from "../../repositories/ParkingTariffsRepository";
|
|
5
3
|
import { StaticTariffsMatcher } from "../../transformations/StaticTariffsMatcher";
|
|
6
|
-
import {
|
|
4
|
+
import { StaticTariffsTransformation } from "../../transformations/StaticTariffsTransformation";
|
|
5
|
+
import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine";
|
|
6
|
+
import { DataSource } from "@golemio/core/dist/integration-engine/datasources";
|
|
7
7
|
export declare class UpdateStaticTariffsTask extends AbstractEmptyTask {
|
|
8
8
|
readonly queueName = "updateStaticTariffs";
|
|
9
9
|
readonly queueTtl: number;
|
|
10
10
|
private dataSource;
|
|
11
11
|
private transformer;
|
|
12
|
-
private
|
|
12
|
+
private parkingTariffsRepository;
|
|
13
13
|
private matcher;
|
|
14
|
-
private
|
|
15
|
-
constructor(queuePrefix: string, dataSource: DataSource, transformer: StaticTariffsTransformation,
|
|
14
|
+
private parkingTariffRelationsRepository;
|
|
15
|
+
constructor(queuePrefix: string, dataSource: DataSource, transformer: StaticTariffsTransformation, parkingTariffsRepository: ParkingTariffsRepository, parkingTariffRelationsRepository: ParkingTariffRelationsRepository, matcher: StaticTariffsMatcher);
|
|
16
16
|
execute(): Promise<void>;
|
|
17
17
|
}
|
|
@@ -1,26 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.UpdateStaticTariffsTask = void 0;
|
|
4
|
+
const SourceEnum_1 = require("../../../helpers/constants/SourceEnum");
|
|
4
5
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
5
6
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
6
7
|
class UpdateStaticTariffsTask extends integration_engine_1.AbstractEmptyTask {
|
|
7
|
-
constructor(queuePrefix, dataSource, transformer,
|
|
8
|
+
constructor(queuePrefix, dataSource, transformer, parkingTariffsRepository, parkingTariffRelationsRepository, matcher) {
|
|
8
9
|
super(queuePrefix);
|
|
9
10
|
this.queueName = "updateStaticTariffs";
|
|
10
11
|
this.queueTtl = 60 * 60 * 1000; // 1 hour
|
|
11
12
|
this.dataSource = dataSource;
|
|
12
13
|
this.transformer = transformer;
|
|
13
|
-
this.
|
|
14
|
-
this.
|
|
14
|
+
this.parkingTariffsRepository = parkingTariffsRepository;
|
|
15
|
+
this.parkingTariffRelationsRepository = parkingTariffRelationsRepository;
|
|
15
16
|
this.matcher = matcher;
|
|
16
17
|
}
|
|
17
18
|
async execute() {
|
|
18
19
|
try {
|
|
19
20
|
const data = await this.dataSource.getAll();
|
|
20
21
|
const transformedData = await this.transformer.transform(data.tariffs);
|
|
21
|
-
await this.
|
|
22
|
+
await this.parkingTariffsRepository.save(transformedData);
|
|
22
23
|
const matches = await this.matcher.matchTariffRelations(data.relations);
|
|
23
|
-
await this.
|
|
24
|
+
await this.parkingTariffRelationsRepository.saveTariffsRelations(matches, SourceEnum_1.SourceEnum.Manual);
|
|
24
25
|
}
|
|
25
26
|
catch (err) {
|
|
26
27
|
if (err instanceof golemio_errors_1.AbstractGolemioError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateStaticTariffsTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/UpdateStaticTariffsTask.ts"],"names":[],"mappings":";;;AAAA,8EAA0E;
|
|
1
|
+
{"version":3,"file":"UpdateStaticTariffsTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/UpdateStaticTariffsTask.ts"],"names":[],"mappings":";;;AAAA,sEAA2D;AAO3D,8EAA0E;AAE1E,6EAA8F;AAE9F,MAAa,uBAAwB,SAAQ,sCAAiB;IAU1D,YACI,WAAmB,EACnB,UAAsB,EACtB,WAAwC,EACxC,wBAAkD,EAClD,gCAAkE,EAClE,OAA6B;QAE7B,KAAK,CAAC,WAAW,CAAC,CAAC;QAjBP,cAAS,GAAG,qBAAqB,CAAC;QAClC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,SAAS;QAiBhD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,IAAI,CAAC,gCAAgC,GAAG,gCAAgC,CAAC;QACzE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,IAAI;YACA,MAAM,IAAI,GAAsB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC/D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvE,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAE1D,MAAM,OAAO,GAA6B,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAClG,MAAM,IAAI,CAAC,gCAAgC,CAAC,oBAAoB,CAAC,OAAO,EAAE,uBAAU,CAAC,MAAM,CAAC,CAAC;SAChG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;gBACrC,MAAM,GAAG,CAAC;aACb;iBAAM;gBACH,MAAM,IAAI,6BAAY,CAClB,kDAAkD,GAAG,CAAC,OAAO,EAAE,EAC/D,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,GAAG,CACN,CAAC;aACL;SACJ;IACL,CAAC;CACJ;AA9CD,0DA8CC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { IRepositorySetup } from "./interfaces/IRepositorySetup";
|
|
2
2
|
import { IParkingMachinesParams } from "../helpers/params/IParkingMachinesParams";
|
|
3
|
-
import {
|
|
3
|
+
import { IParkingMachineWithTariff } from "../../schema-definitions/models/interfaces/IParkingMachine";
|
|
4
4
|
import { SequelizeModel } from "@golemio/core/dist/output-gateway/models/SequelizeModel";
|
|
5
5
|
export declare class ParkingMachinesRepository extends SequelizeModel {
|
|
6
6
|
protected readonly shouldHideSecondarySourcesFromPrimaryData: boolean;
|
|
7
7
|
private geoConfigHelper;
|
|
8
|
+
private parkingTariffRelationsRepository;
|
|
8
9
|
constructor(setup: IRepositorySetup);
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
private associate;
|
|
11
|
+
GetAll(params: IParkingMachinesParams): Promise<IParkingMachineWithTariff[]>;
|
|
12
|
+
GetOne(id: any): Promise<IParkingMachineWithTariff | null>;
|
|
11
13
|
}
|
|
@@ -21,7 +21,16 @@ let ParkingMachinesRepository = exports.ParkingMachinesRepository = class Parkin
|
|
|
21
21
|
constructor(setup) {
|
|
22
22
|
super(setup.name, setup.tableName, setup.attributes, setup.options);
|
|
23
23
|
this.shouldHideSecondarySourcesFromPrimaryData = true;
|
|
24
|
+
this.associate = () => {
|
|
25
|
+
this.sequelizeModel.hasOne(this.parkingTariffRelationsRepository.sequelizeModel, {
|
|
26
|
+
as: "parking_tariffs_relation",
|
|
27
|
+
foreignKey: "parking_id",
|
|
28
|
+
sourceKey: "id",
|
|
29
|
+
});
|
|
30
|
+
};
|
|
24
31
|
this.geoConfigHelper = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.GeoConfigHelper);
|
|
32
|
+
this.parkingTariffRelationsRepository = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingTariffRelationsRepository);
|
|
33
|
+
this.associate();
|
|
25
34
|
}
|
|
26
35
|
async GetAll(params) {
|
|
27
36
|
try {
|
|
@@ -60,6 +69,16 @@ let ParkingMachinesRepository = exports.ParkingMachinesRepository = class Parkin
|
|
|
60
69
|
}
|
|
61
70
|
return await this.sequelizeModel.findAll({
|
|
62
71
|
raw: true,
|
|
72
|
+
nest: true,
|
|
73
|
+
include: [
|
|
74
|
+
{
|
|
75
|
+
model: this.parkingTariffRelationsRepository.sequelizeModel,
|
|
76
|
+
as: "parking_tariffs_relation",
|
|
77
|
+
attributes: ["tariff_id"],
|
|
78
|
+
required: false,
|
|
79
|
+
subQuery: false,
|
|
80
|
+
},
|
|
81
|
+
],
|
|
63
82
|
where,
|
|
64
83
|
limit: params.limit,
|
|
65
84
|
offset: params.offset,
|
|
@@ -78,7 +97,19 @@ let ParkingMachinesRepository = exports.ParkingMachinesRepository = class Parkin
|
|
|
78
97
|
}
|
|
79
98
|
async GetOne(id) {
|
|
80
99
|
try {
|
|
81
|
-
return await this.sequelizeModel.findByPk(id, {
|
|
100
|
+
return await this.sequelizeModel.findByPk(id, {
|
|
101
|
+
raw: true,
|
|
102
|
+
nest: true,
|
|
103
|
+
include: [
|
|
104
|
+
{
|
|
105
|
+
model: this.parkingTariffRelationsRepository.sequelizeModel,
|
|
106
|
+
as: "parking_tariffs_relation",
|
|
107
|
+
attributes: ["tariff_id"],
|
|
108
|
+
required: false,
|
|
109
|
+
subQuery: false,
|
|
110
|
+
},
|
|
111
|
+
],
|
|
112
|
+
});
|
|
82
113
|
}
|
|
83
114
|
catch (err) {
|
|
84
115
|
throw new golemio_errors_1.GeneralError("Database error ~ GetOne", this.name, err, 500);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingMachinesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAA2D;
|
|
1
|
+
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingMachinesRepository.ts"],"names":[],"mappings":"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"}
|