@golemio/energetics 1.1.1-dev.746690471 → 1.1.1-dev.753198398

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/20230118164116-optimize_vpalac_measurements_view.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', '20230118164116-optimize_vpalac_measurements_view-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', '20230118164116-optimize_vpalac_measurements_view-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/db/migrations/postgresql/sqls/20230118164116-optimize_vpalac_measurements_view-down.sql

@@ -0,0 +1,45 @@
+CREATE OR REPLACE VIEW v_vpalac_apartments_daily_consumption
+AS WITH last_measurement AS (
+         SELECT date_part('year'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone) AS measure_year,
+            date_trunc('day'::text, max(to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone)) AS last_measurement,
+            m.var_id
+           FROM vpalac_measurement m
+          GROUP BY (date_part('year'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone)), m.var_id
+        ), daily_status AS (
+         SELECT
+                CASE
+                    WHEN me.me_serial::text = '5640201'::text THEN 'Prostor 109,111'::text
+                    WHEN mm.location_name IS NOT NULL THEN mm.location_name::text
+                    WHEN me.umisteni::text ~~ '%Byt%'::text THEN "right"(me.umisteni::text, length(me.umisteni::text) - "position"(me.umisteni::text, 'Byt'::text) + 1)
+                    ELSE "right"(me.umisteni::text, length(me.umisteni::text) - "position"(me.umisteni::text, 'Prostor'::text) + 1)
+                END AS apartment,
+                CASE
+                    WHEN mt.met_nazev::text = 'Sensor'::text THEN 'Teplo'::character varying
+                    ELSE mt.met_nazev
+                END AS met_nazev,
+            me.mis_nazev,
+            me.var_id,
+            u.jed_nazev,
+            date_trunc('hour'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone) AS measure_date,
+            min(m.value) AS start_value
+           FROM vpalac_measuring_equipment me
+             JOIN vpalac_measurement m ON me.var_id = m.var_id
+             LEFT JOIN vpalac_meter_type mt ON me.met_id = mt.met_id
+             LEFT JOIN vpalac_units u ON me.pot_id = u.pot_id
+             LEFT JOIN vpalac_meter_mapping mm ON mm.var_id = me.var_id
+          WHERE to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone >= (now() - '3 years'::interval)
+          GROUP BY mm.location_name, me.umisteni, me.me_serial, (date_part('month'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone)), me.var_id, ("right"(me.umisteni::text, 6)), mt.met_nazev, me.mis_nazev, (date_trunc('hour'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone)), u.jed_nazev
+        )
+ SELECT ds.apartment,
+    ds.met_nazev AS measure_type,
+    ds.mis_nazev AS measure_detail,
+    ds.jed_nazev,
+    ds.measure_date,
+    lm.last_measurement,
+        CASE
+            WHEN ds.met_nazev::text = 'Teplo'::text AND ds.measure_date = lm.last_measurement THEN lead(ds.start_value) OVER (PARTITION BY ds.var_id ORDER BY ds.measure_date)
+            ELSE ds.start_value - lag(ds.start_value) OVER (PARTITION BY ds.var_id ORDER BY ds.measure_date)
+        END AS consumption,
+    ds.var_id
+   FROM daily_status ds
+     JOIN last_measurement lm ON ds.var_id = lm.var_id AND date_part('year'::text, ds.measure_date) = lm.measure_year;

package/db/migrations/postgresql/sqls/20230118164116-optimize_vpalac_measurements_view-up.sql

@@ -0,0 +1,52 @@
+create or replace view v_vpalac_apartments_daily_consumption as WITH last_measurement AS (
+         SELECT date_part('year'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone) AS measure_year,
+            date_trunc('day'::text, max(to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone)) AS last_measurement,
+            m.var_id
+           FROM vpalac_measurement m
+          GROUP BY (date_part('year'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone)), m.var_id
+        ), daily_status AS (
+           SELECT
+                CASE
+                    WHEN me.me_serial::text = '5640201'::text THEN 'Prostor 109,111'::text
+                    WHEN mm.location_name IS NOT NULL THEN mm.location_name::text
+                    WHEN me.umisteni::text ~~ '%Byt%'::text THEN "right"(me.umisteni::text, length(me.umisteni::text) - "position"(me.umisteni::text, 'Byt'::text) + 1)
+                    ELSE "right"(me.umisteni::text, length(me.umisteni::text) - "position"(me.umisteni::text, 'Prostor'::text) + 1)
+                END AS apartment,
+                CASE
+                    WHEN mt.met_nazev::text = 'Sensor'::text THEN 'Teplo'::character varying
+                    ELSE mt.met_nazev
+                END AS met_nazev,
+            me.mis_nazev,
+            me.var_id,
+            u.jed_nazev,
+            m.measure_date,
+            m.start_value
+           FROM vpalac_measuring_equipment me
+             JOIN 
+             	(select
+             		m.var_id,
+					date_trunc('hour'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone) AS measure_date,
+            		min(m.value) AS start_value
+             	from
+             		vpalac_measurement m
+             	where to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone >= (now() - '3 years'::interval)
+             	group by
+             		m.var_id,
+					date_trunc('hour'::text, to_timestamp((m.time_measurement / 1000)::double precision)::timestamp without time zone)) m ON me.var_id = m.var_id           	
+             LEFT JOIN vpalac_meter_type mt ON me.met_id = mt.met_id
+             LEFT JOIN vpalac_units u ON me.pot_id = u.pot_id
+             LEFT JOIN vpalac_meter_mapping mm ON mm.var_id = me.var_id
+        )
+ SELECT ds.apartment,
+    ds.met_nazev AS measure_type,
+    ds.mis_nazev AS measure_detail,
+    ds.jed_nazev,
+    ds.measure_date,
+    lm.last_measurement,
+        CASE
+            WHEN ds.met_nazev::text = 'Teplo'::text AND ds.measure_date = lm.last_measurement THEN lead(ds.start_value) OVER (PARTITION BY ds.var_id ORDER BY ds.measure_date)
+            ELSE ds.start_value - lag(ds.start_value) OVER (PARTITION BY ds.var_id ORDER BY ds.measure_date)
+        END AS consumption,
+    ds.var_id
+   FROM daily_status ds
+     JOIN last_measurement lm ON ds.var_id = lm.var_id AND date_part('year'::text, ds.measure_date) = lm.measure_year;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/energetics",
-    "version": "1.1.1-dev.746690471",
+    "version": "1.1.1-dev.753198398",
     "description": "Golemio Energetics Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",