@golemio/energetics 1.4.9-dev.1632898261 → 1.4.9-rc.1648124816

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.
Files changed (133) hide show
  1. package/dist/input-gateway/pre/PreCsvInputController.js +4 -13
  2. package/dist/input-gateway/pre/PreCsvInputController.js.map +1 -1
  3. package/dist/input-gateway/pre/PreInputRouter.js +6 -15
  4. package/dist/input-gateway/pre/PreInputRouter.js.map +1 -1
  5. package/dist/input-gateway/pre/PreJsonInputController.js +4 -13
  6. package/dist/input-gateway/pre/PreJsonInputController.js.map +1 -1
  7. package/dist/input-gateway/ptas/PtasRouter.js +3 -12
  8. package/dist/input-gateway/ptas/PtasRouter.js.map +1 -1
  9. package/dist/input-gateway/ptas/PtasWebScrapingController.js +4 -13
  10. package/dist/input-gateway/ptas/PtasWebScrapingController.js.map +1 -1
  11. package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/PpasAveApiHelper.js +9 -18
  12. package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/PpasAveApiHelper.js.map +1 -1
  13. package/dist/integration-engine/commodity-providers/datasources/pre-elektro-api/helpers/PreElectroHelper.js +29 -40
  14. package/dist/integration-engine/commodity-providers/datasources/pre-elektro-api/helpers/PreElectroHelper.js.map +1 -1
  15. package/dist/integration-engine/commodity-providers/ioc/Di.js +1 -1
  16. package/dist/integration-engine/commodity-providers/ioc/Di.js.map +1 -1
  17. package/dist/integration-engine/commodity-providers/repositories/MeasurementRepository.js +15 -26
  18. package/dist/integration-engine/commodity-providers/repositories/MeasurementRepository.js.map +1 -1
  19. package/dist/integration-engine/commodity-providers/repositories/StaticMeterSettingsRepository.js +24 -38
  20. package/dist/integration-engine/commodity-providers/repositories/StaticMeterSettingsRepository.js.map +1 -1
  21. package/dist/integration-engine/commodity-providers/workers/tasks/AbstractFetchMeasurementsTask.js +13 -24
  22. package/dist/integration-engine/commodity-providers/workers/tasks/AbstractFetchMeasurementsTask.js.map +1 -1
  23. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.js +14 -25
  24. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.js.map +1 -1
  25. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.js +18 -29
  26. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.js.map +1 -1
  27. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromProvidersTask.js +30 -41
  28. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromProvidersTask.js.map +1 -1
  29. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js +33 -61
  30. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js.map +1 -1
  31. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js +50 -92
  32. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js.map +1 -1
  33. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPreMeasurementDataTask.js +20 -31
  34. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPreMeasurementDataTask.js.map +1 -1
  35. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPtasWebScrapedMeasurementsTask.js +22 -33
  36. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPtasWebScrapedMeasurementsTask.js.map +1 -1
  37. package/dist/integration-engine/commodity-providers/workers/tasks/FetchVeoliaMeasurementsTask.js +46 -87
  38. package/dist/integration-engine/commodity-providers/workers/tasks/FetchVeoliaMeasurementsTask.js.map +1 -1
  39. package/dist/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.js +13 -24
  40. package/dist/integration-engine/commodity-providers/workers/tasks/ProcessPreEanMeasurementsTask.js.map +1 -1
  41. package/dist/integration-engine/datasources/vpalace/BaseVpalaceFactory.js +8 -12
  42. package/dist/integration-engine/datasources/vpalace/BaseVpalaceFactory.js.map +1 -1
  43. package/dist/integration-engine/datasources/vpalace/VpalaceMeasurementDataSource.js +3 -14
  44. package/dist/integration-engine/datasources/vpalace/VpalaceMeasurementDataSource.js.map +1 -1
  45. package/dist/integration-engine/datasources/vpalace/VpalaceMeasuringEquipmentDataSource.js +3 -14
  46. package/dist/integration-engine/datasources/vpalace/VpalaceMeasuringEquipmentDataSource.js.map +1 -1
  47. package/dist/integration-engine/datasources/vpalace/VpalaceMeterTypeDataSource.js +3 -14
  48. package/dist/integration-engine/datasources/vpalace/VpalaceMeterTypeDataSource.js.map +1 -1
  49. package/dist/integration-engine/datasources/vpalace/VpalaceTypeMeasuringEquipmentDataSource.js +3 -14
  50. package/dist/integration-engine/datasources/vpalace/VpalaceTypeMeasuringEquipmentDataSource.js.map +1 -1
  51. package/dist/integration-engine/datasources/vpalace/VpalaceUnitsDataSource.js +3 -14
  52. package/dist/integration-engine/datasources/vpalace/VpalaceUnitsDataSource.js.map +1 -1
  53. package/dist/integration-engine/helpers/ParserHelpers.js +1 -1
  54. package/dist/integration-engine/helpers/ParserHelpers.js.map +1 -1
  55. package/dist/integration-engine/helpers/UnimonitorCemApiHelper.js +7 -17
  56. package/dist/integration-engine/helpers/UnimonitorCemApiHelper.js.map +1 -1
  57. package/dist/integration-engine/repositories/oict-energetika/AccessLimitationRepository.js +24 -36
  58. package/dist/integration-engine/repositories/oict-energetika/AccessLimitationRepository.js.map +1 -1
  59. package/dist/integration-engine/repositories/oict-energetika/ConsumptionRepository.js +3 -12
  60. package/dist/integration-engine/repositories/oict-energetika/ConsumptionRepository.js.map +1 -1
  61. package/dist/integration-engine/repositories/vpalace/VpalacUnitsRepository.js +4 -13
  62. package/dist/integration-engine/repositories/vpalace/VpalacUnitsRepository.js.map +1 -1
  63. package/dist/integration-engine/repositories/vpalace/VpalaceMeasurementRepository.js +4 -13
  64. package/dist/integration-engine/repositories/vpalace/VpalaceMeasurementRepository.js.map +1 -1
  65. package/dist/integration-engine/repositories/vpalace/VpalaceMeasuringEquipmentRepository.js +4 -13
  66. package/dist/integration-engine/repositories/vpalace/VpalaceMeasuringEquipmentRepository.js.map +1 -1
  67. package/dist/integration-engine/repositories/vpalace/VpalaceMeterTypeRepository.js +4 -13
  68. package/dist/integration-engine/repositories/vpalace/VpalaceMeterTypeRepository.js.map +1 -1
  69. package/dist/integration-engine/repositories/vpalace/VpalaceTypeMeasuringEquipmentRepository.js +4 -13
  70. package/dist/integration-engine/repositories/vpalace/VpalaceTypeMeasuringEquipmentRepository.js.map +1 -1
  71. package/dist/integration-engine/tasks/oict-energetika/FetchAccessConfigurationTask.js +3 -14
  72. package/dist/integration-engine/tasks/oict-energetika/FetchAccessConfigurationTask.js.map +1 -1
  73. package/dist/integration-engine/tasks/oict-energetika/FetchConsumptionTask.js +12 -23
  74. package/dist/integration-engine/tasks/oict-energetika/FetchConsumptionTask.js.map +1 -1
  75. package/dist/integration-engine/tasks/oict-energetika/FetchDataTask.js +4 -15
  76. package/dist/integration-engine/tasks/oict-energetika/FetchDataTask.js.map +1 -1
  77. package/dist/integration-engine/tasks/vpalace/FetchDateFactory.js +15 -26
  78. package/dist/integration-engine/tasks/vpalace/FetchDateFactory.js.map +1 -1
  79. package/dist/integration-engine/tasks/vpalace/FetchXDaysDataTask.js +18 -29
  80. package/dist/integration-engine/tasks/vpalace/FetchXDaysDataTask.js.map +1 -1
  81. package/dist/integration-engine/tasks/vpalace/FetchXHoursDataTask.js +15 -26
  82. package/dist/integration-engine/tasks/vpalace/FetchXHoursDataTask.js.map +1 -1
  83. package/dist/integration-engine/tasks/vpalace/MeasurementDataFetcher.js +5 -14
  84. package/dist/integration-engine/tasks/vpalace/MeasurementDataFetcher.js.map +1 -1
  85. package/dist/integration-engine/tasks/vpalace/MeasuringEquipmentFetcher.js +5 -14
  86. package/dist/integration-engine/tasks/vpalace/MeasuringEquipmentFetcher.js.map +1 -1
  87. package/dist/integration-engine/tasks/vpalace/MeterTypeFetcher.js +5 -14
  88. package/dist/integration-engine/tasks/vpalace/MeterTypeFetcher.js.map +1 -1
  89. package/dist/integration-engine/tasks/vpalace/TypeMeasuringEquipmentFetcher.js +5 -14
  90. package/dist/integration-engine/tasks/vpalace/TypeMeasuringEquipmentFetcher.js.map +1 -1
  91. package/dist/integration-engine/tasks/vpalace/UnitDataFetcher.js +5 -14
  92. package/dist/integration-engine/tasks/vpalace/UnitDataFetcher.js.map +1 -1
  93. package/dist/integration-engine/transformations/oict-energetika/ConsumptionTransformation.js +2 -11
  94. package/dist/integration-engine/transformations/oict-energetika/ConsumptionTransformation.js.map +1 -1
  95. package/dist/integration-engine/transformations/vpalace/VpalacMeasuringEquipmentTransformation.js +2 -11
  96. package/dist/integration-engine/transformations/vpalace/VpalacMeasuringEquipmentTransformation.js.map +1 -1
  97. package/dist/integration-engine/transformations/vpalace/VpalacMeterTypeTransformation.js +2 -11
  98. package/dist/integration-engine/transformations/vpalace/VpalacMeterTypeTransformation.js.map +1 -1
  99. package/dist/integration-engine/transformations/vpalace/VpalacTypeMeasuringEquipmentTransformation.js +2 -11
  100. package/dist/integration-engine/transformations/vpalace/VpalacTypeMeasuringEquipmentTransformation.js.map +1 -1
  101. package/dist/integration-engine/transformations/vpalace/VpalacUnitsTransformation.js +2 -11
  102. package/dist/integration-engine/transformations/vpalace/VpalacUnitsTransformation.js.map +1 -1
  103. package/dist/output-gateway/controllers/v2/AbstractController.js +6 -17
  104. package/dist/output-gateway/controllers/v2/AbstractController.js.map +1 -1
  105. package/dist/output-gateway/controllers/v2/BuildingsController.js +15 -24
  106. package/dist/output-gateway/controllers/v2/BuildingsController.js.map +1 -1
  107. package/dist/output-gateway/controllers/v2/V2DevicesController.js +8 -17
  108. package/dist/output-gateway/controllers/v2/V2DevicesController.js.map +1 -1
  109. package/dist/output-gateway/controllers/v2/V2MeasurementsController.js +18 -19
  110. package/dist/output-gateway/controllers/v2/V2MeasurementsController.js.map +1 -1
  111. package/dist/output-gateway/controllers/v2/V2OrganizationsController.js +9 -18
  112. package/dist/output-gateway/controllers/v2/V2OrganizationsController.js.map +1 -1
  113. package/dist/output-gateway/repositories/AccessLimitationRepository.js +13 -24
  114. package/dist/output-gateway/repositories/AccessLimitationRepository.js.map +1 -1
  115. package/dist/output-gateway/repositories/DevicesRepository.js +26 -39
  116. package/dist/output-gateway/repositories/DevicesRepository.js.map +1 -1
  117. package/dist/output-gateway/repositories/MeasurementRepository.js +49 -66
  118. package/dist/output-gateway/repositories/MeasurementRepository.js.map +1 -1
  119. package/dist/output-gateway/repositories/OrganizationBuildingsRepository.js +4 -17
  120. package/dist/output-gateway/repositories/OrganizationBuildingsRepository.js.map +1 -1
  121. package/dist/output-gateway/repositories/OrganizationResponsibleUsersRepository.js +4 -17
  122. package/dist/output-gateway/repositories/OrganizationResponsibleUsersRepository.js.map +1 -1
  123. package/dist/output-gateway/repositories/OrganizationsRepository.js +67 -82
  124. package/dist/output-gateway/repositories/OrganizationsRepository.js.map +1 -1
  125. package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js +37 -52
  126. package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js.map +1 -1
  127. package/dist/output-gateway/transformations/BuildingTransformationFull.js +114 -115
  128. package/dist/output-gateway/transformations/BuildingTransformationFull.js.map +1 -1
  129. package/dist/output-gateway/transformations/BuildingsTransformation.js +2 -3
  130. package/dist/output-gateway/transformations/BuildingsTransformation.js.map +1 -1
  131. package/dist/output-gateway/transformations/OrganizationDetailDtoTransformation.js +1 -2
  132. package/dist/output-gateway/transformations/OrganizationDetailDtoTransformation.js.map +1 -1
  133. package/package.json +4 -4
