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 DB Venue Devices list.

Browse Source
This commit is contained in:
stephb9959
2021-10-24 21:43:52 -07:00
parent 70a201f8c0
commit 3056ddb6cb
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/RESTAPI/RESTAPI_entity_handler.cpp
View File

@@ -25,7 +25,7 @@ namespace OpenWifi{
Poco::JSON::Object Answer;
Existing.to_json(Answer);
if(QB_.AdditionalInfo)
if(NeedAdditionalInfo())
AddExtendedInfo( Existing, Answer);
ReturnObject(Answer);
}
@@ -41,21 +41,14 @@ namespace OpenWifi{
return BadRequest(RESTAPI::Errors::CannotDeleteRoot);
}
if(!Existing.children.empty() || !Existing.devices.empty() || !Existing.venues.empty()) {
if( !Existing.children.empty() || !Existing.devices.empty() || !Existing.venues.empty() || !Existing.locations.empty()
|| !Existing.contacts.empty()) {
return BadRequest(RESTAPI::Errors::StillInUse);
}
if(!Existing.deviceConfiguration.empty())
StorageService()->ConfigurationDB().DeleteInUse("id", Existing.deviceConfiguration, DB_.Prefix(), Existing.info.id);
for(auto &i:Existing.locations) {
StorageService()->LocationDB().DeleteInUse("id", i, DB_.Prefix(), Existing.info.id);
}
for(auto &i:Existing.contacts) {
StorageService()->ContactDB().DeleteInUse("id", i, DB_.Prefix(), Existing.info.id);
}
if(DB_.DeleteRecord("id",UUID)) {
DB_.DeleteChild("id",Existing.parent,UUID);
return OK();