Refactoring namespace and subsystems

This commit is contained in:
stephb9959
2021-06-13 12:01:07 -07:00
parent 05ce9ebabd
commit d338ef8225
89 changed files with 2877 additions and 3617 deletions

View File

@@ -10,93 +10,96 @@
#include "Poco/JSON/Stringifier.h"
#include "RESTAPI_devices_handler.h"
#include "uStorageService.h"
#include "uUtils.h"
#include "RESTAPI_protocol.h"
#include "StorageService.h"
#include "Utils.h"
void RESTAPI_devices_handler::handleRequest(Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response)
{
if(!ContinueProcessing(Request,Response))
return;
if(!IsAuthorized(Request,Response))
return;
try {
if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET) {
ParseParameters(Request);
InitQueryBlock();
auto serialOnly = GetBoolParameter(uCentral::RESTAPI::Protocol::SERIALONLY, false);
auto countOnly = GetBoolParameter(uCentral::RESTAPI::Protocol::COUNTONLY, false);
auto deviceWithStatus = GetBoolParameter(uCentral::RESTAPI::Protocol::DEVICEWITHSTATUS, false);
Logger_.debug(Poco::format("DEVICES: from %Lu, limit of %Lu, filter='%s'.",
(uint64_t)QB_.Offset, (uint64_t)QB_.Limit, QB_.Filter));
RESTAPIHandler::PrintBindings();
Poco::JSON::Object RetObj;
if (!QB_.Select.empty()) {
Poco::JSON::Array Objects;
std::vector<std::string> Numbers = uCentral::Utils::Split(QB_.Select);
for(auto &i:Numbers) {
uCentral::Objects::Device D;
if(uCentral::Storage::GetDevice(i,D)) {
Poco::JSON::Object Obj;
if (deviceWithStatus)
D.to_json_with_status(Obj);
else
D.to_json(Obj);
Objects.add(Obj);
} else {
Logger_.error(Poco::format("DEVICE(%s): device in select cannot be found.",i));
}
}
if(deviceWithStatus)
RetObj.set(uCentral::RESTAPI::Protocol::DEVICESWITHSTATUS, Objects);
else
RetObj.set(uCentral::RESTAPI::Protocol::DEVICES, Objects);
} else if (countOnly == true) {
uint64_t Count = 0;
if (uCentral::Storage::GetDeviceCount(Count)) {
RetObj.set(uCentral::RESTAPI::Protocol::COUNT, Count);
}
} else if (serialOnly) {
std::vector<std::string> SerialNumbers;
uCentral::Storage::GetDeviceSerialNumbers(QB_.Offset, QB_.Limit, SerialNumbers);
Poco::JSON::Array Objects;
for (const auto &i : SerialNumbers) {
Objects.add(i);
}
RetObj.set(uCentral::RESTAPI::Protocol::SERIALNUMBERS, Objects);
} else {
std::vector<uCentral::Objects::Device> Devices;
uCentral::Storage::GetDevices(QB_.Offset, QB_.Limit, Devices);
Poco::JSON::Array Objects;
for (const auto &i : Devices) {
Poco::JSON::Object Obj;
if(deviceWithStatus)
i.to_json_with_status(Obj);
else
i.to_json(Obj);
Objects.add(Obj);
}
if(deviceWithStatus)
RetObj.set(uCentral::RESTAPI::Protocol::DEVICESWITHSTATUS, Objects);
else
RetObj.set(uCentral::RESTAPI::Protocol::DEVICES, Objects);
}
ReturnObject(Request, RetObj, Response);
namespace uCentral {
void RESTAPI_devices_handler::handleRequest(Poco::Net::HTTPServerRequest &Request,
Poco::Net::HTTPServerResponse &Response) {
if (!ContinueProcessing(Request, Response))
return;
if (!IsAuthorized(Request, Response))
return;
try {
if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET) {
ParseParameters(Request);
InitQueryBlock();
auto serialOnly = GetBoolParameter(uCentral::RESTAPI::Protocol::SERIALONLY, false);
auto countOnly = GetBoolParameter(uCentral::RESTAPI::Protocol::COUNTONLY, false);
auto deviceWithStatus =
GetBoolParameter(uCentral::RESTAPI::Protocol::DEVICEWITHSTATUS, false);
Logger_.debug(Poco::format("DEVICES: from %Lu, limit of %Lu, filter='%s'.",
(uint64_t)QB_.Offset, (uint64_t)QB_.Limit, QB_.Filter));
RESTAPIHandler::PrintBindings();
Poco::JSON::Object RetObj;
if (!QB_.Select.empty()) {
Poco::JSON::Array Objects;
std::vector<std::string> Numbers = uCentral::Utils::Split(QB_.Select);
for (auto &i : Numbers) {
uCentral::Objects::Device D;
if (Storage()->GetDevice(i, D)) {
Poco::JSON::Object Obj;
if (deviceWithStatus)
D.to_json_with_status(Obj);
else
D.to_json(Obj);
Objects.add(Obj);
} else {
Logger_.error(
Poco::format("DEVICE(%s): device in select cannot be found.", i));
}
}
if (deviceWithStatus)
RetObj.set(uCentral::RESTAPI::Protocol::DEVICESWITHSTATUS, Objects);
else
RetObj.set(uCentral::RESTAPI::Protocol::DEVICES, Objects);
} else if (countOnly == true) {
uint64_t Count = 0;
if (Storage()->GetDeviceCount(Count)) {
RetObj.set(uCentral::RESTAPI::Protocol::COUNT, Count);
}
} else if (serialOnly) {
std::vector<std::string> SerialNumbers;
Storage()->GetDeviceSerialNumbers(QB_.Offset, QB_.Limit, SerialNumbers);
Poco::JSON::Array Objects;
for (const auto &i : SerialNumbers) {
Objects.add(i);
}
RetObj.set(uCentral::RESTAPI::Protocol::SERIALNUMBERS, Objects);
} else {
std::vector<uCentral::Objects::Device> Devices;
Storage()->GetDevices(QB_.Offset, QB_.Limit, Devices);
Poco::JSON::Array Objects;
for (const auto &i : Devices) {
Poco::JSON::Object Obj;
if (deviceWithStatus)
i.to_json_with_status(Obj);
else
i.to_json(Obj);
Objects.add(Obj);
}
if (deviceWithStatus)
RetObj.set(uCentral::RESTAPI::Protocol::DEVICESWITHSTATUS, Objects);
else
RetObj.set(uCentral::RESTAPI::Protocol::DEVICES, Objects);
}
ReturnObject(Request, RetObj, Response);
return;
}
} catch (const Poco::Exception &E) {
Logger_.warning(
Poco::format("%s: Failed with: %s", std::string(__func__), E.displayText()));
}
}
catch (const Poco::Exception & E)
{
Logger_.warning(Poco::format("%s: Failed with: %s",std::string(__func__), E.displayText()));
}
BadRequest(Request, Response);
}
BadRequest(Request, Response);
}
}