fix: rename "device" to "controller"
This commit is contained in:
Tobias Reisinger
parent
9981eeabcb
commit
368df26ad7
12 changed files with 362 additions and 362 deletions
68
controllers/api_v1_controllers.cc
Normal file
68
controllers/api_v1_controllers.cc
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
#include <netdb.h>
|
||||
#include <models/controller_dbo.h>
|
||||
#include "api_v1_controllers.h"
|
||||
using namespace api::v1;
|
||||
|
||||
void
|
||||
controllers::get_all(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
controller_dbo **all_controllers = controller_dbo::get_all();
|
||||
Json::Value all_controllers_json(Json::arrayValue);
|
||||
|
||||
for(int i = 0; all_controllers[i] != nullptr; i++)
|
||||
{
|
||||
all_controllers_json.append(all_controllers[i]->to_json());
|
||||
}
|
||||
|
||||
auto resp = HttpResponse::newHttpJsonResponse(all_controllers_json);
|
||||
|
||||
callback(resp);
|
||||
|
||||
controller_dbo::free_list(all_controllers);
|
||||
}
|
||||
|
||||
void
|
||||
controllers::get_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string& controller_id)
|
||||
{
|
||||
controller_dbo **controllers = controller_dbo::get_by_simple("id", controller_id.c_str(), (intptr_t) &sqlite3_bind_text);
|
||||
|
||||
if(controllers[0])
|
||||
{
|
||||
auto resp = HttpResponse::newHttpJsonResponse(controllers[0]->to_json());
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
else
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
resp->setStatusCode(k404NotFound);
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
controller_dbo::free_list(controllers);
|
||||
}
|
||||
|
||||
void
|
||||
controllers::delete_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string& controller_id)
|
||||
{
|
||||
controller_dbo **controllers = controller_dbo::get_by_simple("id", controller_id.c_str(), (intptr_t) &sqlite3_bind_text);
|
||||
|
||||
if(controllers[0])
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
if(!controllers[0]->remove())
|
||||
{
|
||||
resp->setStatusCode(k500InternalServerError);
|
||||
}
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
else
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
resp->setStatusCode(k404NotFound);
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
controller_dbo::free_list(controllers);
|
||||
}
|
||||
|
|
@ -5,28 +5,28 @@ namespace api
|
|||
{
|
||||
namespace v1
|
||||
{
|
||||
class devices:public drogon::HttpController<devices>
|
||||
class controllers:public drogon::HttpController<controllers>
|
||||
{
|
||||
public:
|
||||
METHOD_LIST_BEGIN
|
||||
METHOD_ADD(devices::post_discover, "/discover", Post);
|
||||
METHOD_ADD(devices::get_all, "/", Get);
|
||||
METHOD_ADD(devices::get_one_by_id, "/{1}", Get);
|
||||
METHOD_ADD(devices::delete_one_by_id, "/{1}", Delete);
|
||||
METHOD_ADD(controllers::post_discover, "/discover", Post);
|
||||
METHOD_ADD(controllers::get_all, "/", Get);
|
||||
METHOD_ADD(controllers::get_one_by_id, "/{1}", Get);
|
||||
METHOD_ADD(controllers::delete_one_by_id, "/{1}", Delete);
|
||||
|
||||
METHOD_ADD(devices::get_relays_all, "/{1}/relays/", Get);
|
||||
METHOD_ADD(devices::get_relays_one_by_id_and_num, "/{1}/relays/{2}", Get);
|
||||
METHOD_ADD(devices::put_relays_one_by_id_and_num, "/{1}/relays/{2}", Put, "filters::json_required", "filters::relays::valid_json");
|
||||
METHOD_ADD(controllers::get_relays_all, "/{1}/relays/", Get);
|
||||
METHOD_ADD(controllers::get_relays_one_by_id_and_num, "/{1}/relays/{2}", Get);
|
||||
METHOD_ADD(controllers::put_relays_one_by_id_and_num, "/{1}/relays/{2}", Put, "filters::json_required", "filters::relays::valid_json");
|
||||
METHOD_LIST_END
|
||||
|
||||
static void post_discover(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback);
|
||||
static void get_all(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback);
|
||||
static void get_one_by_id(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& device_id);
|
||||
static void delete_one_by_id(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& device_id);
|
||||
static void get_one_by_id(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& controller_id);
|
||||
static void delete_one_by_id(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& controller_id);
|
||||
|
||||
static void get_relays_all(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& device_id);
|
||||
static void get_relays_one_by_id_and_num(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& device_id, int relay_num);
|
||||
static void put_relays_one_by_id_and_num(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& device_id, int relay_num);
|
||||
static void get_relays_all(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& controller_id);
|
||||
static void get_relays_one_by_id_and_num(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& controller_id, int relay_num);
|
||||
static void put_relays_one_by_id_and_num(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& controller_id, int relay_num);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
#include <config.h>
|
||||
#include <helpers.h>
|
||||
#include <cmath>
|
||||
#include <models/device_dbo.h>
|
||||
#include "api_v1_devices.h"
|
||||
#include <models/controller_dbo.h>
|
||||
#include "api_v1_controllers.h"
|
||||
using namespace api::v1;
|
||||
|
||||
void devices::post_discover(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
void controllers::post_discover(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
|
||||
int discover_server_socket = helpers::bind_tcp_server("0.0.0.0", "0", config::discover_max_client_backlog);
|
||||
|
|
@ -43,7 +43,7 @@ void devices::post_discover(const HttpRequestPtr &req, std::function<void(const
|
|||
uint8_t discover_answer_buf[1];
|
||||
uint8_t discover_header_buf[1];
|
||||
|
||||
device_dbo **known_devices = device_dbo::get_all();
|
||||
controller_dbo **known_controllers = controller_dbo::get_all();
|
||||
|
||||
while(true)
|
||||
{
|
||||
|
|
@ -105,36 +105,36 @@ void devices::post_discover(const HttpRequestPtr &req, std::function<void(const
|
|||
|
||||
bool found_discovered_in_list = false;
|
||||
|
||||
for(int i = 0; known_devices[i] != nullptr; i++)
|
||||
for(int i = 0; known_controllers[i] != nullptr; i++)
|
||||
{
|
||||
if(!found_discovered_in_list)
|
||||
{
|
||||
if(strcmp(known_devices[i]->id, discovered_id) == 0)
|
||||
if(strcmp(known_controllers[i]->id, discovered_id) == 0)
|
||||
{
|
||||
known_devices[i]->active = true;
|
||||
known_devices[i]->update();
|
||||
free(known_devices[i]);
|
||||
known_controllers[i]->active = true;
|
||||
known_controllers[i]->update();
|
||||
free(known_controllers[i]);
|
||||
found_discovered_in_list = true;
|
||||
known_devices[i] = known_devices[i + 1];
|
||||
known_controllers[i] = known_controllers[i + 1];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
known_devices[i] = known_devices[i + 1];
|
||||
known_controllers[i] = known_controllers[i + 1];
|
||||
}
|
||||
}
|
||||
|
||||
if(!found_discovered_in_list)
|
||||
{
|
||||
device_dbo discovered_device{};
|
||||
strcpy(discovered_device.ip, inet_ntoa(addr.sin_addr));
|
||||
strcpy(discovered_device.id, discovered_id);
|
||||
strcpy(discovered_device.name, client_info["name"].asCString());
|
||||
discovered_device.relay_count = client_info["relay_count"].asInt();
|
||||
discovered_device.port = client_info["port"].asInt();
|
||||
discovered_device.active = true;
|
||||
controller_dbo discovered_controller{};
|
||||
strcpy(discovered_controller.ip, inet_ntoa(addr.sin_addr));
|
||||
strcpy(discovered_controller.id, discovered_id);
|
||||
strcpy(discovered_controller.name, client_info["name"].asCString());
|
||||
discovered_controller.relay_count = client_info["relay_count"].asInt();
|
||||
discovered_controller.port = client_info["port"].asInt();
|
||||
discovered_controller.active = true;
|
||||
|
||||
discovered_device.insert();
|
||||
discovered_controller.insert();
|
||||
}
|
||||
|
||||
discover_answer_buf[0] = config::discover_code_accept;
|
||||
|
|
@ -142,27 +142,27 @@ void devices::post_discover(const HttpRequestPtr &req, std::function<void(const
|
|||
close(client_fd);
|
||||
}
|
||||
}
|
||||
for(int i = 0; known_devices[i] != nullptr; i++)
|
||||
for(int i = 0; known_controllers[i] != nullptr; i++)
|
||||
{
|
||||
known_devices[i]->active = false;
|
||||
known_devices[i]->update();
|
||||
LOG_DEBUG << "Lost: " << known_devices[i]->name;
|
||||
known_controllers[i]->active = false;
|
||||
known_controllers[i]->update();
|
||||
LOG_DEBUG << "Lost: " << known_controllers[i]->name;
|
||||
}
|
||||
device_dbo::free_list(known_devices);
|
||||
controller_dbo::free_list(known_controllers);
|
||||
|
||||
device_dbo **all_devices = device_dbo::get_all();
|
||||
Json::Value all_devices_json(Json::arrayValue);
|
||||
controller_dbo **all_controllers = controller_dbo::get_all();
|
||||
Json::Value all_controllers_json(Json::arrayValue);
|
||||
|
||||
for(int i = 0; all_devices[i] != nullptr; i++)
|
||||
for(int i = 0; all_controllers[i] != nullptr; i++)
|
||||
{
|
||||
all_devices_json.append(all_devices[i]->to_json());
|
||||
all_controllers_json.append(all_controllers[i]->to_json());
|
||||
}
|
||||
|
||||
auto resp = HttpResponse::newHttpJsonResponse(all_devices_json);
|
||||
auto resp = HttpResponse::newHttpJsonResponse(all_controllers_json);
|
||||
|
||||
callback(resp);
|
||||
|
||||
device_dbo::free_list(all_devices);
|
||||
controller_dbo::free_list(all_controllers);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
#include <netdb.h>
|
||||
#include <models/device_dbo.h>
|
||||
#include "api_v1_devices.h"
|
||||
using namespace api::v1;
|
||||
|
||||
void
|
||||
devices::get_all(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
|
||||
{
|
||||
device_dbo **all_devices = device_dbo::get_all();
|
||||
Json::Value all_devices_json(Json::arrayValue);
|
||||
|
||||
for(int i = 0; all_devices[i] != nullptr; i++)
|
||||
{
|
||||
all_devices_json.append(all_devices[i]->to_json());
|
||||
}
|
||||
|
||||
auto resp = HttpResponse::newHttpJsonResponse(all_devices_json);
|
||||
|
||||
callback(resp);
|
||||
|
||||
device_dbo::free_list(all_devices);
|
||||
}
|
||||
|
||||
void
|
||||
devices::get_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string& device_id)
|
||||
{
|
||||
device_dbo **devices = device_dbo::get_by_simple("id", device_id.c_str(), (intptr_t) &sqlite3_bind_text);
|
||||
|
||||
if(devices[0])
|
||||
{
|
||||
auto resp = HttpResponse::newHttpJsonResponse(devices[0]->to_json());
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
else
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
resp->setStatusCode(k404NotFound);
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
device_dbo::free_list(devices);
|
||||
}
|
||||
|
||||
void
|
||||
devices::delete_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string& device_id)
|
||||
{
|
||||
device_dbo **devices = device_dbo::get_by_simple("id", device_id.c_str(), (intptr_t) &sqlite3_bind_text);
|
||||
|
||||
if(devices[0])
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
if(!devices[0]->remove())
|
||||
{
|
||||
resp->setStatusCode(k500InternalServerError);
|
||||
}
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
else
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
resp->setStatusCode(k404NotFound);
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
device_dbo::free_list(devices);
|
||||
}
|
||||
|
|
@ -1,36 +1,36 @@
|
|||
#include <netdb.h>
|
||||
#include <models/relay_dbo.h>
|
||||
#include <helpers.h>
|
||||
#include <models/device_dbo.h>
|
||||
#include "api_v1_devices.h"
|
||||
#include <models/controller_dbo.h>
|
||||
#include "api_v1_controllers.h"
|
||||
|
||||
using namespace api::v1;
|
||||
|
||||
void
|
||||
devices::get_relays_all(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback,
|
||||
const std::string& device_id)
|
||||
controllers::get_relays_all(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback,
|
||||
const std::string& controller_id)
|
||||
{
|
||||
relay_dbo **all_device_relays = relay_dbo::get_by_simple("device_id", (void *) device_id.c_str(), (intptr_t) sqlite3_bind_text);
|
||||
relay_dbo **all_controller_relays = relay_dbo::get_by_simple("controller_id", (void *) controller_id.c_str(), (intptr_t) sqlite3_bind_text);
|
||||
Json::Value all_relays_json(Json::arrayValue);
|
||||
|
||||
for(int i = 0; all_device_relays[i] != nullptr; i++)
|
||||
for(int i = 0; all_controller_relays[i] != nullptr; i++)
|
||||
{
|
||||
all_relays_json.append(all_device_relays[i]->to_json());
|
||||
all_relays_json.append(all_controller_relays[i]->to_json());
|
||||
}
|
||||
|
||||
auto resp = HttpResponse::newHttpJsonResponse(all_relays_json);
|
||||
|
||||
callback(resp);
|
||||
|
||||
relay_dbo::free_list(all_device_relays);
|
||||
relay_dbo::free_list(all_controller_relays);
|
||||
}
|
||||
|
||||
void
|
||||
devices::get_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
||||
std::function<void(const HttpResponsePtr &)> &&callback, const std::string& device_id,
|
||||
controllers::get_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
||||
std::function<void(const HttpResponsePtr &)> &&callback, const std::string& controller_id,
|
||||
int relay_num)
|
||||
{
|
||||
relay_dbo *relay = relay_dbo::get_relay_for_device(device_id.c_str(), relay_num);
|
||||
relay_dbo *relay = relay_dbo::get_relay_for_controller(controller_id.c_str(), relay_num);
|
||||
|
||||
if(relay)
|
||||
{
|
||||
|
|
@ -50,11 +50,11 @@ devices::get_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
|||
}
|
||||
|
||||
void
|
||||
devices::put_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
||||
std::function<void(const HttpResponsePtr &)> &&callback, const std::string& device_id,
|
||||
controllers::put_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
||||
std::function<void(const HttpResponsePtr &)> &&callback, const std::string& controller_id,
|
||||
int relay_num)
|
||||
{
|
||||
if(!relay_dbo::valid_num_for_device(device_id.c_str(), relay_num))
|
||||
if(!relay_dbo::valid_num_for_controller(controller_id.c_str(), relay_num))
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
resp->setStatusCode(k400BadRequest);
|
||||
|
|
@ -62,7 +62,7 @@ devices::put_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
|||
return;
|
||||
}
|
||||
|
||||
relay_dbo *relay = relay_dbo::get_relay_for_device(device_id.c_str(), relay_num);
|
||||
relay_dbo *relay = relay_dbo::get_relay_for_controller(controller_id.c_str(), relay_num);
|
||||
Json::Value body = *req->getJsonObject();
|
||||
|
||||
bool db_action_result;
|
||||
|
|
@ -80,7 +80,7 @@ devices::put_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
|||
relay->number = relay_num;
|
||||
strncpy(relay->name, body["name"].asCString(), 128);
|
||||
strncpy(relay->active_schedule_id, body["active_schedule"].asCString(), 33);
|
||||
strncpy(relay->device_id, device_id.c_str(), 33);
|
||||
strncpy(relay->controller_id, controller_id.c_str(), 33);
|
||||
|
||||
db_action_result = relay->insert();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ namespace api
|
|||
METHOD_ADD(schedules::get_one_by_id, "/{1}", Get);
|
||||
METHOD_ADD(schedules::delete_one_by_id, "/{1}", Delete);
|
||||
METHOD_ADD(schedules::put_one_by_id, "/{1}", Put, "filters::json_required", "filters::schedules::valid_json");
|
||||
//METHOD_ADD(Devices::get_relays_all,"/{1}/relays",Get);
|
||||
//METHOD_ADD(Devices::get_relays_one,"/{1}/relays/{2}",Get);
|
||||
//METHOD_ADD(controllers::get_relays_all,"/{1}/relays",Get);
|
||||
//METHOD_ADD(controllers::get_relays_one,"/{1}/relays/{2}",Get);
|
||||
METHOD_LIST_END
|
||||
|
||||
static void post_new(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue