@golemio/energetics 1.1.0 → 1.1.1-dev.749143389

package/README.md

@@ -35,10 +35,10 @@ The APIs may be unstable. Therefore, we recommend to install this module as an e
 
 ```bash
 # Latest version
-yarn add --exact @golemio/energetics@latest
+npm install --save-exact @golemio/energetics@latest
 
 # Development version
-yarn add --exact @golemio/energetics@dev
+npm install --save-exact @golemio/energetics@dev
 ```
 
 <!-- ## Description -->

package/db/migrations/postgresql/20230116095151-correct_v_energetis_upadate.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+  * We receive the dbmigrate dependency from dbmigrate initially.
+  * This enables us to not have to rely on NODE_PATH.
+  */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20230116095151-correct_v_energetis_upadate-up.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20230116095151-correct_v_energetis_upadate-down.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  "version": 1
+};

package/db/migrations/postgresql/sqls/20230116095151-correct_v_energetis_upadate-down.sql

@@ -0,0 +1,27 @@
+DROP VIEW v_consumption_energy_last_update;
+
+CREATE OR REPLACE VIEW v_consumption_energy_last_update
+AS WITH last_update AS (
+         SELECT b.building_name,
+            c.addr,
+            max(c.time_utc) AS last_update
+           FROM energetics.consumption_energy_consumption c
+             JOIN energetics.consumption_energy_devices d ON c.addr::text = d.addr::text
+             JOIN energetics.consumption_energy_buildings b ON d.building_id = b.id
+          GROUP BY b.building_name, c.addr
+        ), last_not_zero AS (
+         SELECT consumption_energy_consumption.addr,
+            max(consumption_energy_consumption.time_utc) AS last_not_zero_value
+           FROM energetics.consumption_energy_consumption
+          WHERE consumption_energy_consumption.value > 0::numeric
+          GROUP BY consumption_energy_consumption.addr
+        )
+ SELECT lu.building_name,
+    lu.last_update,
+    lu.addr,
+        CASE
+            WHEN lnz.last_not_zero_value = lu.last_update THEN NULL::timestamp without time zone
+            ELSE lnz.last_not_zero_value
+        END AS zero_values_after
+   FROM last_update lu
+     LEFT JOIN last_not_zero lnz ON lu.addr::text = lnz.addr::text;

package/db/migrations/postgresql/sqls/20230116095151-correct_v_energetis_upadate-up.sql

@@ -0,0 +1,28 @@
+DROP VIEW v_consumption_energy_last_update;
+
+CREATE OR REPLACE VIEW v_consumption_energy_last_update
+AS WITH last_update AS (
+         SELECT b.building_name,
+           replace(c.addr, concat('/', c.var), '') as addr,
+            max(c.time_utc) AS last_update
+           FROM energetics.consumption_energy_consumption c
+             JOIN energetics.consumption_energy_devices d ON replace(c.addr, concat('/', c.var), '') = d.addr::text
+             JOIN energetics.consumption_energy_buildings b ON d.building_id = b.id
+          GROUP BY b.building_name, replace(c.addr, concat('/', c.var), '')
+        ), last_not_zero AS (
+         SELECT replace(addr, concat('/', var), '') as addr,
+            max(time_utc) AS last_not_zero_value
+           FROM consumption_energy_consumption
+          WHERE value > 0::numeric
+          GROUP BY replace(addr, concat('/', var), '')
+        )
+ SELECT lu.building_name,
+    lu.last_update,
+    lu.addr,
+        CASE
+            WHEN lnz.last_not_zero_value = lu.last_update THEN NULL::timestamp without time zone
+            ELSE lnz.last_not_zero_value
+        END AS zero_values_after
+   FROM last_update lu
+     LEFT JOIN last_not_zero lnz ON lu.addr::text = lnz.addr::text
+    

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "@golemio/energetics",
-    "version": "1.1.0",
+    "version": "1.1.1-dev.749143389",
     "description": "Golemio Energetics Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
         "build": "rimraf ./dist && ttsc -p ./tsconfig.build.json",
-        "build-minimal": "run-s 'build --sourceMap false --declaration false'",
-        "build-watch": "run-s 'build --watch --preserveWatchOutput'",
+        "build-minimal": "run-s 'build -- --sourceMap false --declaration false'",
+        "build-watch": "run-s 'build -- --watch --preserveWatchOutput'",
         "test": "cross-env NODE_ENV=test TS_NODE_COMPILER='ttypescript' mocha --exit --check-leaks --timeout 120000 -r ts-node/register --file 'test/setup.ts' 'test/**/*.test.ts'",
-        "test-debug": "run-s 'test --inspect-brk=9230'",
-        "code-coverage": "nyc run-s 'test -r source-map-support/register'",
+        "test-debug": "run-s 'test -- --inspect-brk=9230'",
+        "code-coverage": "nyc run-s 'test -- -r source-map-support/register'",
         "generate-docs": "typedoc --out docs/typedoc src",
         "lint": "eslint \"{src,test}/**/*.ts\""
     },
@@ -23,6 +23,11 @@
         "type": "git",
         "url": "https://gitlab.com/operator-ict/golemio/code/modules/energetics"
     },
+    "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=8.0.0",
+        "yarn": "Use npm!"
+    },
     "devDependencies": {
         "@commitlint/cli": "^11.0.0",
         "@commitlint/config-conventional": "^11.0.0",
@@ -59,7 +64,5 @@
     "dependencies": {
         "JSONStream": "^1.3.5"
     },
-    "resolutions": {
-        "mpath": "^0.8.4"
-    }
-}
+    "overrides": {}
+}