emgauwa/core-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: rename "device" to "controller"

Browse source
This commit is contained in:
Tobias Reisinger 2019-07-22 22:06:13 +02:00
parent 9981eeabcb
commit 368df26ad7
12 changed files with 362 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

207
models/controller_dbo.cc Normal file
View file

@ -0,0 +1,207 @@
#include <cstdio>
#include <cstring>
#include <cstring>
#include <trantor/utils/Logger.h>
#include <helpers.h>
#include "controller_dbo.h"
#include "globals.h"
static bool controller_db_update_insert(controller_dbo *controller, sqlite3_stmt *stmt)
{
int rc;
sqlite3_bind_text(stmt, 1, controller->id, -1, SQLITE_STATIC);
sqlite3_bind_text(stmt, 2, controller->name, -1, SQLITE_STATIC);
sqlite3_bind_text(stmt, 3, controller->ip, -1, SQLITE_STATIC);
sqlite3_bind_int(stmt, 4, controller->active);
sqlite3_bind_int(stmt, 5, controller->port);
sqlite3_bind_int(stmt, 6, controller->relay_count);
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 controller_dbo*
controller_db_select_mapper(sqlite3_stmt *stmt)
{
auto *new_controller = new controller_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
new_controller->active = (bool)sqlite3_column_int(stmt, i);
break;
case 'i':
switch(name[1])
{
case 'd': // id
strncpy(new_controller->id, (const char*)sqlite3_column_text(stmt, i), 32);
break;
case 'p': // ip
strncpy(new_controller->ip, (const char*)sqlite3_column_text(stmt, i), 16);
break;
default: // ignore columns not implemented
break;
}
break;
case 'n': // name
strncpy(new_controller->name, (const char*)sqlite3_column_text(stmt, i), 127);
break;
case 'p': // port
new_controller->port = sqlite3_column_int(stmt, i);
break;
case 'r': // relay_count
new_controller->relay_count = sqlite3_column_int(stmt, i);
break;
default: // ignore columns not implemented
break;
}
}
return new_controller;
}
static controller_dbo**
controller_db_select(sqlite3_stmt *stmt)
{
auto **all_controllers = (controller_dbo**)malloc(sizeof(controller_dbo*));
int row = 0;
while(true)
{
int s;
s = sqlite3_step(stmt);
if (s == SQLITE_ROW)
{
controller_dbo *new_controller = controller_db_select_mapper(stmt);
row++;
all_controllers = (controller_dbo**)realloc(all_controllers, sizeof(controller_dbo*) * (row + 1));
all_controllers[row - 1] = new_controller;
}
else
{
if (s == SQLITE_DONE)
{
break;
}
else
{
LOG_ERROR << "Error Selecting controllers from database";
sqlite3_finalize(stmt);
return nullptr;
}
}
}
sqlite3_finalize(stmt);
all_controllers[row] = nullptr;
return all_controllers;
}
bool
controller_dbo::update()
{
sqlite3_stmt *stmt;
sqlite3_prepare_v2(globals::db, "UPDATE controllers set name = ?2, ip = ?3, active = ?4, port = ?5, relay_count = ?6 WHERE id = ?1;", -1, &stmt, nullptr);
return controller_db_update_insert(this, stmt);
}
bool
controller_dbo::insert()
{
sqlite3_stmt *stmt;
sqlite3_prepare_v2(globals::db, "INSERT INTO controllers(id, name, ip, active, port, relay_count) values (?1, ?2, ?3, ?4, ?5, ?6);", -1, &stmt, nullptr);
return controller_db_update_insert(this, stmt);
}
bool
controller_dbo::remove()
{
sqlite3_stmt *stmt;
int rc;
sqlite3_prepare_v2(globals::db, "DELETE FROM controllers WHERE id=?1;", -1, &stmt, nullptr);
sqlite3_bind_text(stmt, 1, this->id, -1, SQLITE_STATIC);
rc = sqlite3_step(stmt);
sqlite3_finalize(stmt);
return rc == SQLITE_DONE;
}
Json::Value
controller_dbo::to_json()
{
Json::Value controller_json;
controller_json["name"] = this->name;
controller_json["id"] = this->id;
controller_json["ip"] = this->ip;
controller_json["port"] = this->port;
controller_json["relay_count"] = this->relay_count;
controller_json["active"] = this->active;
return controller_json;
}
controller_dbo**
controller_dbo::get_all()
{
sqlite3_stmt *stmt;
sqlite3_prepare_v2(globals::db, "SELECT * FROM controllers;", -1, &stmt, nullptr);
return controller_db_select(stmt);
}
controller_dbo**
controller_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 controllers WHERE", filters);
return controller_db_select(stmt);
}
controller_dbo**
controller_dbo::get_by(helpers::sql_filter_builder **filters)
{
sqlite3_stmt *stmt = helpers::create_sql_filtered_query("SELECT * FROM controllers WHERE", filters);
return controller_db_select(stmt);
}
void
controller_dbo::free_list(controller_dbo **controllers_list)
{
for(int i = 0; controllers_list[i] != nullptr; i++)
{
free(controllers_list[i]);
}
free(controllers_list);
}

