trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add user filtering which is evaluate whether or not lot is specified

This commit is contained in:
yiorgos marinellis 2020-04-28 21:20:40 +02:00
parent 252c60ea89
commit 59d6d69bda
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ereuse_devicehub/resources/device/views.py
View File

@ -61,8 +61,7 @@ class Filters(query.Query):
# todo This part of the query is really slow # todo This part of the query is really slow
# And forces usage of distinct, as it returns many rows # And forces usage of distinct, as it returns many rows
# due to having multiple paths to the same # due to having multiple paths to the same
lot = query.Join((Device.id == LotDeviceDescendants.device_id) lot = query.Join((Device.id == LotDeviceDescendants.device_id),
& (Deliverynote.lot_id == LotDeviceDescendants.ancestor_lot_id),
LotQ) LotQ)
@ -142,10 +141,7 @@ class DeviceView(View):
) )
def query(self, args): def query(self, args):
# query = Device.query.distinct() # todo we should not force to do this if the query is ok query = Device.query.distinct() # todo we should not force to do this if the query is ok
query = Device.query.distinct() \
.filter(Computer.owner_id == g.user.id) \
.filter(Deliverynote.receiver_address == g.user.email)
search_p = args.get('search', None) search_p = args.get('search', None)
if search_p: if search_p:
@ -156,9 +152,18 @@ class DeviceView(View):
).order_by( ).order_by(
search.Search.rank(properties, search_p) + search.Search.rank(tags, search_p) search.Search.rank(properties, search_p) + search.Search.rank(tags, search_p)
) )
query = self.user_filter(query)
return query.filter(*args['filter']).order_by(*args['sort']) return query.filter(*args['filter']).order_by(*args['sort'])
def user_filter(self, query):
filterqs = request.args.get('filter', None)
if (filterqs and
'lot' not in filterqs):
query = query.filter((Computer.id == Device.id), (Computer.owner_id == g.user.id))
pass
return query
class ManufacturerView(View): class ManufacturerView(View):
class FindArgs(marshmallow.Schema): class FindArgs(marshmallow.Schema):
search = marshmallow.fields.Str(required=True, search = marshmallow.fields.Str(required=True,