@golemio/energetics 1.8.3 → 1.9.0-dev.2567800850
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/db/migrations/postgresql/20250213141826-add-device-serial-id.js +53 -0
- package/db/migrations/postgresql/20260427093000-enapo-porsenna.js +53 -0
- package/db/migrations/postgresql/sqls/20250213141826-add-device-serial-id-down.sql +1 -0
- package/db/migrations/postgresql/sqls/20250213141826-add-device-serial-id-up.sql +1 -0
- package/db/migrations/postgresql/sqls/20260427093000-enapo-porsenna-down.sql +3 -0
- package/db/migrations/postgresql/sqls/20260427093000-enapo-porsenna-up.sql +85 -0
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/AveDataTypeEnum.d.ts +4 -4
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/AveDataTypeEnum.js +5 -5
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/AveDataTypeEnum.js.map +1 -1
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/PpasAveApiDataSourceProvider.d.ts +1 -1
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/PpasAveApiDataSourceProvider.js +16 -13
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/PpasAveApiDataSourceProvider.js.map +1 -1
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/ArchiveDataTypeStrategy.d.ts +6 -0
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/ArchiveDataTypeStrategy.js +26 -0
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/ArchiveDataTypeStrategy.js.map +1 -0
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/PpasAveApiHelper.d.ts +4 -23
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/PpasAveApiHelper.js +3 -67
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/helpers/PpasAveApiHelper.js.map +1 -1
- package/dist/integration-engine/commodity-providers/datasources/ppas-ave-api/interfaces/IAveApiDeviceDataParams.d.ts +3 -5
- package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.d.ts +6 -2
- package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.js +3 -2
- package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.js.map +1 -1
- package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.d.ts +2 -0
- package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.js +1 -0
- package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.js.map +1 -1
- package/dist/integration-engine/commodity-providers/transformations/PreElectroTransformation.js +1 -0
- package/dist/integration-engine/commodity-providers/transformations/PreElectroTransformation.js.map +1 -1
- package/dist/integration-engine/commodity-providers/transformations/PreMeasurementTransformation.js +1 -0
- package/dist/integration-engine/commodity-providers/transformations/PreMeasurementTransformation.js.map +1 -1
- package/dist/integration-engine/commodity-providers/transformations/PtasWebMeasurementTransformation.js +1 -0
- package/dist/integration-engine/commodity-providers/transformations/PtasWebMeasurementTransformation.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js +11 -10
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.d.ts +4 -7
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js +20 -23
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPreMeasurementDataTask.js +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPreMeasurementDataTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchVeoliaMeasurementsTask.js +3 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchVeoliaMeasurementsTask.js.map +1 -1
- package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSource.d.ts +15 -0
- package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSource.js +67 -0
- package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSource.js.map +1 -0
- package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSourceProvider.d.ts +10 -0
- package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSourceProvider.js +52 -0
- package/dist/integration-engine/enapo/datasources/porsenna/PorsennaDataSourceProvider.js.map +1 -0
- package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IConsumptionApiEntry.d.ts +7 -0
- package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IConsumptionApiEntry.js +3 -0
- package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IConsumptionApiEntry.js.map +1 -0
- package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IGaugeApiDto.d.ts +5 -0
- package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IGaugeApiDto.js +3 -0
- package/dist/integration-engine/enapo/datasources/porsenna/interfaces/IGaugeApiDto.js.map +1 -0
- package/dist/integration-engine/enapo/helpers/IntervalGenerator.d.ts +1 -0
- package/dist/integration-engine/enapo/helpers/IntervalGenerator.js +6 -0
- package/dist/integration-engine/enapo/helpers/IntervalGenerator.js.map +1 -1
- package/dist/integration-engine/enapo/interfaces/IPPasPlaces.d.ts +3 -46
- package/dist/integration-engine/enapo/ioc/Di.js +24 -8
- package/dist/integration-engine/enapo/ioc/Di.js.map +1 -1
- package/dist/integration-engine/enapo/ioc/EnapoWorkerContainerToken.d.ts +8 -0
- package/dist/integration-engine/enapo/ioc/EnapoWorkerContainerToken.js +8 -0
- package/dist/integration-engine/enapo/ioc/EnapoWorkerContainerToken.js.map +1 -1
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaBuildingsRepository.d.ts +5 -0
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaBuildingsRepository.js +32 -0
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaBuildingsRepository.js.map +1 -0
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaConsumptionRepository.d.ts +5 -0
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaConsumptionRepository.js +32 -0
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaConsumptionRepository.js.map +1 -0
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaDevicesRepository.d.ts +5 -0
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaDevicesRepository.js +32 -0
- package/dist/integration-engine/enapo/repositories/porsenna/PorsennaDevicesRepository.js.map +1 -0
- package/dist/integration-engine/enapo/transformations/PPasMeasurementTransformation.d.ts +1 -0
- package/dist/integration-engine/enapo/transformations/PPasMeasurementTransformation.js +4 -4
- package/dist/integration-engine/enapo/transformations/PPasMeasurementTransformation.js.map +1 -1
- package/dist/integration-engine/enapo/transformations/porsenna/PorsennaConsumptionTransformation.d.ts +8 -0
- package/dist/integration-engine/enapo/transformations/porsenna/PorsennaConsumptionTransformation.js +47 -0
- package/dist/integration-engine/enapo/transformations/porsenna/PorsennaConsumptionTransformation.js.map +1 -0
- package/dist/integration-engine/enapo/transformations/porsenna/PorsennaGaugeTransformation.d.ts +15 -0
- package/dist/integration-engine/enapo/transformations/porsenna/PorsennaGaugeTransformation.js +62 -0
- package/dist/integration-engine/enapo/transformations/porsenna/PorsennaGaugeTransformation.js.map +1 -0
- package/dist/integration-engine/enapo/workers/EnapoWorker.js +1 -0
- package/dist/integration-engine/enapo/workers/EnapoWorker.js.map +1 -1
- package/dist/integration-engine/enapo/workers/interfaces/IEnapoPorsennaDistributionParams.d.ts +5 -0
- package/dist/integration-engine/enapo/workers/interfaces/IEnapoPorsennaDistributionParams.js +3 -0
- package/dist/integration-engine/enapo/workers/interfaces/IEnapoPorsennaDistributionParams.js.map +1 -0
- package/dist/integration-engine/enapo/workers/schema/EnapoPorsennaDistributionParamsSchema.d.ts +6 -0
- package/dist/integration-engine/enapo/workers/schema/EnapoPorsennaDistributionParamsSchema.js +34 -0
- package/dist/integration-engine/enapo/workers/schema/EnapoPorsennaDistributionParamsSchema.js.map +1 -0
- package/dist/integration-engine/enapo/workers/task/EnapoPpasTask.d.ts +2 -5
- package/dist/integration-engine/enapo/workers/task/EnapoPpasTask.js +21 -24
- package/dist/integration-engine/enapo/workers/task/EnapoPpasTask.js.map +1 -1
- package/dist/integration-engine/enapo/workers/task/PorsennaDistributionTask.d.ts +27 -0
- package/dist/integration-engine/enapo/workers/task/PorsennaDistributionTask.js +125 -0
- package/dist/integration-engine/enapo/workers/task/PorsennaDistributionTask.js.map +1 -0
- package/dist/output-gateway/controllers/v2/AbstractController.js +4 -1
- package/dist/output-gateway/controllers/v2/AbstractController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/BuildingsController.js +2 -1
- package/dist/output-gateway/controllers/v2/BuildingsController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2DevicesController.js +1 -1
- package/dist/output-gateway/controllers/v2/V2DevicesController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2OrganizationsController.js +1 -1
- package/dist/output-gateway/controllers/v2/V2OrganizationsController.js.map +1 -1
- package/dist/output-gateway/repositories/MeasurementRepository.js +5 -1
- package/dist/output-gateway/repositories/MeasurementRepository.js.map +1 -1
- package/dist/schema-definitions/datasources/StaticMeterSettingsJsonSchema.js +4 -3
- package/dist/schema-definitions/datasources/StaticMeterSettingsJsonSchema.js.map +1 -1
- package/dist/schema-definitions/datasources/commodity-providers/AveApiArchiveResponseJsonSchema.d.ts +3 -0
- package/dist/schema-definitions/datasources/commodity-providers/AveApiArchiveResponseJsonSchema.js +37 -0
- package/dist/schema-definitions/datasources/commodity-providers/AveApiArchiveResponseJsonSchema.js.map +1 -0
- package/dist/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.js +2 -2
- package/dist/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.js.map +1 -1
- package/dist/schema-definitions/datasources/commodity-providers/AveApiPlacesJsonSchema.js +5 -4
- package/dist/schema-definitions/datasources/commodity-providers/AveApiPlacesJsonSchema.js.map +1 -1
- package/dist/schema-definitions/datasources/commodity-providers/interfaces/IAveApiArchiveHeaderDto.d.ts +5 -0
- package/dist/schema-definitions/datasources/commodity-providers/interfaces/IAveApiArchiveHeaderDto.js +3 -0
- package/dist/schema-definitions/datasources/commodity-providers/interfaces/IAveApiArchiveHeaderDto.js.map +1 -0
- package/dist/schema-definitions/datasources/commodity-providers/interfaces/IAveApiArchiveResponseDto.d.ts +10 -0
- package/dist/schema-definitions/datasources/commodity-providers/interfaces/IAveApiArchiveResponseDto.js +3 -0
- package/dist/schema-definitions/datasources/commodity-providers/interfaces/IAveApiArchiveResponseDto.js.map +1 -0
- package/dist/schema-definitions/datasources/commodity-providers/interfaces/IAveApiDeviceDataDto.d.ts +1 -1
- package/dist/schema-definitions/datasources/commodity-providers/interfaces/IAveApiPlaceDto.d.ts +4 -3
- package/dist/schema-definitions/datasources/enapo/porsenna/PorsennaJsonSchema.d.ts +5 -0
- package/dist/schema-definitions/datasources/enapo/porsenna/PorsennaJsonSchema.js +92 -0
- package/dist/schema-definitions/datasources/enapo/porsenna/PorsennaJsonSchema.js.map +1 -0
- package/dist/schema-definitions/datasources/enapo/porsenna/interfaces/IConsumptionApiEntry.d.ts +15 -0
- package/dist/schema-definitions/datasources/enapo/porsenna/interfaces/IConsumptionApiEntry.js +3 -0
- package/dist/schema-definitions/datasources/enapo/porsenna/interfaces/IConsumptionApiEntry.js.map +1 -0
- package/dist/schema-definitions/datasources/enapo/porsenna/interfaces/IGaugeApiDto.d.ts +41 -0
- package/dist/schema-definitions/datasources/enapo/porsenna/interfaces/IGaugeApiDto.js +3 -0
- package/dist/schema-definitions/datasources/enapo/porsenna/interfaces/IGaugeApiDto.js.map +1 -0
- package/dist/schema-definitions/datasources/interfaces/IStaticMeterSettings.d.ts +3 -2
- package/dist/schema-definitions/models/MeasurementsModel.d.ts +1 -0
- package/dist/schema-definitions/models/MeasurementsModel.js +15 -1
- package/dist/schema-definitions/models/MeasurementsModel.js.map +1 -1
- package/dist/schema-definitions/models/interfaces/IMeasurementDto.d.ts +1 -0
- package/dist/schema-definitions/models/porsenna/PorsennaBuildingsModel.d.ts +21 -0
- package/dist/schema-definitions/models/porsenna/PorsennaBuildingsModel.js +77 -0
- package/dist/schema-definitions/models/porsenna/PorsennaBuildingsModel.js.map +1 -0
- package/dist/schema-definitions/models/porsenna/PorsennaConsumptionModel.d.ts +20 -0
- package/dist/schema-definitions/models/porsenna/PorsennaConsumptionModel.js +72 -0
- package/dist/schema-definitions/models/porsenna/PorsennaConsumptionModel.js.map +1 -0
- package/dist/schema-definitions/models/porsenna/PorsennaDevicesModel.d.ts +27 -0
- package/dist/schema-definitions/models/porsenna/PorsennaDevicesModel.js +107 -0
- package/dist/schema-definitions/models/porsenna/PorsennaDevicesModel.js.map +1 -0
- package/dist/schema-definitions/models/porsenna/index.d.ts +3 -0
- package/dist/schema-definitions/models/porsenna/index.js +20 -0
- package/dist/schema-definitions/models/porsenna/index.js.map +1 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IBuildings.d.ts +11 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IBuildings.js +3 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IBuildings.js.map +1 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IConsumption.d.ts +10 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IConsumption.js +3 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IConsumption.js.map +1 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IDevices.d.ts +17 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IDevices.js +3 -0
- package/dist/schema-definitions/models/porsenna/interfaces/IDevices.js.map +1 -0
- package/docs/implementation_documentation.md +44 -3
- package/package.json +12 -8
|
@@ -39,24 +39,25 @@ let EnapoPpasTask = exports.EnapoPpasTask = class EnapoPpasTask extends Abstract
|
|
|
39
39
|
this.schema = EnapoPpasMeasurementsParamsValidationSchema_1.EnapoPpasMeasurementsParamsValidationSchema;
|
|
40
40
|
}
|
|
41
41
|
async execute(params) {
|
|
42
|
-
const
|
|
43
|
-
const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
|
|
44
|
-
const sessionId = await aveApiHelper.createSession();
|
|
42
|
+
const config = this.getProviderConfig(params);
|
|
45
43
|
try {
|
|
46
|
-
const places = await this.getDataFromDataSource("Places",
|
|
44
|
+
const places = await this.getDataFromDataSource("Places", config.apikey);
|
|
47
45
|
for (const place of places) {
|
|
48
|
-
if (config.excludelist && config.excludelist.includes(place.
|
|
46
|
+
if (config.excludelist && config.excludelist.includes(place.eic)) {
|
|
49
47
|
continue;
|
|
50
48
|
}
|
|
51
|
-
this.logger.info(`Fetching data for device ${place.
|
|
52
|
-
await this.fetchAndSave(place,
|
|
49
|
+
this.logger.info(`Fetching data for device ${place.serialNumber}`);
|
|
50
|
+
await this.fetchAndSave(place, config.apikey, params);
|
|
53
51
|
}
|
|
54
52
|
}
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
catch (err) {
|
|
54
|
+
if (err instanceof golemio_errors_1.AbstractGolemioError) {
|
|
55
|
+
throw err;
|
|
56
|
+
}
|
|
57
|
+
throw new golemio_errors_1.GeneralError(`Unable to download ppas measurements`, this.constructor.name, err);
|
|
57
58
|
}
|
|
58
59
|
}
|
|
59
|
-
async fetchAndSave(place,
|
|
60
|
+
async fetchAndSave(place, apiKey, params) {
|
|
60
61
|
try {
|
|
61
62
|
if (!params?.targetDays && (!params?.dateFrom || !params?.dateTo)) {
|
|
62
63
|
throw new golemio_errors_1.GeneralError("Both dateFrom and dateTo must be provided when targetDays is not specified", this.constructor.name);
|
|
@@ -67,14 +68,11 @@ let EnapoPpasTask = exports.EnapoPpasTask = class EnapoPpasTask extends Abstract
|
|
|
67
68
|
for (const interval of intervals) {
|
|
68
69
|
const start = interval.start.startOf("day");
|
|
69
70
|
const end = interval.end.startOf("day");
|
|
70
|
-
const measurementRawData = await this.getDataFromDataSource("DeviceData",
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
// fill all measurement values (we need the OperatingAmount and ConvertDifference values)
|
|
76
|
-
truncateData: "0",
|
|
77
|
-
dataType: AveDataTypeEnum_1.AveDataType.RawData.toString(),
|
|
71
|
+
const measurementRawData = await this.getDataFromDataSource("DeviceData", apiKey, {
|
|
72
|
+
deviceId: place.deviceId,
|
|
73
|
+
from: start.toUTC().toISO({ suppressMilliseconds: true }),
|
|
74
|
+
to: end.toUTC().toISO({ suppressMilliseconds: true }),
|
|
75
|
+
dataType: AveDataTypeEnum_1.AveDataType.HourlyData,
|
|
78
76
|
});
|
|
79
77
|
const measurementRawDataWithPlace = measurementRawData.map((item) => ({
|
|
80
78
|
...place,
|
|
@@ -88,19 +86,18 @@ let EnapoPpasTask = exports.EnapoPpasTask = class EnapoPpasTask extends Abstract
|
|
|
88
86
|
if (err instanceof golemio_errors_1.AbstractGolemioError) {
|
|
89
87
|
throw err;
|
|
90
88
|
}
|
|
91
|
-
throw new golemio_errors_1.GeneralError(`Unable to download data for
|
|
89
|
+
throw new golemio_errors_1.GeneralError(`Unable to download data for deviceId: ${place.deviceId} eic: ${place.eic}`, this.constructor.name, err);
|
|
92
90
|
}
|
|
93
91
|
}
|
|
94
92
|
getProviderConfig(data) {
|
|
95
93
|
const rawConfig = this.config.getValue(`module.energetics.commodityProviders.${data.providerType}`);
|
|
96
|
-
rawConfig.excludelist = rawConfig.excludelist ? Object.values(rawConfig.excludelist) : null;
|
|
97
94
|
return {
|
|
98
|
-
|
|
99
|
-
|
|
95
|
+
...rawConfig,
|
|
96
|
+
excludelist: rawConfig.excludelist ? Object.values(rawConfig.excludelist) : null,
|
|
100
97
|
};
|
|
101
98
|
}
|
|
102
|
-
getDataFromDataSource(resourceTypeKey,
|
|
103
|
-
const dataSource = this.dataSourceFactory.getDataSource(CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi, PpasAveApiHelper_1.PpasAveApiHelper.resourceType[resourceTypeKey],
|
|
99
|
+
getDataFromDataSource(resourceTypeKey, apiKey, params) {
|
|
100
|
+
const dataSource = this.dataSourceFactory.getDataSource(CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi, PpasAveApiHelper_1.PpasAveApiHelper.resourceType[resourceTypeKey], apiKey, params);
|
|
104
101
|
return dataSource.getAll();
|
|
105
102
|
}
|
|
106
103
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnapoPpasTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/enapo/workers/task/EnapoPpasTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kHAAsG;AAKtG,2GAA+F;AAC/F,qHAAyH;AAGzH,uEAAwE;AAExE,mFAAoF;AACpF,gGAAiG;AACjG,uGAAwG;AAIxG,wEAAqE;AAErE,6EAA8F;AAC9F,2DAA2D;AAC3D,iEAAwE;AAExE,uHAAoH;AACpH,6FAA0F;AAGnF,IAAM,aAAa,2BAAnB,MAAM,aAAc,SAAQ,uEAAmE;IAKlG,YACoC,MAA+B,EAE/D,sBAA6D,EAE7D,cAAuD,EAC7B,MAAyB,EAEnD,iBAAgE;QAEhE,KAAK,EAAE,CAAC;QATkC,WAAM,GAAN,MAAM,CAAe;QAErD,2BAAsB,GAAtB,sBAAsB,CAA6B;QAEnD,mBAAc,GAAd,cAAc,CAA+B;QACnB,WAAM,GAAN,MAAM,CAAS;QAEzC,sBAAiB,GAAjB,iBAAiB,CAAqC;QAZ7D,cAAS,GAAG,uBAAuB,CAAC;QACpC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAC1B,WAAM,GAAG,yFAA2C,CAAC;IAa5D,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,MAA+B;QAChD,MAAM,
|
|
1
|
+
{"version":3,"file":"EnapoPpasTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/enapo/workers/task/EnapoPpasTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { PorsennaDataSource } from "../../datasources/porsenna/PorsennaDataSource";
|
|
2
|
+
import { PorsennaBuildingsRepository } from "../../repositories/porsenna/PorsennaBuildingsRepository";
|
|
3
|
+
import { PorsennaConsumptionRepository } from "../../repositories/porsenna/PorsennaConsumptionRepository";
|
|
4
|
+
import { PorsennaDevicesRepository } from "../../repositories/porsenna/PorsennaDevicesRepository";
|
|
5
|
+
import { PorsennaConsumptionTransformation } from "../../transformations/porsenna/PorsennaConsumptionTransformation";
|
|
6
|
+
import { PorsennaGaugeTransformation } from "../../transformations/porsenna/PorsennaGaugeTransformation";
|
|
7
|
+
import { IDatabaseConnector } from "@golemio/core/dist/helpers/data-access/postgres/IDatabaseConnector";
|
|
8
|
+
import { AbstractTask } from "@golemio/core/dist/integration-engine";
|
|
9
|
+
import { IEnapoPorsennaDistributionParams } from "../interfaces/IEnapoPorsennaDistributionParams";
|
|
10
|
+
import { EnapoPorsennaDistributionParamsSchema } from "../schema/EnapoPorsennaDistributionParamsSchema";
|
|
11
|
+
export declare class PorsennaDistributionTask extends AbstractTask<IEnapoPorsennaDistributionParams> {
|
|
12
|
+
protected datasource: PorsennaDataSource;
|
|
13
|
+
protected dbConnector: IDatabaseConnector;
|
|
14
|
+
protected porsennaConsumptionRepository: PorsennaConsumptionRepository;
|
|
15
|
+
protected porsennaBuildingsRepository: PorsennaBuildingsRepository;
|
|
16
|
+
protected porsennaDevicesRepository: PorsennaDevicesRepository;
|
|
17
|
+
protected gaugeTransformation: PorsennaGaugeTransformation;
|
|
18
|
+
protected consumptionTransformation: PorsennaConsumptionTransformation;
|
|
19
|
+
queueName: string;
|
|
20
|
+
queueTtl: number;
|
|
21
|
+
schema: typeof EnapoPorsennaDistributionParamsSchema;
|
|
22
|
+
constructor(datasource: PorsennaDataSource, dbConnector: IDatabaseConnector, porsennaConsumptionRepository: PorsennaConsumptionRepository, porsennaBuildingsRepository: PorsennaBuildingsRepository, porsennaDevicesRepository: PorsennaDevicesRepository, gaugeTransformation: PorsennaGaugeTransformation, consumptionTransformation: PorsennaConsumptionTransformation);
|
|
23
|
+
execute(params: IEnapoPorsennaDistributionParams): Promise<void>;
|
|
24
|
+
private prepareData;
|
|
25
|
+
private saveDataToDb;
|
|
26
|
+
private appendUniqueBuilding;
|
|
27
|
+
}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.PorsennaDistributionTask = void 0;
|
|
16
|
+
const constants_1 = require("../../constants");
|
|
17
|
+
const PorsennaDataSource_1 = require("../../datasources/porsenna/PorsennaDataSource");
|
|
18
|
+
const EnapoWorkerContainerToken_1 = require("../../ioc/EnapoWorkerContainerToken");
|
|
19
|
+
const PorsennaBuildingsRepository_1 = require("../../repositories/porsenna/PorsennaBuildingsRepository");
|
|
20
|
+
const PorsennaConsumptionRepository_1 = require("../../repositories/porsenna/PorsennaConsumptionRepository");
|
|
21
|
+
const PorsennaDevicesRepository_1 = require("../../repositories/porsenna/PorsennaDevicesRepository");
|
|
22
|
+
const PorsennaConsumptionTransformation_1 = require("../../transformations/porsenna/PorsennaConsumptionTransformation");
|
|
23
|
+
const PorsennaGaugeTransformation_1 = require("../../transformations/porsenna/PorsennaGaugeTransformation");
|
|
24
|
+
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
25
|
+
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
26
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
27
|
+
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
28
|
+
const EnapoPorsennaDistributionParamsSchema_1 = require("../schema/EnapoPorsennaDistributionParamsSchema");
|
|
29
|
+
let PorsennaDistributionTask = exports.PorsennaDistributionTask = class PorsennaDistributionTask extends integration_engine_1.AbstractTask {
|
|
30
|
+
constructor(datasource, dbConnector, porsennaConsumptionRepository, porsennaBuildingsRepository, porsennaDevicesRepository, gaugeTransformation, consumptionTransformation) {
|
|
31
|
+
super(constants_1.ENAPO_WORKER_NAME);
|
|
32
|
+
this.datasource = datasource;
|
|
33
|
+
this.dbConnector = dbConnector;
|
|
34
|
+
this.porsennaConsumptionRepository = porsennaConsumptionRepository;
|
|
35
|
+
this.porsennaBuildingsRepository = porsennaBuildingsRepository;
|
|
36
|
+
this.porsennaDevicesRepository = porsennaDevicesRepository;
|
|
37
|
+
this.gaugeTransformation = gaugeTransformation;
|
|
38
|
+
this.consumptionTransformation = consumptionTransformation;
|
|
39
|
+
this.queueName = "fetchPorsennaDistribution";
|
|
40
|
+
this.queueTtl = 60 * 60 * 1000;
|
|
41
|
+
this.schema = EnapoPorsennaDistributionParamsSchema_1.EnapoPorsennaDistributionParamsSchema;
|
|
42
|
+
}
|
|
43
|
+
async execute(params) {
|
|
44
|
+
try {
|
|
45
|
+
const currentYear = new Date().getFullYear();
|
|
46
|
+
const resolvedParams = {
|
|
47
|
+
...params,
|
|
48
|
+
yearFrom: params.yearFrom ?? String(currentYear - 1),
|
|
49
|
+
yearTo: params.yearTo ?? String(currentYear),
|
|
50
|
+
};
|
|
51
|
+
const { buildings, devices, consumption } = await this.prepareData(resolvedParams);
|
|
52
|
+
await this.saveDataToDb(buildings, devices, consumption);
|
|
53
|
+
}
|
|
54
|
+
catch (err) {
|
|
55
|
+
if (err instanceof golemio_errors_1.AbstractGolemioError) {
|
|
56
|
+
throw err;
|
|
57
|
+
}
|
|
58
|
+
throw new golemio_errors_1.GeneralError(`Unable to download porsenna distribution data`, this.constructor.name, err);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
async prepareData(params) {
|
|
62
|
+
let buildings = [];
|
|
63
|
+
const devices = [];
|
|
64
|
+
const consumption = [];
|
|
65
|
+
const seenBuildings = new Set();
|
|
66
|
+
for await (const gauge of this.datasource.generateAsyncPages(params.source)) {
|
|
67
|
+
const { device, building } = this.gaugeTransformation.transformElement({ gauge, source: params.source });
|
|
68
|
+
buildings = this.appendUniqueBuilding(building, buildings, seenBuildings);
|
|
69
|
+
devices.push(device);
|
|
70
|
+
const consumptionResponse = await this.datasource.getGaugeConsumption(params.source, device.id, params.yearFrom, params.yearTo);
|
|
71
|
+
for (const entry of consumptionResponse?.member ?? []) {
|
|
72
|
+
const transformed = await this.consumptionTransformation.transformElement({
|
|
73
|
+
entry,
|
|
74
|
+
deviceId: device.id,
|
|
75
|
+
source: params.source,
|
|
76
|
+
gaugeType: gauge.type,
|
|
77
|
+
});
|
|
78
|
+
consumption.push(transformed);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return { buildings, devices, consumption };
|
|
82
|
+
}
|
|
83
|
+
async saveDataToDb(buildings, devices, consumption) {
|
|
84
|
+
const transaction = await this.dbConnector.getConnection().transaction();
|
|
85
|
+
try {
|
|
86
|
+
if (buildings.length > 0) {
|
|
87
|
+
await this.porsennaBuildingsRepository.bulkSave(buildings, undefined, undefined, undefined, transaction);
|
|
88
|
+
}
|
|
89
|
+
if (devices.length > 0) {
|
|
90
|
+
await this.porsennaDevicesRepository.bulkSave(devices, undefined, undefined, undefined, transaction);
|
|
91
|
+
}
|
|
92
|
+
if (consumption.length > 0) {
|
|
93
|
+
await this.porsennaConsumptionRepository.bulkSave(consumption, undefined, undefined, undefined, transaction);
|
|
94
|
+
}
|
|
95
|
+
await transaction.commit();
|
|
96
|
+
}
|
|
97
|
+
catch (err) {
|
|
98
|
+
await transaction.rollback();
|
|
99
|
+
throw err;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
appendUniqueBuilding(building, current, seen) {
|
|
103
|
+
const key = `${building.source}:${building.id}`;
|
|
104
|
+
if (seen.has(key))
|
|
105
|
+
return current;
|
|
106
|
+
seen.add(key);
|
|
107
|
+
return [...current, building];
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
exports.PorsennaDistributionTask = PorsennaDistributionTask = __decorate([
|
|
111
|
+
(0, tsyringe_1.injectable)(),
|
|
112
|
+
__param(0, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PorsennaDatasource)),
|
|
113
|
+
__param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.PostgresConnector)),
|
|
114
|
+
__param(2, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PorsennaConsumptionRepository)),
|
|
115
|
+
__param(3, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PorsennaBuildingsRepository)),
|
|
116
|
+
__param(4, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PorsennaDevicesRepository)),
|
|
117
|
+
__param(5, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PorsennaGaugeTransformation)),
|
|
118
|
+
__param(6, (0, tsyringe_1.inject)(EnapoWorkerContainerToken_1.EnapoWorkerContainerToken.PorsennaConsumptionTransformation)),
|
|
119
|
+
__metadata("design:paramtypes", [PorsennaDataSource_1.PorsennaDataSource, Object, PorsennaConsumptionRepository_1.PorsennaConsumptionRepository,
|
|
120
|
+
PorsennaBuildingsRepository_1.PorsennaBuildingsRepository,
|
|
121
|
+
PorsennaDevicesRepository_1.PorsennaDevicesRepository,
|
|
122
|
+
PorsennaGaugeTransformation_1.PorsennaGaugeTransformation,
|
|
123
|
+
PorsennaConsumptionTransformation_1.PorsennaConsumptionTransformation])
|
|
124
|
+
], PorsennaDistributionTask);
|
|
125
|
+
//# sourceMappingURL=PorsennaDistributionTask.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PorsennaDistributionTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/enapo/workers/task/PorsennaDistributionTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ class AbstractController {
|
|
|
6
6
|
this.accessLimitationRepository = accessLimitationRepository;
|
|
7
7
|
}
|
|
8
8
|
async getAllowedOrganizationIds(req) {
|
|
9
|
-
|
|
9
|
+
let accessLimit = req.query.accessLimit;
|
|
10
|
+
if (Array.isArray(accessLimit)) {
|
|
11
|
+
accessLimit = accessLimit[0];
|
|
12
|
+
}
|
|
10
13
|
if (accessLimit === "admin") {
|
|
11
14
|
return null;
|
|
12
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/AbstractController.ts"],"names":[],"mappings":";;;AAGA,MAAa,kBAAkB;IAG3B,YAAY,0BAAsD;QAC9D,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;IACjE,CAAC;IAES,KAAK,CAAC,yBAAyB,CAAC,GAAY;QAClD,
|
|
1
|
+
{"version":3,"file":"AbstractController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/AbstractController.ts"],"names":[],"mappings":";;;AAGA,MAAa,kBAAkB;IAG3B,YAAY,0BAAsD;QAC9D,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;IACjE,CAAC;IAES,KAAK,CAAC,yBAAyB,CAAC,GAAY;QAClD,IAAI,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,WAAgC,CAAC;QAE7D,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC5B,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;SAChC;QAED,IAAI,WAAW,KAAK,OAAO,EAAE;YACzB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,MAAM,IAAI,CAAC,0BAA0B,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;IAC1F,CAAC;CACJ;AApBD,gDAoBC"}
|
|
@@ -44,7 +44,8 @@ let BuildingsController = exports.BuildingsController = class BuildingsControlle
|
|
|
44
44
|
this.getOne = async (req, res, next) => {
|
|
45
45
|
try {
|
|
46
46
|
const allowedOrganizations = await this.getAllowedOrganizationIds(req);
|
|
47
|
-
const
|
|
47
|
+
const paramId = Array.isArray(req.params.id) ? req.params.id[0] : req.params.id;
|
|
48
|
+
const id = parseInt(paramId);
|
|
48
49
|
const result = await this.buildingsRepository.GetOne(id, allowedOrganizations);
|
|
49
50
|
if (result === null) {
|
|
50
51
|
throw new golemio_errors_1.GeneralError("not_found", "V2BuildingsController", undefined, 404);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildingsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/BuildingsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAoE;AACpE,8FAAyF;AACzF,8FAAyF;AACzF,iGAA4F;AAC5F,2FAAsF;AACtF,mEAAiF;AAEjF,6EAAwE;AACxE,iEAAwE;AACxE,6DAA0D;AAC1D,mFAA0E;AAGnE,IAAM,mBAAmB,iCAAzB,MAAM,mBAAoB,SAAQ,uCAAkB;IAIvD,YAC6D,0BAAsD,EACtD,sBAA0D;QAEnH,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAF+B,2BAAsB,GAAtB,sBAAsB,CAA4B;QAOhH,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,SAAS,GAAG,IAAA,8BAAsB,EAAC,SAAS,CAAC,IAAc,CAAC,CAAC;gBACnE,MAAM,iBAAiB,GAAG,SAAS;oBAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC;oBAC9C,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;gBACtD,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aAC/B;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"BuildingsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/BuildingsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ let V2DevicesController = exports.V2DevicesController = class V2DevicesControlle
|
|
|
40
40
|
this.getOne = async (req, res, next) => {
|
|
41
41
|
try {
|
|
42
42
|
const allowedOrganizations = await this.getAllowedOrganizationIds(req);
|
|
43
|
-
const id = req.params.id;
|
|
43
|
+
const id = Array.isArray(req.params.id) ? req.params.id[0] : req.params.id;
|
|
44
44
|
const result = await this.devicesRepository.GetOne(id, allowedOrganizations);
|
|
45
45
|
if (!result) {
|
|
46
46
|
return next(new golemio_errors_1.GeneralError("not_found", this.constructor.name, `Device with id ${req.params.id} not found`, 404));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V2DevicesController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2DevicesController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4EAAsF;AAEtF,yEAAoE;AACpE,8FAAyF;AACzF,4EAAuE;AACvE,2FAAsF;AAEtF,6EAAwE;AACxE,iEAAwE;AACxE,6DAA0D;AAGnD,IAAM,mBAAmB,iCAAzB,MAAM,mBAAoB,SAAQ,uCAAkB;IACvD,YACoD,iBAA4C,EAE5F,cAA+C,EACU,0BAAsD;QAE/G,KAAK,CAAC,0BAA0B,CAAC,CAAC;QALsB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpF,mBAAc,GAAd,cAAc,CAAyB;QAM5C,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,MAAM,GAAsB,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;gBACjF,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;aAC/D;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"V2DevicesController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2DevicesController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4EAAsF;AAEtF,yEAAoE;AACpE,8FAAyF;AACzF,4EAAuE;AACvE,2FAAsF;AAEtF,6EAAwE;AACxE,iEAAwE;AACxE,6DAA0D;AAGnD,IAAM,mBAAmB,iCAAzB,MAAM,mBAAoB,SAAQ,uCAAkB;IACvD,YACoD,iBAA4C,EAE5F,cAA+C,EACU,0BAAsD;QAE/G,KAAK,CAAC,0BAA0B,CAAC,CAAC;QALsB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpF,mBAAc,GAAd,cAAc,CAAyB;QAM5C,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,MAAM,GAAsB,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;gBACjF,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;aAC/D;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAC;gBAE7E,IAAI,CAAC,MAAM,EAAE;oBACT,OAAO,IAAI,CACP,IAAI,6BAAY,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,CACzG,CAAC;iBACL;gBAED,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;aACjE;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAC;IA7BF,CAAC;CA8BJ,CAAA;8BAtCY,mBAAmB;IAD/B,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,iBAAiB,CAAC,CAAA;IAC9C,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,uBAAuB,CAAC,CAAA;IAEpD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,0BAA0B,CAAC,CAAA;qCAHmB,qCAAiB;QAEpE,iDAAuB;QACsC,uDAA0B;GAL1G,mBAAmB,CAsC/B"}
|
|
@@ -52,7 +52,7 @@ let V2OrganizationsController = exports.V2OrganizationsController = class V2Orga
|
|
|
52
52
|
this.getOne = async (req, res, next) => {
|
|
53
53
|
try {
|
|
54
54
|
const allowedOrganizations = await this.getAllowedOrganizationIds(req);
|
|
55
|
-
const id = req.params.id;
|
|
55
|
+
const id = Array.isArray(req.params.id) ? req.params.id[0] : req.params.id;
|
|
56
56
|
const result = await this.organizationsRepository.GetOne(id, allowedOrganizations);
|
|
57
57
|
if (!result) {
|
|
58
58
|
return next(new golemio_errors_1.GeneralError("not_found", this.constructor.name, `Organization with id ${req.params.id} not found`, 404));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V2OrganizationsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2OrganizationsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4EAAsF;AAEtF,yEAAoE;AACpE,8FAAyF;AACzF,wFAAmF;AACnF,mHAA8G;AAC9G,uGAAkG;AAClG,mEAAiF;AAEjF,6EAAwE;AACxE,iEAAwE;AACxE,6DAA0D;AAC1D,mFAA0E;AAGnE,IAAM,yBAAyB,uCAA/B,MAAM,yBAA0B,SAAQ,uCAAkB;IAC7D,YAC0D,uBAAwD,EAClD,cAAqD,EAEjH,oBAAiE,EACR,0BAAsD;QAE/G,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAN4B,4BAAuB,GAAvB,uBAAuB,CAAyB;QAC1C,mBAAc,GAAd,cAAc,CAA+B;QAEzG,yBAAoB,GAApB,oBAAoB,CAAqC;QAM9D,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,MAAM,GAAsB,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAC7D,MAAM,IAAI,GAAG,IAAA,8BAAsB,EAAC,SAAS,CAAC,IAAc,CAAC,IAAI,KAAK,CAAC;gBACvE,IAAI,MAAM,GAAG,EAAE,CAAC;gBAEhB,IAAI,CAAC,IAAI,EAAE;oBACP,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CACvC,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAChF,CAAC;iBACL;qBAAM;oBACH,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAC7C,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAC1E,CAAC;iBACL;gBAED,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3B;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aACpB;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBACvE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"V2OrganizationsController.js","sourceRoot":"","sources":["../../../../src/output-gateway/controllers/v2/V2OrganizationsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,11 @@ let MeasurementRepository = exports.MeasurementRepository = class MeasurementRep
|
|
|
49
49
|
return await this.sequelizeModel.findAll({
|
|
50
50
|
attributes: [["timestamp", "time"], "value", "addr", "meter", "type", "var"],
|
|
51
51
|
where,
|
|
52
|
-
order: [
|
|
52
|
+
order: [
|
|
53
|
+
["timestamp", "DESC"],
|
|
54
|
+
["addr", "ASC"],
|
|
55
|
+
["var", "DESC"],
|
|
56
|
+
],
|
|
53
57
|
limit: options.limit,
|
|
54
58
|
offset: options.offset,
|
|
55
59
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/MeasurementRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAwC;AACxC,sEAAmE;AACnE,mEAAqG;AACrG,iEAAgE;AAChE,6EAAwE;AAGxE,yFAAiE;AACjE,kEAA2C;AAGpC,IAAM,qBAAqB,mCAA3B,MAAM,qBAAsB,SAAQ,+BAAc;IACrD;QACI,KAAK,CAAC,wBAAwB,EAAE,oCAAgB,CAAC,SAAS,EAAE,oCAAgB,CAAC,cAAc,EAAE;YACzF,MAAM,EAAE,uBAAgB,CAAC,QAAQ;SACpC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MeasurementRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/MeasurementRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,14 +11,15 @@ exports.staticMeterSettingsJsonSchema = {
|
|
|
11
11
|
items: {
|
|
12
12
|
type: "object",
|
|
13
13
|
properties: {
|
|
14
|
-
MeterSerialNumber: { type: "string" },
|
|
15
14
|
Name: { type: "string" },
|
|
16
15
|
Addr: { type: "string" },
|
|
17
|
-
Meter: { type: "string" },
|
|
16
|
+
Meter: { type: "string", nullable: true },
|
|
18
17
|
Type: { type: "string" },
|
|
19
18
|
Var: { type: "string" },
|
|
19
|
+
MeId: { type: "number", nullable: true },
|
|
20
|
+
EIC: { type: "string", nullable: true },
|
|
20
21
|
},
|
|
21
|
-
required: ["Name", "Addr", "
|
|
22
|
+
required: ["Name", "Addr", "Type", "Var"],
|
|
22
23
|
},
|
|
23
24
|
},
|
|
24
25
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticMeterSettingsJsonSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/StaticMeterSettingsJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,6BAA6B,GAAyC;IAC/E,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE;QAClB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,kBAAkB,EAAE;gBAChB,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACR,
|
|
1
|
+
{"version":3,"file":"StaticMeterSettingsJsonSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/StaticMeterSettingsJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,6BAA6B,GAAyC;IAC/E,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE;QAClB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,kBAAkB,EAAE;gBAChB,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACR,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;wBACzC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACxB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACvB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;wBACxC,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;qBAC1C;oBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;iBAC5C;aACJ;SACJ;QACD,QAAQ,EAAE,CAAC,oBAAoB,CAAC;KACnC;IACD,QAAQ,EAAE,EAAE;CACf,CAAC"}
|
package/dist/schema-definitions/datasources/commodity-providers/AveApiArchiveResponseJsonSchema.js
ADDED
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.aveApiArchiveResponseJsonSchema = void 0;
|
|
4
|
+
exports.aveApiArchiveResponseJsonSchema = {
|
|
5
|
+
type: "object",
|
|
6
|
+
properties: {
|
|
7
|
+
deviceId: { type: "string" },
|
|
8
|
+
dataType: { type: "string" },
|
|
9
|
+
headers: {
|
|
10
|
+
type: "array",
|
|
11
|
+
items: {
|
|
12
|
+
type: "object",
|
|
13
|
+
properties: {
|
|
14
|
+
key: { type: "string" },
|
|
15
|
+
name: { type: "string" },
|
|
16
|
+
type: { type: "string" },
|
|
17
|
+
},
|
|
18
|
+
required: ["key", "name", "type"],
|
|
19
|
+
additionalProperties: false,
|
|
20
|
+
},
|
|
21
|
+
},
|
|
22
|
+
rows: {
|
|
23
|
+
type: "array",
|
|
24
|
+
items: {
|
|
25
|
+
type: "array",
|
|
26
|
+
items: {
|
|
27
|
+
anyOf: [{ type: "string" }, { type: "number" }, { type: "null", nullable: true }],
|
|
28
|
+
},
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
count: { type: "integer" },
|
|
32
|
+
totalCount: { type: "integer" },
|
|
33
|
+
},
|
|
34
|
+
required: ["deviceId", "dataType", "headers", "rows", "count", "totalCount"],
|
|
35
|
+
additionalProperties: true,
|
|
36
|
+
};
|
|
37
|
+
//# sourceMappingURL=AveApiArchiveResponseJsonSchema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AveApiArchiveResponseJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/commodity-providers/AveApiArchiveResponseJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,+BAA+B,GAA8C;IACtF,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC5B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC5B,OAAO,EAAE;YACL,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACvB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACxB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBAC3B;gBACD,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC;gBACjC,oBAAoB,EAAE,KAAK;aAC9B;SACJ;QACD,IAAI,EAAE;YACF,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACH,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;iBACpF;aACJ;SACJ;QACD,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC1B,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAClC;IACD,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC;IAC5E,oBAAoB,EAAE,IAAI;CAC7B,CAAC"}
|
package/dist/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.js
CHANGED
|
@@ -6,12 +6,12 @@ exports.aveApiDeviceDataJsonSchema = {
|
|
|
6
6
|
items: {
|
|
7
7
|
type: "object",
|
|
8
8
|
properties: {
|
|
9
|
-
|
|
9
|
+
Timestamp: { type: "string" },
|
|
10
10
|
OperatingAmount: { type: "number" },
|
|
11
11
|
ConvertDifference: { type: "number" },
|
|
12
12
|
OperatingDifference: { type: "number" },
|
|
13
13
|
},
|
|
14
|
-
required: ["
|
|
14
|
+
required: ["Timestamp", "OperatingAmount", "ConvertDifference", "OperatingDifference"],
|
|
15
15
|
},
|
|
16
16
|
};
|
|
17
17
|
//# sourceMappingURL=AveApiDeviceDataJsonSchema.js.map
|
package/dist/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AveApiDeviceDataJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,0BAA0B,GAA2C;IAC9E,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,
|
|
1
|
+
{"version":3,"file":"AveApiDeviceDataJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,0BAA0B,GAA2C;IAC9E,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACnC,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACrC,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC1C;QACD,QAAQ,EAAE,CAAC,WAAW,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,qBAAqB,CAAC;KACzF;CACJ,CAAC"}
|
|
@@ -6,11 +6,12 @@ exports.aveApiPlacesJsonSchema = {
|
|
|
6
6
|
items: {
|
|
7
7
|
type: "object",
|
|
8
8
|
properties: {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
deviceId: { type: "string" },
|
|
10
|
+
eic: { type: "string" },
|
|
11
|
+
serialNumber: { type: "number" },
|
|
12
|
+
placeId: { type: "number" },
|
|
12
13
|
},
|
|
13
|
-
required: ["
|
|
14
|
+
required: ["deviceId", "eic", "serialNumber", "placeId"],
|
|
14
15
|
},
|
|
15
16
|
};
|
|
16
17
|
//# sourceMappingURL=AveApiPlacesJsonSchema.js.map
|
package/dist/schema-definitions/datasources/commodity-providers/AveApiPlacesJsonSchema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AveApiPlacesJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/commodity-providers/AveApiPlacesJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,sBAAsB,GAAsC;IACrE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,
|
|
1
|
+
{"version":3,"file":"AveApiPlacesJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/commodity-providers/AveApiPlacesJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,sBAAsB,GAAsC;IACrE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACvB,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC9B;QACD,QAAQ,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,EAAE,SAAS,CAAC;KAC3D;CACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IAveApiArchiveHeaderDto.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/datasources/commodity-providers/interfaces/IAveApiArchiveHeaderDto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { IAveApiArchiveHeaderDto } from "./IAveApiArchiveHeaderDto";
|
|
2
|
+
export type ArchiveCell = string | number | null;
|
|
3
|
+
export interface IAveApiArchiveResponseDto {
|
|
4
|
+
deviceId: string;
|
|
5
|
+
dataType: string;
|
|
6
|
+
headers: IAveApiArchiveHeaderDto[];
|
|
7
|
+
rows: ArchiveCell[][];
|
|
8
|
+
count: number;
|
|
9
|
+
totalCount: number;
|
|
10
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IAveApiArchiveResponseDto.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/datasources/commodity-providers/interfaces/IAveApiArchiveResponseDto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
|
|
2
|
+
import { IConsumptionApiCollection } from "./interfaces/IConsumptionApiEntry";
|
|
3
|
+
import { IGaugeApiCollection } from "./interfaces/IGaugeApiDto";
|
|
4
|
+
export declare const porsennaGaugeCollectionJsonSchema: JSONSchemaType<IGaugeApiCollection>;
|
|
5
|
+
export declare const porsennaConsumptionCollectionJsonSchema: JSONSchemaType<IConsumptionApiCollection>;
|