Merge branch 'master' into 4-mongodb_api
This commit is contained in:
commit
dddaaaabf6
@ -198,20 +198,27 @@ class ImageEndpoint:
|
|||||||
logger.debug('Image DELETE single call: {}'.format(request))
|
logger.debug('Image DELETE single call: {}'.format(request))
|
||||||
result_bool = True
|
result_bool = True
|
||||||
|
|
||||||
# get metadata from MongoDB
|
while identifier is not None:
|
||||||
metadata = MongoDBService.getSingle(identifier)
|
# get metadata from MongoDB
|
||||||
|
metadata = MongoDBService.getSingle(identifier)
|
||||||
|
|
||||||
if not metadata:
|
if not metadata:
|
||||||
return JsonResponse({'Result': 'Error - could not find any metadata in mongoDB.',
|
return JsonResponse({'Result': 'Error - could not find any metadata in mongoDB.',
|
||||||
'id': identifier}, status=404, safe=False)
|
'id': identifier}, status=404, safe=False)
|
||||||
|
|
||||||
resp = MongoDBService.deleteSingle(identifier)
|
resp = MongoDBService.deleteSingle(identifier)
|
||||||
print(resp)
|
print(resp)
|
||||||
|
|
||||||
for service in ImageEndpoint.storageServiceList:
|
for service in ImageEndpoint.storageServiceList:
|
||||||
if not service.delete_file(metadata['filename']):
|
if not service.delete_file(metadata['filename']):
|
||||||
print('Error deleting file in ' + service.name)
|
print('Error deleting file in ' + service.name)
|
||||||
result_bool = False
|
result_bool = False
|
||||||
|
|
||||||
|
identifier = None
|
||||||
|
if 'previous' in metadata:
|
||||||
|
identifier = metadata['previous']
|
||||||
|
if identifier == '':
|
||||||
|
identifier = None
|
||||||
|
|
||||||
return JsonResponse({'Result': result_bool}, safe=False)
|
return JsonResponse({'Result': result_bool}, safe=False)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user