Simplify User object check by updating tokens instead of resolved values

This commit is contained in:
Brian Tiemann 2024-08-26 15:12:05 -04:00
parent 8f5162ed02
commit 5e6aab33a6

View File

@ -93,12 +93,14 @@ def qs_filter_from_constraints(constraints, tokens=None):
if tokens is None: if tokens is None:
tokens = {} tokens = {}
User = apps.get_model('users.User')
for token, value in tokens.items():
if token == CONSTRAINT_TOKEN_USER and isinstance(value, User):
tokens[token] = value.id
def _replace_tokens(value, tokens): def _replace_tokens(value, tokens):
if type(value) is list: if type(value) is list:
return list(map(lambda v: tokens.get(v, v), value)) return list(map(lambda v: tokens.get(v, v), value))
User = apps.get_model('users.User')
if value == CONSTRAINT_TOKEN_USER and isinstance(tokens.get(CONSTRAINT_TOKEN_USER), User):
return tokens[CONSTRAINT_TOKEN_USER].id
return tokens.get(value, value) return tokens.get(value, value)
params = Q() params = Q()