yvachot/FlaskALED
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update: Filter Search (tested)

Browse source
This commit is contained in:
Yûki VACHOT 2022-01-06 15:52:08 +01:00
parent f46f7ba4f9
commit 1d7947b91b
1 changed files with 42 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

39
backend/application/api_functions.py
View file

@ -281,20 +281,11 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or
# q= or id = # q= or id =
# if q= then by= (default: email,nickname) or email or nickname # if q= then by= (default: email,nickname) or email or nickname
# is_admin = # is_admin =
# order_by = email, nickname, id, is_admin # order_by = (default: email), nickname, id, is_admin
users = Users.query users = Users.query
if query is not id: if query is id and query is not None:
if query: message = 'Query or id field'
if query and by:
if by == 'email':
users = users.filter(Users.email.like(query))
elif by == 'nickname':
users = users.filter(Users.nickname.like(query))
else:
users = users.filter(or_(Users.nickname.like('%'+query+'%'), Users.email.like('%'+query+'%')))
else:
message = 'Need q and by field if using query and not id'
db_create_log( db_create_log(
ip=ip, ip=ip,
action='users', action='users',
@ -305,8 +296,20 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or
id_user=user_id id_user=user_id
) )
return {'status': 1, 'message': message} return {'status': 1, 'message': message}
if query and by:
if by == 'email':
users = users.filter(Users.email.like('%' + query + '%'))
elif by == 'nickname':
users = users.filter(Users.nickname.like('%' + query + '%'))
else: else:
users = users.filter(or_(Users.nickname.like('%' + query + '%'), Users.email.like('%' + query + '%')))
elif query and not by:
users = users.filter(or_(Users.nickname.like('%' + query + '%'), Users.email.like('%' + query + '%')))
elif id:
users = users.filter(Users.id == id) users = users.filter(Users.id == id)
else:
pass
if is_admin is not None: if is_admin is not None:
users = users.filter(Users.is_admin == is_admin) users = users.filter(Users.is_admin == is_admin)
@ -333,15 +336,3 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or
id_user=user_id id_user=user_id
) )
return {'status': 0, 'message': message, 'data': [user.json() for user in users]} return {'status': 0, 'message': message, 'data': [user.json() for user in users]}
else:
message = 'Query or id field'
db_create_log(
ip=ip,
action='users',
message=message,
has_succeeded=False,
status_code=1,
table='users',
id_user=user_id
)
return {'status': 1, 'message': message}