16
models/device_dbo.h → models/controller_dbo.h
View file

@ -1,12 +1,12 @@
#ifndef EMGAUWA_CORE_DEVICE_DBO_H
#define EMGAUWA_CORE_DEVICE_DBO_H
#ifndef EMGAUWA_CORE_controller_DBO_H
#define EMGAUWA_CORE_controller_DBO_H
#include <string>
#include <sqlite3.h>
#include <json/value.h>
#include <helpers.h>
class device_dbo
class controller_dbo
{
public:
@ -30,17 +30,17 @@ public:
to_json();
static void
free_list(device_dbo **devices_list);
free_list(controller_dbo **controllers_list);
static device_dbo**
static controller_dbo**
get_by_simple(const char *key, const void *value, intptr_t bind_func);
static device_dbo**
static controller_dbo**
get_by(helpers::sql_filter_builder **filters);
static device_dbo**
static controller_dbo**
get_all();
};
#endif //EMGAUWA_CORE_DEVICE_DBO_H
#endif //EMGAUWA_CORE_controller_DBO_H

207
models/device_dbo.cc
View file

@ -1,207 +0,0 @@
#include <cstdio>
#include <cstring>
#include <cstring>
#include <trantor/utils/Logger.h>
#include <helpers.h>
#include "device_dbo.h"
#include "globals.h"
static bool device_db_update_insert(device_dbo *device, sqlite3_stmt *stmt)
{
int rc;
sqlite3_bind_text(stmt, 1, device->id, -1, SQLITE_STATIC);
sqlite3_bind_text(stmt, 2, device->name, -1, SQLITE_STATIC);
sqlite3_bind_text(stmt, 3, device->ip, -1, SQLITE_STATIC);
sqlite3_bind_int(stmt, 4, device->active);
sqlite3_bind_int(stmt, 5, device->port);
sqlite3_bind_int(stmt, 6, device->relay_count);
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 device_dbo*
device_db_select_mapper(sqlite3_stmt *stmt)
{
auto *new_device = new device_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
new_device->active = (bool)sqlite3_column_int(stmt, i);
break;
case 'i':
switch(name[1])
{
case 'd': // id
strncpy(new_device->id, (const char*)sqlite3_column_text(stmt, i), 32);
break;
case 'p': // ip
strncpy(new_device->ip, (const char*)sqlite3_column_text(stmt, i), 16);
break;
default: // ignore columns not implemented
break;
}
break;
case 'n': // name
strncpy(new_device->name, (const char*)sqlite3_column_text(stmt, i), 127);
break;
case 'p': // port
new_device->port = sqlite3_column_int(stmt, i);
break;
case 'r': // relay_count
new_device->relay_count = sqlite3_column_int(stmt, i);
break;
default: // ignore columns not implemented
break;
}
}
return new_device;
}
static device_dbo**
device_db_select(sqlite3_stmt *stmt)
{
auto **all_devices = (device_dbo**)malloc(sizeof(device_dbo*));
int row = 0;
while(true)
{
int s;
s = sqlite3_step(stmt);
if (s == SQLITE_ROW)
{
device_dbo *new_device = device_db_select_mapper(stmt);
row++;
all_devices = (device_dbo**)realloc(all_devices, sizeof(device_dbo*) * (row + 1));
all_devices[row - 1] = new_device;
}
else
{
if (s == SQLITE_DONE)
{
break;
}
else
{
LOG_ERROR << "Error Selecting devices from database";
sqlite3_finalize(stmt);
return nullptr;
}
}
}
sqlite3_finalize(stmt);
all_devices[row] = nullptr;
return all_devices;
}
bool
device_dbo::update()
{
sqlite3_stmt *stmt;
sqlite3_prepare_v2(globals::db, "UPDATE devices set name = ?2, ip = ?3, active = ?4, port = ?5, relay_count = ?6 WHERE id = ?1;", -1, &stmt, nullptr);
return device_db_update_insert(this, stmt);
}
bool
device_dbo::insert()
{
sqlite3_stmt *stmt;
sqlite3_prepare_v2(globals::db, "INSERT INTO devices(id, name, ip, active, port, relay_count) values (?1, ?2, ?3, ?4, ?5, ?6);", -1, &stmt, nullptr);
return device_db_update_insert(this, stmt);
}
bool
device_dbo::remove()
{
sqlite3_stmt *stmt;
int rc;
sqlite3_prepare_v2(globals::db, "DELETE FROM devices WHERE id=?1;", -1, &stmt, nullptr);
sqlite3_bind_text(stmt, 1, this->id, -1, SQLITE_STATIC);
rc = sqlite3_step(stmt);
sqlite3_finalize(stmt);
return rc == SQLITE_DONE;
}
Json::Value
device_dbo::to_json()
{
Json::Value device_json;
device_json["name"] = this->name;
device_json["id"] = this->id;
device_json["ip"] = this->ip;
device_json["port"] = this->port;
device_json["relay_count"] = this->relay_count;
device_json["active"] = this->active;
return device_json;
}
device_dbo**
device_dbo::get_all()
{
sqlite3_stmt *stmt;
sqlite3_prepare_v2(globals::db, "SELECT * FROM devices;", -1, &stmt, nullptr);
return device_db_select(stmt);
}
device_dbo**
device_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 devices WHERE", filters);
return device_db_select(stmt);
}
device_dbo**
device_dbo::get_by(helpers::sql_filter_builder **filters)
{
sqlite3_stmt *stmt = helpers::create_sql_filtered_query("SELECT * FROM devices WHERE", filters);
return device_db_select(stmt);
}
void
device_dbo::free_list(device_dbo **devices_list)
{
for(int i = 0; devices_list[i] != nullptr; i++)
{
free(devices_list[i]);
}
free(devices_list);
}

