completed the data modeling part

app/crud.py

@@ -17,7 +17,15 @@ def add_message(db: Session, message: schemas.MessageBase, username: str):
     # - create a models.Message instance
     # - pass the retrieved user to the message instance
     # - save the message instance to the database
-    raise NotImplemented
+    user = get_or_create_user(db, username)
+    msg = models.Message(**message.dict())
+    msg.user = user
+    db.add(msg)
+    db.commit()
+    db.refresh(msg)
+    return msg
+
 
 def get_user_chat_history(db: Session, username: str):
-    raise NotImplemented
+    user = db.query(models.User).filter(models.User.username == username).first()
+    return user.messages if user is not None else []

app/models.py

@@ -10,7 +10,7 @@ class User(Base):
     # 	This defines the name of the table in the database. 
     # Here, the class User is mapped to a table called users.
     __tablename__ = "users"
-    __table_args__ = {'extend_existing': True}  
+    # __table_args__ = {'extend_existing': True}  
 
     # This line defines a column called id in the users table.
     # Integer: The data type of this column is an integer.
@@ -44,12 +44,12 @@ class User(Base):
 
 class Message(Base):
     __tablename__ = "messages"
-    __table_args__ = {'extend_existing': True} 
+    # __table_args__ = {'extend_existing': True} 
 
-    id = id = Column(Integer, primary_key=True, index=True)
+    id = Column(Integer, primary_key=True, index=True)
+    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
     message = Column(String, nullable=False)
-    type = Column(String(50), nullable=False)
+    type = Column(String, nullable=False)
     timestamp = Column(DateTime, default=datetime.utcnow, nullable=False)
-    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
-
+    
     user = relationship("User", back_populates="messages")

app/schemas.py

@@ -1,18 +1,25 @@
 from pydantic import BaseModel
+from datetime import datetime
 
 class UserQuestion(BaseModel):
     question: str
 
-# TODO: create a HistoryInput data model with a chat_history and question attributes.
+# create a HistoryInput data model with a chat_history and question attributes.
 class HistoryInput(BaseModel):
-    pass
+    chat_history: str
+    question: str
 
-# TODO: let's create a UserRequest data model with a question and username attribute. 
+# let's create a UserRequest data model with a question and username attribute. 
 # This will be used to parse the input request.
 class UserRequest(BaseModel):
     username: str
+    question: str
 
 # TODO: implement MessageBase as a schema mapping from the database model to the 
 # FastAPI data model. Basically MessageBase should have the same attributes as models.Message
 class MessageBase(BaseModel):
-    pass
+    id: int
+    user_id: int
+    message: str
+    type: str
+    timestamp: datetime