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

add: filters

Browse source 
add: schedule api calls
This commit is contained in:
Tobias Reisinger 2019-07-20 14:51:45 +02:00
parent a2dfcebf3f
commit a38a6e63b3
23 changed files with 171 additions and 95 deletions

4
controllers/api_v1_devices.cc
View file

@ -22,7 +22,7 @@ devices::get_all(const HttpRequestPtr &req, std::function<void(const HttpRespons
}
void
devices::get_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, std::string device_id)
devices::get_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string& device_id)
{
device_dbo *device = device_dbo::get_one_by("id", device_id.c_str());
@ -44,7 +44,7 @@ devices::get_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpR
}
void
devices::delete_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, std::string device_id)
devices::delete_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string& device_id)
{
device_dbo *device = device_dbo::get_one_by("id", device_id.c_str());

8
controllers/api_v1_devices.h
View file

@ -17,10 +17,10 @@ namespace api
//METHOD_ADD(Devices::get_relays_one,"/{1}/relays/{2}",Get);
METHOD_LIST_END
void post_discover(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback);
void get_all(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback);
void get_one_by_id(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback,std::string device_id);
void delete_one_by_id(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback,std::string device_id);
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);
//void get_relays_all(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback,std::string device_id);
//void get_relays_one(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback,std::string device_id,std::string relay_id);
};

20
controllers/api_v1_devices_discover.cc
View file

@ -34,11 +34,11 @@ void devices::post_discover(const HttpRequestPtr &req, std::function<void(const
return;
}
struct sockaddr_storage their_addr;
struct sockaddr_storage their_addr{};
socklen_t addr_size;
int client_fd, s_ret;
fd_set accept_fds;
struct timeval timeout;
struct timeval timeout{};
uint8_t discover_answer_buf[1];
uint8_t discover_header_buf[1];
@ -50,12 +50,12 @@ void devices::post_discover(const HttpRequestPtr &req, std::function<void(const
addr_size = sizeof(their_addr);
FD_ZERO(&accept_fds);
FD_SET(discover_server_socket, &accept_fds);
FD_SET(discover_server_socket, &accept_fds); // NOLINT(hicpp-signed-bitwise)
timeout.tv_sec = floor(config::discover_timeout_ms / 1000);
timeout.tv_sec = config::discover_timeout_ms / 1000;
timeout.tv_usec = (config::discover_timeout_ms % 1000) * 1000;
s_ret = select(discover_server_socket + 1, &accept_fds, NULL, NULL, &timeout);
s_ret = select(discover_server_socket + 1, &accept_fds, nullptr, nullptr, &timeout);
if(s_ret == 0)
{
break;
@ -74,7 +74,7 @@ void devices::post_discover(const HttpRequestPtr &req, std::function<void(const
continue;
}
int payload_length = discover_header_buf[0];
size_t payload_length = discover_header_buf[0];
char *answer_payload = (char*)malloc((payload_length + 1) * sizeof(*answer_payload));
if(recv(client_fd, answer_payload, payload_length, 0) < 0)
@ -83,9 +83,9 @@ void devices::post_discover(const HttpRequestPtr &req, std::function<void(const
continue;
}
struct sockaddr_in addr;
socklen_t addr_size = sizeof(struct sockaddr_in);
if(getpeername(client_fd, (struct sockaddr *)&addr, &addr_size) != 0)
struct sockaddr_in addr{};
socklen_t client_addr_size = sizeof(struct sockaddr_in);
if(getpeername(client_fd, (struct sockaddr *)&addr, &client_addr_size) != 0)
{
LOG_ERROR << "Error Receiving payload from client";
@ -126,7 +126,7 @@ void devices::post_discover(const HttpRequestPtr &req, std::function<void(const
if(!found_discovered_in_list)
{
device_dbo discovered_device;
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());

52
controllers/api_v1_schedules.cc
View file

@ -25,7 +25,7 @@ schedules::get_all(const HttpRequestPtr &req, std::function<void(const HttpRespo
}
void
schedules::get_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, std::string schedule_id)
schedules::get_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string& schedule_id)
{
schedule_dbo *schedule = schedule_dbo::get_one_by("id", schedule_id.c_str());
@ -35,7 +35,7 @@ schedules::get_one_by_id(const HttpRequestPtr &req, std::function<void(const Htt
callback(resp);
free(schedule);
delete schedule;
}
else
{
@ -47,7 +47,7 @@ schedules::get_one_by_id(const HttpRequestPtr &req, std::function<void(const Htt
}
void
schedules::delete_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, std::string schedule_id)
schedules::delete_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string& schedule_id)
{
schedule_dbo *schedule = schedule_dbo::get_one_by("id", schedule_id.c_str());
@ -77,16 +77,13 @@ schedules::post_new(const HttpRequestPtr &req, std::function<void(const HttpResp
{
Json::Value body = *req->jsonObject();
const char *name = body["name"].asCString();
period_list *periods = helpers::parse_periods(body["periods"]);
schedule_dbo new_schedule{};
schedule_dbo new_schedule;
strncpy(new_schedule.name, name, 127);
strncpy(new_schedule.name, body["name"].asCString(), 127);
new_schedule.name[127] = '\0';
strncpy(new_schedule.id, drogon::utils::getUuid().c_str(), 32);
new_schedule.id[32] = '\0';
new_schedule.periods = periods;
new_schedule.periods = helpers::parse_periods(body["periods"]);
if(!new_schedule.insert())
{
@ -101,3 +98,40 @@ schedules::post_new(const HttpRequestPtr &req, std::function<void(const HttpResp
}
}
void
schedules::put_one_by_id(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback, const std::string &schedule_id)
{
Json::Value body = *req->jsonObject();
schedule_dbo *schedule = schedule_dbo::get_one_by("id", schedule_id.c_str());
if(schedule)
{
strncpy(schedule->name, body["name"].asCString(), 127);
schedule->name[127] = '\0';
delete schedule->periods;
schedule->periods = helpers::parse_periods(body["periods"]);
if(!schedule->update())
{
auto resp = HttpResponse::newHttpResponse();
resp->setStatusCode(k500InternalServerError);
callback(resp);
}
else
{
auto resp = HttpResponse::newHttpJsonResponse(schedule->to_json());
callback(resp);
}
delete schedule;
}
else
{
auto resp = HttpResponse::newHttpResponse();
resp->setStatusCode(k404NotFound);
callback(resp);
}
}

18
controllers/api_v1_schedules.h
View file

@ -9,18 +9,20 @@ namespace api
{
public:
METHOD_LIST_BEGIN
METHOD_ADD(schedules::post_new,"/",Post, "filters::json_required");
METHOD_ADD(schedules::get_all,"/",Get);
METHOD_ADD(schedules::get_one_by_id,"/{1}",Get);
METHOD_ADD(schedules::delete_one_by_id,"/{1}",Delete);
METHOD_ADD(schedules::post_new, "/", Post, "filters::json_required", "filters::schedules::valid_json");
METHOD_ADD(schedules::get_all, "/", Get);
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_LIST_END
void post_new(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback);
void get_all(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback);
void get_one_by_id(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback,std::string schedule_id);
void delete_one_by_id(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback,std::string schedule_id);
static void post_new(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& schedule_id);
static void delete_one_by_id(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& schedule_id);
static void put_one_by_id(const HttpRequestPtr& req, std::function<void (const HttpResponsePtr &)> &&callback, const std::string& schedule_id);
//void get_relays_all(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback,std::string schedule_id);
//void get_relays_one(const HttpRequestPtr& req,std::function<void (const HttpResponsePtr &)> &&callback,std::string schedule_id,std::string relay_id);
};