@golemio/energetics 1.3.8 → 1.3.9-rc.1367638314
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/00_clear_test_data.sql +1 -0
- package/db/example/04_measurements.sql +26 -26
- package/db/example/05_access.sql +5 -0
- package/db/migrations/postgresql/20240621083051-access-limitation.js +53 -0
- package/db/migrations/postgresql/20240625134438-fix-pk-measurements.js +53 -0
- package/db/migrations/postgresql/sqls/20240621083051-access-limitation-down.sql +1 -0
- package/db/migrations/postgresql/sqls/20240621083051-access-limitation-up.sql +7 -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/AccessConfigurationDataSource.d.ts +9 -0
- package/dist/integration-engine/commodity-providers/datasources/static-data/AccessConfigurationDataSource.js +45 -0
- package/dist/integration-engine/commodity-providers/datasources/static-data/AccessConfigurationDataSource.js.map +1 -0
- package/dist/integration-engine/commodity-providers/ioc/Di.js +8 -4
- package/dist/integration-engine/commodity-providers/ioc/Di.js.map +1 -1
- package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.d.ts +2 -0
- package/dist/integration-engine/commodity-providers/ioc/WorkerContainerToken.js +2 -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/ioc/Di.js.map +1 -1
- package/dist/integration-engine/repositories/oict-energetika/AccessLimitationRepository.d.ts +9 -0
- package/dist/integration-engine/repositories/oict-energetika/AccessLimitationRepository.js +78 -0
- package/dist/integration-engine/repositories/oict-energetika/AccessLimitationRepository.js.map +1 -0
- package/dist/integration-engine/tasks/oict-energetika/FetchAccessConfigurationTask.d.ts +9 -0
- package/dist/integration-engine/tasks/oict-energetika/FetchAccessConfigurationTask.js +32 -0
- package/dist/integration-engine/tasks/oict-energetika/FetchAccessConfigurationTask.js.map +1 -0
- package/dist/integration-engine/workers/oict-energetika/OictEnergetikaWorker.js +2 -0
- package/dist/integration-engine/workers/oict-energetika/OictEnergetikaWorker.js.map +1 -1
- package/dist/output-gateway/controllers/v2/AbstractController.d.ts +8 -0
- package/dist/output-gateway/controllers/v2/AbstractController.js +28 -0
- package/dist/output-gateway/controllers/v2/AbstractController.js.map +1 -0
- package/dist/output-gateway/controllers/v2/BuildingsController.d.ts +6 -3
- package/dist/output-gateway/controllers/v2/BuildingsController.js +26 -13
- package/dist/output-gateway/controllers/v2/BuildingsController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2DevicesController.d.ts +5 -3
- package/dist/output-gateway/controllers/v2/V2DevicesController.js +15 -8
- package/dist/output-gateway/controllers/v2/V2DevicesController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2MeasurementsController.d.ts +5 -3
- package/dist/output-gateway/controllers/v2/V2MeasurementsController.js +15 -8
- package/dist/output-gateway/controllers/v2/V2MeasurementsController.js.map +1 -1
- package/dist/output-gateway/controllers/v2/V2OrganizationsController.d.ts +6 -4
- package/dist/output-gateway/controllers/v2/V2OrganizationsController.js +17 -10
- package/dist/output-gateway/controllers/v2/V2OrganizationsController.js.map +1 -1
- package/dist/output-gateway/ioc/Di.js +9 -1
- package/dist/output-gateway/ioc/Di.js.map +1 -1
- package/dist/output-gateway/ioc/ModuleContainerToken.d.ts +2 -0
- package/dist/output-gateway/ioc/ModuleContainerToken.js +2 -0
- package/dist/output-gateway/ioc/ModuleContainerToken.js.map +1 -1
- package/dist/output-gateway/repositories/AccessLimitationRepository.d.ts +11 -0
- package/dist/output-gateway/repositories/AccessLimitationRepository.js +51 -0
- package/dist/output-gateway/repositories/AccessLimitationRepository.js.map +1 -0
- package/dist/output-gateway/repositories/DevicesRepository.d.ts +4 -3
- package/dist/output-gateway/repositories/DevicesRepository.js +19 -5
- package/dist/output-gateway/repositories/DevicesRepository.js.map +1 -1
- package/dist/output-gateway/repositories/MeasurementRepository.d.ts +3 -2
- package/dist/output-gateway/repositories/MeasurementRepository.js +29 -20
- package/dist/output-gateway/repositories/MeasurementRepository.js.map +1 -1
- package/dist/output-gateway/repositories/OrganizationsRepository.d.ts +3 -3
- package/dist/output-gateway/repositories/OrganizationsRepository.js +7 -4
- package/dist/output-gateway/repositories/OrganizationsRepository.js.map +1 -1
- package/dist/output-gateway/repositories/PrimaryBuildingsRepository.d.ts +4 -3
- package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js +19 -4
- package/dist/output-gateway/repositories/PrimaryBuildingsRepository.js.map +1 -1
- package/dist/output-gateway/routers/v2/V2BuildingsRouter.js +4 -4
- package/dist/output-gateway/routers/v2/V2BuildingsRouter.js.map +1 -1
- package/dist/output-gateway/routers/v2/V2DevicesRouter.js +2 -2
- package/dist/output-gateway/routers/v2/V2DevicesRouter.js.map +1 -1
- package/dist/output-gateway/routers/v2/V2MeasurementsRouter.js +2 -0
- package/dist/output-gateway/routers/v2/V2MeasurementsRouter.js.map +1 -1
- package/dist/output-gateway/routers/v2/V2OrganizationsRouter.js +2 -2
- package/dist/output-gateway/routers/v2/V2OrganizationsRouter.js.map +1 -1
- package/dist/schema-definitions/datasources/AccessConfigurationJsonSchema.d.ts +3 -0
- package/dist/schema-definitions/datasources/AccessConfigurationJsonSchema.js +18 -0
- package/dist/schema-definitions/datasources/AccessConfigurationJsonSchema.js.map +1 -0
- package/dist/schema-definitions/models/AccessLimitationModel.d.ts +10 -0
- package/dist/schema-definitions/models/AccessLimitationModel.js +32 -0
- package/dist/schema-definitions/models/AccessLimitationModel.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/interfaces/IAccessLimitation.d.ts +4 -0
- package/dist/schema-definitions/models/interfaces/IAccessLimitation.js +3 -0
- package/dist/schema-definitions/models/interfaces/IAccessLimitation.js.map +1 -0
- package/docs/implementation_documentation.md +21 -0
- package/docs/openapi-output.yaml +6 -0
- package/package.json +3 -3
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AccessLimitationModel = void 0;
|
|
4
|
+
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
5
|
+
class AccessLimitationModel extends sequelize_1.Model {
|
|
6
|
+
}
|
|
7
|
+
exports.AccessLimitationModel = AccessLimitationModel;
|
|
8
|
+
AccessLimitationModel.TABLE_NAME = "access_limitation";
|
|
9
|
+
AccessLimitationModel.attributeModel = {
|
|
10
|
+
group_name: {
|
|
11
|
+
type: sequelize_1.DataTypes.STRING,
|
|
12
|
+
primaryKey: true,
|
|
13
|
+
},
|
|
14
|
+
organization_ids: {
|
|
15
|
+
type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.INTEGER),
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
AccessLimitationModel.jsonSchema = {
|
|
19
|
+
type: "array",
|
|
20
|
+
items: {
|
|
21
|
+
type: "object",
|
|
22
|
+
properties: {
|
|
23
|
+
group_name: { type: "string" },
|
|
24
|
+
organization_ids: {
|
|
25
|
+
type: "array",
|
|
26
|
+
items: { type: "integer" },
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
required: ["group_name", "organization_ids"],
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
//# sourceMappingURL=AccessLimitationModel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AccessLimitationModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/AccessLimitationModel.ts"],"names":[],"mappings":";;;AAAA,mEAAwF;AAIxF,MAAa,qBAAsB,SAAQ,iBAA4B;;AAAvE,sDA8BC;AA7BiB,gCAAU,GAAG,mBAAmB,CAAC;AAKjC,oCAAc,GAA2C;IACnE,UAAU,EAAE;QACR,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,UAAU,EAAE,IAAI;KACnB;IACD,gBAAgB,EAAE;QACd,IAAI,EAAE,qBAAS,CAAC,KAAK,CAAC,qBAAS,CAAC,OAAO,CAAC;KAC3C;CACJ,CAAC;AAEY,gCAAU,GAAwC;IAC5D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,gBAAgB,EAAE;gBACd,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;aAC7B;SACJ;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,kBAAkB,CAAC;KAC/C;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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IAccessLimitation.js","sourceRoot":"","sources":["../../../../src/schema-definitions/models/interfaces/IAccessLimitation.ts"],"names":[],"mappings":""}
|
|
@@ -305,6 +305,24 @@ Metoda sbírá data o spotřebách od různých poskytovalů API (consumption) a
|
|
|
305
305
|
- data modely
|
|
306
306
|
- ConsumptionModel `consumption_energy_consumption`
|
|
307
307
|
|
|
308
|
+
#### _task: FetchAccessConfigurationTask_
|
|
309
|
+
|
|
310
|
+
Task aktualizuje lookup tabulku pro limitaci přístupu k output API.
|
|
311
|
+
|
|
312
|
+
- vstupní rabbitmq fronta
|
|
313
|
+
- název: dataplatform.energeticsoict.fetchAccessConfiguration
|
|
314
|
+
- TTL: 10 minutes
|
|
315
|
+
- závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
|
|
316
|
+
- žádné
|
|
317
|
+
- datové zdroje
|
|
318
|
+
- blob storage
|
|
319
|
+
- rabín: https://rabingolemio.blob.core.windows.net/rabin-energetics/access_configuration.json
|
|
320
|
+
- golem: https://golemgolemio.blob.core.windows.net/golem-energetics/access_configuration.json
|
|
321
|
+
- transformace
|
|
322
|
+
- není
|
|
323
|
+
- data modely
|
|
324
|
+
- AccessLimitationModel `access_limitation`
|
|
325
|
+
|
|
308
326
|
### _EnergeticsVpalacWorker_
|
|
309
327
|
|
|
310
328
|
Worker se stará o stahování dat (odečty, měřidla a počítadla) z datového zdroje Unimonitor CEM API - Vrtbovský palác
|
|
@@ -373,6 +391,9 @@ Metoda sbírá historická data
|
|
|
373
391
|
- zdrojový soubor: [openapi-output.yaml](./openapi-output.yaml)
|
|
374
392
|
- rabin: https://rabin.golemio.cz/v2/docs/openapi/
|
|
375
393
|
- golem: https://api.golemio.cz/v2/docs/openapi/
|
|
394
|
+
- přístup je řízen pomocí interního parametru `accessLimit`, který musí být vždy nastaven a omezen z permission proxy
|
|
395
|
+
- při obdržení dotazu na API se stáhnou povolené organizace z tabulky `access_limit` a omezí se podle toho dotazy do databáze
|
|
396
|
+
- pokud je `accessLimit` nastaven na `admin`, tak se vždy dotazuje na všechny organizace
|
|
376
397
|
|
|
377
398
|
### API
|
|
378
399
|
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -195,6 +195,8 @@ paths:
|
|
|
195
195
|
RH - Relativní vlhkost [%]<br />
|
|
196
196
|
EFwActiNT - Odběr činné energie, nízký tarif [kVArh]<br />
|
|
197
197
|
VOC - Míra koncentrace těkavých látek [%]<br />
|
|
198
|
+
VT - Vysoký tarif [kWh]<br />
|
|
199
|
+
NT - Nízký tarif [kWh]<br />
|
|
198
200
|
- name: type
|
|
199
201
|
in: query
|
|
200
202
|
required: false
|
|
@@ -295,6 +297,8 @@ paths:
|
|
|
295
297
|
RH - Relativní vlhkost [%]<br />
|
|
296
298
|
EFwActiNT - Odběr činné energie, nízký tarif [kVArh]<br />
|
|
297
299
|
VOC - Míra koncentrace těkavých látek [%]<br />
|
|
300
|
+
VT - Vysoký tarif [kWh]<br />
|
|
301
|
+
NT - Nízký tarif [kWh]<br />
|
|
298
302
|
- name: year
|
|
299
303
|
in: query
|
|
300
304
|
description: Year of measurement
|
|
@@ -1041,6 +1045,8 @@ components:
|
|
|
1041
1045
|
RH - Relativní vlhkost [%]<br />
|
|
1042
1046
|
EFwActiNT - Odběr činné energie, nízký tarif [kVArh]<br />
|
|
1043
1047
|
VOC - Míra koncentrace těkavých látek [%]<br />
|
|
1048
|
+
VT - Vysoký tarif [kWh]<br />
|
|
1049
|
+
NT - Nízký tarif [kWh]<br />
|
|
1044
1050
|
EnergeticsTypes:
|
|
1045
1051
|
type: string
|
|
1046
1052
|
example: provider_value
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/energetics",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.9-rc.1367638314",
|
|
4
4
|
"description": "Golemio Energetics Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"test-debug": "run-s 'test -- --inspect-brk=9230'",
|
|
14
14
|
"apidocs-test": "npm run apidocs-test-input && npm run apidocs-test-output",
|
|
15
15
|
"apidocs-test-input": "cross-env NODE_ENV=test golemio swagger api-test --oas docs/openapi-input.yaml --script test/api-docs/input-gateway/server.js",
|
|
16
|
-
"apidocs-test-output": "cross-env NODE_ENV=test golemio swagger api-test --oas docs/openapi-output.yaml --script test/api-docs/output-gateway/server.js",
|
|
16
|
+
"apidocs-test-output": "cross-env NODE_ENV=test golemio swagger api-test --oas docs/openapi-output.yaml --script test/api-docs/output-gateway/server.js --config test/api-docs/output-gateway/portman-config.json",
|
|
17
17
|
"code-coverage": "nyc run-s 'test -- -r source-map-support/register'",
|
|
18
18
|
"generate-docs": "typedoc --out docs/typedoc src",
|
|
19
19
|
"lint": "eslint \"{src,test}/**/*.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.11.
|
|
39
|
+
"@golemio/core": "1.11.1",
|
|
40
40
|
"@golemio/db-common": "1.1.4",
|
|
41
41
|
"@golemio/eslint-config": "1.1.2",
|
|
42
42
|
"@types/chai": "4.2.3",
|