@golemio/energetics 1.3.8-dev.1347315277 → 1.3.8-dev.1350798883
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/input-gateway/ptas/PtasRouter.d.ts +1 -1
- package/dist/input-gateway/ptas/PtasRouter.js +9 -42
- package/dist/input-gateway/ptas/PtasRouter.js.map +1 -1
- package/dist/input-gateway/ptas/interfaces/IExtendedPtasRequest.d.ts +9 -0
- package/dist/input-gateway/ptas/interfaces/IExtendedPtasRequest.js +3 -0
- package/dist/input-gateway/ptas/interfaces/IExtendedPtasRequest.js.map +1 -0
- 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/tasks/FetchPtasWebScrapedMeasurementsTask.js +2 -2
- package/dist/integration-engine/commodity-providers/workers/tasks/FetchPtasWebScrapedMeasurementsTask.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/schema-definitions/datasources/PtasWebScrapingJsonSchema.js +2 -2
- package/dist/schema-definitions/datasources/PtasWebScrapingJsonSchema.js.map +1 -1
- package/dist/schema-definitions/datasources/interfaces/PtasWebScrapingInput.d.ts +1 -1
- 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/docs/openapi-input.yaml +2 -2
- package/docs/openapi-output.yaml +2 -0
- package/package.json +2 -4
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
INSERT INTO consumption_energy_measurements ("timestamp", value, addr, var, "type", meter, "source", measurement_category, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by) VALUES
|
|
2
|
-
('2023-05-02 04:59:44.000+02', 551.800000000000000, '/10.22/VF1
|
|
3
|
-
('2023-05-02 04:59:11.000+02', 44592.000000000000000, '/10.12/EF1
|
|
4
|
-
('2023-05-02 04:59:11.000+02', 2.000000000000000, '/10.12/EF1
|
|
5
|
-
('2023-05-02 04:59:00.375+02', 11075.509765625000000, '/2.2/EP2
|
|
6
|
-
('2023-05-02 04:59:00.115+02', 205.720001220703000, '/2.2/EP2
|
|
7
|
-
('2023-05-02 04:58:59.862+02', 6666.450195312500000, '/2.2/EP2
|
|
8
|
-
('2023-05-02 04:58:58.996+02', 898.159973144531000, '/2.2/EP1
|
|
9
|
-
('2023-05-02 04:58:58.746+02', 8525.040039062500000, '/2.2/EP1
|
|
10
|
-
('2023-05-02 04:58:57.871+02', 3481.060058593750000, '/2.2/EP1
|
|
11
|
-
('2023-05-02 04:53:15.131+02', 17.700000762939500, '/2.5/Text
|
|
12
|
-
('2023-05-02 04:53:15.131+02', -64.000000000000000, '/2.5/Text
|
|
13
|
-
('2023-05-02 04:53:15.131+02', 1.000000000000000, '/2.5/Text
|
|
14
|
-
('2023-05-02 04:51:33.697+02', 180790.000000000000000, '/2.2/TVP1
|
|
15
|
-
('2023-05-02 04:00:00.000+02', 2709814.000000000000000, '/2.9/PF1
|
|
16
|
-
('2023-05-02 04:00:00.001+02', 19.000000000000000, '/2.9/PF1
|
|
17
|
-
('2023-05-02 03:00:00.000+02', 2709812.000000000000000, '/2.9/PF1
|
|
18
|
-
('2023-05-02 03:00:00.001+02', 3.000000000000000, '/2.9/PF1
|
|
19
|
-
('2023-05-02 00:00:00.000+02', 0.000000000000000, '/2.9/PF1
|
|
20
|
-
('2023-05-02 00:00:00.001+02', 0.000000000000000, '/2.9/PF1
|
|
21
|
-
('2023-05-01 06:00:00.000+02', 2709721.000000000000000, '/2.9/PF1
|
|
22
|
-
('2023-05-01 05:00:00.000+02', 2709705.000000000000000, '/2.9/PF1
|
|
23
|
-
('2023-05-01 05:00:00.001+02', 20.000000000000000, '/2.9/PF1
|
|
24
|
-
('2023-05-01 04:00:00.000+02', 2709691.000000000000000, '/2.9/PF1
|
|
25
|
-
('2023-05-01 04:00:00.001+02', 18.000000000000000, '/2.9/PF1
|
|
26
|
-
('2023-05-01 03:00:00.000+02', 2709680.000000000000000, '/2.9/PF1
|
|
27
|
-
('2023-05-01 03:00:00.001+02', 14.000000000000000, '/2.9/PF1
|
|
2
|
+
('2023-05-02 04:59:44.000+02', 551.800000000000000, '/10.22/VF1', 'core', 'provider_value', '300017125', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
|
|
3
|
+
('2023-05-02 04:59:11.000+02', 44592.000000000000000, '/10.12/EF1', 'VT', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
|
|
4
|
+
('2023-05-02 04:59:11.000+02', 2.000000000000000, '/10.12/EF1', 'NT', 'provider_value', '859182400303057720', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
|
|
5
|
+
('2023-05-02 04:59:00.375+02', 11075.509765625000000, '/2.2/EP2', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
6
|
+
('2023-05-02 04:59:00.115+02', 205.720001220703000, '/2.2/EP2', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
7
|
+
('2023-05-02 04:58:59.862+02', 6666.450195312500000, '/2.2/EP2', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
8
|
+
('2023-05-02 04:58:58.996+02', 898.159973144531000, '/2.2/EP1', 'EFwReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
9
|
+
('2023-05-02 04:58:58.746+02', 8525.040039062500000, '/2.2/EP1', 'EFwActi', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
10
|
+
('2023-05-02 04:58:57.871+02', 3481.060058593750000, '/2.2/EP1', 'ERvReact', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
11
|
+
('2023-05-02 04:53:15.131+02', 17.700000762939500, '/2.5/Text', 'T', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
12
|
+
('2023-05-02 04:53:15.131+02', -64.000000000000000, '/2.5/Text', 'RSSI', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
13
|
+
('2023-05-02 04:53:15.131+02', 1.000000000000000, '/2.5/Text', 'BAT', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
14
|
+
('2023-05-02 04:51:33.697+02', 180790.000000000000000, '/2.2/TVP1', 'raw', 'dotcontrols_value', '', NULL, NULL, NULL, '2023-05-03 00:30:44.752', NULL, NULL, '2023-05-03 00:30:44.752', NULL),
|
|
15
|
+
('2023-05-02 04:00:00.000+02', 2709814.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
|
|
16
|
+
('2023-05-02 04:00:00.001+02', 19.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
|
|
17
|
+
('2023-05-02 03:00:00.000+02', 2709812.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
|
|
18
|
+
('2023-05-02 03:00:00.001+02', 3.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-03 00:30:37.779', NULL, NULL, '2023-05-03 00:30:37.779', NULL),
|
|
19
|
+
('2023-05-02 00:00:00.000+02', 0.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
|
|
20
|
+
('2023-05-02 00:00:00.001+02', 0.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
|
|
21
|
+
('2023-05-01 06:00:00.000+02', 2709721.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
|
|
22
|
+
('2023-05-01 05:00:00.000+02', 2709705.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
|
|
23
|
+
('2023-05-01 05:00:00.001+02', 20.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
|
|
24
|
+
('2023-05-01 04:00:00.000+02', 2709691.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
|
|
25
|
+
('2023-05-01 04:00:00.001+02', 18.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
|
|
26
|
+
('2023-05-01 03:00:00.000+02', 2709680.000000000000000, '/2.9/PF1', 'core', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL),
|
|
27
|
+
('2023-05-01 03:00:00.001+02', 14.000000000000000, '/2.9/PF1', 'core2', 'provider_value', '27ZG100Z0000521V', NULL, NULL, NULL, '2023-05-02 00:30:44.263', NULL, NULL, '2023-05-02 00:30:44.263', NULL);
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var dbm;
|
|
4
|
+
var type;
|
|
5
|
+
var seed;
|
|
6
|
+
var fs = require('fs');
|
|
7
|
+
var path = require('path');
|
|
8
|
+
var Promise;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* We receive the dbmigrate dependency from dbmigrate initially.
|
|
12
|
+
* This enables us to not have to rely on NODE_PATH.
|
|
13
|
+
*/
|
|
14
|
+
exports.setup = function(options, seedLink) {
|
|
15
|
+
dbm = options.dbmigrate;
|
|
16
|
+
type = dbm.dataType;
|
|
17
|
+
seed = seedLink;
|
|
18
|
+
Promise = options.Promise;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
exports.up = function(db) {
|
|
22
|
+
var filePath = path.join(__dirname, 'sqls', '20240625134438-fix-pk-measurements-up.sql');
|
|
23
|
+
return new Promise( function( resolve, reject ) {
|
|
24
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
25
|
+
if (err) return reject(err);
|
|
26
|
+
console.log('received data: ' + data);
|
|
27
|
+
|
|
28
|
+
resolve(data);
|
|
29
|
+
});
|
|
30
|
+
})
|
|
31
|
+
.then(function(data) {
|
|
32
|
+
return db.runSql(data);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
exports.down = function(db) {
|
|
37
|
+
var filePath = path.join(__dirname, 'sqls', '20240625134438-fix-pk-measurements-down.sql');
|
|
38
|
+
return new Promise( function( resolve, reject ) {
|
|
39
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
40
|
+
if (err) return reject(err);
|
|
41
|
+
console.log('received data: ' + data);
|
|
42
|
+
|
|
43
|
+
resolve(data);
|
|
44
|
+
});
|
|
45
|
+
})
|
|
46
|
+
.then(function(data) {
|
|
47
|
+
return db.runSql(data);
|
|
48
|
+
});
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
exports._meta = {
|
|
52
|
+
"version": 1
|
|
53
|
+
};
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
import { Router } from "@golemio/core/dist/shared/express";
|
|
3
3
|
export declare class PtasRouter {
|
|
4
4
|
router: Router;
|
|
5
|
+
private csvParser;
|
|
5
6
|
private controller;
|
|
6
7
|
constructor();
|
|
7
8
|
private initRoutes;
|
|
8
9
|
private post;
|
|
9
|
-
private parseCSV;
|
|
10
10
|
}
|
|
11
11
|
declare const ptasRouter: Router;
|
|
12
12
|
export { ptasRouter };
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -35,19 +12,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
35
12
|
exports.ptasRouter = exports.PtasRouter = void 0;
|
|
36
13
|
const PtasWebScrapingController_1 = require("./PtasWebScrapingController");
|
|
37
14
|
const helpers_1 = require("@golemio/core/dist/input-gateway/helpers");
|
|
15
|
+
const ContainerToken_1 = require("@golemio/core/dist/input-gateway/ioc/ContainerToken");
|
|
16
|
+
const Di_1 = require("@golemio/core/dist/input-gateway/ioc/Di");
|
|
38
17
|
const express_1 = require("@golemio/core/dist/shared/express");
|
|
39
|
-
const csv = __importStar(require("@fast-csv/parse"));
|
|
40
18
|
class PtasRouter {
|
|
41
19
|
constructor() {
|
|
42
20
|
this.initRoutes = () => {
|
|
43
|
-
this.router.post("/:
|
|
21
|
+
this.router.post("/:placeId", (0, helpers_1.checkContentTypeMiddleware)(["text/csv"]), this.csvParser.getMiddleware({
|
|
22
|
+
delimiter: ";",
|
|
23
|
+
shouldIncludeHeaders: true,
|
|
24
|
+
}), this.post);
|
|
44
25
|
};
|
|
45
26
|
this.post = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
46
27
|
try {
|
|
47
|
-
const parsedCsv = (yield this.parseCSV(req.body));
|
|
48
28
|
yield this.controller.processData({
|
|
49
|
-
|
|
50
|
-
measurements:
|
|
29
|
+
placeId: req.params.placeId,
|
|
30
|
+
measurements: req.body,
|
|
51
31
|
});
|
|
52
32
|
res.sendStatus(204);
|
|
53
33
|
}
|
|
@@ -55,21 +35,8 @@ class PtasRouter {
|
|
|
55
35
|
next(err);
|
|
56
36
|
}
|
|
57
37
|
});
|
|
58
|
-
this.parseCSV = (data) => {
|
|
59
|
-
return new Promise((resolve, reject) => {
|
|
60
|
-
const parsedCsvData = [];
|
|
61
|
-
const stream = csv
|
|
62
|
-
.parse({ headers: true, delimiter: ";" })
|
|
63
|
-
.on("data", (data) => {
|
|
64
|
-
parsedCsvData.push(data);
|
|
65
|
-
})
|
|
66
|
-
.on("end", () => resolve(parsedCsvData))
|
|
67
|
-
.on("error", (error) => reject(error));
|
|
68
|
-
stream.write(data);
|
|
69
|
-
stream.end();
|
|
70
|
-
});
|
|
71
|
-
};
|
|
72
38
|
this.router = (0, express_1.Router)();
|
|
39
|
+
this.csvParser = Di_1.InputGatewayContainer.resolve(ContainerToken_1.ContainerToken.CsvParserMiddleware);
|
|
73
40
|
this.controller = new PtasWebScrapingController_1.PtasWebScrapingController();
|
|
74
41
|
this.initRoutes();
|
|
75
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PtasRouter.js","sourceRoot":"","sources":["../../../src/input-gateway/ptas/PtasRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PtasRouter.js","sourceRoot":"","sources":["../../../src/input-gateway/ptas/PtasRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA+E;AAC/E,sEAAsF;AACtF,wFAAqF;AACrF,gEAAgF;AAEhF,+DAAmF;AAGnF,MAAa,UAAU;IAKnB;QAOQ,eAAU,GAAG,GAAS,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,WAAW,EACX,IAAA,oCAA0B,EAAC,CAAC,UAAU,CAAC,CAAC,EACxC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;gBACzB,SAAS,EAAE,GAAG;gBACd,oBAAoB,EAAE,IAAI;aAC7B,CAAC,EACF,IAAI,CAAC,IAAI,CACZ,CAAC;QACN,CAAC,CAAC;QAEM,SAAI,GAAG,CAAO,GAAyB,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;YACjG,IAAI;gBACA,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;oBAC9B,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO;oBAC3B,YAAY,EAAE,GAAG,CAAC,IAAI;iBACzB,CAAC,CAAC;gBACH,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACvB;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QA5BE,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,0BAAqB,CAAC,OAAO,CAAsB,+BAAc,CAAC,mBAAmB,CAAC,CAAC;QACxG,IAAI,CAAC,UAAU,GAAG,IAAI,qDAAyB,EAAE,CAAC;QAClD,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;CAyBJ;AAnCD,gCAmCC;AAED,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC,MAAM,CAAC;AAElC,gCAAU"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/// <reference types="express" />
|
|
2
|
+
import { IPtasMeasurement } from "../../../schema-definitions/datasources/interfaces/PtasWebScrapingInput";
|
|
3
|
+
import { Request } from "@golemio/core/dist/shared/express";
|
|
4
|
+
export interface IExtendedPtasRequest extends Request {
|
|
5
|
+
params: {
|
|
6
|
+
placeId: string;
|
|
7
|
+
};
|
|
8
|
+
body: IPtasMeasurement[];
|
|
9
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IExtendedPtasRequest.js","sourceRoot":"","sources":["../../../../src/input-gateway/ptas/interfaces/IExtendedPtasRequest.ts"],"names":[],"mappings":""}
|
|
@@ -5,6 +5,5 @@ import { AbstractTransformation } from "@golemio/core/dist/helpers/transformatio
|
|
|
5
5
|
export declare class AveMeasurementTransformation extends AbstractTransformation<IMeasurementOption & IAveApiDeviceDataDto, IMeasurementDto> {
|
|
6
6
|
name: string;
|
|
7
7
|
protected transformInternal: (data: IMeasurementOption & IAveApiDeviceDataDto) => IMeasurementDto;
|
|
8
|
-
private formatAddress;
|
|
9
8
|
private getValue;
|
|
10
9
|
}
|
package/dist/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.js
CHANGED
|
@@ -21,7 +21,7 @@ let AveMeasurementTransformation = exports.AveMeasurementTransformation = class
|
|
|
21
21
|
return {
|
|
22
22
|
source: CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi,
|
|
23
23
|
measurement_category: data.Name,
|
|
24
|
-
addr:
|
|
24
|
+
addr: data.Addr,
|
|
25
25
|
meter: data.Meter,
|
|
26
26
|
timestamp: luxon_1.DateTime.fromISO(data.StandardTime, {
|
|
27
27
|
zone: PpasAveApiHelper_1.PpasAveApiHelper.API_DATE_TZ,
|
|
@@ -31,9 +31,6 @@ let AveMeasurementTransformation = exports.AveMeasurementTransformation = class
|
|
|
31
31
|
value: this.getValue(data, data.Var),
|
|
32
32
|
};
|
|
33
33
|
};
|
|
34
|
-
this.formatAddress = (address, variable) => {
|
|
35
|
-
return address + "/" + variable;
|
|
36
|
-
};
|
|
37
34
|
this.getValue = (data, variable) => {
|
|
38
35
|
switch (variable) {
|
|
39
36
|
case MeasurementVariableEnum_1.MeasurementVariable.Core:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AveMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAChE,wFAAiF;AACjF,2FAAwF;AACxF,qHAAuF;AAGhF,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAAC,IAA+C,EAAmB,EAAE;YAC/F,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,kBAAkB;gBAC5C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"AveMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAChE,wFAAiF;AACjF,2FAAwF;AACxF,qHAAuF;AAGhF,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAAC,IAA+C,EAAmB,EAAE;YAC/F,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,kBAAkB;gBAC5C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC3C,IAAI,EAAE,mCAAgB,CAAC,WAAW;iBACrC,CAAC,CAAC,QAAQ,EAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;aAC9D,CAAC;QACN,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,IAA0B,EAAE,QAA6B,EAAU,EAAE;YACrF,QAAQ,QAAQ,EAAE;gBACd,KAAK,6CAAmB,CAAC,IAAI,CAAC;gBAC9B;oBACI,OAAO,IAAI,CAAC,eAAe,CAAC;gBAChC,KAAK,6CAAmB,CAAC,KAAK;oBAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;aACrC;QACL,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}
|
|
@@ -9,5 +9,5 @@ export declare class CemMeasurementTransformation extends AbstractTransformation
|
|
|
9
9
|
protected transformInternal: (data: IMeasurementOption & ICemApiMeasurementDto & {
|
|
10
10
|
counterTypeId: number;
|
|
11
11
|
}) => IMeasurementDto;
|
|
12
|
-
private
|
|
12
|
+
private getVariable;
|
|
13
13
|
}
|
package/dist/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.js
CHANGED
|
@@ -19,22 +19,22 @@ let CemMeasurementTransformation = exports.CemMeasurementTransformation = class
|
|
|
19
19
|
return {
|
|
20
20
|
source: CommodityProviderEnum_1.CommodityProvider.UnimonitorCemApi,
|
|
21
21
|
measurement_category: data.Name,
|
|
22
|
-
addr:
|
|
22
|
+
addr: data.Addr,
|
|
23
23
|
meter: data.Meter,
|
|
24
24
|
timestamp: new Date(data.timestamp),
|
|
25
|
-
variable: data.Var,
|
|
25
|
+
variable: this.getVariable(data.Var, data.counterTypeId),
|
|
26
26
|
type: data.Type,
|
|
27
27
|
value: data.value,
|
|
28
28
|
};
|
|
29
29
|
};
|
|
30
|
-
this.
|
|
30
|
+
this.getVariable = (variable, counterTypeId) => {
|
|
31
31
|
if (counterTypeId === helpers_1.UnimonitorCemApiHelper.counterType.ElHighTariff) {
|
|
32
|
-
|
|
32
|
+
return "VT"; // Vysoky tarif
|
|
33
33
|
}
|
|
34
34
|
else if (counterTypeId === helpers_1.UnimonitorCemApiHelper.counterType.ElLowTariff) {
|
|
35
|
-
|
|
35
|
+
return "NT"; // Nizky tarif
|
|
36
36
|
}
|
|
37
|
-
return
|
|
37
|
+
return variable;
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CemMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,iEAAgE;AAChE,wFAAiF;AACjF,2CAAqD;AAI9C,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAC1B,IAA4E,EAC7D,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,gBAAgB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"CemMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,iEAAgE;AAChE,wFAAiF;AACjF,2CAAqD;AAI9C,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAC1B,IAA4E,EAC7D,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,gBAAgB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACnC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC;gBACxD,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;QACN,CAAC,CAAC;QAEM,gBAAW,GAAG,CAAC,QAAgB,EAAE,aAAqB,EAAU,EAAE;YACtE,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,YAAY,EAAE;gBACnE,OAAO,IAAI,CAAC,CAAC,eAAe;aAC/B;iBAAM,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,WAAW,EAAE;gBACzE,OAAO,IAAI,CAAC,CAAC,cAAc;aAC9B;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}
|
package/dist/integration-engine/commodity-providers/transformations/PreElectroTransformation.js
CHANGED
|
@@ -16,7 +16,7 @@ let PreElectroTransformation = exports.PreElectroTransformation = class PreElect
|
|
|
16
16
|
this.name = "PreElectroTransformation";
|
|
17
17
|
this.transformInternal = (data) => {
|
|
18
18
|
return {
|
|
19
|
-
addr:
|
|
19
|
+
addr: data.option.Addr,
|
|
20
20
|
meter: data.option.Meter,
|
|
21
21
|
timestamp: new Date(data.measurement["Čas měření"] + " UTC"),
|
|
22
22
|
variable: data.option.Var,
|
package/dist/integration-engine/commodity-providers/transformations/PreElectroTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PreElectroTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/PreElectroTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oHAAsF;AAEtF,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,wBAAwB,sCAA9B,MAAM,wBAAyB,SAAQ,+CAG7C;IAHM;;QAII,SAAI,GAAG,0BAA0B,CAAC;QAE/B,sBAAiB,GAAG,CAC1B,IAAoF,EACrE,EAAE;YACjB,OAAO;gBACH,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"PreElectroTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/PreElectroTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAEA,oHAAsF;AAEtF,6GAA0G;AAC1G,iEAAgE;AAGzD,IAAM,wBAAwB,sCAA9B,MAAM,wBAAyB,SAAQ,+CAG7C;IAHM;;QAII,SAAI,GAAG,0BAA0B,CAAC;QAE/B,sBAAiB,GAAG,CAC1B,IAAoF,EACrE,EAAE;YACjB,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;gBAC5D,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACzB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,EAAE,iDAAqB,CAAC,UAAU;gBACxC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;aACzC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;mCApBY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;GACA,wBAAwB,CAoBpC"}
|
|
@@ -58,9 +58,9 @@ let FetchPtasWebScrapedMeasurementsTask = exports.FetchPtasWebScrapedMeasurement
|
|
|
58
58
|
//podle původního scraperu z C# bereme pouze teplo horké vody
|
|
59
59
|
const hotWaterMeasurements = data.measurements.filter((item) => item["Druh registru"] === "Teplo horké vody");
|
|
60
60
|
for (const measurement of hotWaterMeasurements) {
|
|
61
|
-
const option = measurementOptions.find((item) => item.Meter === data["
|
|
61
|
+
const option = measurementOptions.find((item) => item.Meter === data["placeId"]);
|
|
62
62
|
if (!option) {
|
|
63
|
-
this.logger.warn(`Incoming Meter id ${data["
|
|
63
|
+
this.logger.warn(`Incoming Meter id ${data["placeId"]} is missing in the static data file (measurement options).`);
|
|
64
64
|
continue;
|
|
65
65
|
}
|
|
66
66
|
const consumptionData = this.transformation.transformElement({ option, measurement });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchPtasWebScrapedMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPtasWebScrapedMeasurementsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,iGAAgH;AAChH,yEAAwF;AACxF,oFAAmG;AACnG,oGAAmH;AACnH,6GAA4H;AAC5H,oHAAuF;AAGvF,uHAAsF;AACtF,yHAAwF;AACxF,iHAA8G;AAC9G,6EAAwE;AACxE,mFAAkF;AAClF,iEAAwE;AAExE,wEAAqE;AAE9D,IAAM,mCAAmC,iDAAzC,MAAM,mCAAoC,SAAQ,+CAA6C;IAKlG,YAC8B,MAAuB,EAEjD,uBAA8D,EACV,qBAAsD,EAC3C,cAA0D,EAEzH,MAAkC;QAElC,KAAK,CAAC,uBAAW,CAAC,CAAC;QARe,WAAM,GAAN,MAAM,CAAS;QAEzC,4BAAuB,GAAvB,uBAAuB,CAA+B;QACA,0BAAqB,GAArB,qBAAqB,CAAuB;QACjC,mBAAc,GAAd,cAAc,CAAkC;QAE/G,WAAM,GAAN,MAAM,CAAkB;QAX5B,WAAM,GAAG,IAAI,uCAAmB,CAAC,qCAAqC,EAAE,qDAAyB,CAAC,CAAC;QAC7F,cAAS,GAAG,sBAAsB,CAAC;QACnC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAY1C,CAAC;IAEe,OAAO,CAAC,IAA2B;;YAC/C,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CACjE,iDAAqB,CAAC,WAAW,EACjC,mDAAsB,CAAC,kBAAkB,CAC5C,CAAC;YAEF,IAAI,CAAC,kBAAkB,EAAE;gBACrB,MAAM,IAAI,6BAAY,CAAC,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAClF;YAED,MAAM,KAAK,GAAG,EAAE,CAAC;YAEjB,6DAA6D;YAC7D,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,kBAAkB,CAAC,CAAC;YAE9G,KAAK,MAAM,WAAW,IAAI,oBAAoB,EAAE;gBAC5C,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"FetchPtasWebScrapedMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPtasWebScrapedMeasurementsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,iGAAgH;AAChH,yEAAwF;AACxF,oFAAmG;AACnG,oGAAmH;AACnH,6GAA4H;AAC5H,oHAAuF;AAGvF,uHAAsF;AACtF,yHAAwF;AACxF,iHAA8G;AAC9G,6EAAwE;AACxE,mFAAkF;AAClF,iEAAwE;AAExE,wEAAqE;AAE9D,IAAM,mCAAmC,iDAAzC,MAAM,mCAAoC,SAAQ,+CAA6C;IAKlG,YAC8B,MAAuB,EAEjD,uBAA8D,EACV,qBAAsD,EAC3C,cAA0D,EAEzH,MAAkC;QAElC,KAAK,CAAC,uBAAW,CAAC,CAAC;QARe,WAAM,GAAN,MAAM,CAAS;QAEzC,4BAAuB,GAAvB,uBAAuB,CAA+B;QACA,0BAAqB,GAArB,qBAAqB,CAAuB;QACjC,mBAAc,GAAd,cAAc,CAAkC;QAE/G,WAAM,GAAN,MAAM,CAAkB;QAX5B,WAAM,GAAG,IAAI,uCAAmB,CAAC,qCAAqC,EAAE,qDAAyB,CAAC,CAAC;QAC7F,cAAS,GAAG,sBAAsB,CAAC;QACnC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAY1C,CAAC;IAEe,OAAO,CAAC,IAA2B;;YAC/C,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CACjE,iDAAqB,CAAC,WAAW,EACjC,mDAAsB,CAAC,kBAAkB,CAC5C,CAAC;YAEF,IAAI,CAAC,kBAAkB,EAAE;gBACrB,MAAM,IAAI,6BAAY,CAAC,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAClF;YAED,MAAM,KAAK,GAAG,EAAE,CAAC;YAEjB,6DAA6D;YAC7D,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,kBAAkB,CAAC,CAAC;YAE9G,KAAK,MAAM,WAAW,IAAI,oBAAoB,EAAE;gBAC5C,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBAErG,IAAI,CAAC,MAAM,EAAE;oBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,qBAAqB,IAAI,CAAC,SAAS,CAAC,4DAA4D,CACnG,CAAC;oBACF,SAAS;iBACZ;gBAED,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;gBAEtF,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC/B;YAED,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC;KAAA;CACJ,CAAA;8CAjDY,mCAAmC;IAD/C,IAAA,qBAAU,GAAE;IAOJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;IAE1D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qBAAqB,CAAC,CAAA;IAClD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,gCAAgC,CAAC,CAAA;IAC7D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,gBAAgB,CAAC,CAAA;6CAHb,6DAA6B;QACuB,6CAAqB;QACjB,mEAAgC;QAEvG,mCAAgB;GAZ7B,mCAAmC,CAiD/C"}
|
|
@@ -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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"}
|
|
@@ -4,7 +4,7 @@ exports.ptasWebScrapingJsonSchema = void 0;
|
|
|
4
4
|
exports.ptasWebScrapingJsonSchema = {
|
|
5
5
|
type: "object",
|
|
6
6
|
properties: {
|
|
7
|
-
|
|
7
|
+
placeId: { type: "string" },
|
|
8
8
|
measurements: {
|
|
9
9
|
type: "array",
|
|
10
10
|
items: {
|
|
@@ -36,6 +36,6 @@ exports.ptasWebScrapingJsonSchema = {
|
|
|
36
36
|
},
|
|
37
37
|
},
|
|
38
38
|
},
|
|
39
|
-
required: ["
|
|
39
|
+
required: ["placeId", "measurements"],
|
|
40
40
|
};
|
|
41
41
|
//# sourceMappingURL=PtasWebScrapingJsonSchema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PtasWebScrapingJsonSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/PtasWebScrapingJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,yBAAyB,GAA0C;IAC5E,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,
|
|
1
|
+
{"version":3,"file":"PtasWebScrapingJsonSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/PtasWebScrapingJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,yBAAyB,GAA0C;IAC5E,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,YAAY,EAAE;YACV,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,4BAA4B,EAAE;oBACzE,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAChC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACnC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACnC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC1B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC/B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC9B,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAChC,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAChC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBACtC;gBACD,QAAQ,EAAE;oBACN,cAAc;oBACd,YAAY;oBACZ,eAAe;oBACf,eAAe;oBACf,QAAQ;oBACR,WAAW;oBACX,UAAU;oBACV,YAAY;oBACZ,YAAY;oBACZ,eAAe;iBAClB;aACJ;SACJ;KACJ;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC;CACxC,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"}
|
package/docs/openapi-input.yaml
CHANGED
|
@@ -31,11 +31,11 @@ paths:
|
|
|
31
31
|
summary: Receive and save data
|
|
32
32
|
requestBody:
|
|
33
33
|
content:
|
|
34
|
-
text/
|
|
34
|
+
text/csv:
|
|
35
35
|
schema:
|
|
36
36
|
$ref: "#/components/schemas/PtasMeasurement"
|
|
37
37
|
examples:
|
|
38
|
-
text/
|
|
38
|
+
text/csv:
|
|
39
39
|
summary: Sample data
|
|
40
40
|
value:
|
|
41
41
|
"Datum odečtu;Čas odečtu;Výrobní číslo;Druh registru;Odečet;MJ odečtu;MJ zúčt.;OM závislé;Typ odečtu;Status odečtu
|
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,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/energetics",
|
|
3
|
-
"version": "1.3.8-dev.
|
|
3
|
+
"version": "1.3.8-dev.1350798883",
|
|
4
4
|
"description": "Golemio Energetics Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@commitlint/cli": "^11.0.0",
|
|
37
37
|
"@commitlint/config-conventional": "^11.0.0",
|
|
38
38
|
"@golemio/cli": "1.5.0",
|
|
39
|
-
"@golemio/core": "1.10.
|
|
39
|
+
"@golemio/core": "1.10.4-dev.1350777994",
|
|
40
40
|
"@golemio/db-common": "1.1.4",
|
|
41
41
|
"@golemio/eslint-config": "1.1.2",
|
|
42
42
|
"@types/chai": "4.2.3",
|
|
@@ -46,8 +46,6 @@
|
|
|
46
46
|
"@types/papaparse": "^5.3.14",
|
|
47
47
|
"@types/sinon": "^9.0.10",
|
|
48
48
|
"@types/supertest": "^6.0.2",
|
|
49
|
-
"body-parser": "^1.20.2",
|
|
50
|
-
"body-parser-csv": "^1.1.0",
|
|
51
49
|
"chai": "4.2.0",
|
|
52
50
|
"chai-as-promised": "7.1.1",
|
|
53
51
|
"cross-env": "^7.0.3",
|