From f851cee76ceb16a8ff26913e0d4d20101b5cd79a Mon Sep 17 00:00:00 2001 From: Ciro Scognamiglio Date: Fri, 28 Feb 2014 19:50:44 +0100 Subject: [PATCH] REST get interface reworked, added filter operators --- rest/__init__.py | 167 ++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 83 deletions(-) diff --git a/rest/__init__.py b/rest/__init__.py index f8719663..1ce245ba 100644 --- a/rest/__init__.py +++ b/rest/__init__.py @@ -27,110 +27,111 @@ class DecimalEncoder(json.JSONEncoder): return (str(o) for o in [o]) return super(DecimalEncoder, self)._iterencode(o, markers) -def dispatch(request, object_type, object_name): +class objectRequest(object): + + def __init__(self, request, object_type, object_name): + self.type = object_type + self.name = object_name + self.properties = [] + self.filters = {} + self.options = None + + self.request = request + + if ((self.type == 'platform') or (self.type == 'testbed')) : + self.type = 'local:platform' + self.id = 'platform' + self.properties = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type']; + self.filters['disabled'] = '0' + self.filters['gateway_type'] = 'sfa' + self.filters['platform'] = '!myslice' + else : + self.id = 'hrn' + query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name') + results = execute_query(self.request, query) + if results : + for r in results[0]['column'] : + self.properties.append(r['name']) + else : + return error('db error') + return None - object_properties = None - object_filters = {} + def addFilters(self, properties): + selected_properties = [] + for p in properties : + if p in self.properties : + selected_properties.append(p) + self.properties = selected_properties + self.setId() - switch = { - 'platform' : platform, - 'slice' : slice, - 'resource' : resource, - 'user' : user, - 'authority' : authority, - } + def setId(self): + if self.id in self.properties : + self.properties.remove(self.id) + [self.id].extend(self.properties) + + def execute(self): + query = Query.get(self.type).select(self.properties) + if self.filters : + for k, f in self.filters.iteritems() : + if (f[:1] == "!") : + query.filter_by(k, '!=', f[1:]) + elif (f[:2] == ">=") : + query.filter_by(k, '>=', f[2:]) + elif (f[:1] == ">") : + query.filter_by(k, '>', f[1:]) + elif (f[:2] == "<=") : + query.filter_by(k, '<=', f[2:]) + elif (f[:1] == "<") : + query.filter_by(k, '<', f[1:]) + else : + query.filter_by(k, '==', f) + return execute_query(self.request, query) + +def dispatch(request, object_type, object_name): + + o = objectRequest(request, object_type, object_name) if request.method == 'POST': - req_items = request.POST.items() + req_items = request.POST elif request.method == 'GET': - req_items = request.GET.items() - - for el in req_items: + req_items = request.GET + + print req_items + + for el in req_items.items(): if el[0].startswith('filters'): - object_filters[el[0][8:-1]] = el[1] + o.filters[el[0][8:-1]] = el[1] elif el[0].startswith('columns'): - object_properties = request.POST.getlist('columns[]') - - # platform is local - if ((object_type == 'platform') or (object_type == 'testbed')) : - object_type = 'local:platform' - if object_properties == None : - object_properties = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type']; - return switch.get('platform', error)(request, object_name, object_properties, object_filters) - else : - if object_properties == None : - query = Query.get('local:object').filter_by('table', '==', object_type).select('column.name') - results = execute_query(request, query) - if results : - object_properties = [] - for r in results[0]['column'] : - object_properties.append(r['name']) - else : - return error(request, object_name, {}) - return switch.get(object_type, error)(request, object_name, object_properties, object_filters) - -def platform(request, object_name, object_properties, object_filters = None): - query = Query().get('local:platform').filter_by('disabled', '==', '0').filter_by('gateway_type', '==', 'sfa').filter_by('platform', '!=', 'myslice') - if object_filters : - for k, f in object_filters.iteritems() : - query.filter_by(k, '==', f) - query.select(object_properties) - return send(request, execute_query(request, query), object_properties) + o.addFilters(req_items.getlist('columns[]')) + elif el[0].startswith('options'): + o.options = req_items.getlist('options[]') -# Add different filters possibilities [['user.user_hrn','==','$user_hrn'],['parent_authority','==','ple.upmc']] -def slice(request, object_name, object_properties, object_filters = None): - query = Query().get('slice')#.filter_by('user.user_hrn', '==', '$user_hrn') - if object_filters : - for k, f in object_filters.iteritems() : - query.filter_by(k, '==', f) - query.select(object_properties) - return send(request, execute_query(request, query), object_properties) - -def resource(request, object_name, object_properties, object_filters = None): - query = Query().get('resource') - if object_filters : - for k, f in object_filters.iteritems() : - query.filter_by(k, '==', f) - query.select(object_properties) - return send(request, execute_query(request, query), object_properties) - -def user(request, object_name, object_properties, object_filters = None): - query = Query().get('user')#.filter_by('user_hrn', '==', '$user_hrn') - if object_filters : - for k, f in object_filters.iteritems() : - query.filter_by(k, '==', f) - query.select(object_properties) - return send(request, execute_query(request, query), object_properties) - -def authority(request, object_name, object_properties, object_filters = None): - query = Query().get('authority')#.filter_by('user_hrn', '==', '$user_hrn') - if object_filters : - for k, f in object_filters.iteritems() : - query.filter_by(k, '==', f) - query.select(object_properties) - return send(request, execute_query(request, query), object_properties) - -def send(request, response, object_properties): + response = o.execute() + if request.path.split('/')[1] == 'rest' : response_data = response + print response return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json") elif request.path.split('/')[1] == 'table' : - return render_to_response('table-default.html', {'data' : response, 'properties' : object_properties}) + print o.properties + print o.options + print response + return render_to_response('table-default.html', {'data' : response, 'properties' : o.properties, 'id' : o.id, 'options' : o.options}) elif request.path.split('/')[1] == 'datatable' : response_data = {} - response_data['columns'] = object_properties - response_data['labels'] = object_properties + response_data['columns'] = o.properties + response_data['labels'] = o.properties response_data['data'] = [] response_data['total'] = len(response) for r in response : d = [] - for p in object_properties : + for p in o.properties : d.append(r[p]) - print d + #print d response_data['data'].append(d) return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json") -def error(request, object_name, object_properties): - return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json") +def error(msg): + return HttpResponse(json.dumps({'error' : msg}), content_type="application/json") -- 2.43.0