Adiciona insert_into_database e conserta um erro de lógica.

Author: YukaNiki

routers/messages.py

@@ -5,7 +5,7 @@
 from pydantic import BaseModel
 from .websocket import websockets, isConnected
 from ..utils.logger import logger
-from ..utils.database import SessionDep
+from ..utils.database import SessionDep, insert_into_database
 
 class Message(SQLModel, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
@@ -25,24 +25,25 @@ class Message(SQLModel, table=True):
 async def create_message(client: str, message: Message, session: SessionDep):
     json=message.model_dump()
     message.created = datetime.now()
-    session.add(message)
-    session.commit()
-    session.refresh(message)
+    insert_into_database(session, message)
+    del json["id"]
+    json["event_type"] = "message"
+    
     for clientws in websockets:
         if clientws == client:
             continue
-        json=message.model_dump()
-        json["event_type"] = "message"
 
         try:
             await websockets[clientws]["ws"].send_json(json)
         except RuntimeError:
             logger.info(f"Envio pro cliente websocket {clientws} falhou, tornando a conexão como desconectada...")
             websockets[clientws]["connected"] = False
-            
+    
+    del json["event_type"]
+    
     recipients=isConnected(websockets)
     return {
-            "message": message.model_dump(),
+            "message": json,
             "recipients": recipients          
             }
 

utils/database.py

@@ -12,6 +12,12 @@
 MYSQL_DATABASE = os.getenv("MYSQL_DATABASE")
 SQLEngine=create_engine(f"mysql://{MYSQL_USER}:{MYSQL_PASSWORD}@{MYSQL_URL}:{MYSQL_PORT}/{MYSQL_DATABASE}")
 
+
+def insert_into_database(session, data):
+    session.add(data)
+    session.commit()
+    session.refresh(data)
+
 def create_db_and_tables():
     SQLModel.metadata.create_all(SQLEngine)