Merge pull request #361 from Seluj78/355-chat

Author: Seluj78

backend/PyMatcha/models/message.py

@@ -20,10 +20,12 @@
 
 import logging
 from datetime import datetime
+from typing import Dict
 
 from PyMatcha.utils import create_messages_table
 from PyMatcha.utils.orm import Field
 from PyMatcha.utils.orm import Model
+from timeago import format as timeago_format
 
 
 class Message(Model):
@@ -32,8 +34,8 @@ class Message(Model):
     id = Field(int, modifiable=False)
     from_id = Field(int)
     to_id = Field(int)
-    timestamp = Field(datetime)
-    seen_timestamp = Field(datetime)
+    timestamp = Field(datetime, fmt="%Y-%m-%d %H:%M:%S")
+    seen_timestamp = Field(datetime, fmt="%Y-%m-%d %H:%M:%S")
     content = Field(str)
     is_seen = Field(bool)
     is_liked = Field(bool)
@@ -61,6 +63,16 @@ def create(
         logging.debug("Created new message")
         return new_message
 
+    def to_dict(self) -> Dict:
+        returned_dict = super().to_dict()
+        returned_dict["timestamp_ago"] = timeago_format(self.timestamp, datetime.utcnow())
+        if self.seen_timestamp:
+            returned_dict["seen_timestamp_ago"] = timeago_format(self.seen_timestamp, datetime.utcnow())
+        else:
+            returned_dict["seen_timestamp_ago"] = None
+
+        return returned_dict
+
     @classmethod
     def create_table(cls):
         create_messages_table(cls.db)

backend/PyMatcha/models/user.py

@@ -312,7 +312,7 @@ def get_matches(self):
         return match_list
 
     def send_message(self, to_id, content):
-        Message.create(from_id=self.id, to_id=to_id, content=content)
+        Message.create(from_id=self.id, to_id=to_id, content=content, timestamp=datetime.datetime.utcnow())
 
     def get_messages(self) -> List[Message]:
         with self.db.cursor() as c:

backend/PyMatcha/models/view.py

@@ -32,7 +32,7 @@ class View(Model):
     id = Field(int, modifiable=False)
     profile_id = Field(int)
     viewer_id = Field(int)
-    dt_seen = Field(datetime.datetime)
+    dt_seen = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
 
     @staticmethod
     def create(profile_id: int, viewer_id: int, dt_seen: datetime.datetime = datetime.datetime.utcnow()) -> View:

backend/PyMatcha/routes/api/messages.py

@@ -31,6 +31,8 @@
 from PyMatcha.utils.errors import NotFoundError
 from PyMatcha.utils.success import Success
 from PyMatcha.utils.success import SuccessOutput
+from PyMatcha.utils.success import SuccessOutputMessage
+from timeago import format as timeago_format
 
 
 REQUIRED_KEYS_NEW_MESSAGE = {"to_uid": str, "content": str}
@@ -45,6 +47,7 @@ def get_opened_conversations():
     returned_list = [
         {
             "last_message_timestamp": c.timestamp,
+            "last_message_timestamp_ago": timeago_format(c.timestamp, datetime.datetime.utcnow()),
             "last_message_content": c.content,
             "is_unseen": True if not c.is_seen and c.to_id == current_user.id else False,
             "with_user": get_user(c.to_id if c.to_id != current_user.id else c.from_id).to_dict(),
@@ -72,14 +75,18 @@ def send_message():
 
     current_user.send_message(to_id=to_user.id, content=content)
     current_app.logger.debug("/messages -> Message successfully sent to {}.".format(to_uid))
+    
+    new_message = Message.get_multis(to_id=to_user.id, content=content, from_id=current_user.id)[-1] 
+    
     Notification.create(
         trigger_id=current_user.id,
         user_id=to_user.id,
         content=f"{current_user.first_name} said: {content}",
         type="message",
         link_to=f"conversation/{current_user.id}",
     )
-    return Success("Message successfully sent to {}.".format(to_uid))
+    
+    return SuccessOutputMessage("new_message", new_message.to_dict(), "Message successfully sent to {}.".format(to_uid))    
 
 
 @messages_bp.route("/conversations/<with_uid>", methods=["GET"])
@@ -95,6 +102,7 @@ def get_conversation_messsages(with_uid):
 
     message_list = current_user.get_messages_with_user(with_user.id)
     message_list = [m.to_dict() for m in message_list]
+    message_list = sorted(message_list, key=lambda item: item["timestamp"])
     return SuccessOutput("messages", message_list)
 
 

docker-compose.yml

@@ -25,7 +25,6 @@ services:
   redis:
     container_name: redis
     image: redis:4.0.5-alpine
-    command: ["redis-server", "--appendonly", "yes"]
     hostname: redis
     ports:
       - '6379:6379'