Improve Data Layer

backend/api/resolvers/patient.py

@@ -14,7 +14,7 @@
 from api.types.patient import PatientType
 from database import models
 from graphql import GraphQLError
-from sqlalchemy import select
+from sqlalchemy import desc, func, select
 from sqlalchemy.orm import aliased, selectinload
 
 
@@ -153,25 +153,43 @@ async def recent_patients(
         info: Info,
         limit: int = 5,
     ) -> list[PatientType]:
+        auth_service = AuthorizationService(info.context.db)
+        accessible_location_ids = await auth_service.get_user_accessible_location_ids(
+            info.context.user, info.context
+        )
+
+        if not accessible_location_ids:
+            return []
+
+        max_task_update_date = (
+            select(
+                func.max(models.Task.update_date).label("max_update_date"),
+                models.Task.patient_id.label("patient_id"),
+            )
+            .group_by(models.Task.patient_id)
+            .subquery()
+        )
+
         query = (
-            select(models.Patient)
+            select(models.Patient, max_task_update_date.c.max_update_date)
             .options(
                 selectinload(models.Patient.assigned_locations),
                 selectinload(models.Patient.tasks),
                 selectinload(models.Patient.teams),
             )
+            .outerjoin(
+                max_task_update_date,
+                models.Patient.id == max_task_update_date.c.patient_id,
+            )
             .where(models.Patient.deleted.is_(False))
+            .order_by(desc(max_task_update_date.c.max_update_date), desc(models.Patient.id))
             .limit(limit)
         )
-        auth_service = AuthorizationService(info.context.db)
-        accessible_location_ids = await auth_service.get_user_accessible_location_ids(
-            info.context.user, info.context
-        )
         query = auth_service.filter_patients_by_access(
             info.context.user, query, accessible_location_ids
         )
         result = await info.context.db.execute(query)
-        return result.scalars().all()
+        return [row[0] for row in result.all()]
 
 
 @strawberry.type

web/api/graphql/GetMyTasks.graphql

@@ -40,6 +40,8 @@ query GetMyTasks {
         id
         name
         avatarUrl
+        lastOnline
+        isOnline
       }
     }
   }

web/api/graphql/GetOverviewData.graphql

@@ -28,6 +28,8 @@ query GetOverviewData {
       id
       name
       avatarUrl
+      lastOnline
+      isOnline
     }
     patient {
       id

web/api/graphql/GetPatient.graphql

@@ -92,6 +92,8 @@ query GetPatient($id: ID!) {
         id
         name
         avatarUrl
+        lastOnline
+        isOnline
       }
       assigneeTeam {
         id

web/api/graphql/GetPatients.graphql

@@ -109,6 +109,8 @@ query GetPatients($locationId: ID, $rootLocationIds: [ID!], $states: [PatientSta
         id
         name
         avatarUrl
+        lastOnline
+        isOnline
       }
       assigneeTeam {
         id

web/api/graphql/GetTask.graphql

@@ -16,6 +16,8 @@ query GetTask($id: ID!) {
       id
       name
       avatarUrl
+      lastOnline
+      isOnline
     }
     assigneeTeam {
       id

web/api/graphql/GetTasks.graphql

@@ -38,6 +38,8 @@ query GetTasks($rootLocationIds: [ID!], $assigneeId: ID, $assigneeTeamId: ID, $l
       id
       name
       avatarUrl
+      lastOnline
+      isOnline
     }
     assigneeTeam {
       id

web/api/graphql/GetUser.graphql

@@ -8,6 +8,8 @@ query GetUser($id: ID!) {
     lastname
     title
     avatarUrl
+    lastOnline
+    isOnline
   }
 }
 

web/api/graphql/GetUsers.graphql

@@ -3,6 +3,7 @@ query GetUsers {
     id
     name
     avatarUrl
+    lastOnline
     isOnline
   }
 }

web/api/graphql/GlobalData.graphql

@@ -6,6 +6,8 @@ query GetGlobalData($rootLocationIds: [ID!]) {
     firstname
     lastname
     avatarUrl
+    lastOnline
+    isOnline
     organizations
     rootLocations {
       id

web/api/graphql/TaskMutations.graphql

@@ -10,6 +10,8 @@ mutation CreateTask($data: CreateTaskInput!) {
       id
       name
       avatarUrl
+      lastOnline
+      isOnline
     }
     patient {
       id
@@ -37,6 +39,8 @@ mutation UpdateTask($id: ID!, $data: UpdateTaskInput!) {
       id
       name
       avatarUrl
+      lastOnline
+      isOnline
     }
     properties {
       definition {
@@ -66,6 +70,8 @@ mutation AssignTask($id: ID!, $userId: ID!) {
       id
       name
       avatarUrl
+      lastOnline
+      isOnline
     }
   }
 }
@@ -77,6 +83,8 @@ mutation UnassignTask($id: ID!) {
       id
       name
       avatarUrl
+      lastOnline
+      isOnline
     }
   }
 }