feat: Add sort by id to all somple apis and Add status to node simple response

Author: ImMohammad20000

app/db/crud/admin.py

@@ -41,6 +41,8 @@ async def load_admin_attrs(admin: Admin):
 AdminsSortingOptionsSimple = Enum(
     "AdminsSortingOptionsSimple",
     {
+        "id": Admin.id.asc(),
+        "-id": Admin.id.desc(),
         "username": Admin.username.asc(),
         "-username": Admin.username.desc(),
     },

app/db/crud/core.py

@@ -10,6 +10,8 @@
 CoreSortingOptionsSimple = Enum(
     "CoreSortingOptionsSimple",
     {
+        "id": CoreConfig.id.asc(),
+        "-id": CoreConfig.id.desc(),
         "name": CoreConfig.name.asc(),
         "-name": CoreConfig.name.desc(),
     },

app/db/crud/group.py

@@ -11,6 +11,8 @@
 GroupsSortingOptionsSimple = Enum(
     "GroupsSortingOptionsSimple",
     {
+        "id": Group.id.asc(),
+        "-id": Group.id.desc(),
         "name": Group.name.asc(),
         "-name": Group.name.desc(),
     },

app/db/crud/node.py

@@ -34,6 +34,8 @@
 NodeSortingOptionsSimple = Enum(
     "NodeSortingOptionsSimple",
     {
+        "id": Node.id.asc(),
+        "-id": Node.id.desc(),
         "name": Node.name.asc(),
         "-name": Node.name.desc(),
     },
@@ -171,7 +173,7 @@ async def get_nodes_simple(
     Returns:
         Tuple of (list of (id, name) tuples, total_count).
     """
-    stmt = select(Node.id, Node.name)
+    stmt = select(Node.id, Node.name, Node.status)
 
     if search:
         search_value = search.strip()

app/db/crud/user.py

@@ -136,6 +136,8 @@ async def get_existing_usernames(db: AsyncSession, usernames: Sequence[str]) ->
 UsersSortingOptionsSimple = Enum(
     "UsersSortingOptionsSimple",
     {
+        "id": User.id.asc(),
+        "-id": User.id.desc(),
         "username": User.username.asc(),
         "-username": User.username.desc(),
     },

app/models/node.py

@@ -217,6 +217,7 @@ class NodeSimple(BaseModel):
 
     id: int
     name: str
+    status: NodeStatus
     model_config = ConfigDict(from_attributes=True)
 
 

app/operation/node.py

@@ -143,7 +143,7 @@ async def get_nodes_simple(
             skip_pagination=all,
         )
 
-        nodes = [NodeSimple(id=row[0], name=row[1]) for row in rows]
+        nodes = [NodeSimple(id=row[0], name=row[1], status=row[2]) for row in rows]
 
         return NodesSimpleResponse(nodes=nodes, total=total)
 

tests/api/test_node.py

@@ -427,7 +427,7 @@ async def test_get_nodes_simple_basic(access_token):
         assert "total" in data
 
         for node in data["nodes"]:
-            assert set(node.keys()) == {"id", "name"}
+            assert set(node.keys()) == {"id", "name", "status"}
 
         response_names = [n["name"] for n in data["nodes"]]
         for name in names: