add: tag support for controller and relay

add: static on schedule

models/controller_dbo.cc

@@ -25,6 +25,7 @@ static bool controller_db_update_insert(controller_dbo *controller, sqlite3_stmt
     sqlite3_bind_int(stmt, 4, controller->active);
     sqlite3_bind_int(stmt, 5, controller->port);
     sqlite3_bind_int(stmt, 6, controller->relay_count);
+    sqlite3_bind_text(stmt, 7, controller->tag, -1, SQLITE_STATIC);
 
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_DONE)
@@ -72,6 +73,9 @@ controller_db_select_mapper(sqlite3_stmt *stmt)
             case 'r': // relay_count
                 new_controller->relay_count = sqlite3_column_int(stmt, i);
                 break;
+            case 't': // tag
+                strncpy(new_controller->tag, (const char*)sqlite3_column_text(stmt, i), 63);
+                break;
             default: // ignore columns not implemented
                 break;
         }
@@ -126,7 +130,7 @@ 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);
+    sqlite3_prepare_v2(globals::db, "UPDATE controllers set name = ?2, ip = ?3, active = ?4, port = ?5, relay_count = ?6, tag = ?7 WHERE id = ?1;", -1, &stmt, nullptr);
 
     return controller_db_update_insert(this, stmt);
 }
@@ -136,7 +140,7 @@ 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);
+    sqlite3_prepare_v2(globals::db, "INSERT INTO controllers(id, name, ip, active, port, relay_count, tag) values (?1, ?2, ?3, ?4, ?5, ?6, ?7);", -1, &stmt, nullptr);
 
     return controller_db_update_insert(this, stmt);
 }
@@ -163,9 +167,9 @@ controller_dbo::to_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;
+    controller_json["tag"] = this->tag;
 
 
     controller_json["relays"] = Json::arrayValue;

models/controller_dbo.h

@@ -17,6 +17,7 @@ public:
     bool active;
     int port;
     int relay_count;
+    char tag[64];
     relay_dbo **relays;
 
     ~controller_dbo();

models/relay_dbo.cc

@@ -16,6 +16,7 @@ static bool relay_db_update_insert(relay_dbo *relay, sqlite3_stmt *stmt)
     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->controller_id, -1, SQLITE_STATIC);
+    sqlite3_bind_text(stmt, 6, relay->tag, -1, SQLITE_STATIC);
 
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_DONE)
@@ -59,6 +60,9 @@ relay_db_select_mapper(sqlite3_stmt *stmt)
                     default:
                         break;
                 }
+            case 't': // tag
+                strncpy(new_relay->tag, (const char*)sqlite3_column_text(stmt, i), 63);
+                break;
             default: // ignore columns not implemented
                 break;
         }
@@ -131,7 +135,7 @@ relay_dbo::update()
 {
     sqlite3_stmt *stmt;
 
-    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);
+    sqlite3_prepare_v2(globals::db, "UPDATE relays set number = ?2, name = ?3, active_schedule_id = ?4, controller_id = ?5, tag = ?6 WHERE id = ?1;", -1, &stmt, nullptr);
 
     return relay_db_update_insert(this, stmt);
 }
@@ -141,7 +145,7 @@ relay_dbo::insert()
 {
     sqlite3_stmt *stmt;
 
-    sqlite3_prepare_v2(globals::db, "INSERT INTO relays(number, name, active_schedule_id, controller_id) values (?2, ?3, ?4, ?5);", -1, &stmt, nullptr);
+    sqlite3_prepare_v2(globals::db, "INSERT INTO relays(number, name, active_schedule_id, controller_id, tag) values (?2, ?3, ?4, ?5, ?6);", -1, &stmt, nullptr);
 
     return relay_db_update_insert(this, stmt);
 }
@@ -165,12 +169,12 @@ Json::Value
 relay_dbo::to_json()
 {
     Json::Value relay_json;
-    // relay_json["id"] = this->id;
     relay_json["name"] = this->name;
     relay_json["number"] = this->number;
     relay_json["active_schedule_id"] = this->active_schedule_id;
     relay_json["controller_id"] = this->controller_id;
     relay_json["active_schedule"] = this->active_schedule->to_json();
+    relay_json["tag"] = this->tag;
 
     return relay_json;
 }

models/relay_dbo.h

@@ -16,6 +16,7 @@ public:
     int number;
     char controller_id[33];
     char active_schedule_id[33];
+    char tag[64];
     schedule_dbo *active_schedule;
 
     void