API - add additional order on username when querying users

SamR1 · Aug 13, 2023 · 8e89d4f · 8e89d4f
1 parent 7946c05
commit 8e89d4f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/fittrackee/tests/users/test_users_api.py b/fittrackee/tests/users/test_users_api.py
@@ -875,8 +875,8 @@ def test_it_gets_users_list_ordered_by_admin_rights(
         data = json.loads(response.data.decode())
         assert 'success' in data['status']
         assert len(data['data']['users']) == 3
-        assert 'toto' in data['data']['users'][0]['username']
-        assert 'sam' in data['data']['users'][1]['username']
+        assert 'sam' in data['data']['users'][0]['username']
+        assert 'toto' in data['data']['users'][1]['username']
         assert 'admin' in data['data']['users'][2]['username']
         assert data['pagination'] == {
             'has_next': False,
@@ -902,8 +902,8 @@ def test_it_gets_users_list_ordered_by_admin_rights_ascending(
         data = json.loads(response.data.decode())
         assert 'success' in data['status']
         assert len(data['data']['users']) == 3
-        assert 'toto' in data['data']['users'][0]['username']
-        assert 'sam' in data['data']['users'][1]['username']
+        assert 'sam' in data['data']['users'][0]['username']
+        assert 'toto' in data['data']['users'][1]['username']
         assert 'admin' in data['data']['users'][2]['username']
         assert data['pagination'] == {
             'has_next': False,
@@ -930,8 +930,8 @@ def test_it_gets_users_list_ordered_by_admin_rights_descending(
         assert 'success' in data['status']
         assert len(data['data']['users']) == 3
         assert 'admin' in data['data']['users'][0]['username']
-        assert 'toto' in data['data']['users'][1]['username']
-        assert 'sam' in data['data']['users'][2]['username']
+        assert 'sam' in data['data']['users'][1]['username']
+        assert 'toto' in data['data']['users'][2]['username']
         assert data['pagination'] == {
             'has_next': False,
             'has_prev': False,

diff --git a/fittrackee/users/users.py b/fittrackee/users/users.py
@@ -61,6 +61,9 @@ def get_users_list(auth_user: User) -> Dict:
         per_page = 50
     user_column = getattr(User, params.get('order_by', 'username'))
     order = params.get('order', 'asc')
+    order_clauses = [asc(user_column) if order == 'asc' else desc(user_column)]
+    if user_column != 'username':
+        order_clauses.append(User.username.asc())
     with_inactive = params.get('with_inactive', 'false').lower()
     if not auth_user or not auth_user.admin:
         with_inactive = 'false'
@@ -77,7 +80,7 @@ def get_users_list(auth_user: User) -> Dict:
             if with_hidden_users == 'true'
             else User.hide_profile_in_users_directory == False,  # noqa
         )
-        .order_by(asc(user_column) if order == 'asc' else desc(user_column))
+        .order_by(*order_clauses)
         .paginate(page=page, per_page=per_page, error_out=False)
     )
     users = users_pagination.items