Update database.py

database.py

@@ -438,26 +438,36 @@ class DatabaseManager:
             conn.close()
 
     def get_patients(self, user_id: int, role: str) -> List[Dict]:
-        """Admin ve todos; Doctor ve solo los suyos."""
-        conn = self.get_connection()
-        try:
-            if role == "Admin":
-                rows = conn.execute(
-                    """SELECT p.*, u.username as doctorName
-                       FROM Patients p JOIN Users u ON p.createdByUserID = u.userID
-                       ORDER BY p.creationDate DESC"""
-                ).fetchall()
-            else:
-                rows = conn.execute(
-                    """SELECT p.*, u.username as doctorName
-                       FROM Patients p JOIN Users u ON p.createdByUserID = u.userID
-                       WHERE p.createdByUserID = ?
-                       ORDER BY p.creationDate DESC""",
-                    (user_id,)
-                ).fetchall()
-            return [self._serialize(r) for r in rows]
-        finally:
-            conn.close()
+    """Admin ve todos; Doctor ve solo los suyos."""
+    conn = self.get_connection()
+    try:
+        if role == "Admin":
+            rows = conn.execute(
+                """SELECT p.*, u.username as doctorName,
+                       COUNT(c.consultationID) as consultationCount,
+                       MAX(c.consultationDate) as lastConsultationDate
+                   FROM Patients p
+                   JOIN Users u ON p.createdByUserID = u.userID
+                   LEFT JOIN Consultations c ON c.patientID = p.patientID
+                   GROUP BY p.patientID
+                   ORDER BY p.creationDate DESC"""
+            ).fetchall()
+        else:
+            rows = conn.execute(
+                """SELECT p.*, u.username as doctorName,
+                       COUNT(c.consultationID) as consultationCount,
+                       MAX(c.consultationDate) as lastConsultationDate
+                   FROM Patients p
+                   JOIN Users u ON p.createdByUserID = u.userID
+                   LEFT JOIN Consultations c ON c.patientID = p.patientID
+                   WHERE p.createdByUserID = ?
+                   GROUP BY p.patientID
+                   ORDER BY p.creationDate DESC""",
+                (user_id,)
+            ).fetchall()
+        return [self._serialize(r) for r in rows]
+    finally:
+        conn.close()
 
     def get_patient(self, patient_id: int) -> Optional[Dict]:
         conn = self.get_connection()
@@ -473,28 +483,38 @@ class DatabaseManager:
             conn.close()
 
     def search_patients(self, search_term: str, user_id: int, role: str) -> List[Dict]:
-        conn = self.get_connection()
-        try:
-            like = f"%{search_term}%"
-            if role == "Admin":
-                rows = conn.execute(
-                    """SELECT p.*, u.username as doctorName
-                       FROM Patients p JOIN Users u ON p.createdByUserID = u.userID
-                       WHERE p.name LIKE ?
-                       ORDER BY p.name""",
-                    (like,)
-                ).fetchall()
-            else:
-                rows = conn.execute(
-                    """SELECT p.*, u.username as doctorName
-                       FROM Patients p JOIN Users u ON p.createdByUserID = u.userID
-                       WHERE p.name LIKE ? AND p.createdByUserID = ?
-                       ORDER BY p.name""",
-                    (like, user_id)
-                ).fetchall()
-            return [self._serialize(r) for r in rows]
-        finally:
-            conn.close()
+    conn = self.get_connection()
+    try:
+        like = f"%{search_term}%"
+        if role == "Admin":
+            rows = conn.execute(
+                """SELECT p.*, u.username as doctorName,
+                       COUNT(c.consultationID) as consultationCount,
+                       MAX(c.consultationDate) as lastConsultationDate
+                   FROM Patients p
+                   JOIN Users u ON p.createdByUserID = u.userID
+                   LEFT JOIN Consultations c ON c.patientID = p.patientID
+                   WHERE p.name LIKE ?
+                   GROUP BY p.patientID
+                   ORDER BY p.name""",
+                (like,)
+            ).fetchall()
+        else:
+            rows = conn.execute(
+                """SELECT p.*, u.username as doctorName,
+                       COUNT(c.consultationID) as consultationCount,
+                       MAX(c.consultationDate) as lastConsultationDate
+                   FROM Patients p
+                   JOIN Users u ON p.createdByUserID = u.userID
+                   LEFT JOIN Consultations c ON c.patientID = p.patientID
+                   WHERE p.name LIKE ? AND p.createdByUserID = ?
+                   GROUP BY p.patientID
+                   ORDER BY p.name""",
+                (like, user_id)
+            ).fetchall()
+        return [self._serialize(r) for r in rows]
+    finally:
+        conn.close()
 
     def update_patient(self, patient_id: int, **kwargs) -> bool:
         conn = self.get_connection()