From 6350d86bde1e714e28987c3acb3b0458a674032d Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Mon, 25 Dec 2023 23:43:21 -0800
Subject: [PATCH] fix: chat model schema

---
 backend/apps/web/models/auths.py | 24 +++++++++++++-----------
 backend/apps/web/models/chats.py | 14 ++++++++------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/backend/apps/web/models/auths.py b/backend/apps/web/models/auths.py
index aef80e2f9..99a7567eb 100644
--- a/backend/apps/web/models/auths.py
+++ b/backend/apps/web/models/auths.py
@@ -98,21 +98,23 @@ class AuthsTable:
 
     def authenticate_user(self, email: str, password: str) -> Optional[UserModel]:
         print("authenticate_user", email)
+        try:
+            auth = Auth.get(Auth.email == email, Auth.active == True)
+            print(auth.email)
 
-        auth = Auth.get(Auth.email == email, Auth.active == True)
-        print(auth.email)
+            if auth:
+                print(password, str(auth.password))
+                print(verify_password(password, str(auth.password)))
+                if verify_password(password, auth.password):
+                    user = Users.get_user_by_id(auth.id)
 
-        if auth:
-            print(password, str(auth.password))
-            print(verify_password(password, str(auth.password)))
-            if verify_password(password, auth.password):
-                user = Users.get_user_by_id(auth.id)
-
-                print(user)
-                return user
+                    print(user)
+                    return user
+                else:
+                    return None
             else:
                 return None
-        else:
+        except:
             return None
 
 
diff --git a/backend/apps/web/models/chats.py b/backend/apps/web/models/chats.py
index 30a21a807..cd915d9a3 100644
--- a/backend/apps/web/models/chats.py
+++ b/backend/apps/web/models/chats.py
@@ -18,7 +18,7 @@ from apps.web.internal.db import DB
 
 class Chat(Model):
     id = CharField(unique=True)
-    user_id: CharField()
+    user_id = CharField()
     title = CharField()
     chat = TextField()  # Save Chat JSON as Text
     timestamp = DateField()
@@ -31,7 +31,7 @@ class ChatModel(BaseModel):
     id: str
     user_id: str
     title: str
-    chat: dict
+    chat: str
     timestamp: int  # timestamp in epoch
 
 
@@ -64,8 +64,10 @@ class ChatTable:
             **{
                 "id": id,
                 "user_id": user_id,
-                "title": form_data.chat["title"],
-                "chat": json.dump(form_data.chat),
+                "title": form_data.chat["title"]
+                if "title" in form_data.chat
+                else "New Chat",
+                "chat": json.dumps(form_data.chat),
                 "timestamp": int(time.time()),
             }
         )
@@ -75,7 +77,7 @@ class ChatTable:
 
     def update_chat_by_id(self, id: str, chat: dict) -> Optional[ChatModel]:
         try:
-            query = Chat.update(chat=json.dump(chat)).where(Chat.id == id)
+            query = Chat.update(chat=json.dumps(chat)).where(Chat.id == id)
             query.execute()
 
             chat = Chat.get(Chat.id == id)
@@ -88,7 +90,7 @@ class ChatTable:
     ) -> List[ChatModel]:
         return [
             ChatModel(**model_to_dict(chat))
-            for chat in Chat.select(Chat.id, Chat.title)
+            for chat in Chat.select()
             .where(Chat.user_id == user_id)
             .limit(limit)
             .offset(skip)