@golemio/microclimate 1.1.3-dev.793877555 → 1.1.3-dev.797529028
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/migrations/postgresql/sqls/20230215185618-og-api-up.sql +17 -12
- package/dist/integration-engine/schema/RefreshMeasurementsByIdTaskSchema.js.map +1 -1
- package/dist/output-gateway/repositories/SensorMeasurementsViewRepository.js +4 -0
- package/dist/output-gateway/repositories/SensorMeasurementsViewRepository.js.map +1 -1
- package/dist/schema-definitions/SensorMeasurementsView.d.ts +2 -1
- package/dist/schema-definitions/SensorMeasurementsView.js.map +1 -1
- package/dist/schema-definitions/datasources/MeasurementsJsonSchema.d.ts +0 -3
- package/dist/schema-definitions/datasources/MeasurementsJsonSchema.js.map +1 -1
- package/dist/schema-definitions/models/SensorMeasurementsViewModel.d.ts +1 -0
- package/dist/schema-definitions/models/SensorMeasurementsViewModel.js +1 -0
- package/dist/schema-definitions/models/SensorMeasurementsViewModel.js.map +1 -1
- package/docs/openapi.yaml +1 -1
- package/package.json +1 -1
|
@@ -150,18 +150,23 @@ measurements AS (
|
|
|
150
150
|
WHERE value IS NOT NULL
|
|
151
151
|
)
|
|
152
152
|
SELECT
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
153
|
+
q.*,
|
|
154
|
+
row_number() OVER (PARTITION BY point_id, measure ORDER BY point_id ASC, measure ASC, measured_at DESC) rn
|
|
155
|
+
FROM (
|
|
156
|
+
SELECT
|
|
157
|
+
measurements.sensor_id,
|
|
158
|
+
measurements.measured_at,
|
|
159
|
+
points_heights.point_id,
|
|
160
|
+
points_heights.location_id,
|
|
161
|
+
CONCAT(measurements.measure, points_heights.height_cm) AS measure,
|
|
162
|
+
measurements.value,
|
|
163
|
+
points_heights.unit
|
|
164
|
+
FROM measurements
|
|
165
|
+
JOIN points_heights
|
|
166
|
+
ON points_heights.sensor_id = measurements.sensor_id
|
|
167
|
+
AND points_heights.measure = measurements.measure
|
|
168
|
+
) as q
|
|
169
|
+
ORDER BY point_id ASC, measure ASC, measured_at DESC;
|
|
165
170
|
|
|
166
171
|
CREATE INDEX measured_at_idx ON measurements (measured_at DESC);
|
|
167
172
|
CREATE INDEX sensor_id_idx ON measurements (sensor_id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshMeasurementsByIdTaskSchema.js","sourceRoot":"","sources":["../../../src/integration-engine/schema/RefreshMeasurementsByIdTaskSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"RefreshMeasurementsByIdTaskSchema.js","sourceRoot":"","sources":["../../../src/integration-engine/schema/RefreshMeasurementsByIdTaskSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAA6E;AAC7E,wEAA4E;AAE5E,MAAa,iCAAiC;CAW7C;AATG;IADC,IAAA,0BAAQ,GAAE;;qEACS;AAGpB;IADC,IAAA,wBAAM,EAAC,wBAAS,CAAC;;oEACI;AAL1B,8EAWC"}
|
|
@@ -28,9 +28,13 @@ class SensorMeasurementsViewRepository extends output_gateway_1.SequelizeModel {
|
|
|
28
28
|
...(options.measure ? [{ measure: { [sequelize_1.Op.eq]: options.measure } }] : []),
|
|
29
29
|
...(options.from ? [{ measured_at: { [sequelize_1.Op.gte]: options.from } }] : []),
|
|
30
30
|
...(options.to ? [{ measured_at: { [sequelize_1.Op.lte]: options.to } }] : []),
|
|
31
|
+
...(!options.from && !options.to ? [{ rn: { [sequelize_1.Op.eq]: 1 } }] : []),
|
|
31
32
|
],
|
|
32
33
|
};
|
|
33
34
|
return this.sequelizeModel.findAll({
|
|
35
|
+
attributes: {
|
|
36
|
+
exclude: ["sensor_id", "rn"],
|
|
37
|
+
},
|
|
34
38
|
where: whereAttributes,
|
|
35
39
|
limit: options.limit,
|
|
36
40
|
offset: (_a = options.offset) !== null && _a !== void 0 ? _a : 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SensorMeasurementsViewRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/SensorMeasurementsViewRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAAmE;AACnE,mDAAoC;AACpC,6GAAsF;AAEtF,mEAAuE;AAEvE,MAAa,gCAAiC,SAAQ,+BAAc;IAChE;QACI,KAAK,CACD,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,EACpD,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,WAAW,EAC3D,yDAA2B,CAAC,cAAc,EAC1C;YACI,MAAM,EAAE,mBAAY,CAAC,QAAQ;SAChC,CACJ,CAAC;QAIC,uBAAkB,GAAG,CACxB,UAQI,EAAE,EAC4B,EAAE;;YACpC,MAAM,eAAe,GAAiB;gBAClC,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE;oBACN,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjF,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACtE,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"SensorMeasurementsViewRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/repositories/SensorMeasurementsViewRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sEAAmE;AACnE,mDAAoC;AACpC,6GAAsF;AAEtF,mEAAuE;AAEvE,MAAa,gCAAiC,SAAQ,+BAAc;IAChE;QACI,KAAK,CACD,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,EACpD,mBAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC,WAAW,EAC3D,yDAA2B,CAAC,cAAc,EAC1C;YACI,MAAM,EAAE,mBAAY,CAAC,QAAQ;SAChC,CACJ,CAAC;QAIC,uBAAkB,GAAG,CACxB,UAQI,EAAE,EAC4B,EAAE;;YACpC,MAAM,eAAe,GAAiB;gBAClC,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE;oBACN,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjF,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACtE,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBACpE;aACJ,CAAC;YACF,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC/B,UAAU,EAAE;oBACR,OAAO,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC;iBAC/B;gBACD,KAAK,EAAE,eAAe;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,CAAC;aAC9B,CAAC,CAAC;QACP,CAAC,CAAA,CAAC;QAhCE,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAiCD,MAAM;QACF,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM;QACF,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ;AAnDD,4EAmDC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
export interface ISensorMeasurementsView {
|
|
2
|
-
sensor_id
|
|
2
|
+
sensor_id?: string;
|
|
3
3
|
measured_at: Date | string;
|
|
4
4
|
point_id: number;
|
|
5
5
|
location_id: number;
|
|
6
6
|
measure: string;
|
|
7
7
|
value: number;
|
|
8
8
|
unit: string;
|
|
9
|
+
rn?: number;
|
|
9
10
|
}
|
|
10
11
|
export declare const sensorMeasurementsView: {
|
|
11
12
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SensorMeasurementsView.js","sourceRoot":"","sources":["../../src/schema-definitions/SensorMeasurementsView.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"SensorMeasurementsView.js","sourceRoot":"","sources":["../../src/schema-definitions/SensorMeasurementsView.ts"],"names":[],"mappings":";;;AAWa,QAAA,sBAAsB,GAAG;IAClC,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE,uBAAuB;CACvC,CAAC"}
|
|
@@ -20,9 +20,6 @@ export interface IMeasurementInput {
|
|
|
20
20
|
temp1?: number;
|
|
21
21
|
};
|
|
22
22
|
}
|
|
23
|
-
export interface IMeasurementForTransformation extends IMeasurementInput {
|
|
24
|
-
sensor_id: string;
|
|
25
|
-
}
|
|
26
23
|
export declare const measurementsDatasource: {
|
|
27
24
|
name: string;
|
|
28
25
|
jsonSchema: JSONSchemaType<IMeasurementInput[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsJsonSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/MeasurementsJsonSchema.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"MeasurementsJsonSchema.js","sourceRoot":"","sources":["../../../src/schema-definitions/datasources/MeasurementsJsonSchema.ts"],"names":[],"mappings":";;;AAwBA,MAAM,sBAAsB,GAAwC;IAChE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE;YACxF,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,IAAI,EAAE;gBACF,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC5C,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC3C,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC5C,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC3C,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC7C,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC9C,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC9C,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACvC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC9C,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC9C,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC5C,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC5C;aACJ;SACJ;QACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC;KACrC;IACD,oBAAoB,EAAE,KAAK;CAC9B,CAAC;AAEW,QAAA,sBAAsB,GAAsE;IACrG,IAAI,EAAE,wBAAwB;IAC9B,UAAU,EAAE,sBAAsB;CACrC,CAAC"}
|
|
@@ -13,5 +13,6 @@ SensorMeasurementsViewModel.attributeModel = {
|
|
|
13
13
|
measure: { type: sequelize_1.DataTypes.TEXT },
|
|
14
14
|
value: { type: sequelize_1.DataTypes.DOUBLE },
|
|
15
15
|
unit: { type: sequelize_1.DataTypes.TEXT },
|
|
16
|
+
rn: { type: sequelize_1.DataTypes.INTEGER },
|
|
16
17
|
};
|
|
17
18
|
//# sourceMappingURL=SensorMeasurementsViewModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SensorMeasurementsViewModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/SensorMeasurementsViewModel.ts"],"names":[],"mappings":";;;AAAA,mEAAwF;
|
|
1
|
+
{"version":3,"file":"SensorMeasurementsViewModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/SensorMeasurementsViewModel.ts"],"names":[],"mappings":";;;AAAA,mEAAwF;AAGxF,MAAa,2BAA4B,SAAQ,iBAA8B;;AAA/E,kEAoBC;AAViB,0CAAc,GAA0E;IAClG,SAAS,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;IACzC,WAAW,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE;IACrC,QAAQ,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE;IACrC,WAAW,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE;IACxC,OAAO,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE;IACjC,KAAK,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,MAAM,EAAE;IACjC,IAAI,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE;IAC9B,EAAE,EAAE,EAAE,IAAI,EAAE,qBAAS,CAAC,OAAO,EAAE;CAClC,CAAC"}
|
package/docs/openapi.yaml
CHANGED