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

Fixing openapi definition.

Browse Source
This commit is contained in:
stephb9959
2022-04-08 10:26:27 -07:00
parent c600d3fc21
commit 19583fe6b7
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/RESTAPI/RESTAPI_location_handler.cpp
View File

@@ -110,29 +110,37 @@ namespace OpenWifi{
} }
void RESTAPI_location_handler::DoPut() { void RESTAPI_location_handler::DoPut() {
std::string UUID = GetBinding(RESTAPI::Protocol::UUID,"");
std::string UUID = GetBinding(RESTAPI::Protocol::UUID);
ProvObjects::Location Existing; ProvObjects::Location Existing;
if(UUID.empty() || !DB_.GetRecord("id", UUID, Existing)) { if(UUID.empty() || !DB_.GetRecord("id", UUID, Existing)) {
return NotFound(); return NotFound();
} }
std::cout << __LINE__ << std::endl;
auto RawObject = ParseStream(); auto RawObject = ParseStream();
std::cout << __LINE__ << std::endl;
ProvObjects::Location NewObject; ProvObjects::Location NewObject;
std::cout << __LINE__ << std::endl;
if (!NewObject.from_json(RawObject)) { if (!NewObject.from_json(RawObject)) {
return BadRequest(RESTAPI::Errors::InvalidJSONDocument); return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
} }
std::cout << __LINE__ << std::endl;
if(!UpdateObjectInfo(RawObject, UserInfo_.userinfo, Existing.info)) { if(!UpdateObjectInfo(RawObject, UserInfo_.userinfo, Existing.info)) {
return BadRequest( RESTAPI::Errors::NameMustBeSet); return BadRequest( RESTAPI::Errors::NameMustBeSet);
} }
std::cout << __LINE__ << std::endl;
std::string FromPolicy, ToPolicy; std::string FromPolicy, ToPolicy;
if(!CreateMove(RawObject,"managementPolicy",&LocationDB::RecordName::managementPolicy, Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB())) if(!CreateMove(RawObject,"managementPolicy",&LocationDB::RecordName::managementPolicy, Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
return BadRequest(RESTAPI::Errors::EntityMustExist); return BadRequest(RESTAPI::Errors::EntityMustExist);
std::cout << __LINE__ << std::endl;
std::string FromEntity, ToEntity; std::string FromEntity, ToEntity;
if(!CreateMove(RawObject,"entity",&LocationDB::RecordName::entity, Existing, FromEntity, ToEntity, StorageService()->EntityDB())) if(!CreateMove(RawObject,"entity",&LocationDB::RecordName::entity, Existing, FromEntity, ToEntity, StorageService()->EntityDB()))
return BadRequest(RESTAPI::Errors::EntityMustExist); return BadRequest(RESTAPI::Errors::EntityMustExist);
std::cout << __LINE__ << std::endl;
AssignIfPresent(RawObject, "buildingName", Existing.buildingName); AssignIfPresent(RawObject, "buildingName", Existing.buildingName);
AssignIfPresent(RawObject, "city", Existing.city); AssignIfPresent(RawObject, "city", Existing.city);
@@ -140,8 +148,10 @@ namespace OpenWifi{
AssignIfPresent(RawObject, "postal", Existing.postal); AssignIfPresent(RawObject, "postal", Existing.postal);
AssignIfPresent(RawObject, "country", Existing.country); AssignIfPresent(RawObject, "country", Existing.country);
AssignIfPresent(RawObject, "geoCode", Existing.geoCode); AssignIfPresent(RawObject, "geoCode", Existing.geoCode);
std::cout << __LINE__ << std::endl;
if(RawObject->has("addressLines")) if(RawObject->has("addressLines"))
Existing.addressLines = NewObject.addressLines; Existing.addressLines = NewObject.addressLines;
std::cout << __LINE__ << std::endl;
if(RawObject->has("phones")) if(RawObject->has("phones"))
Existing.phones = NewObject.phones; Existing.phones = NewObject.phones;
if(RawObject->has("mobiles")) if(RawObject->has("mobiles"))
@@ -150,14 +160,20 @@ namespace OpenWifi{
if(RawObject->has("type")) if(RawObject->has("type"))
Existing.type = NewObject.type; Existing.type = NewObject.type;
std::cout << __LINE__ << std::endl;
if(DB_.UpdateRecord("id", UUID, Existing)) { if(DB_.UpdateRecord("id", UUID, Existing)) {
std::cout << __LINE__ << std::endl;
MoveUsage(StorageService()->PolicyDB(), DB_, FromPolicy, ToPolicy, Existing.info.id); MoveUsage(StorageService()->PolicyDB(), DB_, FromPolicy, ToPolicy, Existing.info.id);
std::cout << __LINE__ << std::endl;
ManageMembership(Storage().EntityDB(),&ProvObjects::Entity::locations,FromEntity, ToEntity, Existing.info.id); ManageMembership(Storage().EntityDB(),&ProvObjects::Entity::locations,FromEntity, ToEntity, Existing.info.id);
std::cout << __LINE__ << std::endl;
std::cout << __LINE__ << std::endl;
ProvObjects::Location NewObjectAdded; ProvObjects::Location NewObjectAdded;
DB_.GetRecord("id", UUID, NewObjectAdded); DB_.GetRecord("id", UUID, NewObjectAdded);
Poco::JSON::Object Answer; Poco::JSON::Object Answer;
NewObjectAdded.to_json(Answer); NewObjectAdded.to_json(Answer);
std::cout << __LINE__ << std::endl;
return ReturnObject(Answer); return ReturnObject(Answer);
} }
InternalError(RESTAPI::Errors::RecordNotUpdated); InternalError(RESTAPI::Errors::RecordNotUpdated);