entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 37 Releases Activity

api: don't iterate over all formdefs when getting user forms (#56518)

This commit is contained in:
Frédéric Péters 2021-08-31 15:06:09 +02:00
parent 80660e37d9
commit 522d605701
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wcs/api.py
View File

@ -53,7 +53,7 @@ from .qommon.errors import (
UnknownNameIdAccessForbiddenError,
)
from .qommon.form import ComputedExpressionWidget
from .qommon.storage import Contains, Equal, NotEqual
from .qommon.storage import Contains, Equal, Intersects, NotEqual, Or
from .qommon.template import Template, TemplateError
@ -888,11 +888,9 @@ class ApiUserDirectory(Directory):
if category_slugs:
categories = Category.select([Contains('url_name', category_slugs)])
if get_publisher().is_using_postgresql() and not get_request().form.get('full') == 'on':
if get_publisher().is_using_postgresql():
from wcs import sql
from .qommon.storage import Equal
order_by = 'receipt_time'
if get_request().form.get('sort') == 'desc':
order_by = '-receipt_time'
@ -905,6 +903,22 @@ class ApiUserDirectory(Directory):
offset=misc.get_int_or_400(get_request().form.get('offset')),
order_by=order_by,
)
if get_request().form.get('full') == 'on':
# load full objects
formdefs = {x.formdef_id: x.formdef for x in user_forms}
formdef_user_forms = {}
for formdef_id, formdef in formdefs.items():
formdef_user_forms.update(
{
(formdef_id, x.id): x
for x in formdef.data_class().select(
[Contains('id', [x.id for x in user_forms if x.formdef_id == formdef_id])]
)
}
)
# and put them back in order
sorted_user_forms_tuples = [(x.formdef_id, x.id) for x in user_forms]
user_forms = [formdef_user_forms.get(x) for x in sorted_user_forms_tuples]
else:
formdefs = FormDef.select()
user_forms = []