@golemio/energetics 1.3.8-dev.1350798883 → 1.3.8-rc.1360369806

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 (64) hide show
  1. package/db/example/04_measurements.sql +26 -26
  2. package/dist/integration-engine/commodity-providers/ioc/Di.js +4 -10
  3. package/dist/integration-engine/commodity-providers/ioc/Di.js.map +1 -1
  4. package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.d.ts +0 -4
  5. package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.js +0 -4
  6. package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.js.map +1 -1
  7. package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.d.ts +1 -0
  8. package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.js +4 -1
  9. package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.js.map +1 -1
  10. package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.d.ts +1 -1
  11. package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.js +6 -6
  12. package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.js.map +1 -1
  13. package/dist/integration-engine/commodity-providers/transformations/PreElectroTransformation.js +1 -1
  14. package/dist/integration-engine/commodity-providers/transformations/PreElectroTransformation.js.map +1 -1
  15. package/dist/integration-engine/commodity-providers/workers/CommodityWorker.js +0 -2
  16. package/dist/integration-engine/commodity-providers/workers/CommodityWorker.js.map +1 -1
  17. package/dist/integration-engine/commodity-providers/workers/interfaces/IPpasMeasurementsParams.d.ts +1 -1
  18. package/dist/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.d.ts +1 -1
  19. package/dist/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.js +1 -7
  20. package/dist/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.js.map +1 -1
  21. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.d.ts +1 -3
  22. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.js +3 -12
  23. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.js.map +1 -1
  24. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.d.ts +13 -22
  25. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js.map +1 -1
  26. package/dist/output-gateway/controllers/v2/V2MeasurementsController.js +1 -1
  27. package/dist/output-gateway/controllers/v2/V2MeasurementsController.js.map +1 -1
  28. package/dist/output-gateway/models/BuildingsPrimaryModel.js.map +1 -0
  29. package/dist/output-gateway/models/interfaces/IPrimaryBuildings.js.map +1 -0
  30. package/dist/output-gateway/repositories/MeasurementRepository.js +1 -1
  31. package/dist/output-gateway/repositories/MeasurementRepository.js.map +1 -1
  32. package/dist/output-gateway/repositories/PrimaryBuildingsRepository.d.ts +1 -1
  33. package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js +1 -1
  34. package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js.map +1 -1
  35. package/dist/output-gateway/transformations/BuildingTransformationFull.d.ts +1 -1
  36. package/dist/output-gateway/transformations/BuildingsTransformation.d.ts +1 -1
  37. package/dist/schema-definitions/models/MeasurementsModel.js +1 -0
  38. package/dist/schema-definitions/models/MeasurementsModel.js.map +1 -1
  39. package/dist/schema-definitions/models/constants/MeasurementConstants.js +0 -2
  40. package/dist/schema-definitions/models/constants/MeasurementConstants.js.map +1 -1
  41. package/dist/schema-definitions/models/helpers/CommodityProviderTypeEnum.d.ts +0 -3
  42. package/dist/schema-definitions/models/helpers/CommodityProviderTypeEnum.js +0 -3
  43. package/dist/schema-definitions/models/helpers/CommodityProviderTypeEnum.js.map +1 -1
  44. package/docs/implementation_documentation.md +1 -3
  45. package/docs/openapi-output.yaml +0 -2
  46. package/package.json +2 -2
  47. package/db/migrations/postgresql/20240625134438-fix-pk-measurements.js +0 -53
  48. package/db/migrations/postgresql/sqls/20240625134438-fix-pk-measurements-down.sql +0 -2
  49. package/db/migrations/postgresql/sqls/20240625134438-fix-pk-measurements-up.sql +0 -2
  50. package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.d.ts +0 -11
  51. package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.js +0 -50
  52. package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.js.map +0 -1
  53. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.d.ts +0 -11
  54. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.js +0 -74
  55. package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.js.map +0 -1
  56. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.d.ts +0 -16
  57. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js +0 -112
  58. package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js.map +0 -1
  59. package/dist/schema-definitions/models/BuildingsPrimaryModel.js.map +0 -1
  60. package/dist/schema-definitions/models/interfaces/IPrimaryBuildings.js.map +0 -1
  61. /package/dist/{schema-definitions → output-gateway}/models/BuildingsPrimaryModel.d.ts +0 -0
  62. /package/dist/{schema-definitions → output-gateway}/models/BuildingsPrimaryModel.js +0 -0
  63. /package/dist/{schema-definitions → output-gateway}/models/interfaces/IPrimaryBuildings.d.ts +0 -0
  64. /package/dist/{schema-definitions → output-gateway}/models/interfaces/IPrimaryBuildings.js +0 -0
@@ -1,27 +1,27 @@
1
1
  INSERT INTO consumption_energy_measurements ("timestamp", value, addr, var, "type", meter, "source", measurement_category, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by) VALUES
