scottk/wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2025-11-03 03:57:55 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Finishing DB refactor.

Browse Source
This commit is contained in:
stephb9959
2021-10-24 19:42:29 -07:00
parent 8d358fd24a
commit f70786314d
21 changed files with 197 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/RESTAPI/RESTAPI_location_list_handler.cpp
View File

@@ -6,30 +6,14 @@
#include "RESTObjects/RESTAPI_ProvObjects.h"
#include "StorageService.h"
#include "framework/RESTAPI_errors.h"
#include "RESTAPI/RESTAPI_db_helpers.h"
namespace OpenWifi{
void RESTAPI_location_list_handler::DoGet() {
if(!QB_.Select.empty()) {
auto DevUUIDS = Utils::Split(QB_.Select);
Poco::JSON::Array ObjArr;
for(const auto &i:DevUUIDS) {
ProvObjects::Location E;
if(StorageService()->LocationDB().GetRecord("id",i,E)) {
Poco::JSON::Object Obj;
E.to_json(Obj);
if(QB_.AdditionalInfo)
AddLocationExtendedInfo(E, Obj);
ObjArr.add(Obj);
} else {
return BadRequest(RESTAPI::Errors::LocationMustExist + " ("+i+")");
}
}
Poco::JSON::Object Answer;
Answer.set("locations", ObjArr);
return ReturnObject(Answer);
return ReturnRecordList<decltype(StorageService()->LocationDB()),
ProvObjects::Location>("locations",StorageService()->LocationDB(),*this );
} else if(QB_.CountOnly) {
Poco::JSON::Object Answer;
auto C = StorageService()->LocationDB().Count();
@@ -37,18 +21,7 @@ namespace OpenWifi{
} else {
ProvObjects::LocationVec Locations;
StorageService()->LocationDB().GetRecords(QB_.Offset,QB_.Limit,Locations);
Poco::JSON::Array ObjArray;
for(const auto &i:Locations) {
Poco::JSON::Object Obj;
i.to_json(Obj);
if(QB_.AdditionalInfo)
AddLocationExtendedInfo(i, Obj);
ObjArray.add(Obj);
}
Poco::JSON::Object Answer;
Answer.set("locations",ObjArray);
return ReturnObject(Answer);
return MakeJSONObjectArray("locations", Locations, *this);
}
}
}