28
models/relay_dbo.cc
View file

@ -5,7 +5,7 @@
#include <helpers.h>
#include "relay_dbo.h"
#include "globals.h"
#include "device_dbo.h"
#include "controller_dbo.h"
static bool relay_db_update_insert(relay_dbo *relay, sqlite3_stmt *stmt)
{
@ -15,7 +15,7 @@ static bool relay_db_update_insert(relay_dbo *relay, sqlite3_stmt *stmt)
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);
sqlite3_bind_text(stmt, 5, relay->controller_id, -1, SQLITE_STATIC);
rc = sqlite3_step(stmt);
if (rc != SQLITE_DONE)
@ -41,8 +41,8 @@ relay_db_select_mapper(sqlite3_stmt *stmt)
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);
case 'd': // controller_id
strncpy(new_relay->controller_id, (const char*)sqlite3_column_text(stmt, i), 33);
break;
case 'i':
new_relay->id = sqlite3_column_int(stmt, i);
@ -111,7 +111,7 @@ 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);
sqlite3_prepare_v2(globals::db, "UPDATE relays set number = ?2, name = ?3, active_schedule_id = ?4, controller_id = ?5 WHERE id = ?1;", -1, &stmt, nullptr);
return relay_db_update_insert(this, stmt);
}
@ -121,7 +121,7 @@ relay_dbo::insert()
{
sqlite3_stmt *stmt;
sqlite3_prepare_v2(globals::db, "INSERT INTO relays(number, name, active_schedule_id, device_id) values (?2, ?3, ?4, ?5);", -1, &stmt, nullptr);
sqlite3_prepare_v2(globals::db, "INSERT INTO relays(number, name, active_schedule_id, controller_id) values (?2, ?3, ?4, ?5);", -1, &stmt, nullptr);
return relay_db_update_insert(this, stmt);
}
@ -149,7 +149,7 @@ relay_dbo::to_json()
relay_json["name"] = this->name;
relay_json["number"] = this->number;
relay_json["active_schedule_id"] = this->active_schedule_id;
relay_json["device_id"] = this->device_id;
relay_json["controller_id"] = this->controller_id;
return relay_json;
}
@ -189,7 +189,7 @@ relay_dbo::get_by(helpers::sql_filter_builder **filters)
}
relay_dbo*
relay_dbo::get_relay_for_device(const char *device_id, int relay_num)
relay_dbo::get_relay_for_controller(const char *controller_id, int relay_num)
{
helpers::sql_filter_builder *filters[2];
helpers::sql_filter_builder filter(
@ -199,8 +199,8 @@ relay_dbo::get_relay_for_device(const char *device_id, int relay_num)
"AND"
);
helpers::sql_filter_builder filter2(
"device_id",
(void*)device_id,
"controller_id",
(void*)controller_id,
(intptr_t)sqlite3_bind_text,
";"
);
@ -215,12 +215,12 @@ relay_dbo::get_relay_for_device(const char *device_id, int relay_num)
}
bool
relay_dbo::valid_num_for_device(const char *search_device_id, int relay_num)
relay_dbo::valid_num_for_controller(const char *search_controller_id, int relay_num)
{
device_dbo **devices = device_dbo::get_by_simple("id", search_device_id, (intptr_t)&sqlite3_bind_text);
controller_dbo **controllers = controller_dbo::get_by_simple("id", search_controller_id, (intptr_t)&sqlite3_bind_text);
bool valid_id_and_num = devices[0] && devices[0]->relay_count > relay_num;
device_dbo::free_list(devices);
bool valid_id_and_num = controllers[0] && controllers[0]->relay_count > relay_num;
controller_dbo::free_list(controllers);
return valid_id_and_num;
}

6
models/relay_dbo.h
View file

@ -13,7 +13,7 @@ public:
int id;
char name[128];
int number;
char device_id[33];
char controller_id[33];
char active_schedule_id[33];
bool
@ -38,10 +38,10 @@ public:
get_by(helpers::sql_filter_builder **filters);
static relay_dbo*
get_relay_for_device(const char *device_id, int relay_num);
get_relay_for_controller(const char *controller_id, int relay_num);
static bool
valid_num_for_device(const char *search_device_id, int relay_num);
valid_num_for_controller(const char *search_controller_id, int relay_num);
static relay_dbo**
get_all();