@golemio/air-quality-stations 1.3.4-dev.1564533814 → 1.3.4-dev.2085892530
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/workers/services/ChmiDataService.js +13 -24
- package/dist/integration-engine/workers/services/ChmiDataService.js.map +1 -1
- package/dist/integration-engine/workers/tasks/Refresh1HDataInDBTask.js +4 -15
- package/dist/integration-engine/workers/tasks/Refresh1HDataInDBTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/Refresh3HDataInDBTask.js +9 -20
- package/dist/integration-engine/workers/tasks/Refresh3HDataInDBTask.js.map +1 -1
- package/dist/integration-engine/workers/tasks/UpdateDistrictTask.js +7 -18
- package/dist/integration-engine/workers/tasks/UpdateDistrictTask.js.map +1 -1
- package/dist/integration-engine/workers/transformations/AirQualityStationsTransformation.js +2 -3
- package/dist/integration-engine/workers/transformations/AirQualityStationsTransformation.js.map +1 -1
- package/dist/output-gateway/AirQualityHistoryRouter.js +15 -24
- package/dist/output-gateway/AirQualityHistoryRouter.js.map +1 -1
- package/dist/output-gateway/AirQualityRouter.js +6 -15
- package/dist/output-gateway/AirQualityRouter.js.map +1 -1
- package/dist/output-gateway/repositories/AirQualityHistoryRepository.js +5 -14
- package/dist/output-gateway/repositories/AirQualityHistoryRepository.js.map +1 -1
- package/dist/output-gateway/repositories/AirQualityIndexesRepository.js +11 -21
- package/dist/output-gateway/repositories/AirQualityIndexesRepository.js.map +1 -1
- package/dist/output-gateway/repositories/AirQualityStationsRepository.js +2 -11
- package/dist/output-gateway/repositories/AirQualityStationsRepository.js.map +1 -1
- package/dist/output-gateway/repositories/helpers/HistoryRepositoryHelper.js +1 -1
- package/dist/output-gateway/repositories/helpers/HistoryRepositoryHelper.js.map +1 -1
- package/dist/output-gateway/repositories/helpers/RawQueryProvider.js +7 -7
- package/dist/output-gateway/repositories/helpers/RawQueryProvider.js.map +1 -1
- package/package.json +2 -2
|
@@ -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
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
15
|
exports.ChmiDataService = void 0;
|
|
25
16
|
const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
|
|
@@ -37,21 +28,19 @@ let ChmiDataService = exports.ChmiDataService = class ChmiDataService {
|
|
|
37
28
|
this.measurementsRepository = measurementsRepository;
|
|
38
29
|
this.indexesRepository = indexesRepository;
|
|
39
30
|
}
|
|
40
|
-
saveProcessedData(transformedData) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
});
|
|
31
|
+
async saveProcessedData(transformedData) {
|
|
32
|
+
const connection = this.databaseConnector.getConnection();
|
|
33
|
+
const t = await connection.transaction();
|
|
34
|
+
try {
|
|
35
|
+
await this.stationsRepository.bulkSave(transformedData.stations, models_1.AirQualityStationModel.updateAttributeList, false, false, t);
|
|
36
|
+
await this.measurementsRepository.bulkSave(transformedData.measurements, models_1.AirQualityMeasurementModel.updateAttributeList, false, false, t);
|
|
37
|
+
await this.indexesRepository.bulkSave(transformedData.indexes, models_1.AirQualityIndexModel.updateAttributeList, false, false, t);
|
|
38
|
+
await t.commit();
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
await t.rollback();
|
|
42
|
+
throw new golemio_errors_1.GeneralError(`Database error: ChmiDataService failed to save data`, this.constructor.name, err);
|
|
43
|
+
}
|
|
55
44
|
}
|
|
56
45
|
};
|
|
57
46
|
exports.ChmiDataService = ChmiDataService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChmiDataService.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/services/ChmiDataService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ChmiDataService.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/services/ChmiDataService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAsE;AACtE,yEAA+E;AAC/E,mFAAyF;AACzF,2EAAiF;AAEjF,+DAAuG;AAEvG,wEAAqE;AACrE,6EAAwE;AACxE,iEAAwE;AAGjE,IAAM,eAAe,6BAArB,MAAM,eAAe;IACxB,YACiD,iBAAqC,EACvB,kBAAsC,EAClC,sBAA8C,EACnD,iBAAoC;QAHjD,sBAAiB,GAAjB,iBAAiB,CAAoB;QACvB,uBAAkB,GAAlB,kBAAkB,CAAoB;QAClC,2BAAsB,GAAtB,sBAAsB,CAAwB;QACnD,sBAAiB,GAAjB,iBAAiB,CAAmB;IAC/F,CAAC;IAEG,KAAK,CAAC,iBAAiB,CAAC,eAA6B;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;QAC1D,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;QAEzC,IAAI;YACA,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAClC,eAAe,CAAC,QAAQ,EACxB,+BAAsB,CAAC,mBAAmB,EAC1C,KAAK,EACL,KAAK,EACL,CAAC,CACJ,CAAC;YACF,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CACtC,eAAe,CAAC,YAAY,EAC5B,mCAA0B,CAAC,mBAAmB,EAC9C,KAAK,EACL,KAAK,EACL,CAAC,CACJ,CAAC;YACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CACjC,eAAe,CAAC,OAAO,EACvB,6BAAoB,CAAC,mBAAmB,EACxC,KAAK,EACL,KAAK,EACL,CAAC,CACJ,CAAC;YACF,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;SACpB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,6BAAY,CAAC,qDAAqD,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SAC7G;IACL,CAAC;CACJ,CAAA;0BAxCY,eAAe;IAD3B,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,iBAAiB,CAAC,CAAA;IACnC,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,kBAAkB,CAAC,CAAA;IACjD,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,sBAAsB,CAAC,CAAA;IACrD,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,iBAAiB,CAAC,CAAA;6CAF8B,uCAAkB;QACV,+CAAsB;QAChC,qCAAiB;GALzF,eAAe,CAwC3B"}
|
|
@@ -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
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
15
|
exports.Refresh1HDataInDBTask = void 0;
|
|
25
16
|
const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
|
|
@@ -38,12 +29,10 @@ let Refresh1HDataInDBTask = exports.Refresh1HDataInDBTask = class Refresh1HDataI
|
|
|
38
29
|
this.queueName = "refresh1HDataInDB";
|
|
39
30
|
this.queueTtl = 59 * 60 * 1000; // 59 minutes
|
|
40
31
|
}
|
|
41
|
-
execute() {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
yield this.chmiDataService.saveProcessedData(transformedData);
|
|
46
|
-
});
|
|
32
|
+
async execute() {
|
|
33
|
+
const data = await this.datasource.getDataSource().getAll();
|
|
34
|
+
const transformedData = this.transformation.transformElement(data);
|
|
35
|
+
await this.chmiDataService.saveProcessedData(transformedData);
|
|
47
36
|
}
|
|
48
37
|
};
|
|
49
38
|
exports.Refresh1HDataInDBTask = Refresh1HDataInDBTask = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Refresh1HDataInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/Refresh1HDataInDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Refresh1HDataInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/Refresh1HDataInDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAsE;AACtE,4CAAoD;AACpD,sEAA4E;AAC5E,iEAAuE;AACvE,0GAAgH;AAChH,8EAA0E;AAC1E,iEAAwE;AAGjE,IAAM,qBAAqB,mCAA3B,MAAM,qBAAsB,SAAQ,sCAAiB;IAIxD,YACqD,UAAoC,EACpB,cAAwD,EACzE,eAAwC;QAExF,KAAK,CAAC,uBAAW,CAAC,CAAC;QAJsC,eAAU,GAAV,UAAU,CAAkB;QACZ,mBAAc,GAAd,cAAc,CAAkC;QACjE,oBAAe,GAAf,eAAe,CAAiB;QAN5E,cAAS,GAAG,mBAAmB,CAAC;QAChC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;IAQxD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,CAAC;QAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;CACJ,CAAA;gCAjBY,qBAAqB;IADjC,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,gBAAgB,CAAC,CAAA;IAC/C,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,gCAAgC,CAAC,CAAA;IAC/D,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,eAAe,CAAC,CAAA;qCAFsB,mCAAgB;QACI,mEAAgC;QAChD,iCAAe;GAPnF,qBAAqB,CAiBjC"}
|
|
@@ -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
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
15
|
exports.Refresh3HDataInDBTask = void 0;
|
|
25
16
|
const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
|
|
@@ -41,24 +32,22 @@ let Refresh3HDataInDBTask = exports.Refresh3HDataInDBTask = class Refresh3HDataI
|
|
|
41
32
|
this.chmiDataService = chmiDataService;
|
|
42
33
|
this.queueName = "refresh3HDataInDB";
|
|
43
34
|
this.queueTtl = 59 * 60 * 1000; // 59 minutes
|
|
44
|
-
this.prepareQueueForDistrictUpdate = () =>
|
|
45
|
-
const result =
|
|
35
|
+
this.prepareQueueForDistrictUpdate = async () => {
|
|
36
|
+
const result = await this.stationsRepository["sequelizeModel"].findAll({
|
|
46
37
|
where: { district: null, region_name: "Praha" },
|
|
47
38
|
});
|
|
48
39
|
const stationIds = result.map((station) => station.id);
|
|
49
40
|
const exchange = this.config.getValue("env.RABBIT_EXCHANGE_NAME");
|
|
50
41
|
for (const stationId of stationIds) {
|
|
51
|
-
|
|
42
|
+
await integration_engine_1.QueueManager.sendMessageToExchange(exchange + "." + this.queuePrefix, "updateDistrict", { id: stationId });
|
|
52
43
|
}
|
|
53
|
-
}
|
|
44
|
+
};
|
|
54
45
|
}
|
|
55
|
-
execute() {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
yield this.prepareQueueForDistrictUpdate();
|
|
61
|
-
});
|
|
46
|
+
async execute() {
|
|
47
|
+
const data = await this.datasource.getDataSource().getAll();
|
|
48
|
+
const transformedData = this.transformation.transformElement(data);
|
|
49
|
+
await this.chmiDataService.saveProcessedData(transformedData);
|
|
50
|
+
await this.prepareQueueForDistrictUpdate();
|
|
62
51
|
}
|
|
63
52
|
};
|
|
64
53
|
exports.Refresh3HDataInDBTask = Refresh3HDataInDBTask = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Refresh3HDataInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/Refresh3HDataInDBTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Refresh3HDataInDBTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/Refresh3HDataInDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yEAAsE;AACtE,4CAAoD;AACpD,sEAA4E;AAC5E,2EAAiF;AACjF,iEAAuE;AACvE,0GAAgH;AAEhH,wEAAqE;AACrE,8EAAwF;AACxF,iEAAwE;AAGjE,IAAM,qBAAqB,mCAA3B,MAAM,qBAAsB,SAAQ,sCAAiB;IAIxD,YACoC,MAA6B,EACZ,UAAoC,EACpB,cAAwD,EACtE,kBAA8C,EACjD,eAAwC;QAExF,KAAK,CAAC,uBAAW,CAAC,CAAC;QANqB,WAAM,GAAN,MAAM,CAAe;QACJ,eAAU,GAAV,UAAU,CAAkB;QACZ,mBAAc,GAAd,cAAc,CAAkC;QAC9D,uBAAkB,GAAlB,kBAAkB,CAAoB;QACzC,oBAAe,GAAf,eAAe,CAAiB;QAR5E,cAAS,GAAG,mBAAmB,CAAC;QAChC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QAoBhD,kCAA6B,GAAG,KAAK,IAAmB,EAAE;YAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;gBACnE,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE;aAClD,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,0BAA0B,CAAC,CAAC;YAE1E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAChC,MAAM,iCAAY,CAAC,qBAAqB,CAAC,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;aACpH;QACL,CAAC,CAAC;IArBF,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,CAAC;QAC5D,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAE9D,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;IAC/C,CAAC;CAcJ,CAAA;gCAlCY,qBAAqB;IADjC,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;IAC9B,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,gBAAgB,CAAC,CAAA;IAC/C,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,gCAAgC,CAAC,CAAA;IAC/D,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,kBAAkB,CAAC,CAAA;IACjD,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,eAAe,CAAC,CAAA;6CAHsB,mCAAgB;QACI,mEAAgC;QAC1C,uCAAkB;QACxB,iCAAe;GATnF,qBAAqB,CAkCjC"}
|
|
@@ -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
|
};
|
|
@@ -41,16 +32,14 @@ let UpdateDistrictTask = exports.UpdateDistrictTask = class UpdateDistrictTask e
|
|
|
41
32
|
this.schema = UpdateDistrictValidationSchema_1.UpdateDistrictValidationSchema;
|
|
42
33
|
this.cityDistrictsRepository = new CityDistrictPostgresRepository_1.default();
|
|
43
34
|
}
|
|
44
|
-
execute(data) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
where: { id: data.id },
|
|
48
|
-
});
|
|
49
|
-
if (!dbData.district) {
|
|
50
|
-
dbData.district = yield this.cityDistrictsRepository.getDistrict(dbData.longitude, dbData.latitude);
|
|
51
|
-
dbData.save();
|
|
52
|
-
}
|
|
35
|
+
async execute(data) {
|
|
36
|
+
const dbData = await this.stationsRepository.findOne({
|
|
37
|
+
where: { id: data.id },
|
|
53
38
|
});
|
|
39
|
+
if (!dbData.district) {
|
|
40
|
+
dbData.district = await this.cityDistrictsRepository.getDistrict(dbData.longitude, dbData.latitude);
|
|
41
|
+
dbData.save();
|
|
42
|
+
}
|
|
54
43
|
}
|
|
55
44
|
};
|
|
56
45
|
exports.UpdateDistrictTask = UpdateDistrictTask = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateDistrictTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/UpdateDistrictTask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UpdateDistrictTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/UpdateDistrictTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,yEAAsE;AACtE,4CAAoD;AACpD,2EAAiF;AACjF,6FAAiI;AACjI,iKAAkI;AAClI,8EAAqE;AACrE,iEAAwE;AAGjE,IAAM,kBAAkB,gCAAxB,MAAM,kBAAmB,SAAQ,iCAAmC;IAOvE,YAA+D,kBAA8C;QACzG,KAAK,CAAC,uBAAW,CAAC,CAAC;QADgD,uBAAkB,GAAlB,kBAAkB,CAAoB;QAN7F,cAAS,GAAG,gBAAgB,CAAC;QAC7B,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW;QAC3C,WAAM,GAAG,+DAA8B,CAAC;QAMpD,IAAI,CAAC,uBAAuB,GAAG,IAAI,wCAAuB,EAAE,CAAC;IACjE,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,IAA2B;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACjD,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;SACzB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAClB,MAAM,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YACpG,MAAM,CAAC,IAAI,EAAE,CAAC;SACjB;IACL,CAAC;CACJ,CAAA;6BAtBY,kBAAkB;IAD9B,IAAA,qBAAU,GAAE;IAQI,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,kBAAkB,CAAC,CAAA;qCAA6B,uCAAkB;GAPpG,kBAAkB,CAsB9B"}
|
|
@@ -14,7 +14,6 @@ class AirQualityStationsTransformation extends AbstractTransformation_1.Abstract
|
|
|
14
14
|
super(...arguments);
|
|
15
15
|
this.name = "AirQualityStationsTransformation";
|
|
16
16
|
this.transformInternal = (data) => {
|
|
17
|
-
var _a, _b;
|
|
18
17
|
const res = {
|
|
19
18
|
indexes: [],
|
|
20
19
|
measurements: [],
|
|
@@ -30,11 +29,11 @@ class AirQualityStationsTransformation extends AbstractTransformation_1.Abstract
|
|
|
30
29
|
const id = `${state.Code}_${region.Code}_${station.Code}`;
|
|
31
30
|
// stations
|
|
32
31
|
res.stations.push({
|
|
33
|
-
classification:
|
|
32
|
+
classification: station.Classif ?? null,
|
|
34
33
|
id,
|
|
35
34
|
latitude: station.Lat ? parseFloat(station.Lat) : null,
|
|
36
35
|
longitude: station.Lon ? parseFloat(station.Lon) : null,
|
|
37
|
-
owner:
|
|
36
|
+
owner: station.Owner ?? null,
|
|
38
37
|
region_code: region.Code,
|
|
39
38
|
region_name: region.Name,
|
|
40
39
|
state_code: state.Code,
|
package/dist/integration-engine/workers/transformations/AirQualityStationsTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirQualityStationsTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/transformations/AirQualityStationsTransformation.ts"],"names":[],"mappings":";;;;;;AACA,sHAAuE;AACvE,kIAAmF;AACnF,0HAA2E;AAC3E,wDAAsD;AACtD,6GAA0G;AAS1G,MAAa,gCAAiC,SAAQ,+CAAiD;IAAvG;;QACW,SAAI,GAAG,kCAAkC,CAAC;QAEvC,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE
|
|
1
|
+
{"version":3,"file":"AirQualityStationsTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/transformations/AirQualityStationsTransformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
15
|
const Di_1 = require("./ioc/Di");
|
|
25
16
|
const ModuleContainerToken_1 = require("./ioc/ModuleContainerToken");
|
|
@@ -34,33 +25,33 @@ let AirQualityHistoryRouter = class AirQualityHistoryRouter extends BaseRouter_1
|
|
|
34
25
|
constructor(historyRepository) {
|
|
35
26
|
super();
|
|
36
27
|
this.historyRepository = historyRepository;
|
|
37
|
-
this.initRoutes = () =>
|
|
38
|
-
const sensorIdParam =
|
|
28
|
+
this.initRoutes = async () => {
|
|
29
|
+
const sensorIdParam = await this.GetIdQueryParamWithCorrectType();
|
|
39
30
|
this.router.get("/", [
|
|
40
31
|
(0, express_validator_1.query)("from").optional().isISO8601().not().isArray(),
|
|
41
32
|
(0, express_validator_1.query)("to").optional().isISO8601().not().isArray(),
|
|
42
33
|
sensorIdParam,
|
|
43
|
-
], output_gateway_1.
|
|
44
|
-
}
|
|
45
|
-
this.GetAll = (req, res, next) =>
|
|
46
|
-
var _a, _b;
|
|
34
|
+
], (0, output_gateway_1.paginationLimitMiddleware)("AirQualityHistoryRouter"), output_gateway_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(20 * 60, 5 * 60), this.GetAll);
|
|
35
|
+
};
|
|
36
|
+
this.GetAll = async (req, res, next) => {
|
|
47
37
|
try {
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
38
|
+
const queryData = (0, express_validator_1.matchedData)(req);
|
|
39
|
+
const data = await this.historyRepository.GetAll({
|
|
40
|
+
sensorId: queryData.sensorId,
|
|
41
|
+
from: queryData.from ?? (0, helpers_1.dateTime)(new Date()).subtract(1, "days").toISOString(),
|
|
42
|
+
to: queryData.to ?? (0, helpers_1.dateTime)(new Date()).toISOString(),
|
|
43
|
+
limit: queryData.limit ? parseInt(queryData.limit) : undefined,
|
|
44
|
+
offset: queryData.offset ? parseInt(queryData.offset) : undefined,
|
|
54
45
|
});
|
|
55
46
|
res.status(200).send(data);
|
|
56
47
|
}
|
|
57
48
|
catch (err) {
|
|
58
49
|
next(err);
|
|
59
50
|
}
|
|
60
|
-
}
|
|
61
|
-
this.GetIdQueryParamWithCorrectType = () =>
|
|
51
|
+
};
|
|
52
|
+
this.GetIdQueryParamWithCorrectType = async () => {
|
|
62
53
|
return (0, express_validator_1.query)("sensorId").optional().not().isEmpty({ ignore_whitespace: true }).not().isArray();
|
|
63
|
-
}
|
|
54
|
+
};
|
|
64
55
|
this.cacheHeaderMiddleware = Di_1.OGModuleContainer.resolve(ioc_1.ContainerToken.CacheHeaderMiddleware);
|
|
65
56
|
}
|
|
66
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirQualityHistoryRouter.js","sourceRoot":"","sources":["../../src/output-gateway/AirQualityHistoryRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AirQualityHistoryRouter.js","sourceRoot":"","sources":["../../src/output-gateway/AirQualityHistoryRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iCAA+C;AAC/C,qEAAsE;AACtE,4FAA2F;AAC3F,wDAAsD;AACtD,sEAAkH;AAClH,+DAAuE;AACvE,oFAAiF;AAEjF,mFAAkG;AAClG,iEAA4D;AAE5D,IAAqB,uBAAuB,GAA5C,MAAqB,uBAAwB,SAAQ,uBAAU;IAG3D,YACgE,iBAAsD;QAElH,KAAK,EAAE,CAAC;QAF4D,sBAAiB,GAAjB,iBAAiB,CAA6B;QAM/G,eAAU,GAAG,KAAK,IAAI,EAAE;YAC3B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH;gBACI,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBACpD,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;gBAClD,aAAa;aAChB,EACD,IAAA,0CAAyB,EAAC,yBAAyB,CAAC,EACpD,4BAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,EACzD,IAAI,CAAC,MAAM,CACd,CAAC;QACN,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,IAAI;gBACA,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;oBAC7C,QAAQ,EAAE,SAAS,CAAC,QAAkB;oBACtC,IAAI,EAAG,SAAS,CAAC,IAAe,IAAI,IAAA,kBAAQ,EAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,WAAW,EAAE;oBAC1F,EAAE,EAAG,SAAS,CAAC,EAAa,IAAI,IAAA,kBAAQ,EAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE;oBAClE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAe,CAAC,CAAC,CAAC,CAAC,SAAS;oBACxE,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;iBAC9E,CAAC,CAAC;gBAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9B;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAEQ,mCAA8B,GAAG,KAAK,IAA8B,EAAE;YAC5E,OAAO,IAAA,yBAAK,EAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;QACnG,CAAC,CAAC;QAtCE,IAAI,CAAC,qBAAqB,GAAG,sBAAiB,CAAC,OAAO,CAAwB,oBAAc,CAAC,qBAAqB,CAAC,CAAC;IACxH,CAAC;CAsCJ,CAAA;AA9CoB,uBAAuB;IAInC,WAAA,IAAA,iBAAM,EAAC,6CAAsB,CAAC,2BAA2B,CAAC,CAAA;qCAA4B,yDAA2B;GAJrG,uBAAuB,CA8C3C;kBA9CoB,uBAAuB"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -27,24 +18,24 @@ class AirQualityRouter extends output_gateway_1.GeoJsonRouter {
|
|
|
27
18
|
constructor() {
|
|
28
19
|
super(new AirQualityIndexesRepository_1.AirQualityIndexesRepository());
|
|
29
20
|
this.router = (0, express_1.Router)();
|
|
30
|
-
this.GetIndexTypes = (req, res, next) =>
|
|
21
|
+
this.GetIndexTypes = async (req, res, next) => {
|
|
31
22
|
try {
|
|
32
|
-
const data =
|
|
23
|
+
const data = await this.airQualityIndexTypes.GetAll();
|
|
33
24
|
res.status(200).send(data);
|
|
34
25
|
}
|
|
35
26
|
catch (err) {
|
|
36
27
|
next(err);
|
|
37
28
|
}
|
|
38
|
-
}
|
|
39
|
-
this.GetComponentTypes = (req, res, next) =>
|
|
29
|
+
};
|
|
30
|
+
this.GetComponentTypes = async (req, res, next) => {
|
|
40
31
|
try {
|
|
41
|
-
const data =
|
|
32
|
+
const data = await this.airQualityComponentTypes.GetAll();
|
|
42
33
|
res.status(200).send(data);
|
|
43
34
|
}
|
|
44
35
|
catch (err) {
|
|
45
36
|
next(err);
|
|
46
37
|
}
|
|
47
|
-
}
|
|
38
|
+
};
|
|
48
39
|
this.initRoutes({ maxAge: CACHE_MAX_AGE, staleWhileRevalidate: CACHE_STALE_WHILE_REVALIDATE });
|
|
49
40
|
this.router.get("/indextypes", this.cacheHeaderMiddleware.getMiddleware(CACHE_MAX_AGE, CACHE_STALE_WHILE_REVALIDATE), this.GetIndexTypes);
|
|
50
41
|
this.router.get("/componenttypes", this.cacheHeaderMiddleware.getMiddleware(CACHE_MAX_AGE, CACHE_STALE_WHILE_REVALIDATE), this.GetComponentTypes);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirQualityRouter.js","sourceRoot":"","sources":["../../src/output-gateway/AirQualityRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AirQualityRouter.js","sourceRoot":"","sources":["../../src/output-gateway/AirQualityRouter.ts"],"names":[],"mappings":";;;;;;AAAA,iCAA+C;AAC/C,qEAAsE;AACtE,sEAAkE;AAClE,+DAA4F;AAC5F,wFAAgE;AAChE,0GAAyG;AACzG,4FAA2F;AAC3F,kGAAiG;AAEjG,MAAM,aAAa,GAAG,EAAE,GAAG,EAAE,CAAC;AAC9B,MAAM,4BAA4B,GAAG,CAAC,GAAG,EAAE,CAAC;AAE5C,MAAqB,gBAAiB,SAAQ,8BAAa;IAKvD;QACI,KAAK,CAAC,IAAI,yDAA2B,EAAE,CAAC,CAAC;QALtC,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QA4B1B,kBAAa,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAC7E,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;gBACtD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9B;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAEK,sBAAiB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAS,EAAE,EAAE;YACxE,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC;gBAC1D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9B;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAtCE,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,CAAC,CAAC;QAC/F,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,aAAa,EACb,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,aAAa,EAAE,4BAA4B,CAAC,EACrF,IAAI,CAAC,aAAa,CACrB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,iBAAiB,EACjB,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,aAAa,EAAE,4BAA4B,CAAC,EACrF,IAAI,CAAC,iBAAiB,CACzB,CAAC;QAEF,IAAI,CAAC,wBAAwB,GAAG,IAAI,uEAAkC,EAAE,CAAC;QACzE,IAAI,CAAC,oBAAoB,GAAG,IAAI,+DAA8B,EAAE,CAAC;QAEjE,MAAM,aAAa,GAAG,IAAI,iCAAuB,CAC7C,sBAAiB,CAAC,OAAO,CAAC,6CAAsB,CAAC,2BAA2B,CAAC,CAChF,CAAC;QACF,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;CAmBJ;AA9CD,mCA8CC;AAED,MAAM,gBAAgB,GAAW,IAAI,gBAAgB,EAAE,CAAC,MAAM,CAAC;AAEtD,4CAAgB"}
|
|
@@ -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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
21
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
22
13
|
};
|
|
@@ -37,8 +28,8 @@ let AirQualityHistoryRepository = exports.AirQualityHistoryRepository = class Ai
|
|
|
37
28
|
super("AirQualityHistoryRepository", AirQualityIndexModel_1.AirQualityIndexModel.tableName, AirQualityIndexModel_1.AirQualityIndexModel.attributeModel, {
|
|
38
29
|
schema: constants_1.PG_SCHEMA,
|
|
39
30
|
});
|
|
40
|
-
this.GetAll = (options) =>
|
|
41
|
-
const result =
|
|
31
|
+
this.GetAll = async (options) => {
|
|
32
|
+
const result = await this.sequelizeModel.findAll({
|
|
42
33
|
attributes: {
|
|
43
34
|
include: ["updated_at"],
|
|
44
35
|
},
|
|
@@ -72,11 +63,11 @@ let AirQualityHistoryRepository = exports.AirQualityHistoryRepository = class Ai
|
|
|
72
63
|
],
|
|
73
64
|
}
|
|
74
65
|
: {},
|
|
75
|
-
limit: ParamHelper_1.ParamHelper.getPaginationLimit(options
|
|
76
|
-
offset: Number.isInteger(options
|
|
66
|
+
limit: ParamHelper_1.ParamHelper.getPaginationLimit(options?.limit),
|
|
67
|
+
offset: Number.isInteger(options?.offset) ? options?.offset : 0,
|
|
77
68
|
});
|
|
78
69
|
return result.map((element) => OutputDtoMapper_1.default.mapToHistoricItem(element));
|
|
79
|
-
}
|
|
70
|
+
};
|
|
80
71
|
this.stationModel = new AirQualityStationsRepository_1.AirQualityStationsRepository();
|
|
81
72
|
this.measurementsModel = new AirQualityMeasurementsRepository_1.AirQualityMeasurementsRepository();
|
|
82
73
|
this.sequelizeModel.hasOne(this.stationModel.sequelizeModel, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirQualityHistoryRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/AirQualityHistoryRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AirQualityHistoryRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/AirQualityHistoryRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kEAA2C;AAC3C,+FAAwE;AACxE,sEAAmE;AAEnE,oFAA4D;AAC5D,iEAAgE;AAEhE,yFAAsF;AACtF,iFAA8E;AAC9E,gGAAwE;AACxE,gFAAwD;AACxD,uDAAoD;AAG7C,IAAM,2BAA2B,yCAAjC,MAAM,2BAA4B,SAAQ,+BAAc;IAI3D;QACI,KAAK,CAAC,6BAA6B,EAAE,2CAAoB,CAAC,SAAS,EAAE,2CAAoB,CAAC,cAAc,EAAE;YACtG,MAAM,EAAE,qBAAS;SACpB,CAAC,CAAC;QAkBA,WAAM,GAAG,KAAK,EAAE,OAAkC,EAAgB,EAAE;YACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB;gBACnE,UAAU,EAAE;oBACR,OAAO,EAAE,CAAC,YAAY,CAAC;iBAC1B;gBACD,OAAO,EAAE;oBACL;wBACI,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc;wBACvC,UAAU,EAAE;4BACR,OAAO,EAAE,CAAC,YAAY,CAAC;yBAC1B;wBACD,EAAE,EAAE,SAAS;wBACb,QAAQ,EAAE,IAAI;wBACd,KAAK,EAAE;4BACH,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;gCAChB,EAAE,WAAW,EAAE,GAAG,EAAE;gCACpB,GAAG,iCAAuB,CAAC,iBAAiB,CAAC,OAAO,CAAC;6BACxD;yBACJ;qBACJ;oBACD;wBACI,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,cAAc;wBAC5C,KAAK,EAAE,mBAAS,CAAC,OAAO,CACpB;8FACsE,CACzE;wBACD,EAAE,EAAE,cAAc;qBACrB;iBACJ;gBACD,KAAK,EAAE,OAAO;oBACV,CAAC,CAAC;wBACI,CAAC,mBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;4BAChB,GAAG,iCAAuB,CAAC,oBAAoB,CAAC,OAAO,CAAC;4BACxD,GAAG,iCAAuB,CAAC,kBAAkB,CAAC,OAAO,CAAC;yBACzD;qBACJ;oBACH,CAAC,CAAC,EAAE;gBACR,KAAK,EAAE,yBAAW,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC;gBACrD,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;aAClE,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,yBAAe,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/E,CAAC,CAAC;QA1DE,IAAI,CAAC,YAAY,GAAG,IAAI,2DAA4B,EAAE,CAAC;QACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,mEAAgC,EAAE,CAAC;QAEhE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE;YACzD,SAAS,EAAE,YAAY;YACvB,UAAU,EAAE,IAAI;YAChB,EAAE,EAAE,SAAS;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE;YAC/D,SAAS,EAAE,YAAY;YACvB,UAAU,EAAE,YAAY;YACxB,EAAE,EAAE,cAAc;SACrB,CAAC,CAAC;IACP,CAAC;IA8CM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAA;sCAxEY,2BAA2B;IADvC,IAAA,qBAAU,GAAE;;GACA,2BAA2B,CAwEvC"}
|
|
@@ -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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
21
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
22
13
|
};
|
|
@@ -36,24 +27,23 @@ let AirQualityIndexesRepository = exports.AirQualityIndexesRepository = class Ai
|
|
|
36
27
|
super("AirQualityIndexesRepository", AirQualityIndexModel_1.AirQualityIndexModel.tableName, AirQualityIndexModel_1.AirQualityIndexModel.attributeModel, {
|
|
37
28
|
schema: constants_1.PG_SCHEMA,
|
|
38
29
|
});
|
|
39
|
-
this.GetAll = (options) =>
|
|
40
|
-
|
|
41
|
-
const result = yield ((_a = this.sequelizeModel.sequelize) === null || _a === void 0 ? void 0 : _a.query((0, RawQueryProvider_1.buildIndexesQuery)(options), {
|
|
30
|
+
this.GetAll = async (options) => {
|
|
31
|
+
const result = await this.sequelizeModel.sequelize?.query((0, RawQueryProvider_1.buildIndexesQuery)(options), {
|
|
42
32
|
type: sequelize_1.QueryTypes.SELECT,
|
|
43
33
|
nest: true,
|
|
44
34
|
raw: true,
|
|
45
35
|
replacements: {
|
|
46
|
-
districts: options
|
|
47
|
-
updatedAt: options
|
|
48
|
-
longitude: options
|
|
49
|
-
latitude: options
|
|
50
|
-
range: options
|
|
51
|
-
limit: ParamHelper_1.ParamHelper.getPaginationLimit(options
|
|
52
|
-
offset: Number.isInteger(options
|
|
36
|
+
districts: options?.districts,
|
|
37
|
+
updatedAt: options?.updatedSince,
|
|
38
|
+
longitude: options?.lng,
|
|
39
|
+
latitude: options?.lat,
|
|
40
|
+
range: options?.range,
|
|
41
|
+
limit: ParamHelper_1.ParamHelper.getPaginationLimit(options?.limit),
|
|
42
|
+
offset: Number.isInteger(options?.offset) ? options?.offset : 0,
|
|
53
43
|
},
|
|
54
|
-
})
|
|
44
|
+
});
|
|
55
45
|
return this.formatResult(result);
|
|
56
|
-
}
|
|
46
|
+
};
|
|
57
47
|
this.GetProperties = () => {
|
|
58
48
|
throw new Error("Method not implemented.");
|
|
59
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirQualityIndexesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/AirQualityIndexesRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AirQualityIndexesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/AirQualityIndexesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iEAA8E;AAC9E,kEAA2C;AAC3C,+FAAwE;AACxE,mHAAuE;AACvE,sEAK2C;AAE3C,mEAAiE;AACjE,iEAAgE;AAChE,gFAAwD;AACxD,uDAAoD;AAG7C,IAAM,2BAA2B,yCAAjC,MAAM,2BAA4B,SAAQ,+BAAc;IAC3D;QACI,KAAK,CAAC,6BAA6B,EAAE,2CAAoB,CAAC,SAAS,EAAE,2CAAoB,CAAC,cAAc,EAAE;YACtG,MAAM,EAAE,qBAAS;SACpB,CAAC,CAAC;QAGA,WAAM,GAAG,KAAK,EAAE,OAAqC,EAAgB,EAAE;YAC1E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,CAAuB,IAAA,oCAAiB,EAAC,OAAO,CAAC,EAAE;gBACxG,IAAI,EAAE,sBAAU,CAAC,MAAM;gBACvB,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,IAAI;gBACT,YAAY,EAAE;oBACV,SAAS,EAAE,OAAO,EAAE,SAAS;oBAC7B,SAAS,EAAE,OAAO,EAAE,YAAY;oBAChC,SAAS,EAAE,OAAO,EAAE,GAAG;oBACvB,QAAQ,EAAE,OAAO,EAAE,GAAG;oBACtB,KAAK,EAAE,OAAO,EAAE,KAAK;oBACrB,KAAK,EAAE,yBAAW,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC;oBACrD,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;iBAClE;aACJ,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC,CAAC;QAMF,kBAAa,GAAG,GAAU,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC,CAAC;QAWK,iBAAY,GAAG,CAAC,MAA+D,EAAE,EAAE;YACtF,IAAI,CAAC,MAAM,EAAE;gBACT,OAAO,IAAA,8CAA6B,EAAC,EAAE,CAAC,CAAC;aAC5C;YAED,MAAM,YAAY,GAAuC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAY,EAAE,EAAE,CACjF,yBAAe,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAC5C,CAAC;YACF,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAsB,CAAC;YAC7F,OAAO,IAAA,8CAA6B,EAAC,aAAa,CAAC,CAAC;QACxD,CAAC,CAAC;IAhDF,CAAC;IAqBD,MAAM;QACF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAMD,yBAAyB;IACzB,iBAAiB,CAAC,KAAa;QAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,0BAA0B,CAAC,IAAY;QACnC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IAChC,CAAC;CAaJ,CAAA;sCAtDY,2BAA2B;IADvC,IAAA,qBAAU,GAAE;;GACA,2BAA2B,CAsDvC"}
|
|
@@ -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.AirQualityStationsRepository = void 0;
|
|
22
13
|
const constants_1 = require("../../schema-definitions/constants");
|
|
@@ -28,9 +19,9 @@ let AirQualityStationsRepository = exports.AirQualityStationsRepository = class
|
|
|
28
19
|
super("AirQualityStationsRepository", AirQualityStationModel_1.AirQualityStationModel.tableName, AirQualityStationModel_1.AirQualityStationModel.attributeModel, {
|
|
29
20
|
schema: constants_1.PG_SCHEMA,
|
|
30
21
|
});
|
|
31
|
-
this.GetAll = () =>
|
|
22
|
+
this.GetAll = async () => {
|
|
32
23
|
throw new Error("Method not implemented.");
|
|
33
|
-
}
|
|
24
|
+
};
|
|
34
25
|
}
|
|
35
26
|
GetOne() {
|
|
36
27
|
throw new Error("Method not implemented.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirQualityStationsRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/AirQualityStationsRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AirQualityStationsRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/AirQualityStationsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kEAA2C;AAC3C,mGAA4E;AAC5E,sEAAmE;AACnE,iEAAgE;AAGzD,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+BAAc;IAC5D;QACI,KAAK,CAAC,8BAA8B,EAAE,+CAAsB,CAAC,SAAS,EAAE,+CAAsB,CAAC,cAAc,EAAE;YAC3G,MAAM,EAAE,qBAAS;SACpB,CAAC,CAAC;QAGP,WAAM,GAAG,KAAK,IAAoB,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC,CAAC;IAJF,CAAC;IAMD,MAAM;QACF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAA;uCAdY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;;GACA,4BAA4B,CAcxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HistoryRepositoryHelper.js","sourceRoot":"","sources":["../../../../src/output-gateway/repositories/helpers/HistoryRepositoryHelper.ts"],"names":[],"mappings":";;;;;AAAA,8HAAmF;AACnF,mEAAuE;AAEvE,MAAqB,uBAAuB;IACjC,MAAM,CAAC,oBAAoB,CAAC,OAAiC;QAChE,OAAO,OAAO,CAAC,IAAI;YACf,CAAC,CAAC;gBACI;oBACI,aAAa,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;iBAC5C;aACJ;YACH,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,OAAiC;QAC9D,OAAO,OAAO,CAAC,EAAE;YACb,CAAC,CAAC;gBACI;oBACI,WAAW,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE;iBACvC;aACJ;YACH,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,OAA6C;QACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"HistoryRepositoryHelper.js","sourceRoot":"","sources":["../../../../src/output-gateway/repositories/helpers/HistoryRepositoryHelper.ts"],"names":[],"mappings":";;;;;AAAA,8HAAmF;AACnF,mEAAuE;AAEvE,MAAqB,uBAAuB;IACjC,MAAM,CAAC,oBAAoB,CAAC,OAAiC;QAChE,OAAO,OAAO,CAAC,IAAI;YACf,CAAC,CAAC;gBACI;oBACI,aAAa,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;iBAC5C;aACJ;YACH,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,OAAiC;QAC9D,OAAO,OAAO,CAAC,EAAE;YACb,CAAC,CAAC;gBACI;oBACI,WAAW,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE;iBACvC;aACJ;YACH,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,OAA6C;QACzE,OAAO,OAAO,EAAE,QAAQ;YACpB,CAAC,CAAC;gBACI;oBACI,iBAAiB,EAAE,OAAO,CAAC,QAAQ;iBACtC;aACJ;YACH,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;CACJ;AA9BD,0CA8BC"}
|
|
@@ -68,19 +68,19 @@ const footerLimit = ` limit :limit`;
|
|
|
68
68
|
const footerOffset = ` offset :offset`;
|
|
69
69
|
const buildIndexesQuery = (options) => {
|
|
70
70
|
let preparedQuery = allIndexes;
|
|
71
|
-
preparedQuery = allIndexes.replace("|additionalColumns|",
|
|
71
|
+
preparedQuery = allIndexes.replace("|additionalColumns|", options?.lng && options?.lat ? distanceColumn : "");
|
|
72
72
|
let whereConditions = [];
|
|
73
|
-
if (options
|
|
73
|
+
if (options?.updatedSince)
|
|
74
74
|
whereConditions.push(whereUpdateAt);
|
|
75
|
-
if (
|
|
75
|
+
if (options?.lng && options.lat && options.range)
|
|
76
76
|
whereConditions.push(whereInRange);
|
|
77
|
-
if (options
|
|
77
|
+
if (options?.districts)
|
|
78
78
|
whereConditions.push(whereDistrict);
|
|
79
79
|
preparedQuery = preparedQuery
|
|
80
80
|
.concat(...(whereConditions.length > 0 ? [" where ", whereConditions.join(" and ")] : ""))
|
|
81
|
-
.concat(Number.isFinite(options
|
|
82
|
-
.concat(Number.isInteger(options
|
|
83
|
-
.concat(Number.isInteger(options
|
|
81
|
+
.concat(Number.isFinite(options?.lng) && Number.isFinite(options?.lat) ? orderBy : "")
|
|
82
|
+
.concat(Number.isInteger(options?.limit) ? footerLimit : "")
|
|
83
|
+
.concat(Number.isInteger(options?.offset) ? footerOffset : "");
|
|
84
84
|
return preparedQuery;
|
|
85
85
|
};
|
|
86
86
|
exports.buildIndexesQuery = buildIndexesQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RawQueryProvider.js","sourceRoot":"","sources":["../../../../src/output-gateway/repositories/helpers/RawQueryProvider.ts"],"names":[],"mappings":";;;AACA,qEAA2C;AAE3C,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;eA2BJ,qBAAS;;;;;;;;;;;;;GAarB,qBAAS;;kCAEsB,qBAAS;;aAE9B,qBAAS;;aAET,qBAAS;;;uDAGiC,CAAC;AAExD,MAAM,aAAa,GAAG,sCAAsC,CAAC;AAC7D,MAAM,YAAY,GAAG;;;;GAIlB,CAAC;AACJ,MAAM,aAAa,GAAG,uCAAuC,CAAC;AAC9D,MAAM,cAAc,GAAG;;;wBAGC,CAAC;AACzB,MAAM,OAAO,GAAG,+BAA+B,CAAC;AAChD,MAAM,WAAW,GAAG,eAAe,CAAC;AACpC,MAAM,YAAY,GAAG,iBAAiB,CAAC;AAEhC,MAAM,iBAAiB,GAAG,CAAC,OAAgD,EAAU,EAAE;IAC1F,IAAI,aAAa,GAAG,UAAU,CAAC;IAC/B,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"RawQueryProvider.js","sourceRoot":"","sources":["../../../../src/output-gateway/repositories/helpers/RawQueryProvider.ts"],"names":[],"mappings":";;;AACA,qEAA2C;AAE3C,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;eA2BJ,qBAAS;;;;;;;;;;;;;GAarB,qBAAS;;kCAEsB,qBAAS;;aAE9B,qBAAS;;aAET,qBAAS;;;uDAGiC,CAAC;AAExD,MAAM,aAAa,GAAG,sCAAsC,CAAC;AAC7D,MAAM,YAAY,GAAG;;;;GAIlB,CAAC;AACJ,MAAM,aAAa,GAAG,uCAAuC,CAAC;AAC9D,MAAM,cAAc,GAAG;;;wBAGC,CAAC;AACzB,MAAM,OAAO,GAAG,+BAA+B,CAAC;AAChD,MAAM,WAAW,GAAG,eAAe,CAAC;AACpC,MAAM,YAAY,GAAG,iBAAiB,CAAC;AAEhC,MAAM,iBAAiB,GAAG,CAAC,OAAgD,EAAU,EAAE;IAC1F,IAAI,aAAa,GAAG,UAAU,CAAC;IAC/B,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,EAAE,GAAG,IAAI,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE9G,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,IAAI,OAAO,EAAE,YAAY;QAAE,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/D,IAAI,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,KAAK;QAAE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACrF,IAAI,OAAO,EAAE,SAAS;QAAE,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE5D,aAAa,GAAG,aAAa;SACxB,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACzF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;SACrF,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3D,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEnE,OAAO,aAAa,CAAC;AACzB,CAAC,CAAC;AAhBW,QAAA,iBAAiB,qBAgB5B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/air-quality-stations",
|
|
3
|
-
"version": "1.3.4-dev.
|
|
3
|
+
"version": "1.3.4-dev.2085892530",
|
|
4
4
|
"description": "Golemio Air Quality Stations Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@commitlint/config-conventional": "^11.0.0",
|
|
37
37
|
"@golemio/city-districts": "1.3.3",
|
|
38
38
|
"@golemio/cli": "1.7.3",
|
|
39
|
-
"@golemio/core": "1.
|
|
39
|
+
"@golemio/core": "1.22.2-dev.2083548346",
|
|
40
40
|
"@golemio/db-common": "1.1.4",
|
|
41
41
|
"@golemio/eslint-config": "1.1.2",
|
|
42
42
|
"@types/chai": "4.2.3",
|