add: basic relay structure

add: improved sql calls

models/device_dbo.cc

@@ -2,6 +2,7 @@
 #include <cstring>
 #include <cstring>
 #include <trantor/utils/Logger.h>
+#include <helpers.h>
 #include "device_dbo.h"
 #include "globals.h"
 
@@ -169,18 +170,21 @@ device_dbo::get_all()
     return device_db_select(stmt);
 }
 
-device_dbo*
-device_dbo::get_one_by(const char *key, const char *value)
+device_dbo**
+device_dbo::get_by_simple(const char *key, const void *value, intptr_t bind_func)
 {
-    sqlite3_stmt *stmt;
-    char* sql;
+    helpers::sql_filter_builder *filters[1];
+    helpers::sql_filter_builder filter
+            {
+                    key,
+                    value,
+                    bind_func,
+                    ";"
+            };
+    filters[0] = &filter;
+    sqlite3_stmt *stmt = helpers::create_sql_filtered_query("SELECT * FROM devices WHERE", filters);
 
-    asprintf(&sql, "SELECT * FROM devices WHERE %s=?1;", key);
-
-    sqlite3_prepare_v2(globals::db, sql, -1, &stmt, nullptr);
-    sqlite3_bind_text(stmt, 1, value, -1, SQLITE_STATIC);
-
-    return device_db_select(stmt)[0];
+    return device_db_select(stmt);
 }
 
 void

models/device_dbo.h

@@ -31,8 +31,8 @@ public:
     static void
     free_list(device_dbo **devices_list);
 
-    static device_dbo*
-    get_one_by(const char *key, const char *value);
+    static device_dbo**
+    get_by_simple(const char *key, const void *value, intptr_t bind_func);
 
     static device_dbo**
     get_all();

models/relay_dbo.cc

@@ -0,0 +1,190 @@
+#include <cstdio>
+#include <cstring>
+#include <cstring>
+#include <trantor/utils/Logger.h>
+#include <helpers.h>
+#include "relay_dbo.h"
+#include "globals.h"
+
+static bool relay_db_update_insert(relay_dbo *relay, sqlite3_stmt *stmt)
+{
+    int rc;
+
+    sqlite3_bind_int(stmt, 1, relay->id);
+    sqlite3_bind_int(stmt, 2, relay->number);
+    sqlite3_bind_text(stmt, 3, relay->name, -1, SQLITE_STATIC);
+    sqlite3_bind_text(stmt, 4, relay->active_schedule_id, -1, SQLITE_STATIC);
+    sqlite3_bind_text(stmt, 5, relay->device_id, -1, SQLITE_STATIC);
+
+    rc = sqlite3_step(stmt);
+    if (rc != SQLITE_DONE)
+    {
+        printf("ERROR inserting data: %s\n", sqlite3_errmsg(globals::db));
+        return false;
+    }
+
+    sqlite3_finalize(stmt);
+
+    return true;
+}
+
+static relay_dbo*
+relay_db_select_mapper(sqlite3_stmt *stmt)
+{
+    auto *new_relay = (relay_dbo*)malloc(sizeof(relay_dbo));
+    for(int i = 0; i < sqlite3_column_count(stmt); i++)
+    {
+        const char *name = sqlite3_column_name(stmt, i);
+        switch(name[0])
+        {
+            case 'a': // active_schedule_id
+                strncpy(new_relay->active_schedule_id, (const char*)sqlite3_column_text(stmt, i), 33);
+                break;
+            case 'd': // device_id
+                strncpy(new_relay->device_id, (const char*)sqlite3_column_text(stmt, i), 33);
+                break;
+            case 'i':
+                new_relay->id = sqlite3_column_int(stmt, i);
+                break;
+            case 'n':
+                switch(name[0])
+                {
+                    case 'a': // name
+                        strncpy(new_relay->name, (const char*)sqlite3_column_text(stmt, i), 127);
+                        break;
+                    case 'u': // number
+                        new_relay->number = sqlite3_column_int(stmt, i);
+                        break;
+                    default:
+                        break;
+                }
+            default: // ignore columns not implemented
+                break;
+        }
+    }
+    return new_relay;
+}
+
+static relay_dbo**
+relay_db_select(sqlite3_stmt *stmt)
+{
+    auto **all_relays = (relay_dbo**)malloc(sizeof(relay_dbo*));
+
+    int row = 0;
+
+    while(true)
+    {
+        int s;
+
+        s = sqlite3_step(stmt);
+        if (s == SQLITE_ROW)
+        {
+            relay_dbo *new_relay = relay_db_select_mapper(stmt);
+            row++;
+
+            all_relays = (relay_dbo**)realloc(all_relays, sizeof(relay_dbo*) * (row + 1));
+            all_relays[row - 1] = new_relay;
+        }
+        else
+        {
+            if (s == SQLITE_DONE)
+            {
+                break;
+            }
+            else
+            {
+                LOG_ERROR << "Error Selecting relays from database";
+                sqlite3_finalize(stmt);
+                return nullptr;
+            }
+        }
+    }
+
+    sqlite3_finalize(stmt);
+    all_relays[row] = nullptr;
+
+    return all_relays;
+}
+
+bool
+relay_dbo::update()
+{
+    sqlite3_stmt *stmt;
+
+    sqlite3_prepare_v2(globals::db, "UPDATE relays set number = ?2, name = ?3, active_schedule_id = ?4, device_id = ?5 WHERE id = ?1;", -1, &stmt, nullptr);
+
+    return relay_db_update_insert(this, stmt);
+}
+
+bool
+relay_dbo::insert()
+{
+    sqlite3_stmt *stmt;
+
+    sqlite3_prepare_v2(globals::db, "INSERT INTO relays(id, number, name, active_schedule_id, device_id) values (?1, ?2, ?3, ?4, ?5);", -1, &stmt, nullptr);
+
+    return relay_db_update_insert(this, stmt);
+}
+
+bool
+relay_dbo::remove()
+{
+    sqlite3_stmt *stmt;
+    int rc;
+
+    sqlite3_prepare_v2(globals::db, "DELETE FROM relays WHERE id=?1;", -1, &stmt, nullptr);
+    sqlite3_bind_int(stmt, 1, this->id);
+    rc = sqlite3_step(stmt);
+    sqlite3_finalize(stmt);
+
+    return rc == SQLITE_DONE;
+
+}
+
+Json::Value
+relay_dbo::to_json()
+{
+    Json::Value relay_json;
+    relay_json["name"] = this->name;
+    relay_json["id"] = this->id;
+
+    return relay_json;
+}
+
+relay_dbo**
+relay_dbo::get_all()
+{
+    sqlite3_stmt *stmt;
+
+    sqlite3_prepare_v2(globals::db, "SELECT * FROM relays;", -1, &stmt, nullptr);
+
+    return relay_db_select(stmt);
+}
+
+relay_dbo**
+relay_dbo::get_by_simple(const char *key, const void *value, intptr_t bind_func)
+{
+    helpers::sql_filter_builder *filters[1];
+    helpers::sql_filter_builder filter
+    {
+        key,
+        value,
+        bind_func,
+        ";"
+    };
+    filters[0] = &filter;
+    sqlite3_stmt *stmt = helpers::create_sql_filtered_query("SELECT * FROM relays WHERE", filters);
+
+    return relay_db_select(stmt);
+}
+
+void
+relay_dbo::free_list(relay_dbo **relays_list)
+{
+    for(int i = 0; relays_list[i] != nullptr; i++)
+    {
+        free(relays_list[i]);
+    }
+    free(relays_list);
+}
+

