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

Error Framework update

Browse Source
This commit is contained in:
stephb9959
2022-05-07 20:18:40 -07:00
parent 84cf98d6a8
commit 75a3e57e9d
25 changed files with 307 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/RESTAPI/RESTAPI_location_handler.cpp
View File

@@ -76,7 +76,7 @@ namespace OpenWifi{
return BadRequest(RESTAPI::Errors::MissingUUID);
}
auto Obj = ParseStream();
const auto & Obj = ParsedBody_;
ProvObjects::Location NewObject;
if (!NewObject.from_json(Obj)) {
return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
@@ -117,30 +117,23 @@ namespace OpenWifi{
return NotFound();
}
std::cout << __LINE__ << std::endl;
auto RawObject = ParseStream();
std::cout << __LINE__ << std::endl;
const auto & RawObject = ParsedBody_;
ProvObjects::Location NewObject;
std::cout << __LINE__ << std::endl;
if (!NewObject.from_json(RawObject)) {
return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
}
std::cout << __LINE__ << std::endl;
if(!UpdateObjectInfo(RawObject, UserInfo_.userinfo, Existing.info)) {
return BadRequest( RESTAPI::Errors::NameMustBeSet);
}
std::cout << __LINE__ << std::endl;
std::string FromPolicy, ToPolicy;
if(!CreateMove(RawObject,"managementPolicy",&LocationDB::RecordName::managementPolicy, Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
return BadRequest(RESTAPI::Errors::EntityMustExist);
std::cout << __LINE__ << std::endl;
std::string FromEntity, ToEntity;
if(!CreateMove(RawObject,"entity",&LocationDB::RecordName::entity, Existing, FromEntity, ToEntity, StorageService()->EntityDB()))
return BadRequest(RESTAPI::Errors::EntityMustExist);
std::cout << __LINE__ << std::endl;
AssignIfPresent(RawObject, "buildingName", Existing.buildingName);
AssignIfPresent(RawObject, "city", Existing.city);
@@ -148,10 +141,8 @@ namespace OpenWifi{
AssignIfPresent(RawObject, "postal", Existing.postal);
AssignIfPresent(RawObject, "country", Existing.country);
AssignIfPresent(RawObject, "geoCode", Existing.geoCode);
std::cout << __LINE__ << std::endl;
if(RawObject->has("addressLines"))
Existing.addressLines = NewObject.addressLines;
std::cout << __LINE__ << std::endl;
if(RawObject->has("phones"))
Existing.phones = NewObject.phones;
if(RawObject->has("mobiles"))
@@ -160,20 +151,14 @@ namespace OpenWifi{
if(RawObject->has("type"))
Existing.type = NewObject.type;
std::cout << __LINE__ << std::endl;
if(DB_.UpdateRecord("id", UUID, Existing)) {
std::cout << __LINE__ << std::endl;
MoveUsage(StorageService()->PolicyDB(), DB_, FromPolicy, ToPolicy, Existing.info.id);
std::cout << __LINE__ << std::endl;
ManageMembership(StorageService()->EntityDB(),&ProvObjects::Entity::locations,FromEntity, ToEntity, Existing.info.id);
std::cout << __LINE__ << std::endl;
std::cout << __LINE__ << std::endl;
ProvObjects::Location NewObjectAdded;
DB_.GetRecord("id", UUID, NewObjectAdded);
Poco::JSON::Object Answer;
NewObjectAdded.to_json(Answer);
std::cout << __LINE__ << std::endl;
return ReturnObject(Answer);
}
InternalError(RESTAPI::Errors::RecordNotUpdated);