2
- ('2023-05-02 04:59:44.000+02', 551.800000000000000, '/10.22/VF1', 'core', 'provider_value', '300017125', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
3
- ('2023-05-02 04:59:11.000+02', 44592.000000000000000, '/10.12/EF1', 'VT', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
4
- ('2023-05-02 04:59:11.000+02', 2.000000000000000, '/10.12/EF1', 'NT', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
5
- ('2023-05-02 04:59:00.375+02', 11075.509765625000000, '/2.2/EP2', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
6
- ('2023-05-02 04:59:00.115+02', 205.720001220703000, '/2.2/EP2', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
7
- ('2023-05-02 04:58:59.862+02', 6666.450195312500000, '/2.2/EP2', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
8
- ('2023-05-02 04:58:58.996+02', 898.159973144531000, '/2.2/EP1', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
9
- ('2023-05-02 04:58:58.746+02', 8525.040039062500000, '/2.2/EP1', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
10
- ('2023-05-02 04:58:57.871+02', 3481.060058593750000, '/2.2/EP1', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
11
- ('2023-05-02 04:53:15.131+02', 17.700000762939500, '/2.5/Text', 'T', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
12
- ('2023-05-02 04:53:15.131+02', -64.000000000000000, '/2.5/Text', 'RSSI', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
13
- ('2023-05-02 04:53:15.131+02', 1.000000000000000, '/2.5/Text', 'BAT', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
14
- ('2023-05-02 04:51:33.697+02', 180790.000000000000000, '/2.2/TVP1', 'raw', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
15
- ('2023-05-02 04:00:00.000+02', 2709814.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
16
- ('2023-05-02 04:00:00.001+02', 19.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
17
- ('2023-05-02 03:00:00.000+02', 2709812.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
18
- ('2023-05-02 03:00:00.001+02', 3.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
19
- ('2023-05-02 00:00:00.000+02', 0.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
20
- ('2023-05-02 00:00:00.001+02', 0.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
21
- ('2023-05-01 06:00:00.000+02', 2709721.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
22
- ('2023-05-01 05:00:00.000+02', 2709705.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
23
- ('2023-05-01 05:00:00.001+02', 20.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
24
- ('2023-05-01 04:00:00.000+02', 2709691.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
25
- ('2023-05-01 04:00:00.001+02', 18.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
26
- ('2023-05-01 03:00:00.000+02', 2709680.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
27
- ('2023-05-01 03:00:00.001+02', 14.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL);
2
+ ('2023-05-02 04:59:44.000+02', 551.800000000000000, '/10.22/VF1/core', 'core', 'provider_value', '300017125', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
3
+ ('2023-05-02 04:59:11.000+02', 44592.000000000000000, '/10.12/EF1-VT/core', 'core', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
4
+ ('2023-05-02 04:59:11.000+02', 2.000000000000000, '/10.12/EF1-NT/core', 'core', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
5
+ ('2023-05-02 04:59:00.375+02', 11075.509765625000000, '/2.2/EP2/EFwActi', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
6
+ ('2023-05-02 04:59:00.115+02', 205.720001220703000, '/2.2/EP2/ERvReact', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
7
+ ('2023-05-02 04:58:59.862+02', 6666.450195312500000, '/2.2/EP2/EFwReact', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
8
+ ('2023-05-02 04:58:58.996+02', 898.159973144531000, '/2.2/EP1/EFwReact', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
9
+ ('2023-05-02 04:58:58.746+02', 8525.040039062500000, '/2.2/EP1/EFwActi', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
10
+ ('2023-05-02 04:58:57.871+02', 3481.060058593750000, '/2.2/EP1/ERvReact', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
11
+ ('2023-05-02 04:53:15.131+02', 17.700000762939500, '/2.5/Text/T', 'T', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
12
+ ('2023-05-02 04:53:15.131+02', -64.000000000000000, '/2.5/Text/RSSI', 'RSSI', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
13
+ ('2023-05-02 04:53:15.131+02', 1.000000000000000, '/2.5/Text/BAT', 'BAT', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
14
+ ('2023-05-02 04:51:33.697+02', 180790.000000000000000, '/2.2/TVP1/raw', 'raw', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
15
+ ('2023-05-02 04:00:00.000+02', 2709814.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
16
+ ('2023-05-02 04:00:00.001+02', 19.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
17
+ ('2023-05-02 03:00:00.000+02', 2709812.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
18
+ ('2023-05-02 03:00:00.001+02', 3.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
19
+ ('2023-05-02 00:00:00.000+02', 0.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
20
+ ('2023-05-02 00:00:00.001+02', 0.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
21
+ ('2023-05-01 06:00:00.000+02', 2709721.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
22
+ ('2023-05-01 05:00:00.000+02', 2709705.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
23
+ ('2023-05-01 05:00:00.001+02', 20.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
24
+ ('2023-05-01 04:00:00.000+02', 2709691.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
25
+ ('2023-05-01 04:00:00.001+02', 18.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
26
+ ('2023-05-01 03:00:00.000+02', 2709680.000000000000000, '/2.9/PF1/core', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
27
+ ('2023-05-01 03:00:00.001+02', 14.000000000000000, '/2.9/PF1/core2', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL);
@@ -10,20 +10,17 @@ const FetchMeasurementOptionsStaticDataTask_1 = require("../workers/tasks/FetchM
10
10
  const FetchVeoliaMeasurementsTask_1 = require("../workers/tasks/FetchVeoliaMeasurementsTask");
11
11
  const Di_1 = require("../../ioc/Di");
12
12
  const PpasAveApiDataSourceProvider_1 = require("../datasources/ppas-ave-api/PpasAveApiDataSourceProvider");
13
- const PreElectroApiDataSourceProvider_1 = require("../datasources/pre-elektro-api/PreElectroApiDataSourceProvider");
14
- const PreElectroHelper_1 = require("../datasources/pre-elektro-api/helpers/PreElectroHelper");
15
13
  const StaticMeterSettingsRepository_1 = require("../repositories/StaticMeterSettingsRepository");
16
14
  const AveMeasurementTransformation_1 = require("../transformations/AveMeasurementTransformation");
17
15
  const PreElectroTransformation_1 = require("../transformations/PreElectroTransformation");
18
- const PtasWebMeasurementTransformation_1 = require("../transformations/PtasWebMeasurementTransformation");
19
- const FetchMeasurementsFromEEProvidersTask_1 = require("../workers/tasks/FetchMeasurementsFromEEProvidersTask");
20
16
  const FetchMeasurementsFromProvidersTask_1 = require("../workers/tasks/FetchMeasurementsFromProvidersTask");
21
- const FetchPpasEEMeasurementsTask_1 = require("../workers/tasks/FetchPpasEEMeasurementsTask");
22
17
  const FetchPpasMeasurementsTask_1 = require("../workers/tasks/FetchPpasMeasurementsTask");
23
18
  const FetchPreMeasurementDataTask_1 = require("../workers/tasks/FetchPreMeasurementDataTask");
24
- const FetchPtasWebScrapedMeasurementsTask_1 = require("../workers/tasks/FetchPtasWebScrapedMeasurementsTask");
25
19
  const WorkerContainerToken_1 = require("./WorkerContainerToken");
26
- const StaticMeterSettingsDataSourceCapitalDs_1 = require("../datasources/static-data/StaticMeterSettingsDataSourceCapitalDs");
20
+ const PreElectroApiDataSourceProvider_1 = require("../datasources/pre-elektro-api/PreElectroApiDataSourceProvider");
21
+ const PreElectroHelper_1 = require("../datasources/pre-elektro-api/helpers/PreElectroHelper");
22
+ const PtasWebMeasurementTransformation_1 = require("../transformations/PtasWebMeasurementTransformation");
23
+ const FetchPtasWebScrapedMeasurementsTask_1 = require("../workers/tasks/FetchPtasWebScrapedMeasurementsTask");
27
24
  //#region Initialization
28
25
  const CommodityContainer = Di_1.VPalaceContainer.createChildContainer();
29
26
  exports.CommodityContainer = CommodityContainer;
@@ -38,7 +35,6 @@ CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.PreElect
38
35
  //#region Repositories
39
36
  CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.MeasurementRepository, MeasurementRepository_1.MeasurementRepository);
40
37
  CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsRepository, StaticMeterSettingsRepository_1.StaticMeterSettingsRepository);
41
- CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsDataSourceCapitalDs, StaticMeterSettingsDataSourceCapitalDs_1.StaticMeterSettingsDataSourceCapitalDs);
42
38
  //#endregion
43
39
  //#region Transformation
44
40
  CommodityContainer.registerSingleton(WorkerContainerToken_1.WorkerContainerToken.CemMeasurementTransformation, CemMeasurementTransformation_1.CemMeasurementTransformation);
@@ -50,10 +46,8 @@ CommodityContainer.registerSingleton(WorkerContainerToken_1.WorkerContainerToken
50
46
  //#endregion
51
47
  //#region Tasks
52
48
  CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementsFromProvidersTask, FetchMeasurementsFromProvidersTask_1.FetchMeasurementsFromProvidersTask);
53
- CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementsFromEEProvidersTask, FetchMeasurementsFromEEProvidersTask_1.FetchMeasurementsFromEEProvidersTask);
54
49
  CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchVeoliaMeasurementsTask, FetchVeoliaMeasurementsTask_1.FetchVeoliaMeasurementsTask);
55
50
  CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchPpasMeasurementsTask, FetchPpasMeasurementsTask_1.FetchPpasMeasurementsTask);
56
- CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchPpasEEMeasurementsTask, FetchPpasEEMeasurementsTask_1.FetchPpasEEMeasurementsTask);
57
51
  CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementOptionsStaticDataTask, FetchMeasurementOptionsStaticDataTask_1.FetchMeasurementOptionsStaticDataTask);
58
52
  CommodityContainer.register(WorkerContainerToken_1.WorkerContainerToken.FetchPreMeasurementDataTask, FetchPreMeasurementDataTask_1.FetchPreMeasurementDataTask);
59
53
  CommodityContainer.registerSingleton(WorkerContainerToken_1.WorkerContainerToken.FetchPtasWebScrapedMeasurementsTask, FetchPtasWebScrapedMeasurementsTask_1.FetchPtasWebScrapedMeasurementsTask);
@@ -1 +1 @@
1
- {"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,0GAA4H;AAC5H,8FAAgH;AAChH,4HAA8I;AAC9I,iFAAmG;AACnG,kGAAoH;AACpH,kHAAoI;AACpI,8FAAgH;AAChH,qCAA8C;AAE9C,2GAAwG;AACxG,oHAAiH;AACjH,8FAA2F;AAC3F,iGAA8F;AAC9F,kGAA+F;AAC/F,0FAAuF;AACvF,0GAAuG;AACvG,gHAA6G;AAC7G,4GAAyG;AACzG,8FAA2F;AAC3F,0FAAuF;AACvF,8FAA2F;AAC3F,8GAA2G;AAC3G,iEAA8D;AAC9D,8HAA2H;AAE3H,wBAAwB;AACxB,MAAM,kBAAkB,GAAwB,qBAAgB,CAAC,oBAAoB,EAAE,CAAC;AA4C/E,gDAAkB;AA3C3B,YAAY;AAEZ,oBAAoB;AACpB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AACrG,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AAC7G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AAC/H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,+BAA+B,EAAE,iEAA+B,CAAC,CAAC;AACnH,YAAY;AAEZ,sBAAsB;AACtB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC/F,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAC/G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,sCAAsC,EAAE,+EAAsC,CAAC,CAAC;AACjI,YAAY;AAEZ,wBAAwB;AACxB,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACtH,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACtH,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AAC9G,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AAC9H,YAAY;AAEZ,iBAAiB;AACjB,YAAY;AAEZ,eAAe;AACf,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,oCAAoC,EAAE,2EAAoC,CAAC,CAAC;AAC7H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC,CAAC;AACvG,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AAC/H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,iBAAiB,CAChC,2CAAoB,CAAC,mCAAmC,EACxD,yEAAmC,CACtC,CAAC;AACF,YAAY;AAEZ,iBAAiB;AACjB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,gBAAgB,EAAE,mCAAgB,CAAC,CAAC"}
1
+ {"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,0GAA4H;AAC5H,8FAAgH;AAChH,4HAA8I;AAC9I,iFAAmG;AACnG,kGAAoH;AACpH,kHAAoI;AACpI,8FAAgH;AAChH,qCAA8C;AAE9C,2GAAwG;AACxG,iGAA8F;AAC9F,kGAA+F;AAC/F,0FAAuF;AACvF,4GAAyG;AACzG,0FAAuF;AACvF,8FAA2F;AAC3F,iEAA8D;AAC9D,oHAAiH;AACjH,8FAA2F;AAC3F,0GAAuG;AACvG,8GAA2G;AAE3G,wBAAwB;AACxB,MAAM,kBAAkB,GAAwB,qBAAgB,CAAC,oBAAoB,EAAE,CAAC;AAyC/E,gDAAkB;AAxC3B,YAAY;AAEZ,oBAAoB;AACpB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AACrG,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AAC7G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AAC/H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,+BAA+B,EAAE,iEAA+B,CAAC,CAAC;AACnH,YAAY;AAEZ,sBAAsB;AACtB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC/F,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAC/G,YAAY;AAEZ,wBAAwB;AACxB,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACtH,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACtH,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AAC9G,kBAAkB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AAC9H,YAAY;AAEZ,iBAAiB;AACjB,YAAY;AAEZ,eAAe;AACf,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC,CAAC;AACzH,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC,CAAC;AACvG,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AAC/H,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC3G,kBAAkB,CAAC,iBAAiB,CAChC,2CAAoB,CAAC,mCAAmC,EACxD,yEAAmC,CACtC,CAAC;AACF,YAAY;AAEZ,iBAAiB;AACjB,kBAAkB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,gBAAgB,EAAE,mCAAgB,CAAC,CAAC"}
@@ -3,16 +3,13 @@ declare const WorkerContainerToken: {
3
3
  PpasAveApiDataSourceProvider: symbol;
4
4
  CommodityProviderDataSourceFactory: symbol;
5
5
  StaticMeterSettingsDataSourceProvider: symbol;
6
- StaticMeterSettingsDataSourceCapitalDs: symbol;
7
6
  CemMeasurementTransformation: symbol;
8
7
  AveMeasurementTransformation: symbol;
9
8
  MeasurementRepository: symbol;
10
9
  StaticMeterSettingsRepository: symbol;
11
10
  FetchMeasurementsFromProvidersTask: symbol;
12
- FetchMeasurementsFromEEProvidersTask: symbol;
13
11
  FetchVeoliaMeasurementsTask: symbol;
14
12
  FetchPpasMeasurementsTask: symbol;
15
- FetchPpasEEMeasurementsTask: symbol;
16
13
  FetchMeasurementOptionsStaticDataTask: symbol;
17
14
  FetchPreMeasurementDataTask: symbol;
18
15
  PreElectroTransformation: symbol;
@@ -20,6 +17,5 @@ declare const WorkerContainerToken: {
20
17
  PreElectroHelper: symbol;
21
18
  PtasWebMeasurementTransformation: symbol;
22
19
  FetchPtasWebScrapedMeasurementsTask: symbol;
23
- PrimaryBuildingsRepositoryIE: symbol;
24
20
  };
25
21
  export { WorkerContainerToken };
@@ -6,16 +6,13 @@ const WorkerContainerToken = {
6
6
  PpasAveApiDataSourceProvider: Symbol(),
7
7
  CommodityProviderDataSourceFactory: Symbol(),
8
8
  StaticMeterSettingsDataSourceProvider: Symbol(),
9
- StaticMeterSettingsDataSourceCapitalDs: Symbol(),
10
9
  CemMeasurementTransformation: Symbol(),
11
10
  AveMeasurementTransformation: Symbol(),
12
11
  MeasurementRepository: Symbol(),
13
12
  StaticMeterSettingsRepository: Symbol(),
14
13
  FetchMeasurementsFromProvidersTask: Symbol(),
15
- FetchMeasurementsFromEEProvidersTask: Symbol(),
16
14
  FetchVeoliaMeasurementsTask: Symbol(),
17
15
  FetchPpasMeasurementsTask: Symbol(),
18
- FetchPpasEEMeasurementsTask: Symbol(),
19
16
  FetchMeasurementOptionsStaticDataTask: Symbol(),
20
17
  FetchPreMeasurementDataTask: Symbol(),
21
18
  PreElectroTransformation: Symbol(),
@@ -23,7 +20,6 @@ const WorkerContainerToken = {
23
20
  PreElectroHelper: Symbol(),
24
21
  PtasWebMeasurementTransformation: Symbol(),
25
22
  FetchPtasWebScrapedMeasurementsTask: Symbol(),
26
- PrimaryBuildingsRepositoryIE: Symbol(),
27
23
  };
28
24
  exports.WorkerContainerToken = WorkerContainerToken;
29
25
  //# sourceMappingURL=WorkerContainerToken.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"WorkerContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/ioc/WorkerContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG;IACzB,wBAAwB,EAAE,MAAM,EAAE;IAClC,4BAA4B,EAAE,MAAM,EAAE;IACtC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,qCAAqC,EAAE,MAAM,EAAE;IAC/C,sCAAsC,EAAE,MAAM,EAAE;IAChD,4BAA4B,EAAE,MAAM,EAAE;IACtC,4BAA4B,EAAE,MAAM,EAAE;IACtC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,6BAA6B,EAAE,MAAM,EAAE;IACvC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,oCAAoC,EAAE,MAAM,EAAE;IAC9C,2BAA2B,EAAE,MAAM,EAAE;IACrC,yBAAyB,EAAE,MAAM,EAAE;IACnC,2BAA2B,EAAE,MAAM,EAAE;IACrC,qCAAqC,EAAE,MAAM,EAAE;IAC/C,2BAA2B,EAAE,MAAM,EAAE;IACrC,wBAAwB,EAAE,MAAM,EAAE;IAClC,+BAA+B,EAAE,MAAM,EAAE;IACzC,gBAAgB,EAAE,MAAM,EAAE;IAC1B,gCAAgC,EAAE,MAAM,EAAE;IAC1C,mCAAmC,EAAE,MAAM,EAAE;IAC7C,4BAA4B,EAAE,MAAM,EAAE;CACzC,CAAC;AAEO,oDAAoB"}
1
+ {"version":3,"file":"WorkerContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/ioc/WorkerContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG;IACzB,wBAAwB,EAAE,MAAM,EAAE;IAClC,4BAA4B,EAAE,MAAM,EAAE;IACtC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,qCAAqC,EAAE,MAAM,EAAE;IAC/C,4BAA4B,EAAE,MAAM,EAAE;IACtC,4BAA4B,EAAE,MAAM,EAAE;IACtC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,6BAA6B,EAAE,MAAM,EAAE;IACvC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,2BAA2B,EAAE,MAAM,EAAE;IACrC,yBAAyB,EAAE,MAAM,EAAE;IACnC,qCAAqC,EAAE,MAAM,EAAE;IAC/C,2BAA2B,EAAE,MAAM,EAAE;IACrC,wBAAwB,EAAE,MAAM,EAAE;IAClC,+BAA+B,EAAE,MAAM,EAAE;IACzC,gBAAgB,EAAE,MAAM,EAAE;IAC1B,gCAAgC,EAAE,MAAM,EAAE;IAC1C,mCAAmC,EAAE,MAAM,EAAE;CAChD,CAAC;AAEO,oDAAoB"}
@@ -5,5 +5,6 @@ import { AbstractTransformation } from "@golemio/core/dist/helpers/transformatio
5
5
  export declare class AveMeasurementTransformation extends AbstractTransformation<IMeasurementOption & IAveApiDeviceDataDto, IMeasurementDto> {
6
6
  name: string;
7
7
  protected transformInternal: (data: IMeasurementOption & IAveApiDeviceDataDto) => IMeasurementDto;
8
+ private formatAddress;
8
9
  private getValue;
9
10
  }
@@ -21,7 +21,7 @@ let AveMeasurementTransformation = exports.AveMeasurementTransformation = class
21
21
  return {
22
22
  source: CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi,
23
23
  measurement_category: data.Name,
24
- addr: data.Addr,
24
+ addr: this.formatAddress(data.Addr, data.Var),
25
25
  meter: data.Meter,
26
26
  timestamp: luxon_1.DateTime.fromISO(data.StandardTime, {
27
27
  zone: PpasAveApiHelper_1.PpasAveApiHelper.API_DATE_TZ,
@@ -31,6 +31,9 @@ let AveMeasurementTransformation = exports.AveMeasurementTransformation = class
31
31
  value: this.getValue(data, data.Var),
32
32
  };
33
33
  };
34
+ this.formatAddress = (address, variable) => {
35
+ return address + "/" + variable;
36
+ };
34
37
  this.getValue = (data, variable) => {
35
38
  switch (variable) {
36
39
  case MeasurementVariableEnum_1.MeasurementVariable.Core:
@@ -1 +1 @@
1
- {"version":3,"file":"AveMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAChE,wFAAiF;AACjF,2FAAwF;AACxF,qHAAuF;AAGhF,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAAC,IAA+C,EAAmB,EAAE;YAC/F,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,kBAAkB;gBAC5C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC3C,IAAI,EAAE,mCAAgB,CAAC,WAAW;iBACrC,CAAC,CAAC,QAAQ,EAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;aAC9D,CAAC;QACN,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,IAA0B,EAAE,QAA6B,EAAU,EAAE;YACrF,QAAQ,QAAQ,EAAE;gBACd,KAAK,6CAAmB,CAAC,IAAI,CAAC;gBAC9B;oBACI,OAAO,IAAI,CAAC,eAAe,CAAC;gBAChC,KAAK,6CAAmB,CAAC,KAAK;oBAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;aACrC;QACL,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}
1
+ {"version":3,"file":"AveMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAChE,wFAAiF;AACjF,2FAAwF;AACxF,qHAAuF;AAGhF,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAAC,IAA+C,EAAmB,EAAE;YAC/F,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,kBAAkB;gBAC5C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;gBACpE,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC3C,IAAI,EAAE,mCAAgB,CAAC,WAAW;iBACrC,CAAC,CAAC,QAAQ,EAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;aAC9D,CAAC;QACN,CAAC,CAAC;QAEM,kBAAa,GAAG,CAAC,OAAe,EAAE,QAA6B,EAAU,EAAE;YAC/E,OAAO,OAAO,GAAG,GAAG,GAAG,QAAQ,CAAC;QACpC,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,IAA0B,EAAE,QAA6B,EAAU,EAAE;YACrF,QAAQ,QAAQ,EAAE;gBACd,KAAK,6CAAmB,CAAC,IAAI,CAAC;gBAC9B;oBACI,OAAO,IAAI,CAAC,eAAe,CAAC;gBAChC,KAAK,6CAAmB,CAAC,KAAK;oBAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;aACrC;QACL,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCAlCY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CAkCxC"}
@@ -9,5 +9,5 @@ export declare class CemMeasurementTransformation extends AbstractTransformation
9
9
  protected transformInternal: (data: IMeasurementOption & ICemApiMeasurementDto & {
10
10
  counterTypeId: number;
11
11
  }) => IMeasurementDto;
12
- private getVariable;
12
+ private formatAddress;
13
13
  }
@@ -19,22 +19,22 @@ let CemMeasurementTransformation = exports.CemMeasurementTransformation = class
19
19
  return {
20
20
  source: CommodityProviderEnum_1.CommodityProvider.UnimonitorCemApi,
21
21
  measurement_category: data.Name,
22
- addr: data.Addr,
22
+ addr: this.formatAddress(data.Addr, data.counterTypeId, data.Var),
23
23
  meter: data.Meter,
24
24
  timestamp: new Date(data.timestamp),
25
- variable: this.getVariable(data.Var, data.counterTypeId),
25
+ variable: data.Var,
26
26
  type: data.Type,
27
27
  value: data.value,
28
28
  };
29
29
  };
30
- this.getVariable = (variable, counterTypeId) => {
30
+ this.formatAddress = (address, counterTypeId, variable) => {
31
31
  if (counterTypeId === helpers_1.UnimonitorCemApiHelper.counterType.ElHighTariff) {
32
- return "VT"; // Vysoky tarif
32
+ address += "-VT"; // Vysoky tarif
33
33
  }
34
34
  else if (counterTypeId === helpers_1.UnimonitorCemApiHelper.counterType.ElLowTariff) {
35
- return "NT"; // Nizky tarif
35
+ address += "-NT"; // Nizky tarif
36
36
  }
37
- return variable;
37
+ return address + "/" + variable;
38
38
  };
39
39
  }
40
40
  };
@@ -1 +1 @@
1
- {"version":3,"file":"CemMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,iEAAgE;AAChE,wFAAiF;AACjF,2CAAqD;AAI9C,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAC1B,IAA4E,EAC7D,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,gBAAgB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACnC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC;gBACxD,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;QACN,CAAC,CAAC;QAEM,gBAAW,GAAG,CAAC,QAAgB,EAAE,aAAqB,EAAU,EAAE;YACtE,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,YAAY,EAAE;gBACnE,OAAO,IAAI,CAAC,CAAC,eAAe;aAC/B;iBAAM,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,WAAW,EAAE;gBACzE,OAAO,IAAI,CAAC,CAAC,cAAc;aAC9B;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}
1
+ {"version":3,"file":"CemMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,iEAAgE;AAChE,wFAAiF;AACjF,2CAAqD;AAI9C,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAC1B,IAA4E,EAC7D,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,gBAAgB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAA0B,CAAC;gBACxF,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACnC,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;QACN,CAAC,CAAC;QAEM,kBAAa,GAAG,CAAC,OAAe,EAAE,aAAqB,EAAE,QAA6B,EAAU,EAAE;YACtG,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,YAAY,EAAE;gBACnE,OAAO,IAAI,KAAK,CAAC,CAAC,eAAe;aACpC;iBAAM,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,WAAW,EAAE;gBACzE,OAAO,IAAI,KAAK,CAAC,CAAC,cAAc;aACnC;YAED,OAAO,OAAO,GAAG,GAAG,GAAG,QAAQ,CAAC;QACpC,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}
@@ -16,7 +16,7 @@ let PreElectroTransformation = exports.PreElectroTransformation = class PreElect
16
16
  this.name = "PreElectroTransformation";
17
17
  this.transformInternal = (data) => {
18
18
  return {
19
- addr: data.option.Addr,
19
+ addr: `${data.option.Addr}/${data.option.Var}`,
20
20
  meter: data.option.Meter,
21
21
  timestamp: new Date(data.measurement["Čas měření"] + " UTC"),
22
22
  variable: data.option.Var,
@@ -1 +1 @@
1
- {"version":3,"file":"PreElectroTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/PreElectroTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oHAAsF;AAEtF,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,wBAAwB,sCAA9B,MAAM,wBAAyB,SAAQ,+CAG7C;IAHM;;QAII,SAAI,GAAG,0BAA0B,CAAC;QAE/B,sBAAiB,GAAG,CAC1B,IAAoF,EACrE,EAAE;YACjB,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;gBAC5D,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACzB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,EAAE,iDAAqB,CAAC,UAAU;gBACxC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;aACzC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;mCApBY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;GACA,wBAAwB,CAoBpC"}
1
+ {"version":3,"file":"PreElectroTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/PreElectroTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oHAAsF;AAEtF,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,wBAAwB,sCAA9B,MAAM,wBAAyB,SAAQ,+CAG7C;IAHM;;QAII,SAAI,GAAG,0BAA0B,CAAC;QAE/B,sBAAiB,GAAG,CAC1B,IAAoF,EACrE,EAAE;YACjB,OAAO;gBACH,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;gBAC9C,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;gBAC5D,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACzB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,EAAE,iDAAqB,CAAC,UAAU;gBACxC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;aACzC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;mCApBY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;GACA,wBAAwB,CAoBpC"}
@@ -15,11 +15,9 @@ class CommodityWorker extends integration_engine_1.AbstractWorker {
15
15
  };
16
16
  // Register tasks
17
17
  this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementsFromProvidersTask));
18
- this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementsFromEEProvidersTask));
19
18
  this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchMeasurementOptionsStaticDataTask));
20
19
  this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchVeoliaMeasurementsTask));
21
20
  this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchPpasMeasurementsTask));
22
- this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchPpasEEMeasurementsTask));
23
21
  this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchPreMeasurementDataTask));
24
22
  this.registerTask(Di_1.CommodityContainer.resolve(WorkerContainerToken_1.WorkerContainerToken.FetchPtasWebScrapedMeasurementsTask));
25
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"CommodityWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/workers/CommodityWorker.ts"],"names":[],"mappings":";;;AAAA,8EAAuE;AAEvE,4CAA2C;AAC3C,kCAA+C;AAC/C,sEAAmE;AAEnE,MAAa,eAAgB,SAAQ,mCAAc;IAG/C;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QAuBtB,iBAAY,GAAG,CAAC,IAAW,EAAQ,EAAE;YACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QArBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,kCAAkC,CAAC,CAAC,CAAC;QAE9G,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,oCAAoC,CAAC,CAAC,CAAC;QAEhH,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,qCAAqC,CAAC,CAAC,CAAC;QAEjH,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAErG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,mCAAmC,CAAC,CAAC,CAAC;IACnH,CAAC;CAMJ;AA5BD,0CA4BC"}
1
+ {"version":3,"file":"CommodityWorker.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/workers/CommodityWorker.ts"],"names":[],"mappings":";;;AAAA,8EAAuE;AAEvE,4CAA2C;AAC3C,kCAA+C;AAC/C,sEAAmE;AAEnE,MAAa,eAAgB,SAAQ,mCAAc;IAG/C;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QAmBtB,iBAAY,GAAG,CAAC,IAAW,EAAQ,EAAE;YACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAjBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,kCAAkC,CAAC,CAAC,CAAC;QAE9G,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,qCAAqC,CAAC,CAAC,CAAC;QAEjH,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAErG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,mCAAmC,CAAC,CAAC,CAAC;IACnH,CAAC;CAMJ;AAxBD,0CAwBC"}
@@ -1,5 +1,5 @@
1
1
  import { CommodityProviderType } from "../../../../schema-definitions/models/helpers/CommodityProviderTypeEnum";
2
2
  import { IMeasurementsParams } from "./IMeasurementsParams";
3
3
  export interface IPpasMeasurementsParams extends IMeasurementsParams {
4
- providerType: CommodityProviderType.PpasAveV | CommodityProviderType.PpasAveM | CommodityProviderType.PpasAveA | CommodityProviderType.PpasAveC | CommodityProviderType.PpasAveMO;
4
+ providerType: CommodityProviderType.PpasAveV | CommodityProviderType.PpasAveM;
5
5
  }
@@ -2,5 +2,5 @@ import { CommodityProviderType } from "../../../../schema-definitions/models/hel
2
2
  import { IPpasMeasurementsParams } from "../interfaces/IPpasMeasurementsParams";
3
3
  import { MeasurementsValidationSchema } from "./MeasurementsSchema";
4
4
  export declare class PpasMeasurementsValidationSchema extends MeasurementsValidationSchema implements IPpasMeasurementsParams {
5
- providerType: CommodityProviderType.PpasAveV | CommodityProviderType.PpasAveM | CommodityProviderType.PpasAveA | CommodityProviderType.PpasAveC | CommodityProviderType.PpasAveMO;
5
+ providerType: CommodityProviderType.PpasAveV | CommodityProviderType.PpasAveM;
6
6
  }
@@ -17,13 +17,7 @@ class PpasMeasurementsValidationSchema extends MeasurementsSchema_1.Measurements
17
17
  }
18
18
  exports.PpasMeasurementsValidationSchema = PpasMeasurementsValidationSchema;
19
19
  __decorate([
20
- (0, class_validator_1.IsEnum)([
21
- CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveV,
22
- CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveM,
23
- CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveA,
24
- CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveC,
25
- CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveMO,
26
- ]),
20
+ (0, class_validator_1.IsEnum)([CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveV, CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveM]),
27
21
  __metadata("design:type", String)
28
22
  ], PpasMeasurementsValidationSchema.prototype, "providerType", void 0);
29
23
  //# sourceMappingURL=PpasMeasurementsSchema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"PpasMeasurementsSchema.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uHAAsF;AACtF,+EAAmE;AAEnE,6DAAoE;AAEpE,MAAa,gCAAiC,SAAQ,iDAA4B;CAcjF;AAdD,4EAcC;AANG;IAPC,IAAA,wBAAM,EAAC;QACJ,iDAAqB,CAAC,QAAQ;QAC9B,iDAAqB,CAAC,QAAQ;QAC9B,iDAAqB,CAAC,QAAQ;QAC9B,iDAAqB,CAAC,QAAQ;QAC9B,iDAAqB,CAAC,SAAS;KAClC,CAAC;;sEAMoC"}
1
+ {"version":3,"file":"PpasMeasurementsSchema.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uHAAsF;AACtF,+EAAmE;AAEnE,6DAAoE;AAEpE,MAAa,gCAAiC,SAAQ,iDAA4B;CAGjF;AAHD,4EAGC;AADG;IADC,IAAA,wBAAM,EAAC,CAAC,iDAAqB,CAAC,QAAQ,EAAE,iDAAqB,CAAC,QAAQ,CAAC,CAAC;;sEACM"}
@@ -1,5 +1,4 @@
1
1
  import { StaticMeterSettingsDataSourceProvider } from "../../datasources/static-data/StaticMeterSettingsDataSourceProvider";
2
- import { StaticMeterSettingsDataSourceCapitalDs } from "../../datasources/static-data/StaticMeterSettingsDataSourceCapitalDs";
3
2
  import { StaticMeterSettingsRepository } from "../../repositories/StaticMeterSettingsRepository";
4
3
  import { ILogger } from "@golemio/core/dist/helpers/logger";
5
4
  import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine/workers/AbstractEmptyTask";
@@ -7,10 +6,9 @@ export declare class FetchMeasurementOptionsStaticDataTask extends AbstractEmpty
7
6
  private logger;
8
7
  private staticDataSourceProvider;
9
8
  private meterSettingsRepository;
10
- private meterSettingsRepositoryCapitalDistrict;
11
9
  readonly queueName = "fetchMeasurementOptionsStaticData";
12
10
  readonly queueTtl: number;
13
- constructor(logger: ILogger, staticDataSourceProvider: StaticMeterSettingsDataSourceProvider, meterSettingsRepository: StaticMeterSettingsRepository, meterSettingsRepositoryCapitalDistrict: StaticMeterSettingsDataSourceCapitalDs);
11
+ constructor(logger: ILogger, staticDataSourceProvider: StaticMeterSettingsDataSourceProvider, meterSettingsRepository: StaticMeterSettingsRepository);
14
12
  protected execute(): Promise<void>;
15
13
  private lookupMeasurementsOptionsByKey;
16
14
  }
@@ -24,7 +24,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
24
24
  exports.FetchMeasurementOptionsStaticDataTask = void 0;
25
25
  const constants_1 = require("../../constants");
26
26
  const StaticMeterSettingsDataSourceProvider_1 = require("../../datasources/static-data/StaticMeterSettingsDataSourceProvider");
27
- const StaticMeterSettingsDataSourceCapitalDs_1 = require("../../datasources/static-data/StaticMeterSettingsDataSourceCapitalDs");
28
27
  const WorkerContainerToken_1 = require("../../ioc/WorkerContainerToken");
29
28
  const StaticMeterSettingsRepository_1 = require("../../repositories/StaticMeterSettingsRepository");
30
29
  const CommodityProviderTypeEnum_1 = require("../../../../schema-definitions/models/helpers/CommodityProviderTypeEnum");
@@ -38,30 +37,24 @@ const optionLookupKeys = {
38
37
  [CommodityProviderTypeEnum_1.CommodityProviderType.CemApiVeoliaElectro]: "CemElectroOptions",
39
38
  [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveV]: "AveVOptions",
40
39
  [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveM]: "AveMOptions",
41
- [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveA]: "AveHl.m.Prahaptions",
42
- [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveC]: "AveHlavni.m.Prahaptions",
43
- [CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveMO]: "AveHlavni.mesto.Praha.64581ptions",
44
40
  [CommodityProviderTypeEnum_1.CommodityProviderType.PreOptions]: "PreOptions",
45
41
  [CommodityProviderTypeEnum_1.CommodityProviderType.PtasOptions]: "PtasOptions",
46
42
  };
47
43
  let FetchMeasurementOptionsStaticDataTask = exports.FetchMeasurementOptionsStaticDataTask = class FetchMeasurementOptionsStaticDataTask extends AbstractEmptyTask_1.AbstractEmptyTask {
48
- constructor(logger, staticDataSourceProvider, meterSettingsRepository, meterSettingsRepositoryCapitalDistrict) {
44
+ constructor(logger, staticDataSourceProvider, meterSettingsRepository) {
49
45
  super(constants_1.WORKER_NAME);
50
46
  this.logger = logger;
51
47
  this.staticDataSourceProvider = staticDataSourceProvider;
52
48
  this.meterSettingsRepository = meterSettingsRepository;
53
- this.meterSettingsRepositoryCapitalDistrict = meterSettingsRepositoryCapitalDistrict;
54
49
  this.queueName = "fetchMeasurementOptionsStaticData";
55
50
  this.queueTtl = 59 * 60 * 1000; // 59min
56
51
  }
57
52
  execute() {
58
53
  return __awaiter(this, void 0, void 0, function* () {
59
54
  const dataSource = this.staticDataSourceProvider.getDataSource();
60
- const staticDataSourceCapitalDistrict = this.meterSettingsRepositoryCapitalDistrict.getDataSource();
61
- const meterSettingsCapitalDistrict = yield staticDataSourceCapitalDistrict.getAll();
62
55
  const meterSettings = yield dataSource.getAll();
63
56
  for (const [commodityProvider, key] of Object.entries(optionLookupKeys)) {
64
- const options = this.lookupMeasurementsOptionsByKey(Object.assign(Object.assign({}, meterSettings), meterSettingsCapitalDistrict), key);
57
+ const options = this.lookupMeasurementsOptionsByKey(meterSettings, key);
65
58
  if (options.length === 0) {
66
59
  continue;
67
60
  }
@@ -83,9 +76,7 @@ exports.FetchMeasurementOptionsStaticDataTask = FetchMeasurementOptionsStaticDat
83
76
  __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
84
77
  __param(1, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsDataSourceProvider)),
85
78
  __param(2, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsRepository)),
86
- __param(3, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsDataSourceCapitalDs)),
87
79
  __metadata("design:paramtypes", [Object, StaticMeterSettingsDataSourceProvider_1.StaticMeterSettingsDataSourceProvider,
88
- StaticMeterSettingsRepository_1.StaticMeterSettingsRepository,
89
- StaticMeterSettingsDataSourceCapitalDs_1.StaticMeterSettingsDataSourceCapitalDs])
80
+ StaticMeterSettingsRepository_1.StaticMeterSettingsRepository])
90
81
  ], FetchMeasurementOptionsStaticDataTask);
91
82
  //# sourceMappingURL=FetchMeasurementOptionsStaticDataTask.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"FetchMeasurementOptionsStaticDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FetchMeasurementOptionsStaticDataTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,+HAA8I;AAC9I,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,UAAU,CAAC,EAAE,YAAY;IAChD,CAAC,iDAAqB,CAAC,WAAW,CAAC,EAAE,aAAa;CACrD,CAAC;AAGK,IAAM,qCAAqC,mDAA3C,MAAM,qCAAsC,SAAQ,qCAAiB;IAIxE,YAC8B,MAAuB,EAEjD,wBAAuE,EAEvE,uBAA8D;QAE9D,KAAK,CAAC,uBAAW,CAAC,CAAC;QANe,WAAM,GAAN,MAAM,CAAS;QAEzC,6BAAwB,GAAxB,wBAAwB,CAAuC;QAE/D,4BAAuB,GAAvB,uBAAuB,CAA+B;QARlD,cAAS,GAAG,mCAAmC,CAAC;QAChD,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ;IAUnD,CAAC;IAEe,OAAO;;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,CAAC;YACjE,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,CAAC,aAAa,EAAE,GAAiC,CAAC,CAAC;gBACtG,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;gDA3CY,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;6CADzB,6EAAqC;QAEtC,6DAA6B;GATzD,qCAAqC,CA2CjD"}
@@ -1,36 +1,27 @@
1
- import { AveApiDtoUnion, ICommodityProviderDataSourceFactory } from "../../datasources/interfaces/ICommodityProviderDataSourceFactory";
2
- import { IAveConfig, PpasAveApiHelper } from "../../datasources/ppas-ave-api/helpers/PpasAveApiHelper";
3
- import { IAveApiDeviceDataParams } from "../../datasources/ppas-ave-api/interfaces/IAveApiDeviceDataParams";
1
+ import { ICommodityProviderDataSourceFactory } from "../../datasources/interfaces/ICommodityProviderDataSourceFactory";
4
2
  import { MeasurementRepository } from "../../repositories/MeasurementRepository";
5
3
  import { StaticMeterSettingsRepository } from "../../repositories/StaticMeterSettingsRepository";
6
4
  import { AveMeasurementTransformation } from "../../transformations/AveMeasurementTransformation";
7
- import { IAveApiDeviceDataDto } from "../../../../schema-definitions/datasources/commodity-providers/interfaces/IAveApiDeviceDataDto";
8
- import { IMeasurementOption } from "../../../../schema-definitions/datasources/interfaces/IStaticMeterSettings";
9
5
  import { ILogger } from "@golemio/core/dist/helpers";
10
6
  import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
11
7
  import { IPpasMeasurementsParams } from "../interfaces/IPpasMeasurementsParams";
12
8
  import { PpasMeasurementsValidationSchema } from "../schema/PpasMeasurementsSchema";
13
9
  import { AbstractFetchMeasurementsTask } from "./AbstractFetchMeasurementsTask";
14
10
  export declare class FetchPpasMeasurementsTask extends AbstractFetchMeasurementsTask<IPpasMeasurementsParams> {
15
- protected config: ISimpleConfig;
16
- protected logger: ILogger;
17
- protected dataSourceFactory: ICommodityProviderDataSourceFactory;
18
- protected measurementTransformation: AveMeasurementTransformation;
11
+ private config;
12
+ private logger;
13
+ private dataSourceFactory;
14
+ private measurementTransformation;
19
15
  protected measurementRepository: MeasurementRepository;
20
- protected meterSettingsRepository: StaticMeterSettingsRepository;
21
- queueName: string;
22
- queueTtl: number;
23
- schema: typeof PpasMeasurementsValidationSchema;
16
+ private meterSettingsRepository;
17
+ readonly queueName = "fetchPpasMeasurements";
18
+ readonly queueTtl: number;
19
+ readonly schema: typeof PpasMeasurementsValidationSchema;
24
20
  constructor(config: ISimpleConfig, logger: ILogger, dataSourceFactory: ICommodityProviderDataSourceFactory, measurementTransformation: AveMeasurementTransformation, measurementRepository: MeasurementRepository, meterSettingsRepository: StaticMeterSettingsRepository);
25
21
  execute(data: IPpasMeasurementsParams): Promise<void>;
26
- protected getProviderConfig(data: IPpasMeasurementsParams): {
27
- baseUrl: string;
28
- config: IAveConfig;
29
- };
22
+ private getProviderConfig;
30
23
  /** Splits the measurement options into individual options (multiple variables) */
31
- protected splitOptionsByVars(options: IMeasurementOption[]): IMeasurementOption[];
32
- protected generateMeasurements(data: IPpasMeasurementsParams & {
33
- placeId: number;
34
- }, sessionId: string): AsyncGenerator<IAveApiDeviceDataDto[]>;
35
- protected getDataFromDataSource<T extends AveApiDtoUnion>(resourceTypeKey: keyof typeof PpasAveApiHelper.resourceType, sessionId: string, params?: IAveApiDeviceDataParams): Promise<T[]>;
24
+ private splitOptionsByVars;
25
+ private generateMeasurements;
26
+ private getDataFromDataSource;
36
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"FetchPpasMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FetchPpasMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.ts"],"names":[],"mappings":"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"}
@@ -48,7 +48,7 @@ let V2MeasurementsController = exports.V2MeasurementsController = class V2Measur
48
48
  const fromDate = startDateUtc.startOf("month").toISO();
49
49
  const toDate = startDateUtc.endOf("month").toISO();
50
50
  const params = {
51
- address: `/${req.query.addr1}/${req.query.addr2}`,
51
+ address: `/${req.query.addr1}/${req.query.addr2}/${req.query.variable}`,
52
52
  variable: req.query.variable,
53
53
  from: fromDate,
54
54
  to: toDate,
@@ -1 +1 @@
1
- {"version":3,"file":"V2MeasurementsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2MeasurementsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,iEAAwE;AACxE,yEAAoE;AACpE,oFAA+E;AAE/E,4EAAsF;AACtF,2DAA2D;AAGpD,IAAM,wBAAwB,sCAA9B,MAAM,wBAAwB;IACjC,YAAgE,qBAAoD;QAA5C,0BAAqB,GAArB,qBAAqB,CAAuB;QAE7G,oBAAe,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAC/E,IAAI;gBACA,MAAM,MAAM,mBACR,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAkB,EACtC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAc,EAC9B,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAe,EAChC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAe,EAChC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAkB,EACtC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAgB,IAC/B,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAChC,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBACxE,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3B;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAA,CAAC;QAEK,uBAAkB,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAClF,IAAI;gBACA,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;gBAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;gBAEhD,MAAM,YAAY,GAAG,gBAAQ,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;gBAClG,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;gBACvD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;gBAEnD,MAAM,MAAM,GAAyB;oBACjC,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE;oBACjD,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAkB;oBACtC,IAAI,EAAE,QAAQ;oBACd,EAAE,EAAE,MAAM;iBACb,CAAC;gBAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAC3E,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,iBAAG,IAAI,EAAE,QAAQ,IAAK,EAAE,EAAG,CAAC,CAAC,CAAC;aACpE;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAA,CAAC;IAzCqH,CAAC;CA0C3H,CAAA;mCA3CY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qBAAqB,CAAC,CAAA;qCAAgC,6CAAqB;GAD3G,wBAAwB,CA2CpC"}
1
+ {"version":3,"file":"V2MeasurementsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2MeasurementsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,iEAAwE;AACxE,yEAAoE;AACpE,oFAA+E;AAE/E,4EAAsF;AACtF,2DAA2D;AAGpD,IAAM,wBAAwB,sCAA9B,MAAM,wBAAwB;IACjC,YAAgE,qBAAoD;QAA5C,0BAAqB,GAArB,qBAAqB,CAAuB;QAE7G,oBAAe,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAC/E,IAAI;gBACA,MAAM,MAAM,mBACR,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAkB,EACtC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAc,EAC9B,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAe,EAChC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAe,EAChC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAkB,EACtC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAgB,IAC/B,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAChC,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBACxE,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3B;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAA,CAAC;QAEK,uBAAkB,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAClF,IAAI;gBACA,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;gBAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;gBAEhD,MAAM,YAAY,GAAG,gBAAQ,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;gBAClG,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;gBACvD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;gBAEnD,MAAM,MAAM,GAAyB;oBACjC,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE;oBACvE,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAkB;oBACtC,IAAI,EAAE,QAAQ;oBACd,EAAE,EAAE,MAAM;iBACb,CAAC;gBAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAC3E,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,iBAAG,IAAI,EAAE,QAAQ,IAAK,EAAE,EAAG,CAAC,CAAC,CAAC;aACpE;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAA,CAAC;IAzCqH,CAAC;CA0C3H,CAAA;mCA3CY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qBAAqB,CAAC,CAAA;qCAAgC,6CAAqB;GAD3G,wBAAwB,CA2CpC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"BuildingsPrimaryModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BuildingsPrimaryModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,MAAa,qBAAsB,SAAQ,iBAAwB;;AAAnE,sDAqDC;AApDiB,+BAAS,GAAG,2BAA2B,CAAC;AACxC,+BAAS,GAAG,sCAAsC,CAAC;AAWnD,oCAAc,GAA2C;IACnE,EAAE,EAAE;QACA,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,OAAO;KAC1B;IACD,aAAa,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IACpC,WAAW,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAClC,qBAAqB,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC5C,cAAc,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IACrC,QAAQ,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC/B,aAAa,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IACpC,oBAAoB,EAAE,qBAAS,CAAC,OAAO;CAC1C,CAAC;AAEY,qCAAe,GAAwC;IACjE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACvB,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,qBAAqB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzC,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,oBAAoB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;SAC5C;QACD,QAAQ,EAAE;YACN,IAAI;YACJ,eAAe;YACf,aAAa;YACb,uBAAuB;YACvB,gBAAgB;YAChB,UAAU;YACV,eAAe;YACf,sBAAsB;SACzB;KACJ;CACJ,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IPrimaryBuildings.js","sourceRoot":"","sources":["../../../../src/output-gateway/models/interfaces/IPrimaryBuildings.ts"],"names":[],"mappings":""}
@@ -42,7 +42,7 @@ let MeasurementRepository = exports.MeasurementRepository = class MeasurementRep
42
42
  ...(options.variable ? [{ var: { [sequelize_1.default.Op.eq]: options.variable } }] : []),
43
43
  ...(options.type ? [{ type: { [sequelize_1.default.Op.eq]: options.type } }] : []),
44
44
  ...(options.addr1 && options.addr2
45
- ? [{ addr: { [sequelize_1.default.Op.eq]: `/${options.addr1}/${options.addr2}` } }]
45
+ ? [{ addr: { [sequelize_1.default.Op.like]: sequelize_1.default.literal(`'/${options.addr1}/${options.addr2}/%'`) } }]
46
46
  : []),
47
47
  ...(options.dateFrom ? [{ timestamp: { [sequelize_1.default.Op.gte]: options.dateFrom } }] : []),
48
48
  ...(options.dateTo ? [{ timestamp: { [sequelize_1.default.Op.lte]: options.dateTo } }] : []),
@@ -1 +1 @@
1
- {"version":3,"file":"MeasurementRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/MeasurementRepository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MeasurementRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/MeasurementRepository.ts"],"names":[],"mappings":"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"}