models/relay_dbo.h

@@ -0,0 +1,41 @@
+#ifndef EMGAUWA_CORE_RELAY_DBO_H
+#define EMGAUWA_CORE_RELAY_DBO_H
+
+#include <string>
+#include <sqlite3.h>
+#include <json/value.h>
+
+class relay_dbo
+{
+public:
+
+    int id;
+    char name[128];
+    int number;
+    char device_id[33];
+    char active_schedule_id[33];
+
+    bool
+    update();
+
+    bool
+    insert();
+
+    bool
+    remove();
+
+    Json::Value
+    to_json();
+
+    static void
+    free_list(relay_dbo **relays_list);
+
+    static relay_dbo**
+    get_by_simple(const char *key, const void *value, intptr_t bind_func);
+
+    static relay_dbo**
+    get_all();
+};
+
+
+#endif //EMGAUWA_CORE_RELAY_DBO_H

models/schedule_dbo.cc

@@ -6,6 +6,7 @@
 #include <cstring>
 #include <cstring>
 #include <trantor/utils/Logger.h>
+#include <helpers.h>
 #include "schedule_dbo.h"
 #include "globals.h"
 #include "period.h"
@@ -83,15 +84,14 @@ schedule_db_select(sqlite3_stmt *stmt)
         }
         else
         {
-            if (s == SQLITE_DONE)
+            if(s == SQLITE_DONE)
             {
                 break;
             }
             else
             {
-                LOG_ERROR << "Error Selecting schedules from database";
-                sqlite3_finalize(stmt);
-                return nullptr;
+                LOG_ERROR << "Error Selecting schedules from database: " << sqlite3_errstr(s);
+                break;
             }
         }
     }
@@ -165,24 +165,21 @@ schedule_dbo::get_all()
     return schedule_db_select(stmt);
 }
 
-schedule_dbo*
-schedule_dbo::get_one_by(const char *key, const char *value)
+schedule_dbo**
+schedule_dbo::get_by_simple(const char *key, const void *value, intptr_t bind_func)
 {
-    sqlite3_stmt *stmt;
-    char* sql;
+    helpers::sql_filter_builder *filters[1];
+    helpers::sql_filter_builder filter
+    {
+        key,
+        value,
+        bind_func,
+        ";"
+    };
+    filters[0] = &filter;
+    sqlite3_stmt *stmt = helpers::create_sql_filtered_query("SELECT * FROM schedules WHERE", filters);
 
-    asprintf(&sql, "SELECT * FROM schedules WHERE %s=?1;", key);
-
-    sqlite3_prepare_v2(globals::db, sql, -1, &stmt, nullptr);
-    sqlite3_bind_text(stmt, 1, value, -1, SQLITE_STATIC);
-
-    schedule_dbo **schedule_list = schedule_db_select(stmt);
-    schedule_dbo *target_schedule =  schedule_list[0];
-
-    free(schedule_list);
-    free(sql);
-
-    return target_schedule;
+    return schedule_db_select(stmt);
 }
 
 void

models/schedule_dbo.h

@@ -32,8 +32,8 @@ public:
     static void
     free_list(schedule_dbo **schedules_list);
 
-    static schedule_dbo*
-    get_one_by(const char *key, const char *value);
+    static schedule_dbo**
+    get_by_simple(const char *key, const void *value, intptr_t bind_func);
 
     static schedule_dbo**
     get_all();