scottk/wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2025-10-31 18:48:09 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Finishing framework refactor.

Browse Source
This commit is contained in:
stephb9959
2021-10-24 10:44:27 -07:00
parent f28ef3f65b
commit 75cb2057fe
118 changed files with 4949 additions and 4773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/RESTAPI/RESTAPI_contact_list_handler.cpp
View File

@@ -3,8 +3,9 @@
//
#include "RESTAPI_contact_list_handler.h"
#include "framework/Utils.h"
#include "RESTAPI_ProvObjects.h"
#include "framework/MicroService.h"
#include "RESTObjects/RESTAPI_ProvObjects.h"
#include "StorageService.h"
#include "framework/RESTAPI_errors.h"
#include "RESTAPI_db_helpers.h"
@@ -17,7 +18,7 @@ namespace OpenWifi{
for(const auto &i:DevUUIDS) {
ProvObjects::Contact E;
Poco::JSON::Object Obj;
if(Storage()->ContactDB().GetRecord("id",i,E)) {
if(StorageService()->ContactDB().GetRecord("id",i,E)) {
E.to_json(Obj);
if(QB_.AdditionalInfo)
AddContactExtendedInfo(E, Obj);
@@ -31,12 +32,12 @@ namespace OpenWifi{
return ReturnObject(Answer);
} else if(QB_.CountOnly) {
Poco::JSON::Object Answer;
auto C = Storage()->ContactDB().Count();
auto C = StorageService()->ContactDB().Count();
ReturnCountOnly(C);
return;
} else {
ProvObjects::ContactVec Contacts;
Storage()->ContactDB().GetRecords(QB_.Offset,QB_.Limit,Contacts);
StorageService()->ContactDB().GetRecords(QB_.Offset,QB_.Limit,Contacts);
Poco::JSON::Array ObjArray;
for(const auto &i:Contacts) {
Poco::JSON::Object Obj;