@golemio/microclimate 1.0.3 → 1.0.4-dev.735991902

package/README.md

@@ -44,3 +44,30 @@ yarn add --exact @golemio/microclimate@dev
 <!-- ## Description -->
 
 <!-- Insert module-specific info here -->
+
+## Processing of historical data
+
+To trigger the measurement data processing of a specific sensor for a specific period, use the queue in RabbitMQ `...microclimate.refreshMeasurementsById` according to the template:
+
+```
+{
+    "sensorAddr": "323434316F317A18",
+    "dateRange": "currentYear"
+}
+```
+
+Where:
+
+`sensorAddr` - Represents the transmitter's unique identifier. (Table `sensor_devices`, variable `address`)
+
+`dateRange` - Time period: "today", "yesterday", "currentWeek", "previousWeek", "currentMonth", "previousMonth", "currentYear", "previousYear"
+
+If an error is made in the RabbitMQ msg, the program will not crash, but will continue to work. It will also log an error of the type:
+
+```
+    error: {
+        message:
+            "[Queue ....microclimate.refreshMeasurementsById] Message validation failed: [dateRange must be one of the following values: today, yesterday, currentWeek, previousWeek, currentMonth, previousMonth, currentYear, previousYear]",
+        class_name: "MessageDataValidator",
+    }
+```

package/dist/integration-engine/datasources/MeasurementsDataSourceFactory.js

