sessions sorting

scaleoutsystems · Oct 27, 2023 · 6f20a66 · 6f20a66
1 parent b4c21df
commit 6f20a66
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/fedn/fedn/network/api/interface.py b/fedn/fedn/network/api/interface.py
@@ -173,13 +173,12 @@ def get_all_sessions(self, limit=None, skip=None):
                 jsonify({"success": False, "message": "No sessions found."}),
                 404,
             )
-        payload = {}
-        for object in sessions_object["result"]:
-            id = object["session_id"]
-            info = object["session_config"][0]
-            payload[id] = info
+        arr = []
+        for element in sessions_object["result"]:
+            obj = element["session_config"][0]
+            arr.append(obj)
 
-        result = {"result": payload, "count": sessions_object["count"]}
+        result = {"result": arr, "count": sessions_object["count"]}
 
         return jsonify(result)
 

diff --git a/fedn/fedn/network/statestore/mongostatestore.py b/fedn/fedn/network/statestore/mongostatestore.py
@@ -111,7 +111,7 @@ def transition(self, state):
                 )
             )
 
-    def get_sessions(self, limit=None, skip=None):
+    def get_sessions(self, limit=None, skip=None, sort_key="_id", sort_order=pymongo.DESCENDING):
         """Get all sessions.
 
         :return: All sessions.
@@ -124,9 +124,13 @@ def get_sessions(self, limit=None, skip=None):
             limit = int(limit)
             skip = int(skip)
 
-            result = self.sessions.find().limit(limit).skip(skip)
+            result = self.sessions.find().limit(limit).skip(skip).sort(
+                sort_key, sort_order
+            )
         else:
-            result = self.sessions.find()
+            result = self.sessions.find().sort(
+                sort_key, sort_order
+            )
 
         count = self.sessions.count_documents({})