add: relay api endpoints

This commit is contained in:
Tobias Reisinger 2019-07-22 00:00:07 +02:00
parent a399050892
commit 9981eeabcb
10 changed files with 165 additions and 32 deletions

View file

@ -16,7 +16,7 @@ namespace api
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");
METHOD_ADD(devices::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);

View file

@ -1,6 +1,7 @@
#include <netdb.h>
#include <models/relay_dbo.h>
#include <helpers.h>
#include <models/device_dbo.h>
#include "api_v1_devices.h"
using namespace api::v1;
@ -9,7 +10,6 @@ void
devices::get_relays_all(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback,
const std::string& device_id)
{
relay_dbo **all_device_relays = relay_dbo::get_by_simple("device_id", (void *) device_id.c_str(), (intptr_t) sqlite3_bind_text);
Json::Value all_relays_json(Json::arrayValue);
@ -30,31 +30,15 @@ devices::get_relays_one_by_id_and_num(const HttpRequestPtr &req,
std::function<void(const HttpResponsePtr &)> &&callback, const std::string& device_id,
int relay_num)
{
helpers::sql_filter_builder *filters[2];
helpers::sql_filter_builder filter
{
"number",
(void*)(intptr_t)relay_num,
(intptr_t)&sqlite3_bind_int,
"AND"
};
helpers::sql_filter_builder filter2
{
"device_id",
(void*)device_id.c_str(),
(intptr_t)sqlite3_bind_text,
";"
};
filters[0] = &filter;
filters[1] = &filter2;
relay_dbo *relay = relay_dbo::get_relay_for_device(device_id.c_str(), relay_num);
auto relays = relay_dbo::get_by(filters);
if(relays[0])
if(relay)
{
auto resp = HttpResponse::newHttpJsonResponse(relays[0]->to_json());
auto resp = HttpResponse::newHttpJsonResponse(relay->to_json());
callback(resp);
delete relay;
}
else
{
@ -63,7 +47,6 @@ devices::get_relays_one_by_id_and_num(const HttpRequestPtr &req,
callback(resp);
}
relay_dbo::free_list(relays);
}
void
@ -71,5 +54,48 @@ devices::put_relays_one_by_id_and_num(const HttpRequestPtr &req,
std::function<void(const HttpResponsePtr &)> &&callback, const std::string& device_id,
int relay_num)
{
if(!relay_dbo::valid_num_for_device(device_id.c_str(), relay_num))
{
auto resp = HttpResponse::newHttpResponse();
resp->setStatusCode(k400BadRequest);
callback(resp);
return;
}
relay_dbo *relay = relay_dbo::get_relay_for_device(device_id.c_str(), relay_num);
Json::Value body = *req->getJsonObject();
bool db_action_result;
if(relay)
{
strncpy(relay->name, body["name"].asCString(), 128);
strncpy(relay->active_schedule_id, body["active_schedule"].asCString(), 33);
db_action_result = relay->update();
}
else
{
relay = new relay_dbo();
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);
db_action_result = relay->insert();
}
if(!db_action_result)
{
auto resp = HttpResponse::newHttpResponse();
resp->setStatusCode(k500InternalServerError);
callback(resp);
}
else
{
auto resp = HttpResponse::newHttpJsonResponse(relay->to_json());
callback(resp);
}
delete relay;
}