@golemio/energetics 1.4.9-dev.1632309400 → 1.4.9-rc.1648069376
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/migrations/postgresql/20250120141804-ptas-selected-meters.js +53 -0
- package/db/migrations/postgresql/sqls/20250120141804-ptas-selected-meters-down.sql +1 -0
- package/db/migrations/postgresql/sqls/20250120141804-ptas-selected-meters-up.sql +3 -0
- package/dist/input-gateway/pre/PreCsvInputController.js +4 -13
- package/dist/input-gateway/pre/PreCsvInputController.js.map +1 -1
- package/dist/input-gateway/pre/PreInputRouter.js +6 -15
- package/dist/input-gateway/pre/PreInputRouter.js.map +1 -1
- package/dist/input-gateway/pre/PreJsonInputController.js +4 -13
- package/dist/input-gateway/pre/PreJsonInputController.js.map +1 -1
- package/dist/input-gateway/ptas/PtasRouter.js +3 -12
- package/dist/input-gateway/ptas/PtasRouter.js.map +1 -1
- package/dist/input-gateway/ptas/PtasWebScrapingController.js +4 -13
- package/dist/input-gateway/ptas/PtasWebScrapingController.js.map +1 -1
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/PpasAveApiHelper.js +9 -18
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/PpasAveApiHelper.js.map +1 -1
- package/dist/integration-engine/commodity-providers/datasources/pre-elektro-api/helpers/PreElectroHelper.js +29 -40
- package/dist/integration-engine/commodity-providers/datasources/pre-elektro-api/helpers/PreElectroHelper.js.map +1 -1
- package/dist/integration-engine/commodity-providers/ioc/Di.js +1 -1
- package/dist/integration-engine/commodity-providers/ioc/Di.js.map +1 -1
- package/dist/integration-engine/commodity-providers/repositories/MeasurementRepository.js +15 -26
- package/dist/integration-engine/commodity-providers/repositories/MeasurementRepository.js.map +1 -1
- package/dist/integration-engine/commodity-providers/repositories/StaticMeterSettingsRepository.js +24 -38
- package/dist/integration-engine/commodity-providers/repositories/StaticMeterSettingsRepository.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/AbstractFetchMeasurementsTask.js +13 -24
- package/dist/integration-engine/commodity-providers/workers/tasks/AbstractFetchMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.js +14 -25
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.js +18 -29
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromProvidersTask.js +30 -41
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromProvidersTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js +33 -61
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js +50 -92
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPreMeasurementDataTask.js +20 -31
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPreMeasurementDataTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPtasWebScrapedMeasurementsTask.d.ts +1 -3
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPtasWebScrapedMeasurementsTask.js +27 -38
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPtasWebScrapedMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchVeoliaMeasurementsTask.js +46 -87
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchVeoliaMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.js +13 -24
- package/dist/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/datasources/vpalace/BaseVpalaceFactory.js +8 -12
- package/dist/integration-engine/datasources/vpalace/BaseVpalaceFactory.js.map +1 -1
- package/dist/integration-engine/datasources/vpalace/VpalaceMeasurementDataSource.js +3 -14
- package/dist/integration-engine/datasources/vpalace/VpalaceMeasurementDataSource.js.map +1 -1
- package/dist/integration-engine/datasources/vpalace/VpalaceMeasuringEquipmentDataSource.js +3 -14
- package/dist/integration-engine/datasources/vpalace/VpalaceMeasuringEquipmentDataSource.js.map +1 -1
- package/dist/integration-engine/datasources/vpalace/VpalaceMeterTypeDataSource.js +3 -14
- package/dist/integration-engine/datasources/vpalace/VpalaceMeterTypeDataSource.js.map +1 -1
- package/dist/integration-engine/datasources/vpalace/VpalaceTypeMeasuringEquipmentDataSource.js +3 -14
- package/dist/integration-engine/datasources/vpalace/VpalaceTypeMeasuringEquipmentDataSource.js.map +1 -1
- package/dist/integration-engine/datasources/vpalace/VpalaceUnitsDataSource.js +3 -14
- package/dist/integration-engine/datasources/vpalace/VpalaceUnitsDataSource.js.map +1 -1
- package/dist/integration-engine/helpers/ParserHelpers.js +1 -1
- package/dist/integration-engine/helpers/ParserHelpers.js.map +1 -1
- package/dist/integration-engine/helpers/UnimonitorCemApiHelper.js +7 -17
- package/dist/integration-engine/helpers/UnimonitorCemApiHelper.js.map +1 -1
- package/dist/integration-engine/repositories/oict-energetika/AccessLimitationRepository.js +24 -36
- package/dist/integration-engine/repositories/oict-energetika/AccessLimitationRepository.js.map +1 -1
- package/dist/integration-engine/repositories/oict-energetika/ConsumptionRepository.js +3 -12
- package/dist/integration-engine/repositories/oict-energetika/ConsumptionRepository.js.map +1 -1
- package/dist/integration-engine/repositories/vpalace/VpalacUnitsRepository.js +4 -13
- package/dist/integration-engine/repositories/vpalace/VpalacUnitsRepository.js.map +1 -1
- package/dist/integration-engine/repositories/vpalace/VpalaceMeasurementRepository.js +4 -13
- package/dist/integration-engine/repositories/vpalace/VpalaceMeasurementRepository.js.map +1 -1
- package/dist/integration-engine/repositories/vpalace/VpalaceMeasuringEquipmentRepository.js +4 -13
- package/dist/integration-engine/repositories/vpalace/VpalaceMeasuringEquipmentRepository.js.map +1 -1
- package/dist/integration-engine/repositories/vpalace/VpalaceMeterTypeRepository.js +4 -13
- package/dist/integration-engine/repositories/vpalace/VpalaceMeterTypeRepository.js.map +1 -1
- package/dist/integration-engine/repositories/vpalace/VpalaceTypeMeasuringEquipmentRepository.js +4 -13
- package/dist/integration-engine/repositories/vpalace/VpalaceTypeMeasuringEquipmentRepository.js.map +1 -1
- package/dist/integration-engine/tasks/oict-energetika/FetchAccessConfigurationTask.js +3 -14
- package/dist/integration-engine/tasks/oict-energetika/FetchAccessConfigurationTask.js.map +1 -1
- package/dist/integration-engine/tasks/oict-energetika/FetchConsumptionTask.js +12 -23
- package/dist/integration-engine/tasks/oict-energetika/FetchConsumptionTask.js.map +1 -1
- package/dist/integration-engine/tasks/oict-energetika/FetchDataTask.js +4 -15
- package/dist/integration-engine/tasks/oict-energetika/FetchDataTask.js.map +1 -1
- package/dist/integration-engine/tasks/vpalace/FetchDateFactory.js +15 -26
- package/dist/integration-engine/tasks/vpalace/FetchDateFactory.js.map +1 -1
- package/dist/integration-engine/tasks/vpalace/FetchXDaysDataTask.js +18 -29
- package/dist/integration-engine/tasks/vpalace/FetchXDaysDataTask.js.map +1 -1
- package/dist/integration-engine/tasks/vpalace/FetchXHoursDataTask.js +15 -26
- package/dist/integration-engine/tasks/vpalace/FetchXHoursDataTask.js.map +1 -1
- package/dist/integration-engine/tasks/vpalace/MeasurementDataFetcher.js +5 -14
- package/dist/integration-engine/tasks/vpalace/MeasurementDataFetcher.js.map +1 -1
- package/dist/integration-engine/tasks/vpalace/MeasuringEquipmentFetcher.js +5 -14
- package/dist/integration-engine/tasks/vpalace/MeasuringEquipmentFetcher.js.map +1 -1
- package/dist/integration-engine/tasks/vpalace/MeterTypeFetcher.js +5 -14
- package/dist/integration-engine/tasks/vpalace/MeterTypeFetcher.js.map +1 -1
- package/dist/integration-engine/tasks/vpalace/TypeMeasuringEquipmentFetcher.js +5 -14
- package/dist/integration-engine/tasks/vpalace/TypeMeasuringEquipmentFetcher.js.map +1 -1
- package/dist/integration-engine/tasks/vpalace/UnitDataFetcher.js +5 -14
- package/dist/integration-engine/tasks/vpalace/UnitDataFetcher.js.map +1 -1
- package/dist/integration-engine/transformations/oict-energetika/ConsumptionTransformation.js +2 -11
- package/dist/integration-engine/transformations/oict-energetika/ConsumptionTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/vpalace/VpalacMeasuringEquipmentTransformation.js +2 -11
- package/dist/integration-engine/transformations/vpalace/VpalacMeasuringEquipmentTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/vpalace/VpalacMeterTypeTransformation.js +2 -11
- package/dist/integration-engine/transformations/vpalace/VpalacMeterTypeTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/vpalace/VpalacTypeMeasuringEquipmentTransformation.js +2 -11
- package/dist/integration-engine/transformations/vpalace/VpalacTypeMeasuringEquipmentTransformation.js.map +1 -1
- package/dist/integration-engine/transformations/vpalace/VpalacUnitsTransformation.js +2 -11
- package/dist/integration-engine/transformations/vpalace/VpalacUnitsTransformation.js.map +1 -1
- package/dist/output-gateway/controllers/v2/AbstractController.js +6 -17
- package/dist/output-gateway/controllers/v2/AbstractController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/BuildingsController.js +15 -24
- package/dist/output-gateway/controllers/v2/BuildingsController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2DevicesController.js +8 -17
- package/dist/output-gateway/controllers/v2/V2DevicesController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2MeasurementsController.js +18 -19
- package/dist/output-gateway/controllers/v2/V2MeasurementsController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2OrganizationsController.js +9 -18
- package/dist/output-gateway/controllers/v2/V2OrganizationsController.js.map +1 -1
- package/dist/output-gateway/repositories/AccessLimitationRepository.js +13 -24
- package/dist/output-gateway/repositories/AccessLimitationRepository.js.map +1 -1
- package/dist/output-gateway/repositories/DevicesRepository.js +26 -39
- package/dist/output-gateway/repositories/DevicesRepository.js.map +1 -1
- package/dist/output-gateway/repositories/MeasurementRepository.js +49 -66
- package/dist/output-gateway/repositories/MeasurementRepository.js.map +1 -1
- package/dist/output-gateway/repositories/OrganizationBuildingsRepository.js +4 -17
- package/dist/output-gateway/repositories/OrganizationBuildingsRepository.js.map +1 -1
- package/dist/output-gateway/repositories/OrganizationResponsibleUsersRepository.js +4 -17
- package/dist/output-gateway/repositories/OrganizationResponsibleUsersRepository.js.map +1 -1
- package/dist/output-gateway/repositories/OrganizationsRepository.js +67 -82
- package/dist/output-gateway/repositories/OrganizationsRepository.js.map +1 -1
- package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js +37 -52
- package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js.map +1 -1
- package/dist/output-gateway/transformations/BuildingTransformationFull.js +114 -115
- package/dist/output-gateway/transformations/BuildingTransformationFull.js.map +1 -1
- package/dist/output-gateway/transformations/BuildingsTransformation.js +2 -3
- package/dist/output-gateway/transformations/BuildingsTransformation.js.map +1 -1
- package/dist/output-gateway/transformations/OrganizationDetailDtoTransformation.js +1 -2
- package/dist/output-gateway/transformations/OrganizationDetailDtoTransformation.js.map +1 -1
- package/dist/schema-definitions/datasources/interfaces/IStaticMeterSettings.d.ts +3 -0
- package/dist/schema-definitions/models/helpers/StaticDataResourceTypeEnum.d.ts +2 -1
- package/dist/schema-definitions/models/helpers/StaticDataResourceTypeEnum.js +1 -0
- package/dist/schema-definitions/models/helpers/StaticDataResourceTypeEnum.js.map +1 -1
- package/dist/schema-definitions/models/interfaces/IStaticDataOutputDto.d.ts +2 -1
- package/docs/implementation_documentation.md +1 -0
- package/package.json +4 -4
package/dist/integration-engine/commodity-providers/repositories/StaticMeterSettingsRepository.js
CHANGED
|
@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
15
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
16
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
17
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
18
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
19
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
20
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
|
-
});
|
|
22
|
-
};
|
|
23
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
15
|
exports.StaticMeterSettingsRepository = void 0;
|
|
25
16
|
const constants_1 = require("../../../schema-definitions/constants");
|
|
@@ -39,36 +30,31 @@ let StaticMeterSettingsRepository = exports.StaticMeterSettingsRepository = clas
|
|
|
39
30
|
.getConnection()
|
|
40
31
|
.define(this.tableName, StaticMeterSettingsModel_1.StaticMeterSettingsModel.attributeModel, { schema: this.schema });
|
|
41
32
|
}
|
|
42
|
-
saveData(provider, resourceType, data) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
});
|
|
33
|
+
async saveData(provider, resourceType, data) {
|
|
34
|
+
try {
|
|
35
|
+
await this.validator.Validate({ provider, resource_type: resourceType, data });
|
|
36
|
+
}
|
|
37
|
+
catch (err) {
|
|
38
|
+
throw new golemio_errors_1.ValidationError("Static data validation error", this.constructor.name, err);
|
|
39
|
+
}
|
|
40
|
+
try {
|
|
41
|
+
await this.sequelizeModel.upsert({ provider, resource_type: resourceType, data });
|
|
42
|
+
}
|
|
43
|
+
catch (err) {
|
|
44
|
+
throw new golemio_errors_1.GeneralError("Static data saving error", this.constructor.name, err);
|
|
45
|
+
}
|
|
57
46
|
}
|
|
58
|
-
getData(provider, resourceType) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
throw new golemio_errors_1.GeneralError("Static data fetching error", this.constructor.name, err);
|
|
70
|
-
}
|
|
71
|
-
});
|
|
47
|
+
async getData(provider, resourceType) {
|
|
48
|
+
try {
|
|
49
|
+
const result = await this.sequelizeModel.findOne({
|
|
50
|
+
attributes: ["data"],
|
|
51
|
+
where: { provider, resource_type: resourceType },
|
|
52
|
+
});
|
|
53
|
+
return result?.data ?? null;
|
|
54
|
+
}
|
|
55
|
+
catch (err) {
|
|
56
|
+
throw new golemio_errors_1.GeneralError("Static data fetching error", this.constructor.name, err);
|
|
57
|
+
}
|
|
72
58
|
}
|
|
73
59
|
};
|
|
74
60
|
exports.StaticMeterSettingsRepository = StaticMeterSettingsRepository = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticMeterSettingsRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/repositories/StaticMeterSettingsRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"StaticMeterSettingsRepository.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/repositories/StaticMeterSettingsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qEAA2C;AAC3C,0GAAgF;AAMhF,8IAA2I;AAC3I,wEAAqE;AACrE,6EAAyF;AACzF,mFAAkF;AAElF,iEAAwE;AAGjE,IAAM,6BAA6B,2CAAnC,MAAM,6BAA8B,SAAQ,6DAA6B;IAO5E,YAAiD,SAA6B,EAA4B,MAAe;QACrH,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QANtB,WAAM,GAAG,qBAAS,CAAC;QACnB,cAAS,GAAG,mDAAwB,CAAC,SAAS,CAAC;QAMlD,IAAI,CAAC,SAAS,GAAG,IAAI,uCAAmB,CAAC,aAAa,EAAE,mDAAwB,CAAC,UAAU,CAAC,CAAC;QAC7F,IAAI,CAAC,cAAc,GAAG,SAAS;aAC1B,aAAa,EAAE;aACf,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,mDAAwB,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAClG,CAAC;IAEM,KAAK,CAAC,QAAQ,CACjB,QAA+B,EAC/B,YAAe,EACf,IAAyB;QAEzB,IAAI;YACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;SAClF;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,gCAAe,CAAC,8BAA8B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACzF;QAED,IAAI;YACA,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;SACrF;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,6BAAY,CAAC,0BAA0B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SAClF;IACL,CAAC;IAEM,KAAK,CAAC,OAAO,CAChB,QAA+B,EAC/B,YAAe;QAEf,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC7C,UAAU,EAAE,CAAC,MAAM,CAAC;gBACpB,KAAK,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE;aACnD,CAAC,CAAC;YACH,OAAQ,MAAM,EAAE,IAA4B,IAAI,IAAI,CAAC;SACxD;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,6BAAY,CAAC,4BAA4B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACpF;IACL,CAAC;CACJ,CAAA;wCA/CY,6BAA6B;IADzC,IAAA,qBAAU,GAAE;IAQI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IAAiC,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GAPhG,6BAA6B,CA+CzC"}
|
package/dist/integration-engine/commodity-providers/workers/tasks/AbstractFetchMeasurementsTask.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
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
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.AbstractFetchMeasurementsTask = void 0;
|
|
13
4
|
const constants_1 = require("../../constants");
|
|
@@ -18,22 +9,20 @@ class AbstractFetchMeasurementsTask extends integration_engine_1.AbstractTask {
|
|
|
18
9
|
constructor() {
|
|
19
10
|
super(constants_1.WORKER_NAME);
|
|
20
11
|
}
|
|
21
|
-
saveConsumptionData(data, skipFilter = false) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
batch = MeasurementsDataNormalizer_1.MeasurementsDataNormalizer.filter(batch);
|
|
27
|
-
}
|
|
28
|
-
// Remove duplicated measurements from the batch
|
|
29
|
-
batch = batch.filter((item, index, self) => index ===
|
|
30
|
-
self.findIndex((t) => t.timestamp.getTime() === item.timestamp.getTime() &&
|
|
31
|
-
t.addr === item.addr &&
|
|
32
|
-
t.variable === item.variable &&
|
|
33
|
-
t.meter === item.meter));
|
|
34
|
-
yield this.measurementRepository.bulkSave(batch);
|
|
12
|
+
async saveConsumptionData(data, skipFilter = false) {
|
|
13
|
+
for (let i = 0; i < data.length; i += MEASUREMENTS_BATCH_SIZE) {
|
|
14
|
+
let batch = data.slice(i, i + MEASUREMENTS_BATCH_SIZE);
|
|
15
|
+
if (!skipFilter) {
|
|
16
|
+
batch = MeasurementsDataNormalizer_1.MeasurementsDataNormalizer.filter(batch);
|
|
35
17
|
}
|
|
36
|
-
|
|
18
|
+
// Remove duplicated measurements from the batch
|
|
19
|
+
batch = batch.filter((item, index, self) => index ===
|
|
20
|
+
self.findIndex((t) => t.timestamp.getTime() === item.timestamp.getTime() &&
|
|
21
|
+
t.addr === item.addr &&
|
|
22
|
+
t.variable === item.variable &&
|
|
23
|
+
t.meter === item.meter));
|
|
24
|
+
await this.measurementRepository.bulkSave(batch);
|
|
25
|
+
}
|
|
37
26
|
}
|
|
38
27
|
}
|
|
39
28
|
exports.AbstractFetchMeasurementsTask = AbstractFetchMeasurementsTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractFetchMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/AbstractFetchMeasurementsTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AbstractFetchMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/AbstractFetchMeasurementsTask.ts"],"names":[],"mappings":";;;AAAA,+CAAgE;AAChE,wFAAuG;AAGvG,8EAAqE;AAGrE,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAErC,MAAsB,6BAA6D,SAAQ,iCAAe;IAGtG;QACI,KAAK,CAAC,uBAAW,CAAC,CAAC;IACvB,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,IAAuB,EAAE,aAAsB,KAAK;QACpF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,uBAAuB,EAAE;YAC3D,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,uBAAuB,CAAC,CAAC;YAEvD,IAAI,CAAC,UAAU,EAAE;gBACb,KAAK,GAAG,uDAA0B,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACpD;YAED,gDAAgD;YAChD,KAAK,GAAG,KAAK,CAAC,MAAM,CAChB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAClB,KAAK;gBACL,IAAI,CAAC,SAAS,CACV,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBAClD,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI;oBACpB,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;oBAC5B,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAC7B,CACR,CAAC;YAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACpD;IACL,CAAC;CACJ;AA/BD,sEA+BC"}
|
|
@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
15
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
16
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
17
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
18
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
19
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
20
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
|
-
});
|
|
22
|
-
};
|
|
23
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
15
|
exports.FetchMeasurementOptionsStaticDataTask = void 0;
|
|
25
16
|
const constants_1 = require("../../constants");
|
|
@@ -55,28 +46,26 @@ let FetchMeasurementOptionsStaticDataTask = exports.FetchMeasurementOptionsStati
|
|
|
55
46
|
this.queueName = "fetchMeasurementOptionsStaticData";
|
|
56
47
|
this.queueTtl = 59 * 60 * 1000; // 59min
|
|
57
48
|
}
|
|
58
|
-
execute() {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
continue;
|
|
68
|
-
}
|
|
69
|
-
this.logger.info(`Fetched ${options.length} measurement options for ${commodityProvider}`);
|
|
70
|
-
yield this.meterSettingsRepository.saveData(commodityProvider, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions, options);
|
|
49
|
+
async execute() {
|
|
50
|
+
const dataSource = this.staticDataSourceProvider.getDataSource();
|
|
51
|
+
const staticDataSourceCapitalDistrict = this.meterSettingsRepositoryCapitalDistrict.getDataSource();
|
|
52
|
+
const meterSettingsCapitalDistrict = await staticDataSourceCapitalDistrict.getAll();
|
|
53
|
+
const meterSettings = await dataSource.getAll();
|
|
54
|
+
for (const [commodityProvider, key] of Object.entries(optionLookupKeys)) {
|
|
55
|
+
const options = this.lookupMeasurementsOptionsByKey({ ...meterSettings, ...meterSettingsCapitalDistrict }, key);
|
|
56
|
+
if (options.length === 0) {
|
|
57
|
+
continue;
|
|
71
58
|
}
|
|
72
|
-
|
|
59
|
+
this.logger.info(`Fetched ${options.length} measurement options for ${commodityProvider}`);
|
|
60
|
+
await this.meterSettingsRepository.saveData(commodityProvider, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions, options);
|
|
61
|
+
}
|
|
73
62
|
}
|
|
74
63
|
lookupMeasurementsOptionsByKey(meterSettings, key) {
|
|
75
64
|
const settings = meterSettings[key];
|
|
76
|
-
if (!
|
|
65
|
+
if (!settings?.MeasurementOptions) {
|
|
77
66
|
throw new golemio_errors_1.GeneralError(`No measurements options found for key: ${key}`);
|
|
78
67
|
}
|
|
79
|
-
return settings
|
|
68
|
+
return settings?.MeasurementOptions;
|
|
80
69
|
}
|
|
81
70
|
};
|
|
82
71
|
exports.FetchMeasurementOptionsStaticDataTask = FetchMeasurementOptionsStaticDataTask = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchMeasurementOptionsStaticDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FetchMeasurementOptionsStaticDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
18
|
-
});
|
|
19
|
-
};
|
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
12
|
exports.FetchMeasurementsFromEEProvidersTask = void 0;
|
|
22
13
|
const constants_1 = require("../../constants");
|
|
@@ -32,26 +23,24 @@ let FetchMeasurementsFromEEProvidersTask = exports.FetchMeasurementsFromEEProvid
|
|
|
32
23
|
this.queueTtl = 60 * 60 * 1000;
|
|
33
24
|
this.schema = DataEntrypointSchema_1.DataEntrypointValidationSchema;
|
|
34
25
|
}
|
|
35
|
-
execute(data) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
});
|
|
26
|
+
async execute(data) {
|
|
27
|
+
for (const { dateFrom, dateTo } of this.generateDateParams(data)) {
|
|
28
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
|
|
29
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveA,
|
|
30
|
+
dateFrom,
|
|
31
|
+
dateTo,
|
|
32
|
+
});
|
|
33
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
|
|
34
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveC,
|
|
35
|
+
dateFrom,
|
|
36
|
+
dateTo,
|
|
37
|
+
});
|
|
38
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
|
|
39
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveMO,
|
|
40
|
+
dateFrom,
|
|
41
|
+
dateTo,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
55
44
|
}
|
|
56
45
|
*generateDateParams(data) {
|
|
57
46
|
const currentDate = luxon_1.DateTime.now().startOf("day");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchMeasurementsFromEEProvidersTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FetchMeasurementsFromEEProvidersTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAgE;AAChE,uHAAsF;AACtF,8EAAmF;AACnF,2DAAqE;AACrE,iEAAgE;AAGhE,yEAAgF;AAGzE,IAAM,oCAAoC,kDAA1C,MAAM,oCAAqC,SAAQ,iCAAmC;IAKzF;QACI,KAAK,CAAC,uBAAW,CAAC,CAAC;QALP,cAAS,GAAG,kCAAkC,CAAC;QAC/C,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAC1B,WAAM,GAAG,qDAA8B,CAAC;IAIxD,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAA2B;QAC5C,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;YAC9D,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;gBAC5E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;gBAC5C,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;YAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;gBAC5E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;gBAC5C,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;YAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;gBAC5E,YAAY,EAAE,iDAAqB,CAAC,SAAS;gBAC7C,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;SACN;IACL,CAAC;IAEO,CAAC,kBAAkB,CAAC,IAA2B;QACnD,MAAM,WAAW,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAE9G,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAExC,MAAM;gBACF,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;gBAC3B,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;aAC1B,CAAC;SACL;IACL,CAAC;CACJ,CAAA;+CA9CY,oCAAoC;IADhD,IAAA,qBAAU,GAAE;;GACA,oCAAoC,CA8ChD"}
|
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
18
|
-
});
|
|
19
|
-
};
|
|
20
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
12
|
exports.FetchMeasurementsFromProvidersTask = void 0;
|
|
22
13
|
const constants_1 = require("../../constants");
|
|
@@ -32,38 +23,36 @@ let FetchMeasurementsFromProvidersTask = exports.FetchMeasurementsFromProvidersT
|
|
|
32
23
|
this.queueTtl = 60 * 60 * 1000;
|
|
33
24
|
this.schema = DataEntrypointSchema_1.DataEntrypointValidationSchema;
|
|
34
25
|
}
|
|
35
|
-
execute(data) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}
|
|
66
|
-
});
|
|
26
|
+
async execute(data) {
|
|
27
|
+
for (const { dateFrom, dateTo } of this.generateDateParams(data)) {
|
|
28
|
+
// Veolia
|
|
29
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchVeoliaMeasurements", {
|
|
30
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.CemApiVeoliaWater,
|
|
31
|
+
dateFrom,
|
|
32
|
+
dateTo,
|
|
33
|
+
});
|
|
34
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchVeoliaMeasurements", {
|
|
35
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.CemApiVeoliaElectro,
|
|
36
|
+
dateFrom,
|
|
37
|
+
dateTo,
|
|
38
|
+
});
|
|
39
|
+
// PPAS - Pražská plynárenská
|
|
40
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasMeasurements", {
|
|
41
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveV,
|
|
42
|
+
dateFrom,
|
|
43
|
+
dateTo,
|
|
44
|
+
});
|
|
45
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasMeasurements", {
|
|
46
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveM,
|
|
47
|
+
dateFrom,
|
|
48
|
+
dateTo,
|
|
49
|
+
});
|
|
50
|
+
//PRE
|
|
51
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPreElectroMeasurementsTask", {
|
|
52
|
+
dateFrom,
|
|
53
|
+
dateTo,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
67
56
|
}
|
|
68
57
|
*generateDateParams(data) {
|
|
69
58
|
const currentDate = luxon_1.DateTime.now().startOf("day");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchMeasurementsFromProvidersTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromProvidersTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FetchMeasurementsFromProvidersTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromProvidersTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAgE;AAChE,uHAAsF;AACtF,8EAAmF;AACnF,2DAAqE;AACrE,iEAAgE;AAGhE,yEAAgF;AAGzE,IAAM,kCAAkC,gDAAxC,MAAM,kCAAmC,SAAQ,iCAAmC;IAKvF;QACI,KAAK,CAAC,uBAAW,CAAC,CAAC;QALP,cAAS,GAAG,gCAAgC,CAAC;QAC7C,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAC1B,WAAM,GAAG,qDAA8B,CAAC;IAIxD,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAA2B;QAC5C,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;YAC9D,SAAS;YACT,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;gBAC5E,YAAY,EAAE,iDAAqB,CAAC,iBAAiB;gBACrD,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;YAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;gBAC5E,YAAY,EAAE,iDAAqB,CAAC,mBAAmB;gBACvD,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;YAEH,6BAA6B;YAC7B,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,EAAE;gBAC1E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;gBAC5C,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;YAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,EAAE;gBAC1E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;gBAC5C,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;YAEH,KAAK;YACL,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,iCAAiC,EAAE;gBACpF,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;SACN;IACL,CAAC;IAEO,CAAC,kBAAkB,CAAC,IAA2B;QACnD,MAAM,WAAW,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAE9G,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAExC,MAAM;gBACF,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;gBAC3B,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;aAC1B,CAAC;SACL;IACL,CAAC;CACJ,CAAA;6CA5DY,kCAAkC;IAD9C,IAAA,qBAAU,GAAE;;GACA,kCAAkC,CA4D9C"}
|
package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js
CHANGED
|
@@ -11,22 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
15
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
16
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
17
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
18
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
19
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
20
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
|
-
});
|
|
22
|
-
};
|
|
23
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
24
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
25
|
-
var m = o[Symbol.asyncIterator], i;
|
|
26
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
27
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
28
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
29
|
-
};
|
|
30
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
15
|
exports.FetchPpasEEMeasurementsTask = void 0;
|
|
32
16
|
const PpasAveApiHelper_1 = require("../../datasources/ppas-ave-api/helpers/PpasAveApiHelper");
|
|
@@ -47,54 +31,42 @@ let FetchPpasEEMeasurementsTask = exports.FetchPpasEEMeasurementsTask = class Fe
|
|
|
47
31
|
this.queueTtl = 60 * 60 * 1000;
|
|
48
32
|
this.schema = PpasMeasurementsSchema_1.PpasMeasurementsValidationSchema;
|
|
49
33
|
}
|
|
50
|
-
execute(data) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
for (const option of options) {
|
|
79
|
-
const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement(Object.assign(Object.assign({}, item), option)));
|
|
80
|
-
consumptionData = consumptionData.concat(consumptionBatch);
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
85
|
-
finally {
|
|
86
|
-
try {
|
|
87
|
-
if (!_d && !_a && (_b = measurementChunkGenerator_1.return)) yield _b.call(measurementChunkGenerator_1);
|
|
88
|
-
}
|
|
89
|
-
finally { if (e_1) throw e_1.error; }
|
|
34
|
+
async execute(data) {
|
|
35
|
+
let measurementOptions = await this.meterSettingsRepository.getData(data.providerType, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions);
|
|
36
|
+
if (!measurementOptions) {
|
|
37
|
+
throw new golemio_errors_1.GeneralError("Measurement options not found", this.constructor.name);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
measurementOptions = this.splitOptionsByVars(measurementOptions);
|
|
41
|
+
}
|
|
42
|
+
const { baseUrl, config } = this.getProviderConfig(data);
|
|
43
|
+
const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
|
|
44
|
+
const sessionId = await aveApiHelper.createSession();
|
|
45
|
+
try {
|
|
46
|
+
const places = await this.getDataFromDataSource("Places", sessionId);
|
|
47
|
+
let consumptionData = [];
|
|
48
|
+
for (const place of places) {
|
|
49
|
+
const options = measurementOptions.filter((item) => item.MeterSerialNumber === place.DeviceSerialNumber);
|
|
50
|
+
if (options.length === 0) {
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
this.logger.info(`Fetching data for device ${place.DeviceSerialNumber}`);
|
|
54
|
+
const measurementChunkGenerator = this.generateMeasurements({ ...data, placeId: place.Id }, sessionId);
|
|
55
|
+
for await (const measurements of measurementChunkGenerator) {
|
|
56
|
+
for (const option of options) {
|
|
57
|
+
const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement({
|
|
58
|
+
...item,
|
|
59
|
+
...option,
|
|
60
|
+
}));
|
|
61
|
+
consumptionData = consumptionData.concat(consumptionBatch);
|
|
90
62
|
}
|
|
91
63
|
}
|
|
92
|
-
yield this.saveConsumptionData(consumptionData);
|
|
93
|
-
}
|
|
94
|
-
finally {
|
|
95
|
-
yield aveApiHelper.terminateSession(sessionId);
|
|
96
64
|
}
|
|
97
|
-
|
|
65
|
+
await this.saveConsumptionData(consumptionData);
|
|
66
|
+
}
|
|
67
|
+
finally {
|
|
68
|
+
await aveApiHelper.terminateSession(sessionId);
|
|
69
|
+
}
|
|
98
70
|
}
|
|
99
71
|
};
|
|
100
72
|
exports.FetchPpasEEMeasurementsTask = FetchPpasEEMeasurementsTask = __decorate([
|
package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchPpasEEMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FetchPpasEEMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.ts"],"names":[],"mappings":"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"}
|