fix: update sorting logic to use value prefix for direction

Author: M03ED

app/db/crud/admin.py

@@ -46,7 +46,7 @@ def _build_admin_sort_clause(sort_option: AdminSortOption):
         AdminSortField.used_traffic: Admin.used_traffic,
     }
     column = field_map[sort_option.field]
-    return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+    return column.desc() if sort_option.value.startswith("-") else column.asc()
 
 
 def _build_admin_simple_sort_clause(sort_option: AdminSimpleSortOption):
@@ -55,7 +55,7 @@ def _build_admin_simple_sort_clause(sort_option: AdminSimpleSortOption):
         AdminSimpleSortField.username: Admin.username,
     }
     column = field_map[sort_option.field]
-    return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+    return column.desc() if sort_option.value.startswith("-") else column.asc()
 
 
 async def get_admin(

app/db/crud/client_template.py

@@ -32,7 +32,7 @@ def _build_client_template_simple_sort_clause(sort_option: ClientTemplateSimpleS
         ClientTemplateSimpleSortField.template_type: ClientTemplate.template_type,
     }
     column = field_map[sort_option.field]
-    return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+    return column.desc() if sort_option.value.startswith("-") else column.asc()
 
 
 async def get_client_template_values(db: AsyncSession) -> dict[str, str]:

app/db/crud/core.py

@@ -19,7 +19,7 @@ def _build_core_simple_sort_clause(sort_option: CoreSimpleSortOption):
         CoreSimpleSortField.created_at: CoreConfig.created_at,
     }
     column = field_map[sort_option.field]
-    return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+    return column.desc() if sort_option.value.startswith("-") else column.asc()
 
 
 async def get_core_config_by_id(db: AsyncSession, core_id: int) -> CoreConfig | None:

app/db/crud/group.py

@@ -1,4 +1,4 @@
-from sqlalchemy import select, func, delete
+from sqlalchemy import delete, func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
@@ -28,7 +28,7 @@ def _build_group_simple_sort_clause(sort_option: GroupSimpleSortOption):
         GroupSimpleSortField.group_name: Group.name,
     }
     column = field_map[sort_option.field]
-    return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+    return column.desc() if sort_option.value.startswith("-") else column.asc()
 
 
 async def get_inbounds_by_tags(db: AsyncSession, tags: list[str]) -> list[ProxyInbound]:

app/db/crud/node.py

@@ -44,7 +44,7 @@ def _build_node_simple_sort_clause(sort_option: NodeSimpleSortOption):
         NodeSimpleSortField.node_name: Node.name,
     }
     column = field_map[sort_option.field]
-    return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+    return column.desc() if sort_option.value.startswith("-") else column.asc()
 
 
 async def load_node_attrs(node: Node):

app/db/crud/user.py

@@ -265,12 +265,12 @@ def _build_user_sort_clause(sort_option: UserSortOption):
 
     if sort_option.field in field_map:
         column = field_map[sort_option.field]
-        return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+        return column.desc() if sort_option.value.startswith("-") else column.asc()
 
     column = nullable_field_map[sort_option.field]
     return (
         case((column.is_(None), 1), else_=0).asc(),
-        column.desc() if sort_option.direction == SortDirection.desc else column.asc(),
+        column.desc() if sort_option.value.startswith("-") else column.asc(),
     )
 
 
@@ -280,7 +280,7 @@ def _build_user_simple_sort_clause(sort_option: UserSimpleSortOption):
         UserSimpleSortField.username: User.username,
     }
     column = field_map[sort_option.field]
-    return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+    return column.desc() if sort_option.value.startswith("-") else column.asc()
 
 
 async def get_users(

app/db/crud/user_template.py

@@ -23,7 +23,7 @@ def _build_user_template_simple_sort_clause(sort_option: UserTemplateSimpleSortO
         UserTemplateSimpleSortField.template_name: UserTemplate.name,
     }
     column = field_map[sort_option.field]
-    return column.desc() if sort_option.direction == SortDirection.desc else column.asc()
+    return column.desc() if sort_option.value.startswith("-") else column.asc()
 
 
 async def load_user_template_attrs(template: UserTemplate):