From 1d7947b91b0487f9293d24aee8c18655253a40e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Y=C3=BBki=20Vachot?= <yuki@vachot.fr>
Date: Thu, 6 Jan 2022 15:52:08 +0100
Subject: [PATCH] Update: Filter Search (tested)

---
 backend/application/api_functions.py | 93 +++++++++++++---------------
 1 file changed, 42 insertions(+), 51 deletions(-)

diff --git a/backend/application/api_functions.py b/backend/application/api_functions.py
index e5f0c6f..a97d264 100644
--- a/backend/application/api_functions.py
+++ b/backend/application/api_functions.py
@@ -281,59 +281,10 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or
     # q= or id =
     # if q= then by= (default: email,nickname) or email or nickname
     # is_admin =
-    # order_by = email, nickname, id, is_admin
+    # order_by = (default: email), nickname, id, is_admin
 
     users = Users.query
-    if query is not id:
-        if query:
-            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(
-                    ip=ip,
-                    action='users',
-                    message=message,
-                    has_succeeded=False,
-                    status_code=1,
-                    table='users',
-                    id_user=user_id
-                )
-                return {'status': 1, 'message': message}
-        else:
-            users = users.filter(Users.id == id)
-
-        if is_admin is not None:
-            users = users.filter(Users.is_admin == is_admin)
-
-        if order_by == 'nickname':
-            users = users.order_by(asc(Users.nickname))
-        elif order_by == 'id':
-            users = users.order_by(asc(Users.id))
-        elif order_by == 'is_admin':
-            users = users.order_by(asc(Users.is_admin))
-        else:
-            users = users.order_by(asc(Users.is_admin))
-
-        users = users.all()
-
-        message = f'id({id}), is_admin({is_admin}) and order_by({order_by}): {len(users)} result(s)'
-        db_create_log(
-            ip=ip,
-            action='users',
-            message=message,
-            has_succeeded=True,
-            status_code=0,
-            table='users',
-            id_user=user_id
-        )
-        return {'status': 0, 'message': message, 'data': [user.json() for user in users]}
-    else:
+    if query is id and query is not None:
         message = 'Query or id field'
         db_create_log(
             ip=ip,
@@ -345,3 +296,43 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or
             id_user=user_id
         )
         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:
+            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)
+    else:
+        pass
+
+    if is_admin is not None:
+        users = users.filter(Users.is_admin == is_admin)
+
+    if order_by == 'nickname':
+        users = users.order_by(asc(Users.nickname))
+    elif order_by == 'id':
+        users = users.order_by(asc(Users.id))
+    elif order_by == 'is_admin':
+        users = users.order_by(asc(Users.is_admin))
+    else:
+        users = users.order_by(asc(Users.is_admin))
+
+    users = users.all()
+
+    message = f'id({id}), is_admin({is_admin}) and order_by({order_by}): {len(users)} result(s)'
+    db_create_log(
+        ip=ip,
+        action='users',
+        message=message,
+        has_succeeded=True,
+        status_code=0,
+        table='users',
+        id_user=user_id
+    )
+    return {'status': 0, 'message': message, 'data': [user.json() for user in users]}