Added route to get conversation messages

Author: Seluj78

backend/PyMatcha/models/user.py

@@ -459,8 +459,6 @@ def get_conversation_list(self) -> List[Message]:
         return conversation_list
 
     def get_messages_with_user(self, with_user_id) -> List[Message]:
-        # TODO: Create a function to get latest messages only. Maybe https://stackoverflow.com/a/41095528/6350162 ?
-        #  Based on time or amount of messages https://stackoverflow.com/a/3799223/6350162
         with self.db.cursor() as c:
             c.execute(
                 """
@@ -495,7 +493,7 @@ def get_messages_with_user(self, with_user_id) -> List[Message]:
             messages = c.fetchall()
             message_list = []
             for message in messages:
-                message_list.append(Message(message).get_all_info())
+                message_list.append(Message(message))
         logging.debug(
             "Getting all messages between user {} and {} (Total: {})".format(self.id, with_user_id, len(message_list))
         )

backend/PyMatcha/routes/api/messages.py

@@ -31,17 +31,11 @@
 
 
 REQUIRED_KEYS_NEW_MESSAGE = {"to_id": int, "content": str}
-# REQUIRED_KEYS_GET_CONVERSATION = {"with_id": int}
 
 messages_bp = Blueprint("messages", __name__)
 
-# TODO: Route to get the last message for each open conversation
-# TODO: Route to send a new message to a conversation
 
-"""
-Route to get latest messages with user (then paginated to get the older messages)
-route to receive messages
-"""
+# TODO: route to receive messages
 
 
 @messages_bp.route("/conversations", methods=["GET"])
@@ -52,6 +46,19 @@ def get_opened_conversations():
     return SuccessOutput("conversations", returned_list)
 
 
+@messages_bp.route("/conversations/<with_uid>", methods=["GET"])
+@jwt_required
+def get_conversation_messsages(with_uid):
+    # TODO: Limit to 200 messages and if need be get more
+    try:
+        with_user = get_user(with_uid)
+    except NotFoundError:
+        raise NotFoundError("With user {} not found", "Try again")
+    message_list = current_user.get_messages_with_user(with_user.id)
+    message_list = [m.to_dict for m in message_list]
+    return SuccessOutput("messages", message_list)
+
+
 @messages_bp.route("/messages/see/<with_uid>", methods=["POST"])
 @jwt_required
 def see_conversation_messages(with_uid):
@@ -94,12 +101,3 @@ def send_message():
     current_user.send_message(to_id=to_id, content=content)
     current_app.logger.debug("/messages -> Message successfully sent to {}".format(to_id))
     return Success("Message successfully sent to {}".format(to_id))
-
-
-# @messages_bp.route("/messages/conversation", methods=["GET"])
-# @jwt_required
-# @validate_params(REQUIRED_KEYS_GET_CONVERSATION)
-# def get_conversation():
-#     data = request.get_json()
-#     with_id: int = int(data["with_id"])
-#     return SuccessOutput("messages", current_user.get_messages_with_user(with_id))