Update modules/database.py

modules/database.py

@@ -135,49 +135,56 @@ def get_student_data(username):
 
     try:
         logger.info(f"Buscando datos para el usuario: {username}")
-        # Obtener todos los documentos para el usuario sin ordenar
         cursor = analysis_collection.find({"username": username})
         
-        # Contar documentos
-        count = analysis_collection.count_documents({"username": username})
-        logger.info(f"Número de documentos encontrados para {username}: {count}")
-
-        if count == 0:
-            logger.info(f"No se encontraron datos para el usuario {username}")
-            return None
-        
-        # Formatear los datos
         formatted_data = {
             "username": username,
             "entries": [],
-            "entries_count": count,
-            "word_count": {}
+            "entries_count": 0,
+            "word_count": {},
+            "semantic_analyses": [],
+            "discourse_analyses": [],
+            "chat_history": []
         }
         
         for entry in cursor:
             formatted_entry = {
                 "timestamp": entry["timestamp"],
                 "text": entry["text"],
-                "word_count": entry.get("word_count", {}),
-                "arc_diagrams": entry.get("arc_diagrams", []),
-                "network_diagram": entry.get("network_diagram", "")
+                "analysis_type": entry.get("analysis_type", "morphosyntax")
             }
-            formatted_data["entries"].append(formatted_entry)
             
-            # Agregar conteo de palabras
-            for category, count in formatted_entry["word_count"].items():
-                if category in formatted_data["word_count"]:
-                    formatted_data["word_count"][category] += count
-                else:
-                    formatted_data["word_count"][category] = count
-
-        # Ordenar las entradas por timestamp después de obtenerlas
+            if formatted_entry["analysis_type"] == "morphosyntax":
+                formatted_entry.update({
+                    "word_count": entry.get("word_count", {}),
+                    "arc_diagrams": entry.get("arc_diagrams", [])
+                })
+                for category, count in formatted_entry["word_count"].items():
+                    formatted_data["word_count"][category] = formatted_data["word_count"].get(category, 0) + count
+            
+            elif formatted_entry["analysis_type"] == "semantic":
+                formatted_entry["network_diagram"] = entry.get("network_diagram", "")
+                formatted_data["semantic_analyses"].append(formatted_entry)
+            
+            elif formatted_entry["analysis_type"] == "discourse":
+                formatted_entry.update({
+                    "graph1": entry.get("graph1", ""),
+                    "graph2": entry.get("graph2", "")
+                })
+                formatted_data["discourse_analyses"].append(formatted_entry)
+            
+            formatted_data["entries"].append(formatted_entry)
+        
+        formatted_data["entries_count"] = len(formatted_data["entries"])
         formatted_data["entries"].sort(key=lambda x: x["timestamp"], reverse=True)
         
-        # Convertir los timestamps a formato ISO después de ordenar
         for entry in formatted_data["entries"]:
             entry["timestamp"] = entry["timestamp"].isoformat()
         
+        # Obtener el historial del chat
+        chat_cursor = chat_collection.find({"username": username})
+        formatted_data["chat_history"] = list(chat_cursor)
+        
         logger.info(f"Datos formateados para {username}: {formatted_data}")
         return formatted_data