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

Fixing location/contact deletion.

Browse Source
This commit is contained in:
stephb9959
2021-10-21 08:44:35 -07:00
parent e49cef57e6
commit f28ef3f65b
6 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@@ -1 +1 @@
352
354

2
src/RESTAPI/RESTAPI_contact_handler.cpp
View File

@@ -70,6 +70,8 @@ namespace OpenWifi{
}
if(DB_.DeleteRecord("id",UUID)) {
if(!Existing.entity.empty())
Storage()->EntityDB().DeleteLocation("id",Existing.entity,UUID);
return OK();
}
InternalError(RESTAPI::Errors::CouldNotBeDeleted);

2
src/RESTAPI/RESTAPI_contact_list_handler.cpp
View File

@@ -23,7 +23,7 @@ namespace OpenWifi{
AddContactExtendedInfo(E, Obj);
ObjArr.add(Obj);
} else {
return BadRequest(RESTAPI::Errors::UnknownId + " ("+i+")");
return BadRequest(RESTAPI::Errors::ContactMustExist + " ("+i+")");
}
}
Poco::JSON::Object Answer;

3
src/RESTAPI/RESTAPI_location_handler.cpp
View File

@@ -68,6 +68,9 @@ namespace OpenWifi{
}
if(DB_.DeleteRecord("id",UUID)) {
if(!Existing.entity.empty())
Storage()->EntityDB().DeleteLocation("id",Existing.entity,UUID);
return OK();
}
InternalError(RESTAPI::Errors::CouldNotBeDeleted);

2
src/RESTAPI/RESTAPI_location_list_handler.cpp
View File

@@ -24,7 +24,7 @@ namespace OpenWifi{
AddLocationExtendedInfo(E, Obj);
ObjArr.add(Obj);
} else {
return BadRequest(RESTAPI::Errors::UnknownId + " ("+i+")");
return BadRequest(RESTAPI::Errors::LocationMustExist + " ("+i+")");
}
}
Poco::JSON::Object Answer;

2
src/framework/RESTAPI_errors.h
View File

@@ -15,7 +15,7 @@ namespace OpenWifi::RESTAPI::Errors {
static const std::string CouldNotBeDeleted{"Element could not be deleted."};
static const std::string NameMustBeSet{"The name property must be set."};
static const std::string ConfigBlockInvalid{"Configuration block type invalid."};
static const std::string UnknownId{"Unknown management policy."};
static const std::string UnknownId{"Unknown UUID."};
static const std::string InvalidDeviceTypes{"Unknown or invalid device type(s)."};
static const std::string RecordNotCreated{"Record could not be created."};
static const std::string RecordNotUpdated{"Record could not be updated."};