@golemio/chmu 1.0.8 → 1.0.9-dev.2253958640
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/dist/integration-engine/data-access/MeasurementsRepository.js +4 -13
- package/dist/integration-engine/data-access/MeasurementsRepository.js.map +1 -1
- package/dist/integration-engine/workers/tasks/DownloadMeasurementsTask.js +18 -29
- package/dist/integration-engine/workers/tasks/DownloadMeasurementsTask.js.map +1 -1
- package/package.json +12 -11
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
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
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
12
|
exports.MeasurementsRepository = void 0;
|
|
22
13
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
@@ -32,12 +23,12 @@ let MeasurementsRepository = exports.MeasurementsRepository = class Measurements
|
|
|
32
23
|
pgSchema: const_1.SCHEMA_NAME,
|
|
33
24
|
savingType: "insertOrUpdate",
|
|
34
25
|
}, new golemio_validator_1.JSONSchemaValidator("ChmuMeasurementsValidator", MeasurementModel_1.MeasurementModel.jsonSchema));
|
|
35
|
-
this.bulkUpdate = (data) =>
|
|
36
|
-
|
|
37
|
-
|
|
26
|
+
this.bulkUpdate = async (data) => {
|
|
27
|
+
await this.validate(data);
|
|
28
|
+
await this.sequelizeModel.bulkCreate(data, {
|
|
38
29
|
updateOnDuplicate: this.getUpdateAttributes(),
|
|
39
30
|
});
|
|
40
|
-
}
|
|
31
|
+
};
|
|
41
32
|
this.getUpdateAttributes = () => {
|
|
42
33
|
return Object.keys(MeasurementModel_1.MeasurementModel.attributeModel)
|
|
43
34
|
.filter((att) => !["vendor_id", "pick_at"].includes(att))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsRepository.js","sourceRoot":"","sources":["../../../src/integration-engine/data-access/MeasurementsRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MeasurementsRepository.js","sourceRoot":"","sources":["../../../src/integration-engine/data-access/MeasurementsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAA8E;AAC9E,mFAAkF;AAClF,iEAAgE;AAChE,uCAAwC;AAExC,mGAAgG;AAGzF,IAAM,sBAAsB,oCAA5B,MAAM,sBAAuB,SAAQ,kCAAa;IACrD;QACI,KAAK,CACD,4BAA4B,EAC5B;YACI,yBAAyB,EAAE,mCAAgB,CAAC,cAAc;YAC1D,WAAW,EAAE,cAAc;YAC3B,QAAQ,EAAE,mBAAW;YACrB,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CAAC,2BAA2B,EAAE,mCAAgB,CAAC,UAAU,CAAC,CACpF,CAAC;QAGC,eAAU,GAAG,KAAK,EAAE,IAAuB,EAAE,EAAE;YAClD,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAmB,IAAI,EAAE;gBACzD,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,EAAE;aAChD,CAAC,CAAC;QACP,CAAC,CAAC;QAEM,wBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,MAAM,CAAC,IAAI,CAAC,mCAAgB,CAAC,cAAc,CAAC;iBAC9C,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;iBACxD,MAAM,CAAC,YAAY,CAAiC,CAAC;QAC9D,CAAC,CAAC;IAbF,CAAC;CAcJ,CAAA;iCA1BY,sBAAsB;IADlC,IAAA,qBAAU,GAAE;;GACA,sBAAsB,CA0BlC"}
|
|
@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
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
14
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
24
15
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
25
16
|
};
|
|
@@ -44,24 +35,24 @@ let DownloadMeasurementsTask = class DownloadMeasurementsTask extends integratio
|
|
|
44
35
|
this.logger = logger;
|
|
45
36
|
this.queueName = "downloadMeasurementsTask";
|
|
46
37
|
this.schema = DownloadMeasurementsMessageSchema_1.DownloadMeasurementsMessageSchema;
|
|
47
|
-
this.execute = (data) =>
|
|
38
|
+
this.execute = async (data) => {
|
|
48
39
|
const { from, to } = this.normalizeInput(data);
|
|
49
40
|
if (from.equals(to)) {
|
|
50
|
-
|
|
41
|
+
await this.downloadData(from.toJSDate());
|
|
51
42
|
}
|
|
52
43
|
else {
|
|
53
|
-
|
|
44
|
+
await this.generateSubTasks(from, to);
|
|
54
45
|
}
|
|
55
|
-
}
|
|
56
|
-
this.generateSubTasks = (from, to) =>
|
|
46
|
+
};
|
|
47
|
+
this.generateSubTasks = async (from, to) => {
|
|
57
48
|
const intervals = this.generateIntervals(from, to);
|
|
58
49
|
for (const interval of intervals) {
|
|
59
|
-
|
|
50
|
+
await QueueManager_1.QueueManager.sendMessageToExchange(this.queuePrefix, this.queueName, {
|
|
60
51
|
from: interval.toISO(),
|
|
61
52
|
to: interval.toISO(),
|
|
62
53
|
});
|
|
63
54
|
}
|
|
64
|
-
}
|
|
55
|
+
};
|
|
65
56
|
this.generateIntervals = (from, to) => {
|
|
66
57
|
const intervals = [];
|
|
67
58
|
let tmpFrom = from;
|
|
@@ -72,20 +63,18 @@ let DownloadMeasurementsTask = class DownloadMeasurementsTask extends integratio
|
|
|
72
63
|
return intervals;
|
|
73
64
|
};
|
|
74
65
|
}
|
|
75
|
-
downloadData(date) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
throw error;
|
|
85
|
-
}
|
|
86
|
-
this.logger.error(error, `Unable to download chmu measurements data.`);
|
|
66
|
+
async downloadData(date) {
|
|
67
|
+
try {
|
|
68
|
+
const inputData = await this.datasource.getData(date);
|
|
69
|
+
const transformedData = await this.transformation.transform(inputData.data);
|
|
70
|
+
await this.repository.bulkUpdate(transformedData);
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
if (error instanceof golemio_errors_1.AbstractGolemioError) {
|
|
74
|
+
throw error;
|
|
87
75
|
}
|
|
88
|
-
|
|
76
|
+
this.logger.error(error, `Unable to download chmu measurements data.`);
|
|
77
|
+
}
|
|
89
78
|
}
|
|
90
79
|
normalizeInput(data) {
|
|
91
80
|
const now = luxon_1.DateTime.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadMeasurementsTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/DownloadMeasurementsTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DownloadMeasurementsTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/DownloadMeasurementsTask.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/chmu",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.9-dev.2253958640",
|
|
4
4
|
"description": "Golemio CHMU module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -33,29 +33,30 @@
|
|
|
33
33
|
"@commitlint/cli": "^11.0.0",
|
|
34
34
|
"@commitlint/config-conventional": "^11.0.0",
|
|
35
35
|
"@golemio/cli": "1.7.3",
|
|
36
|
-
"@golemio/core": "
|
|
36
|
+
"@golemio/core": "^3.0.2-dev.2249078403",
|
|
37
37
|
"@golemio/db-common": "1.1.4",
|
|
38
38
|
"@golemio/eslint-config": "1.1.2",
|
|
39
|
-
"@types/chai": "
|
|
40
|
-
"@types/chai-as-promised": "
|
|
41
|
-
"@types/mocha": "^
|
|
39
|
+
"@types/chai": "^5.2.3",
|
|
40
|
+
"@types/chai-as-promised": "^8.0.2",
|
|
41
|
+
"@types/mocha": "^10.0.10",
|
|
42
42
|
"@types/node": "^20.12.7",
|
|
43
|
-
"@types/sinon": "^
|
|
44
|
-
"@types/supertest": "^
|
|
45
|
-
"chai": "
|
|
46
|
-
"chai-as-promised": "
|
|
43
|
+
"@types/sinon": "^21.0.0",
|
|
44
|
+
"@types/supertest": "^6.0.3",
|
|
45
|
+
"chai": "^6.2.2",
|
|
46
|
+
"chai-as-promised": "^8.0.2",
|
|
47
47
|
"cross-env": "^7.0.3",
|
|
48
48
|
"dotenv": "^8.2.0",
|
|
49
49
|
"eslint": "^8.1.1",
|
|
50
50
|
"husky": "^4.3.7",
|
|
51
|
-
"mocha": "^
|
|
51
|
+
"mocha": "^11.7.5",
|
|
52
52
|
"npm-run-all": "^4.1.5",
|
|
53
53
|
"nyc": "^15.1.0",
|
|
54
54
|
"prettier": "^2.5.1",
|
|
55
55
|
"pretty-quick": "^3.1.0",
|
|
56
56
|
"rimraf": "^3.0.2",
|
|
57
|
-
"sinon": "^
|
|
57
|
+
"sinon": "^21.0.1",
|
|
58
58
|
"source-map-support": "0.5.21",
|
|
59
|
+
"supertest": "^7.1.4",
|
|
59
60
|
"ts-node": "^10.9.1",
|
|
60
61
|
"ts-patch": "3.0.0-beta3",
|
|
61
62
|
"tsconfig-paths": "^4.2.0",
|