Merge pull request #14 from sacconazzo:develop

db module
sacconazzo · Aug 28, 2024 · bc146b8 · bc146b8
2 parents 41860cc + 0b30278
commit bc146b8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/src/calibrate/ai.js b/src/calibrate/ai.js
@@ -5,7 +5,7 @@ const apiKey = process.env.OPENAI_API_KEY;
 const openai = new OpenAIApi.OpenAI({ key: apiKey });
 
 const aai = async () => {
-  const [signals] = await db.conn.raw(
+  const [signals] = await db.raw(
     `SELECT\
       ch5, ch6\
     FROM\

diff --git a/src/calibrate/index.js b/src/calibrate/index.js
@@ -1,4 +1,4 @@
-const { conn, getSettingsVars } = require("../db");
+const db = require("../db");
 const ai = require("./ai");
 
 const calibrate = async ({ force = true, tentative = 1, absorption } = {}) => {
@@ -62,7 +62,7 @@ const calibrate = async ({ force = true, tentative = 1, absorption } = {}) => {
   console.log(`Current sensor recalibrate: ${JSON.stringify(data)}`);
 
   if (data && data.OFFSET_A1 > 0.2 && data.OFFSET_A2 > 0.2) {
-    const vars = await getSettingsVars();
+    const vars = await db.getSettingsVars();
 
     const baseA = Number(absorption) || vars["IDLE_A"];
     const offsetBaseA1 = baseA / 2 / (vars["VREF"] * vars["COEFF_A1"]);

diff --git a/src/db/index.js b/src/db/index.js
@@ -3,7 +3,7 @@ const connectionConfig = require("../../knexfile");
 
 const conn = knex(connectionConfig);
 
-const getSettingsVars = async () => {
+conn.getSettingsVars = async () => {
   const vars = await conn("settings");
 
   return vars.reduce((o, e) => {
@@ -12,8 +12,8 @@ const getSettingsVars = async () => {
   }, {});
 };
 
-conn.realTimeQuery = () =>
-  conn.raw(
+conn.realTime = async () => {
+  const [realtime] = await conn.raw(
     `SELECT\
     CONVERT_TZ(timestamp, 'UTC', '${process.env.DB_TIMEZONE}') as timestamp,\
     round(bm_voltage, 2) AS bmV,\
@@ -33,9 +33,11 @@ conn.realTimeQuery = () =>
     id ASC;`
     // LIMIT 500;
   );
+  return realtime;
+};
 
-conn.dayWeekQuery = () =>
-  conn.raw(
+conn.dayWeek = async () => {
+  const [dayweek] = await conn.raw(
     `SELECT\
       date(CONVERT_TZ(timestamp, 'UTC', '${process.env.DB_TIMEZONE}')) AS day,\
       round(avg(bm_voltage), 2) bmV,\
@@ -64,8 +66,7 @@ conn.dayWeekQuery = () =>
     GROUP BY\
       day;`
   );
-
-module.exports = {
-  conn,
-  getSettingsVars,
+  return dayweek;
 };
+
+module.exports = conn;
diff --git a/src/manager.js b/src/manager.js
@@ -68,9 +68,9 @@ const share = async () => {
       ),
     };
 
-    const [dayWeek] = await db.conn.dayWeekQuery();
+    const dayWeek = await db.dayWeek();
 
-    const [realtime] = await db.conn.realTimeQuery();
+    const realtime = await db.realTime();
 
     app._data = {
       system,
@@ -104,10 +104,7 @@ const share = async () => {
 cron.schedule(shareInterval, share);
 share();
 
-app.get("/data", async (req, res) => {
-  const [realtime] = await db.conn.realTimeQuery();
-  res.json(realtime);
-});
+app.get("/data", async (req, res) => res.json(await db.realTime()));
 
 // BUTTONS
 if (process.env.ENABLE_BUTTONS === "true") {