@@ -7,7 +7,7 @@ const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator
 const _sch_1 = require("../../schema-definitions");
 class MeasurementsDataSourceFactory {
     static getDataSource(params) {
-        const { sensorAddr,
+        const { sensorAddr, dateRange,
         // For future FROM-TO implementation:
         // dateFrom,
         // dateTo
@@ -15,7 +15,7 @@ class MeasurementsDataSourceFactory {
         return new datasources_1.DataSource(_sch_1.Microclimate.datasources.measurementsDatasource.name, new datasources_1.HTTPProtocolStrategy({
             headers: { Authorization: "Bearer " + config_1.config.datasources.MicroclimateAgdataCityApikey },
             method: "GET",
-            url: `${config_1.config.datasources.MicroclimateAgdataCity}?sensorAddr=${sensorAddr}&dateRange=today`,
+            url: `${config_1.config.datasources.MicroclimateAgdataCity}?sensorAddr=${sensorAddr}&dateRange=${dateRange}`,
         }), new datasources_1.JSONDataTypeStrategy({ resultsPath: "data" }), new golemio_validator_1.JSONSchemaValidator(_sch_1.Microclimate.datasources.measurementsDatasource.name + "Validator", _sch_1.Microclimate.datasources.measurementsDatasource.jsonSchema, true));
     }
 }

package/dist/integration-engine/datasources/MeasurementsDataSourceFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasurementsDataSourceFactory.js","sourceRoot":"","sources":["../../../src/integration-engine/datasources/MeasurementsDataSourceFactory.ts"],"names":[],"mappings":";;;AAAA,mFAA2H;AAC3H,yEAAsE;AACtE,mFAAkF;AAClF,mDAAoC;AAGpC,MAAa,6BAA6B;IAC/B,MAAM,CAAC,aAAa,CAAC,MAAoC;QAC5D,MAAM,EACF,UAAU;QAEV,qCAAqC;QACrC,YAAY;QACZ,SAAS;UACZ,GAAG,MAAM,CAAC;QACX,OAAO,IAAI,wBAAU,CACjB,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,EACpD,IAAI,kCAAoB,CAAC;YACrB,OAAO,EAAE,EAAE,aAAa,EAAE,SAAS,GAAG,eAAM,CAAC,WAAW,CAAC,4BAA4B,EAAE;YACvF,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,GAAG,eAAM,CAAC,WAAW,CAAC,sBAAsB,eAAe,UAAU,kBAAkB;SAC/F,CAAC,EACF,IAAI,kCAAoB,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EACjD,IAAI,uCAAmB,CACnB,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,GAAG,WAAW,EAClE,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,UAAU,EAC1D,IAAI,CACP,CACJ,CAAC;IACN,CAAC;CACJ;AAxBD,sEAwBC"}
+{"version":3,"file":"MeasurementsDataSourceFactory.js","sourceRoot":"","sources":["../../../src/integration-engine/datasources/MeasurementsDataSourceFactory.ts"],"names":[],"mappings":";;;AAAA,mFAA2H;AAC3H,yEAAsE;AACtE,mFAAkF;AAClF,mDAAoC;AAGpC,MAAa,6BAA6B;IAC/B,MAAM,CAAC,aAAa,CAAC,MAAoC;QAC5D,MAAM,EACF,UAAU,EACV,SAAS;QACT,qCAAqC;QACrC,YAAY;QACZ,SAAS;UACZ,GAAG,MAAM,CAAC;QACX,OAAO,IAAI,wBAAU,CACjB,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,EACpD,IAAI,kCAAoB,CAAC;YACrB,OAAO,EAAE,EAAE,aAAa,EAAE,SAAS,GAAG,eAAM,CAAC,WAAW,CAAC,4BAA4B,EAAE;YACvF,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,GAAG,eAAM,CAAC,WAAW,CAAC,sBAAsB,eAAe,UAAU,cAAc,SAAS,EAAE;SACtG,CAAC,EACF,IAAI,kCAAoB,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EACjD,IAAI,uCAAmB,CACnB,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,GAAG,WAAW,EAClE,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,UAAU,EAC1D,IAAI,CACP,CACJ,CAAC;IACN,CAAC;CACJ;AAxBD,sEAwBC"}

package/dist/integration-engine/schema/RefreshMeasurementsByIdTaskSchema.d.ts

@@ -1,4 +1,5 @@
-import { IRefreshMeasurementsByIdTask } from "../../schema-definitions/Measurements";
+import { DateRange, IRefreshMeasurementsByIdTask } from "../../schema-definitions/Measurements";
 export declare class RefreshMeasurementsByIdTaskSchema implements IRefreshMeasurementsByIdTask {
     sensorAddr: string;
+    dateRange: DateRange;
 }

package/dist/integration-engine/schema/RefreshMeasurementsByIdTaskSchema.js

@@ -11,11 +11,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshMeasurementsByIdTaskSchema = void 0;
 const class_validator_1 = require("@golemio/core/dist/shared/class-validator");
+const Measurements_1 = require("../../schema-definitions/Measurements");
 class RefreshMeasurementsByIdTaskSchema {
 }
 __decorate([
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], RefreshMeasurementsByIdTaskSchema.prototype, "sensorAddr", void 0);
+__decorate([
+    (0, class_validator_1.IsEnum)(Measurements_1.DateRange),
+    __metadata("design:type", String)
+], RefreshMeasurementsByIdTaskSchema.prototype, "dateRange", void 0);
 exports.RefreshMeasurementsByIdTaskSchema = RefreshMeasurementsByIdTaskSchema;
 //# sourceMappingURL=RefreshMeasurementsByIdTaskSchema.js.map

package/dist/integration-engine/schema/RefreshMeasurementsByIdTaskSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"RefreshMeasurementsByIdTaskSchema.js","sourceRoot":"","sources":["../../../src/integration-engine/schema/RefreshMeasurementsByIdTaskSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAAgF;AAGhF,MAAa,iCAAiC;CAS7C;AAPG;IADC,IAAA,0BAAQ,GAAE;;qEACS;AAFxB,8EASC"}
+{"version":3,"file":"RefreshMeasurementsByIdTaskSchema.js","sourceRoot":"","sources":["../../../src/integration-engine/schema/RefreshMeasurementsByIdTaskSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAAwF;AACxF,wEAA4E;AAE5E,MAAa,iCAAiC;CAW7C;AATG;IADC,IAAA,0BAAQ,GAAE;;qEACS;AAGpB;IADC,IAAA,wBAAM,EAAC,wBAAS,CAAC;;oEACI;AAL1B,8EAWC"}

package/dist/integration-engine/workers/tasks/RefreshMeasurementsTask.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshMeasurementsTask = void 0;
 const integration_engine_1 = require("@golemio/core/dist/integration-engine");
 const repositories_1 = require("../../repositories");
+const Measurements_1 = require("../../../schema-definitions/Measurements");
 class RefreshMeasurementsTask extends integration_engine_1.AbstractEmptyTask {
     constructor(queuePrefix) {
         super(queuePrefix);
@@ -28,6 +29,7 @@ class RefreshMeasurementsTask extends integration_engine_1.AbstractEmptyTask {
             const promises = sensorDevicesFromDB.map((sensorIdObject) => {
                 const msg = {
                     sensorAddr: sensorIdObject.sensor_id,
+                    dateRange: Measurements_1.DateRange.TODAY,
                 };
                 return integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshMeasurementsById", msg);
             });

package/dist/integration-engine/workers/tasks/RefreshMeasurementsTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"RefreshMeasurementsTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshMeasurementsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAAwF;AACxF,qDAA2D;AAO3D,MAAa,uBAAwB,SAAQ,sCAAiB;IAM1D,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QANP,cAAS,GAAG,qBAAqB,CAAC;QAClC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW;QAMvD,IAAI,CAAC,UAAU,GAAG,IAAI,sCAAuB,EAAE,CAAC;IACpD,CAAC;IAEe,OAAO;;YACnB,MAAM,mBAAmB,GAAsB,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACtE,UAAU,EAAE,CAAC,WAAW,CAAC;gBACzB,GAAG,EAAE,IAAI;aACZ,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;gBACxD,MAAM,GAAG,GAAiC;oBACtC,UAAU,EAAE,cAAc,CAAC,SAAS;iBACvC,CAAC;gBAEF,OAAO,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE,GAAG,CAAC,CAAC;YAChG,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;KAAA;CACJ;AA1BD,0DA0BC"}
+{"version":3,"file":"RefreshMeasurementsTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/RefreshMeasurementsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAAwF;AACxF,qDAA2D;AAC3D,2EAA4E;AAM5E,MAAa,uBAAwB,SAAQ,sCAAiB;IAM1D,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QANP,cAAS,GAAG,qBAAqB,CAAC;QAClC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW;QAMvD,IAAI,CAAC,UAAU,GAAG,IAAI,sCAAuB,EAAE,CAAC;IACpD,CAAC;IAEe,OAAO;;YACnB,MAAM,mBAAmB,GAAsB,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACtE,UAAU,EAAE,CAAC,WAAW,CAAC;gBACzB,GAAG,EAAE,IAAI;aACZ,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;gBACxD,MAAM,GAAG,GAAiC;oBACtC,UAAU,EAAE,cAAc,CAAC,SAAS;oBACpC,SAAS,EAAE,wBAAS,CAAC,KAAK;iBAC7B,CAAC;gBAEF,OAAO,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,EAAE,GAAG,CAAC,CAAC;YAChG,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;KAAA;CACJ;AA3BD,0DA2BC"}

package/dist/schema-definitions/Measurements.d.ts

@@ -15,8 +15,19 @@ export interface IMeasurements {
     water_pot?: number;
     soil_temp?: number;
 }
+export declare enum DateRange {
+    TODAY = "today",
+    YESTERDAY = "yesterday",
+    CURRENTWEEK = "currentWeek",
+    PREVIOUSWEEK = "previousWeek",
+    CURRENTMONTH = "currentMonth",
+    PREVIOUSMONTH = "previousMonth",
+    CURRENTYEAR = "currentYear",
+    PREVIOUSYEAR = "previousYear"
+}
 export interface IRefreshMeasurementsByIdTask {
     sensorAddr: string;
+    dateRange: DateRange;
 }
 export declare const measurements: {
     name: string;

package/dist/schema-definitions/Measurements.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.measurements = void 0;
+exports.measurements = exports.DateRange = void 0;
+var DateRange;
+(function (DateRange) {
+    DateRange["TODAY"] = "today";
+    DateRange["YESTERDAY"] = "yesterday";
+    DateRange["CURRENTWEEK"] = "currentWeek";
+    DateRange["PREVIOUSWEEK"] = "previousWeek";
+    DateRange["CURRENTMONTH"] = "currentMonth";
+    DateRange["PREVIOUSMONTH"] = "previousMonth";
+    DateRange["CURRENTYEAR"] = "currentYear";
+    DateRange["PREVIOUSYEAR"] = "previousYear";
+})(DateRange = exports.DateRange || (exports.DateRange = {}));
 exports.measurements = {
     name: "Measurements",
     pgTableName: "measurements",

package/dist/schema-definitions/Measurements.js.map

@@ -1 +1 @@
-{"version":3,"file":"Measurements.js","sourceRoot":"","sources":["../../src/schema-definitions/Measurements.ts"],"names":[],"mappings":";;;AA0Ba,QAAA,YAAY,GAAG;IACxB,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,cAAc;CAC9B,CAAC"}
+{"version":3,"file":"Measurements.js","sourceRoot":"","sources":["../../src/schema-definitions/Measurements.ts"],"names":[],"mappings":";;;AAiBA,IAAY,SASX;AATD,WAAY,SAAS;IACjB,4BAAe,CAAA;IACf,oCAAuB,CAAA;IACvB,wCAA2B,CAAA;IAC3B,0CAA6B,CAAA;IAC7B,0CAA6B,CAAA;IAC7B,4CAA+B,CAAA;IAC/B,wCAA2B,CAAA;IAC3B,0CAA6B,CAAA;AACjC,CAAC,EATW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QASpB;AAWY,QAAA,YAAY,GAAG;IACxB,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,cAAc;CAC9B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/microclimate",
-    "version": "1.0.3",
+    "version": "1.0.4-dev.735991902",
     "description": "Golemio Microclimate Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",