@@ -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
- return __awaiter(this, void 0, void 0, function* () {
23
- for (let i = 0; i < data.length; i += MEASUREMENTS_BATCH_SIZE) {
24
- let batch = data.slice(i, i + MEASUREMENTS_BATCH_SIZE);
25
- if (!skipFilter) {
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":";;;;;;;;;;;;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;IAEe,mBAAmB,CAAC,IAAuB,EAAE,aAAsB,KAAK;;YACpF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,uBAAuB,EAAE;gBAC3D,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,uBAAuB,CAAC,CAAC;gBAEvD,IAAI,CAAC,UAAU,EAAE;oBACb,KAAK,GAAG,uDAA0B,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBACpD;gBAED,gDAAgD;gBAChD,KAAK,GAAG,KAAK,CAAC,MAAM,CAChB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAClB,KAAK;oBACL,IAAI,CAAC,SAAS,CACV,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;wBAClD,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI;wBACpB,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;wBAC5B,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAC7B,CACR,CAAC;gBAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aACpD;QACL,CAAC;KAAA;CACJ;AA/BD,sEA+BC"}
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
- return __awaiter(this, void 0, void 0, function* () {
60
- const dataSource = this.staticDataSourceProvider.getDataSource();
61
- const staticDataSourceCapitalDistrict = this.meterSettingsRepositoryCapitalDistrict.getDataSource();
62
- const meterSettingsCapitalDistrict = yield staticDataSourceCapitalDistrict.getAll();
63
- const meterSettings = yield dataSource.getAll();
64
- for (const [commodityProvider, key] of Object.entries(optionLookupKeys)) {
65
- const options = this.lookupMeasurementsOptionsByKey(Object.assign(Object.assign({}, meterSettings), meterSettingsCapitalDistrict), key);
66
- if (options.length === 0) {
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 (!(settings === null || settings === void 0 ? void 0 : settings.MeasurementOptions)) {
65
+ if (!settings?.MeasurementOptions) {
77
66
  throw new golemio_errors_1.GeneralError(`No measurements options found for key: ${key}`);
78
67
  }
79
- return settings === null || settings === void 0 ? void 0 : settings.MeasurementOptions;
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":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,+HAA8I;AAC9I,iIAAgJ;AAChJ,yEAAwF;AACxF,oGAAmH;AAEnH,uHAAsF;AACtF,yHAAwF;AACxF,wEAAqE;AAErE,uGAAoG;AACpG,6EAAwE;AACxE,iEAAwE;AAExE,MAAM,gBAAgB,GAAG;IACrB,CAAC,iDAAqB,CAAC,iBAAiB,CAAC,EAAE,iBAAiB;IAC5D,CAAC,iDAAqB,CAAC,mBAAmB,CAAC,EAAE,mBAAmB;IAChE,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,aAAa;IAC/C,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,aAAa;IAC/C,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,qBAAqB;IACvD,CAAC,iDAAqB,CAAC,QAAQ,CAAC,EAAE,yBAAyB;IAC3D,CAAC,iDAAqB,CAAC,SAAS,CAAC,EAAE,mCAAmC;IACtE,CAAC,iDAAqB,CAAC,UAAU,CAAC,EAAE,YAAY;IAChD,CAAC,iDAAqB,CAAC,WAAW,CAAC,EAAE,aAAa;IAClD,CAAC,iDAAqB,CAAC,eAAe,CAAC,EAAE,iBAAiB;CAC7D,CAAC;AAGK,IAAM,qCAAqC,mDAA3C,MAAM,qCAAsC,SAAQ,qCAAiB;IAIxE,YAC8B,MAAuB,EAEjD,wBAAuE,EAEvE,uBAA8D,EAE9D,sCAAsF;QAEtF,KAAK,CAAC,uBAAW,CAAC,CAAC;QARe,WAAM,GAAN,MAAM,CAAS;QAEzC,6BAAwB,GAAxB,wBAAwB,CAAuC;QAE/D,4BAAuB,GAAvB,uBAAuB,CAA+B;QAEtD,2CAAsC,GAAtC,sCAAsC,CAAwC;QAV1E,cAAS,GAAG,mCAAmC,CAAC;QAChD,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ;IAYnD,CAAC;IAEe,OAAO;;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,CAAC;YACjE,MAAM,+BAA+B,GAAG,IAAI,CAAC,sCAAsC,CAAC,aAAa,EAAE,CAAC;YACpG,MAAM,4BAA4B,GAAG,MAAM,+BAA+B,CAAC,MAAM,EAAE,CAAC;YACpF,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;YAEhD,KAAK,MAAM,CAAC,iBAAiB,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;gBACrE,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,iCAC1C,aAAa,GAAK,4BAA4B,GACnD,GAAiC,CACpC,CAAC;gBACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;oBACtB,SAAS;iBACZ;gBAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,MAAM,4BAA4B,iBAAiB,EAAE,CAAC,CAAC;gBAC3F,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CACvC,iBAA0C,EAC1C,mDAAsB,CAAC,kBAAkB,EACzC,OAAO,CACV,CAAC;aACL;QACL,CAAC;KAAA;IAEO,8BAA8B,CAClC,aAAmC,EACnC,GAA+B;QAE/B,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAA,EAAE;YAC/B,MAAM,IAAI,6BAAY,CAAC,0CAA0C,GAAG,EAAE,CAAC,CAAC;SAC3E;QACD,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,kBAAkB,CAAC;IACxC,CAAC;CACJ,CAAA;gDAlDY,qCAAqC;IADjD,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qCAAqC,CAAC,CAAA;IAElE,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;IAE1D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,sCAAsC,CAAC,CAAA;6CAHlC,6EAAqC;QAEtC,6DAA6B;QAEd,+EAAsC;GAXjF,qCAAqC,CAkDjD"}
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
- return __awaiter(this, void 0, void 0, function* () {
37
- for (const { dateFrom, dateTo } of this.generateDateParams(data)) {
38
- integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
39
- providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveA,
40
- dateFrom,
41
- dateTo,
42
- });
43
- integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
44
- providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveC,
45
- dateFrom,
46
- dateTo,
47
- });
48
- integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
49
- providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveMO,
50
- dateFrom,
51
- dateTo,
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":";;;;;;;;;;;;;;;;;;;;;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;IAEY,OAAO,CAAC,IAA2B;;YAC5C,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;gBAC9D,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;oBAC5E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;oBAC5C,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;gBAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;oBAC5E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;oBAC5C,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;gBAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;oBAC5E,YAAY,EAAE,iDAAqB,CAAC,SAAS;oBAC7C,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;aACN;QACL,CAAC;KAAA;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"}
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
- return __awaiter(this, void 0, void 0, function* () {
37
- for (const { dateFrom, dateTo } of this.generateDateParams(data)) {
38
- // Veolia
39
- integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchVeoliaMeasurements", {
40
- providerType: CommodityProviderTypeEnum_1.CommodityProviderType.CemApiVeoliaWater,
41
- dateFrom,
42
- dateTo,
43
- });
44
- integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchVeoliaMeasurements", {
45
- providerType: CommodityProviderTypeEnum_1.CommodityProviderType.CemApiVeoliaElectro,
46
- dateFrom,
47
- dateTo,
48
- });
49
- // PPAS - Pražská plynárenská
50
- integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasMeasurements", {
51
- providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveV,
52
- dateFrom,
53
- dateTo,
54
- });
55
- integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasMeasurements", {
56
- providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveM,
57
- dateFrom,
58
- dateTo,
59
- });
60
- //PRE
61
- integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPreElectroMeasurementsTask", {
62
- dateFrom,
63
- dateTo,
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":";;;;;;;;;;;;;;;;;;;;;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;IAEY,OAAO,CAAC,IAA2B;;YAC5C,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;gBAC9D,SAAS;gBACT,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;oBAC5E,YAAY,EAAE,iDAAqB,CAAC,iBAAiB;oBACrD,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;gBAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;oBAC5E,YAAY,EAAE,iDAAqB,CAAC,mBAAmB;oBACvD,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;gBAEH,6BAA6B;gBAC7B,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,EAAE;oBAC1E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;oBAC5C,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;gBAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,EAAE;oBAC1E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;oBAC5C,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;gBAEH,KAAK;gBACL,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,iCAAiC,EAAE;oBACpF,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;aACN;QACL,CAAC;KAAA;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"}
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"}
@@ -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
- var _a, e_1, _b, _c;
52
- return __awaiter(this, void 0, void 0, function* () {
53
- let measurementOptions = yield this.meterSettingsRepository.getData(data.providerType, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions);
54
- if (!measurementOptions) {
55
- throw new golemio_errors_1.GeneralError("Measurement options not found", this.constructor.name);
56
- }
57
- else {
58
- measurementOptions = this.splitOptionsByVars(measurementOptions);
59
- }
60
- const { baseUrl, config } = this.getProviderConfig(data);
61
- const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
62
- const sessionId = yield aveApiHelper.createSession();
63
- try {
64
- const places = yield this.getDataFromDataSource("Places", sessionId);
65
- let consumptionData = [];
66
- for (const place of places) {
67
- const options = measurementOptions.filter((item) => item.MeterSerialNumber === place.DeviceSerialNumber);
68
- if (options.length === 0) {
69
- continue;
70
- }
71
- this.logger.info(`Fetching data for device ${place.DeviceSerialNumber}`);
72
- const measurementChunkGenerator = this.generateMeasurements(Object.assign(Object.assign({}, data), { placeId: place.Id }), sessionId);
73
- try {
74
- for (var _d = true, measurementChunkGenerator_1 = (e_1 = void 0, __asyncValues(measurementChunkGenerator)), measurementChunkGenerator_1_1; measurementChunkGenerator_1_1 = yield measurementChunkGenerator_1.next(), _a = measurementChunkGenerator_1_1.done, !_a; _d = true) {
75
- _c = measurementChunkGenerator_1_1.value;
76
- _d = false;
77
- const measurements = _c;
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([
@@ -1 +1 @@
1
- {"version":3,"file":"FetchPpasEEMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FetchPpasEEMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.ts"],"names":[],"mappings":"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"}
@@ -11,34 +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
- var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
31
- var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
32
- if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
33
- var g = generator.apply(thisArg, _arguments || []), i, q = [];
34
- return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
35
- function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
36
- function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
37
- function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
38
- function fulfill(value) { resume("next", value); }
39
- function reject(value) { resume("throw", value); }
40
- function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
41
- };
42
14
  Object.defineProperty(exports, "__esModule", { value: true });
43
15
  exports.FetchPpasMeasurementsTask = void 0;
44
16
  const CommodityProviderEnum_1 = require("../../datasources/helpers/CommodityProviderEnum");
@@ -68,54 +40,42 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
68
40
  this.queueTtl = 60 * 60 * 1000;
69
41
  this.schema = PpasMeasurementsSchema_1.PpasMeasurementsValidationSchema;
70
42
  }
71
- execute(data) {
72
- var _a, e_1, _b, _c;
73
- return __awaiter(this, void 0, void 0, function* () {
74
- let measurementOptions = yield this.meterSettingsRepository.getData(data.providerType, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions);
75
- if (!measurementOptions) {
76
- throw new golemio_errors_1.GeneralError("Measurement options not found", this.constructor.name);
77
- }
78
- else {
79
- measurementOptions = this.splitOptionsByVars(measurementOptions);
80
- }
81
- const { baseUrl, config } = this.getProviderConfig(data);
82
- const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
83
- const sessionId = yield aveApiHelper.createSession();
84
- try {
85
- const places = yield this.getDataFromDataSource("Places", sessionId);
86
- let consumptionData = [];
87
- for (const place of places) {
88
- const options = measurementOptions.filter((item) => item.MeterSerialNumber === place.DeviceSerialNumber);
89
- if (options.length === 0) {
90
- continue;
91
- }
92
- this.logger.info(`Fetching data for device ${place.DeviceSerialNumber}`);
93
- const measurementChunkGenerator = this.generateMeasurements(Object.assign(Object.assign({}, data), { placeId: place.Id }), sessionId);
94
- try {
95
- for (var _d = true, measurementChunkGenerator_1 = (e_1 = void 0, __asyncValues(measurementChunkGenerator)), measurementChunkGenerator_1_1; measurementChunkGenerator_1_1 = yield measurementChunkGenerator_1.next(), _a = measurementChunkGenerator_1_1.done, !_a; _d = true) {
96
- _c = measurementChunkGenerator_1_1.value;
97
- _d = false;
98
- const measurements = _c;
99
- for (const option of options) {
100
- const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement(Object.assign(Object.assign({}, item), option)));
101
- consumptionData = consumptionData.concat(consumptionBatch);
102
- }
103
- }
104
- }
105
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
106
- finally {
107
- try {
108
- if (!_d && !_a && (_b = measurementChunkGenerator_1.return)) yield _b.call(measurementChunkGenerator_1);
109
- }
110
- finally { if (e_1) throw e_1.error; }
43
+ async execute(data) {
44
+ let measurementOptions = await this.meterSettingsRepository.getData(data.providerType, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions);
45
+ if (!measurementOptions) {
46
+ throw new golemio_errors_1.GeneralError("Measurement options not found", this.constructor.name);
47
+ }
48
+ else {
49
+ measurementOptions = this.splitOptionsByVars(measurementOptions);
50
+ }
51
+ const { baseUrl, config } = this.getProviderConfig(data);
52
+ const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
53
+ const sessionId = await aveApiHelper.createSession();
54
+ try {
55
+ const places = await this.getDataFromDataSource("Places", sessionId);
56
+ let consumptionData = [];
57
+ for (const place of places) {
58
+ const options = measurementOptions.filter((item) => item.MeterSerialNumber === place.DeviceSerialNumber);
59
+ if (options.length === 0) {
60
+ continue;
61
+ }
62
+ this.logger.info(`Fetching data for device ${place.DeviceSerialNumber}`);
63
+ const measurementChunkGenerator = this.generateMeasurements({ ...data, placeId: place.Id }, sessionId);
64
+ for await (const measurements of measurementChunkGenerator) {
65
+ for (const option of options) {
66
+ const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement({
67
+ ...item,
68
+ ...option,
69
+ }));
70
+ consumptionData = consumptionData.concat(consumptionBatch);
111
71
  }
112
72
  }
113
- yield this.saveConsumptionData(consumptionData);
114
73
  }
115
- finally {
116
- yield aveApiHelper.terminateSession(sessionId);
117
- }
118
- });
74
+ await this.saveConsumptionData(consumptionData);
75
+ }
76
+ finally {
77
+ await aveApiHelper.terminateSession(sessionId);
78
+ }
119
79
  }
120
80
  getProviderConfig(data) {
121
81
  return {
@@ -128,28 +88,26 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
128
88
  let result = [];
129
89
  for (const option of options) {
130
90
  const vars = option.Var.split("|");
131
- result = result.concat(vars.map((v) => (Object.assign(Object.assign({}, option), { Var: v }))));
91
+ result = result.concat(vars.map((v) => ({ ...option, Var: v })));
132
92
  }
133
93
  return result;
134
94
  }
135
- generateMeasurements(data, sessionId) {
136
- return __asyncGenerator(this, arguments, function* generateMeasurements_1() {
137
- const dateFrom = luxon_1.DateTime.fromISO(data.dateFrom).startOf("day");
138
- const dateTo = luxon_1.DateTime.fromISO(data.dateTo).startOf("day");
139
- const intervals = luxon_1.Interval.fromDateTimes(dateFrom, dateTo).splitBy({ days: 5 });
140
- for (const interval of intervals) {
141
- const start = interval.start.startOf("day");
142
- const end = interval.end.startOf("day");
143
- yield yield __await(this.getDataFromDataSource("DeviceData", sessionId, {
144
- placeId: data.placeId,
145
- dateFrom: start.toISODate(),
146
- dateTo: end.toISODate(),
147
- isoDate: "1",
148
- // fill all measurement values (we need the OperatingAmount and ConvertDifference values)
149
- dataType: AveDataTypeEnum_1.AveDataType.RawData.toString(),
150
- }));
151
- }
152
- });
95
+ async *generateMeasurements(data, sessionId) {
96
+ const dateFrom = luxon_1.DateTime.fromISO(data.dateFrom).startOf("day");
97
+ const dateTo = luxon_1.DateTime.fromISO(data.dateTo).startOf("day");
98
+ const intervals = luxon_1.Interval.fromDateTimes(dateFrom, dateTo).splitBy({ days: 5 });
99
+ for (const interval of intervals) {
100
+ const start = interval.start.startOf("day");
101
+ const end = interval.end.startOf("day");
102
+ yield this.getDataFromDataSource("DeviceData", sessionId, {
103
+ placeId: data.placeId,
104
+ dateFrom: start.toISODate(),
105
+ dateTo: end.toISODate(),
106
+ isoDate: "1",
107
+ // fill all measurement values (we need the OperatingAmount and ConvertDifference values)
108
+ dataType: AveDataTypeEnum_1.AveDataType.RawData.toString(),
109
+ });
110
+ }
153
111
  }
154
112
  getDataFromDataSource(resourceTypeKey, sessionId, params) {
155
113
  const dataSource = this.dataSourceFactory.getDataSource(CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi, PpasAveApiHelper_1.PpasAveApiHelper.resourceType[resourceTypeKey], sessionId, params);