@golemio/energetics 1.3.8-dev.1345014248 → 1.3.8-dev.1347421314
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/db/example/04_measurements.sql +26 -26
- package/db/migrations/postgresql/20240625134438-fix-pk-measurements.js +53 -0
- package/db/migrations/postgresql/sqls/20240625134438-fix-pk-measurements-down.sql +2 -0
- package/db/migrations/postgresql/sqls/20240625134438-fix-pk-measurements-up.sql +2 -0
- package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.d.ts +11 -0
- package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.js +50 -0
- package/dist/integration-engine/commodity-providers/datasources/static-data/StaticMeterSettingsDataSourceCapitalDs.js.map +1 -0
- package/dist/integration-engine/commodity-providers/ioc/Di.js +10 -4
- package/dist/integration-engine/commodity-providers/ioc/Di.js.map +1 -1
- package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.d.ts +4 -0
- package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.js +4 -0
- package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.js.map +1 -1
- package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.d.ts +0 -1
- package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.js +1 -4
- package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.js.map +1 -1
- package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.d.ts +1 -1
- package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.js +6 -6
- package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.js.map +1 -1
- package/dist/integration-engine/commodity-providers/transformations/PreElectroTransformation.js +1 -1
- package/dist/integration-engine/commodity-providers/transformations/PreElectroTransformation.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/CommodityWorker.js +2 -0
- package/dist/integration-engine/commodity-providers/workers/CommodityWorker.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/interfaces/IPpasMeasurementsParams.d.ts +1 -1
- package/dist/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.d.ts +1 -1
- package/dist/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.js +7 -1
- package/dist/integration-engine/commodity-providers/workers/schema/PpasMeasurementsSchema.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.d.ts +3 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.js +12 -3
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementOptionsStaticDataTask.js.map +1 -1
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.d.ts +11 -0
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.js +74 -0
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.js.map +1 -0
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.d.ts +16 -0
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js +112 -0
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js.map +1 -0
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.d.ts +22 -13
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2MeasurementsController.js +1 -1
- package/dist/output-gateway/controllers/v2/V2MeasurementsController.js.map +1 -1
- package/dist/output-gateway/repositories/MeasurementRepository.js +1 -1
- package/dist/output-gateway/repositories/MeasurementRepository.js.map +1 -1
- package/dist/output-gateway/repositories/PrimaryBuildingsRepository.d.ts +1 -1
- package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js +1 -1
- package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js.map +1 -1
- package/dist/output-gateway/transformations/BuildingTransformationFull.d.ts +1 -1
- package/dist/output-gateway/transformations/BuildingsTransformation.d.ts +1 -1
- package/dist/schema-definitions/models/BuildingsPrimaryModel.js.map +1 -0
- package/dist/schema-definitions/models/MeasurementsModel.js +0 -1
- package/dist/schema-definitions/models/MeasurementsModel.js.map +1 -1
- package/dist/schema-definitions/models/constants/MeasurementConstants.js +2 -0
- package/dist/schema-definitions/models/constants/MeasurementConstants.js.map +1 -1
- package/dist/schema-definitions/models/helpers/CommodityProviderTypeEnum.d.ts +3 -0
- package/dist/schema-definitions/models/helpers/CommodityProviderTypeEnum.js +3 -0
- package/dist/schema-definitions/models/helpers/CommodityProviderTypeEnum.js.map +1 -1
- package/dist/schema-definitions/models/interfaces/IPrimaryBuildings.js.map +1 -0
- package/docs/implementation_documentation.md +3 -1
- package/docs/openapi-output.yaml +2 -0
- package/package.json +1 -1
- package/dist/output-gateway/models/BuildingsPrimaryModel.js.map +0 -1
- package/dist/output-gateway/models/interfaces/IPrimaryBuildings.js.map +0 -1
- /package/dist/{output-gateway → schema-definitions}/models/BuildingsPrimaryModel.d.ts +0 -0
- /package/dist/{output-gateway → schema-definitions}/models/BuildingsPrimaryModel.js +0 -0
- /package/dist/{output-gateway → schema-definitions}/models/interfaces/IPrimaryBuildings.d.ts +0 -0
- /package/dist/{output-gateway → schema-definitions}/models/interfaces/IPrimaryBuildings.js +0 -0
|
@@ -0,0 +1,74 @@
|
|
|
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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
12
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
13
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
14
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
15
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
16
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
17
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
18
|
+
});
|
|
19
|
+
};
|
|
20
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
+
exports.FetchMeasurementsFromEEProvidersTask = void 0;
|
|
22
|
+
const constants_1 = require("../../constants");
|
|
23
|
+
const CommodityProviderTypeEnum_1 = require("../../../../schema-definitions/models/helpers/CommodityProviderTypeEnum");
|
|
24
|
+
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
25
|
+
const luxon_1 = require("@golemio/core/dist/shared/luxon");
|
|
26
|
+
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
27
|
+
const DataEntrypointSchema_1 = require("../schema/DataEntrypointSchema");
|
|
28
|
+
let FetchMeasurementsFromEEProvidersTask = exports.FetchMeasurementsFromEEProvidersTask = class FetchMeasurementsFromEEProvidersTask extends integration_engine_1.AbstractTask {
|
|
29
|
+
constructor() {
|
|
30
|
+
super(constants_1.WORKER_NAME);
|
|
31
|
+
this.queueName = "fetchMeasurementsFromEEProviders";
|
|
32
|
+
this.queueTtl = 60 * 60 * 1000;
|
|
33
|
+
this.schema = DataEntrypointSchema_1.DataEntrypointValidationSchema;
|
|
34
|
+
}
|
|
35
|
+
execute(data) {
|
|
36
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
+
for (const { dateFrom, dateTo } of this.generateDateParams(data)) {
|
|
38
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
|
|
39
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveA,
|
|
40
|
+
dateFrom,
|
|
41
|
+
dateTo,
|
|
42
|
+
});
|
|
43
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
|
|
44
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveC,
|
|
45
|
+
dateFrom,
|
|
46
|
+
dateTo,
|
|
47
|
+
});
|
|
48
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "fetchPpasEEMeasurements", {
|
|
49
|
+
providerType: CommodityProviderTypeEnum_1.CommodityProviderType.PpasAveMO,
|
|
50
|
+
dateFrom,
|
|
51
|
+
dateTo,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
*generateDateParams(data) {
|
|
57
|
+
const currentDate = luxon_1.DateTime.now().startOf("day");
|
|
58
|
+
const leftBoundDate = currentDate.minus({ days: data.targetDays });
|
|
59
|
+
const intervals = luxon_1.Interval.fromDateTimes(leftBoundDate, currentDate.plus({ days: 1 })).splitBy({ months: 1 });
|
|
60
|
+
for (const interval of intervals) {
|
|
61
|
+
const start = interval.start.startOf("day");
|
|
62
|
+
const end = interval.end.startOf("day");
|
|
63
|
+
yield {
|
|
64
|
+
dateFrom: start.toISODate(),
|
|
65
|
+
dateTo: end.toISODate(),
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
exports.FetchMeasurementsFromEEProvidersTask = FetchMeasurementsFromEEProvidersTask = __decorate([
|
|
71
|
+
(0, tsyringe_1.injectable)(),
|
|
72
|
+
__metadata("design:paramtypes", [])
|
|
73
|
+
], FetchMeasurementsFromEEProvidersTask);
|
|
74
|
+
//# sourceMappingURL=FetchMeasurementsFromEEProvidersTask.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FetchMeasurementsFromEEProvidersTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchMeasurementsFromEEProvidersTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,uHAAsF;AACtF,8EAAmF;AACnF,2DAAqE;AACrE,iEAAgE;AAGhE,yEAAgF;AAGzE,IAAM,oCAAoC,kDAA1C,MAAM,oCAAqC,SAAQ,iCAAmC;IAKzF;QACI,KAAK,CAAC,uBAAW,CAAC,CAAC;QALP,cAAS,GAAG,kCAAkC,CAAC;QAC/C,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAC1B,WAAM,GAAG,qDAA8B,CAAC;IAIxD,CAAC;IAEY,OAAO,CAAC,IAA2B;;YAC5C,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;gBAC9D,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;oBAC5E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;oBAC5C,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;gBAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;oBAC5E,YAAY,EAAE,iDAAqB,CAAC,QAAQ;oBAC5C,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;gBAEH,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE;oBAC5E,YAAY,EAAE,iDAAqB,CAAC,SAAS;oBAC7C,QAAQ;oBACR,MAAM;iBACT,CAAC,CAAC;aACN;QACL,CAAC;KAAA;IAEO,CAAC,kBAAkB,CAAC,IAA2B;QACnD,MAAM,WAAW,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAE9G,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAExC,MAAM;gBACF,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;gBAC3B,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;aAC1B,CAAC;SACL;IACL,CAAC;CACJ,CAAA;+CA9CY,oCAAoC;IADhD,IAAA,qBAAU,GAAE;;GACA,oCAAoC,CA8ChD"}
|
package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.d.ts
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ICommodityProviderDataSourceFactory } from "../../datasources/interfaces/ICommodityProviderDataSourceFactory";
|
|
2
|
+
import { MeasurementRepository } from "../../repositories/MeasurementRepository";
|
|
3
|
+
import { StaticMeterSettingsRepository } from "../../repositories/StaticMeterSettingsRepository";
|
|
4
|
+
import { AveMeasurementTransformation } from "../../transformations/AveMeasurementTransformation";
|
|
5
|
+
import { ILogger } from "@golemio/core/dist/helpers";
|
|
6
|
+
import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
|
|
7
|
+
import { IPpasMeasurementsParams } from "../interfaces/IPpasMeasurementsParams";
|
|
8
|
+
import { PpasMeasurementsValidationSchema } from "../schema/PpasMeasurementsSchema";
|
|
9
|
+
import { FetchPpasMeasurementsTask } from "./FetchPpasMeasurementsTask";
|
|
10
|
+
export declare class FetchPpasEEMeasurementsTask extends FetchPpasMeasurementsTask {
|
|
11
|
+
queueName: string;
|
|
12
|
+
queueTtl: number;
|
|
13
|
+
schema: typeof PpasMeasurementsValidationSchema;
|
|
14
|
+
constructor(config: ISimpleConfig, logger: ILogger, dataSourceFactory: ICommodityProviderDataSourceFactory, measurementTransformation: AveMeasurementTransformation, measurementRepository: MeasurementRepository, meterSettingsRepository: StaticMeterSettingsRepository);
|
|
15
|
+
execute(data: IPpasMeasurementsParams): Promise<void>;
|
|
16
|
+
}
|
package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js
ADDED
|
@@ -0,0 +1,112 @@
|
|
|
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
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
15
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
16
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
17
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
18
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
19
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
20
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
|
+
});
|
|
22
|
+
};
|
|
23
|
+
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
24
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
25
|
+
var m = o[Symbol.asyncIterator], i;
|
|
26
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
27
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
28
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
29
|
+
};
|
|
30
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
|
+
exports.FetchPpasEEMeasurementsTask = void 0;
|
|
32
|
+
const PpasAveApiHelper_1 = require("../../datasources/ppas-ave-api/helpers/PpasAveApiHelper");
|
|
33
|
+
const WorkerContainerToken_1 = require("../../ioc/WorkerContainerToken");
|
|
34
|
+
const MeasurementRepository_1 = require("../../repositories/MeasurementRepository");
|
|
35
|
+
const StaticMeterSettingsRepository_1 = require("../../repositories/StaticMeterSettingsRepository");
|
|
36
|
+
const AveMeasurementTransformation_1 = require("../../transformations/AveMeasurementTransformation");
|
|
37
|
+
const StaticDataResourceTypeEnum_1 = require("../../../../schema-definitions/models/helpers/StaticDataResourceTypeEnum");
|
|
38
|
+
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
39
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
40
|
+
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
41
|
+
const PpasMeasurementsSchema_1 = require("../schema/PpasMeasurementsSchema");
|
|
42
|
+
const FetchPpasMeasurementsTask_1 = require("./FetchPpasMeasurementsTask");
|
|
43
|
+
let FetchPpasEEMeasurementsTask = exports.FetchPpasEEMeasurementsTask = class FetchPpasEEMeasurementsTask extends FetchPpasMeasurementsTask_1.FetchPpasMeasurementsTask {
|
|
44
|
+
constructor(config, logger, dataSourceFactory, measurementTransformation, measurementRepository, meterSettingsRepository) {
|
|
45
|
+
super(config, logger, dataSourceFactory, measurementTransformation, measurementRepository, meterSettingsRepository);
|
|
46
|
+
this.queueName = "fetchPpasEEMeasurements";
|
|
47
|
+
this.queueTtl = 60 * 60 * 1000;
|
|
48
|
+
this.schema = PpasMeasurementsSchema_1.PpasMeasurementsValidationSchema;
|
|
49
|
+
}
|
|
50
|
+
execute(data) {
|
|
51
|
+
var _a, e_1, _b, _c;
|
|
52
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
+
let measurementOptions = yield this.meterSettingsRepository.getData(data.providerType, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions);
|
|
54
|
+
if (!measurementOptions) {
|
|
55
|
+
throw new golemio_errors_1.GeneralError("Measurement options not found", this.constructor.name);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
measurementOptions = this.splitOptionsByVars(measurementOptions);
|
|
59
|
+
}
|
|
60
|
+
const { baseUrl, config } = this.getProviderConfig(data);
|
|
61
|
+
const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
|
|
62
|
+
const sessionId = yield aveApiHelper.createSession();
|
|
63
|
+
try {
|
|
64
|
+
const places = yield this.getDataFromDataSource("Places", sessionId);
|
|
65
|
+
let consumptionData = [];
|
|
66
|
+
for (const place of places) {
|
|
67
|
+
const options = measurementOptions.filter((item) => item.MeterSerialNumber === place.DeviceSerialNumber);
|
|
68
|
+
if (options.length === 0) {
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
this.logger.info(`Fetching data for device ${place.DeviceSerialNumber}`);
|
|
72
|
+
const measurementChunkGenerator = this.generateMeasurements(Object.assign(Object.assign({}, data), { placeId: place.Id }), sessionId);
|
|
73
|
+
try {
|
|
74
|
+
for (var _d = true, measurementChunkGenerator_1 = (e_1 = void 0, __asyncValues(measurementChunkGenerator)), measurementChunkGenerator_1_1; measurementChunkGenerator_1_1 = yield measurementChunkGenerator_1.next(), _a = measurementChunkGenerator_1_1.done, !_a; _d = true) {
|
|
75
|
+
_c = measurementChunkGenerator_1_1.value;
|
|
76
|
+
_d = false;
|
|
77
|
+
const measurements = _c;
|
|
78
|
+
for (const option of options) {
|
|
79
|
+
const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement(Object.assign(Object.assign({}, item), option)));
|
|
80
|
+
consumptionData = consumptionData.concat(consumptionBatch);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
85
|
+
finally {
|
|
86
|
+
try {
|
|
87
|
+
if (!_d && !_a && (_b = measurementChunkGenerator_1.return)) yield _b.call(measurementChunkGenerator_1);
|
|
88
|
+
}
|
|
89
|
+
finally { if (e_1) throw e_1.error; }
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
yield this.saveConsumptionData(consumptionData);
|
|
93
|
+
}
|
|
94
|
+
finally {
|
|
95
|
+
yield aveApiHelper.terminateSession(sessionId);
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
};
|
|
100
|
+
exports.FetchPpasEEMeasurementsTask = FetchPpasEEMeasurementsTask = __decorate([
|
|
101
|
+
(0, tsyringe_1.injectable)(),
|
|
102
|
+
__param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.SimpleConfig)),
|
|
103
|
+
__param(1, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
104
|
+
__param(2, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.CommodityProviderDataSourceFactory)),
|
|
105
|
+
__param(3, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.AveMeasurementTransformation)),
|
|
106
|
+
__param(4, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.MeasurementRepository)),
|
|
107
|
+
__param(5, (0, tsyringe_1.inject)(WorkerContainerToken_1.WorkerContainerToken.StaticMeterSettingsRepository)),
|
|
108
|
+
__metadata("design:paramtypes", [Object, Object, Object, AveMeasurementTransformation_1.AveMeasurementTransformation,
|
|
109
|
+
MeasurementRepository_1.MeasurementRepository,
|
|
110
|
+
StaticMeterSettingsRepository_1.StaticMeterSettingsRepository])
|
|
111
|
+
], FetchPpasEEMeasurementsTask);
|
|
112
|
+
//# sourceMappingURL=FetchPpasEEMeasurementsTask.js.map
|
package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FetchPpasEEMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasEEMeasurementsTask.ts"],"names":[],"mappings":"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"}
|
package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.d.ts
CHANGED
|
@@ -1,27 +1,36 @@
|
|
|
1
|
-
import { ICommodityProviderDataSourceFactory } from "../../datasources/interfaces/ICommodityProviderDataSourceFactory";
|
|
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";
|
|
2
4
|
import { MeasurementRepository } from "../../repositories/MeasurementRepository";
|
|
3
5
|
import { StaticMeterSettingsRepository } from "../../repositories/StaticMeterSettingsRepository";
|
|
4
6
|
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";
|
|
5
9
|
import { ILogger } from "@golemio/core/dist/helpers";
|
|
6
10
|
import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
|
|
7
11
|
import { IPpasMeasurementsParams } from "../interfaces/IPpasMeasurementsParams";
|
|
8
12
|
import { PpasMeasurementsValidationSchema } from "../schema/PpasMeasurementsSchema";
|
|
9
13
|
import { AbstractFetchMeasurementsTask } from "./AbstractFetchMeasurementsTask";
|
|
10
14
|
export declare class FetchPpasMeasurementsTask extends AbstractFetchMeasurementsTask<IPpasMeasurementsParams> {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
protected config: ISimpleConfig;
|
|
16
|
+
protected logger: ILogger;
|
|
17
|
+
protected dataSourceFactory: ICommodityProviderDataSourceFactory;
|
|
18
|
+
protected measurementTransformation: AveMeasurementTransformation;
|
|
15
19
|
protected measurementRepository: MeasurementRepository;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
+
protected meterSettingsRepository: StaticMeterSettingsRepository;
|
|
21
|
+
queueName: string;
|
|
22
|
+
queueTtl: number;
|
|
23
|
+
schema: typeof PpasMeasurementsValidationSchema;
|
|
20
24
|
constructor(config: ISimpleConfig, logger: ILogger, dataSourceFactory: ICommodityProviderDataSourceFactory, measurementTransformation: AveMeasurementTransformation, measurementRepository: MeasurementRepository, meterSettingsRepository: StaticMeterSettingsRepository);
|
|
21
25
|
execute(data: IPpasMeasurementsParams): Promise<void>;
|
|
22
|
-
|
|
26
|
+
protected getProviderConfig(data: IPpasMeasurementsParams): {
|
|
27
|
+
baseUrl: string;
|
|
28
|
+
config: IAveConfig;
|
|
29
|
+
};
|
|
23
30
|
/** Splits the measurement options into individual options (multiple variables) */
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
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[]>;
|
|
27
36
|
}
|
package/dist/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchPpasMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2FAAsG;AAKtG,8FAAyH;AAEzH,yEAAwF;AACxF,oFAAmG;AACnG,oGAAmH;AACnH,qGAAoH;AAIpH,yHAAwF;AAIxF,wEAAqE;AACrE,6EAAwE;AACxE,2DAAqE;AACrE,iEAAwE;AAExE,6EAAoF;AACpF,mFAAgF;AAGzE,IAAM,yBAAyB,uCAA/B,MAAM,yBAA0B,SAAQ,6DAAsD;IAKjG,YACoC,
|
|
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}`,
|
|
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,
|
|
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"}
|
|
@@ -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.
|
|
45
|
+
? [{ addr: { [sequelize_1.default.Op.eq]: `/${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":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAwC;AACxC,sEAAmE;AACnE,oFAA4D;AAC5D,iEAAgE;AAChE,6EAAwE;AAGxE,yFAAiE;AAG1D,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;IACP,CAAC;IAEY,eAAe,CAAC,OAAsB;;YAC/C,IAAI;gBACA,MAAM,KAAK,GAA2B;oBAClC,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;wBAChB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC/E,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBACxE,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK;4BAC9B,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,mBAAS,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"MeasurementRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/MeasurementRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IBuildingsPrimary } from "../models/interfaces/IPrimaryBuildings";
|
|
2
1
|
import { ISecondaryBuildingsOutput } from "../models/interfaces/ISecondaryBuildingsOutput";
|
|
2
|
+
import { IBuildingsPrimary } from "../../schema-definitions/models/interfaces/IPrimaryBuildings";
|
|
3
3
|
import { SequelizeModel } from "@golemio/core/dist/output-gateway";
|
|
4
4
|
export declare class PrimaryBuildingsRepository extends SequelizeModel {
|
|
5
5
|
private secondaryBuildingRepository;
|
|
@@ -19,7 +19,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
19
19
|
};
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.PrimaryBuildingsRepository = void 0;
|
|
22
|
-
const BuildingsPrimaryModel_1 = require("
|
|
22
|
+
const BuildingsPrimaryModel_1 = require("../../schema-definitions/models/BuildingsPrimaryModel");
|
|
23
23
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
24
24
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
25
25
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrimaryBuildingsRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/PrimaryBuildingsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"PrimaryBuildingsRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/PrimaryBuildingsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AACA,iGAA0E;AAE1E,sEAAmE;AACnE,6EAAwE;AACxE,iEAAgE;AAChE,iFAA8E;AAGvE,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,+BAAc;IAE1D;QACI,KAAK,CAAC,6CAAqB,CAAC,SAAS,EAAE,6CAAqB,CAAC,SAAS,EAAE,6CAAqB,CAAC,cAAc,EAAE;YAC1G,MAAM,EAAE,YAAY;SACvB,CAAC,CAAC;QAKA,cAAS,GAAG,GAAG,EAAE;YACpB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,cAAc,EAAE;gBACxE,EAAE,EAAE,WAAW;gBACf,UAAU,EAAE,IAAI;gBAChB,SAAS,EAAE,IAAI;aAClB,CAAC,CAAC;QACP,CAAC,CAAC;QAVE,IAAI,CAAC,2BAA2B,GAAG,IAAI,2DAA4B,EAAE,CAAC;QACtE,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IAUY,MAAM;;YACf,IAAI;gBACA,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAwB;oBACtD,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBACvB,GAAG,EAAE,IAAI;iBACZ,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,6CAA6C,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC9F;QACL,CAAC;KAAA;IAEY,UAAU;;YACnB,IAAI;gBACA,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAmE;oBACjG,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,2BAA2B,CAAC,cAAc,EAAE,CAAC;oBACtF,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;iBAC1B,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,6CAA6C,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC9F;QACL,CAAC;KAAA;IAEY,MAAM,CAAC,EAAU;;YAC1B,IAAI;gBACA,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAmE;oBACvG,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,2BAA2B,CAAC,cAAc,EAAE,CAAC;oBACtF,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;iBACpB,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,6CAA6C,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC9F;QACL,CAAC;KAAA;CACJ,CAAA;qCAlDY,0BAA0B;IADtC,IAAA,qBAAU,GAAE;;GACA,0BAA0B,CAkDtC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IFullTransformationSchemaItem } from "../models/interfaces/IFullTransformationSchemaItem";
|
|
2
|
-
import { IBuildingsPrimary } from "../models/interfaces/IPrimaryBuildings";
|
|
3
2
|
import { ISecondaryBuildingsOutput } from "../models/interfaces/ISecondaryBuildingsOutput";
|
|
3
|
+
import { IBuildingsPrimary } from "../../schema-definitions/models/interfaces/IPrimaryBuildings";
|
|
4
4
|
import { AbstractTransformation } from "@golemio/core/dist/helpers/transformation/AbstractTransformation";
|
|
5
5
|
export declare class BuildingTransformationFull extends AbstractTransformation<IBuildingsPrimary & {
|
|
6
6
|
secondary: ISecondaryBuildingsOutput;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IBuildingsPrimary } from "
|
|
1
|
+
import { IBuildingsPrimary } from "../../schema-definitions/models/interfaces/IPrimaryBuildings";
|
|
2
2
|
import { AbstractTransformation } from "@golemio/core/dist/helpers/transformation/AbstractTransformation";
|
|
3
3
|
export declare class BuildingsTransformation extends AbstractTransformation<IBuildingsPrimary, IBuildingsTransformationOutput> {
|
|
4
4
|
name: string;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BuildingsPrimaryModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/MeasurementsModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAExF,2EAAsG;AAEtG,MAAa,gBAAiB,SAAQ,iBAAwC;;AAA9E,
|
|
1
|
+
{"version":3,"file":"MeasurementsModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/MeasurementsModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAExF,2EAAsG;AAEtG,MAAa,gBAAiB,SAAQ,iBAAwC;;AAA9E,4CA4DC;AA3DiB,0BAAS,GAAG,iCAAiC,CAAC;AAW9C,+BAAc,GAAuD;IAC/E,SAAS,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,IAAI;KACvB;IACD,KAAK,EAAE,qBAAS,CAAC,MAAM,CAAC;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,EAAE;KACZ,CAAC;IACF,IAAI,EAAE;QACF,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;KAC9B;IACD,QAAQ,EAAE;QACN,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3B,KAAK,EAAE,KAAK;KACf;IACD,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;IAC3B,KAAK,EAAE;QACH,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,GAAG,CAAC;KAC9B;IACD,MAAM,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAC5B,oBAAoB,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;CAC7C,CAAC;AAEY,mCAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAEvF,gCAAe,GAAsC;IAC/D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,SAAS,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;YACD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,4CAAqB,EAAE;YACzD,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,wCAAiB,EAAE;YACjD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3C;QACD,QAAQ,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,sBAAsB,CAAC;KAC1G;CACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementConstants.js","sourceRoot":"","sources":["../../../../src/schema-definitions/models/constants/MeasurementConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG;IACjC,MAAM;IACN,OAAO;IACP,SAAS;IACT,WAAW;IACX,UAAU;IACV,UAAU;IACV,KAAK;IACL,GAAG;IACH,KAAK;IACL,IAAI;IACJ,WAAW;IACX,KAAK;
|
|
1
|
+
{"version":3,"file":"MeasurementConstants.js","sourceRoot":"","sources":["../../../../src/schema-definitions/models/constants/MeasurementConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG;IACjC,MAAM;IACN,OAAO;IACP,SAAS;IACT,WAAW;IACX,UAAU;IACV,UAAU;IACV,KAAK;IACL,GAAG;IACH,KAAK;IACL,IAAI;IACJ,WAAW;IACX,KAAK;IACL,IAAI;IACJ,IAAI;CACP,CAAC;AAEW,QAAA,iBAAiB,GAAG,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,CAAC"}
|
|
@@ -3,6 +3,9 @@ export declare enum CommodityProviderType {
|
|
|
3
3
|
CemApiVeoliaElectro = "cem_api_veolia_electro",
|
|
4
4
|
PpasAveV = "ppas_ave_api_v",
|
|
5
5
|
PpasAveM = "ppas_ave_api_m",
|
|
6
|
+
PpasAveA = "ppas_ave_api_a",
|
|
7
|
+
PpasAveC = "ppas_ave_api_c",
|
|
8
|
+
PpasAveMO = "ppas_ave_api_mo",
|
|
6
9
|
PreOptions = "pre_electro_ftp",
|
|
7
10
|
PtasOptions = "ptas_hot_water"
|
|
8
11
|
}
|
|
@@ -7,6 +7,9 @@ var CommodityProviderType;
|
|
|
7
7
|
CommodityProviderType["CemApiVeoliaElectro"] = "cem_api_veolia_electro";
|
|
8
8
|
CommodityProviderType["PpasAveV"] = "ppas_ave_api_v";
|
|
9
9
|
CommodityProviderType["PpasAveM"] = "ppas_ave_api_m";
|
|
10
|
+
CommodityProviderType["PpasAveA"] = "ppas_ave_api_a";
|
|
11
|
+
CommodityProviderType["PpasAveC"] = "ppas_ave_api_c";
|
|
12
|
+
CommodityProviderType["PpasAveMO"] = "ppas_ave_api_mo";
|
|
10
13
|
CommodityProviderType["PreOptions"] = "pre_electro_ftp";
|
|
11
14
|
CommodityProviderType["PtasOptions"] = "ptas_hot_water";
|
|
12
15
|
})(CommodityProviderType || (exports.CommodityProviderType = CommodityProviderType = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommodityProviderTypeEnum.js","sourceRoot":"","sources":["../../../../src/schema-definitions/models/helpers/CommodityProviderTypeEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"CommodityProviderTypeEnum.js","sourceRoot":"","sources":["../../../../src/schema-definitions/models/helpers/CommodityProviderTypeEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,qBAUX;AAVD,WAAY,qBAAqB;IAC7B,mEAA0C,CAAA;IAC1C,uEAA8C,CAAA;IAC9C,oDAA2B,CAAA;IAC3B,oDAA2B,CAAA;IAC3B,oDAA2B,CAAA;IAC3B,oDAA2B,CAAA;IAC3B,sDAA6B,CAAA;IAC7B,uDAA8B,CAAA;IAC9B,uDAA8B,CAAA;AAClC,CAAC,EAVW,qBAAqB,qCAArB,qBAAqB,QAUhC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IPrimaryBuildings.js","sourceRoot":"","sources":["../../../../src/schema-definitions/models/interfaces/IPrimaryBuildings.ts"],"names":[],"mappings":""}
|
|
@@ -22,7 +22,9 @@ Modul slouží k ukládání dat o spotřebě energií v budovách a jednotlivý
|
|
|
22
22
|
- Vrtbovský palác
|
|
23
23
|
- Veolia měření P10 - vodoměry a elektroměry
|
|
24
24
|
- PPAS (Pražská plynárenská) InternetAVE API
|
|
25
|
-
- Měření plynu pro P10
|
|
25
|
+
- Měření plynu pro P10 (Uživatelé AveM a AveV)
|
|
26
|
+
- Měření plynu pro zbytek Prahy pro odběratele různých kategorií A,C a MO
|
|
27
|
+
- Jedná se o odběratele různých kategorií odběru („A“ „C“ „MO“), konkrétně: účet Hl. m. Praha = „C“; Hlavní m. Praha = „MO“ a HlavníměstoPraha64581_1 = „A“
|
|
26
28
|
- Azure Blob Storage
|
|
27
29
|
- Mapovací JSON pro měření přímo od poskytovatelů komodit
|
|
28
30
|
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -1041,6 +1041,8 @@ components:
|
|
|
1041
1041
|
RH - Relativní vlhkost [%]<br />
|
|
1042
1042
|
EFwActiNT - Odběr činné energie, nízký tarif [kVArh]<br />
|
|
1043
1043
|
VOC - Míra koncentrace těkavých látek [%]<br />
|
|
1044
|
+
VT - Vysoký tarif [kWh]<br />
|
|
1045
|
+
NT - Nízký tarif [kWh]<br />
|
|
1044
1046
|
EnergeticsTypes:
|
|
1045
1047
|
type: string
|
|
1046
1048
|
example: provider_value
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"IPrimaryBuildings.js","sourceRoot":"","sources":["../../../../src/output-gateway/models/interfaces/IPrimaryBuildings.ts"],"names":[],"mappings":""}
|
|
File without changes
|
|
File without changes
|
/package/dist/{output-gateway → schema-definitions}/models/interfaces/IPrimaryBuildings.d.ts
RENAMED
|
File without changes
|
|
File without changes
|