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

rebuild query for filter devs without lots

Browse source
This commit is contained in:
Cayo Puigdefabregas 2021-08-02 18:17:08 +02:00
parent c2745fa437
commit 1961e3d408
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ereuse_devicehub/resources/device/views.py
View file

@ -86,6 +86,7 @@ class DeviceView(View):
filter = f.Nested(Filters, missing=[]) filter = f.Nested(Filters, missing=[])
sort = f.Nested(Sorting, missing=[Device.id.asc()]) sort = f.Nested(Sorting, missing=[Device.id.asc()])
page = f.Integer(validate=v.Range(min=1), missing=1) page = f.Integer(validate=v.Range(min=1), missing=1)
unassign = f.Integer(validate=v.Range(min=0, max=1), missing=0)
def get(self, id): def get(self, id):
"""Devices view """Devices view
@ -161,6 +162,7 @@ class DeviceView(View):
(Device.owner_id == g.user.id) | (Device.id.in_(trades_dev_ids)) (Device.owner_id == g.user.id) | (Device.id.in_(trades_dev_ids))
).distinct() ).distinct()
unassign = args.get('unassign', None)
search_p = args.get('search', None) search_p = args.get('search', None)
if search_p: if search_p:
properties = DeviceSearch.properties properties = DeviceSearch.properties
@ -175,6 +177,11 @@ class DeviceView(View):
search.Search.rank(tags, search_p) + search.Search.rank(tags, search_p) +
search.Search.rank(devicehub_ids, search_p) search.Search.rank(devicehub_ids, search_p)
) )
if unassign:
subquery = LotDeviceDescendants.query.with_entities(
LotDeviceDescendants.device_id
)
query = query.filter(Device.id.notin_(subquery))
return query.filter(*args['filter']).order_by(*args['sort']) return query.filter(*args['filter']).order_by(*args['sort'])