fyp

app/models/message.py

@@ -43,6 +43,7 @@ class Message:
             "replied_to_sender": replied_to_sender,  # Name of original sender
             "is_read": False,
             "read_at": None,
+            "read_by": [],  # List of user IDs who have read this message
             # Edit tracking
             "is_edited": False,
             "edited_at": None,
@@ -163,13 +164,37 @@ class Message:
             # Reactions
             "reactions": message_doc.get("reactions", {}),
             "created_at": Message._serialize_datetime(message_doc.get("created_at")),
-            # Status field for read receipts (derived from is_read)
-            "status": "read" if message_doc.get("is_read", False) else "sent",
+            # Status field for read receipts - calculated from sender's perspective
+            "status": Message._calculate_status(message_doc, for_user_id),
             # Action availability flags for frontend UI
             "can_edit": action_availability["can_edit"],
             "can_delete_for_everyone": action_availability["can_delete_for_everyone"],
         }
         
         return response
+    
+    @staticmethod
+    def _calculate_status(message_doc: dict, for_user_id: Optional[str] = None) -> str:
+        """
+        Calculate message status from user's perspective.
+        
+        For sender: Check if recipient has read it
+        For recipient: Always show as delivered (they have it)
+        """
+        sender_id = message_doc.get("sender_id")
+        read_by = message_doc.get("read_by", [])
+        
+        # If viewing as sender
+        if for_user_id and for_user_id == sender_id:
+            # Check if anyone else has read it
+            other_readers = [uid for uid in read_by if uid != sender_id]
+            if other_readers:
+                return "read"
+            else:
+                return "delivered"  # Sent and delivered but not read yet
+        else:
+            # Viewing as recipient - they have the message
+            return "delivered"
+
 
 

app/services/conversation_service.py

@@ -1001,22 +1001,27 @@ If user says they found what they wanted or wants to stop notifications, use del
                 detail="You are not a participant in this conversation"
             )
         
-        # Mark messages as read
+        # Mark messages as read and add user to read_by array
         now = datetime.utcnow()
-        await db.messages.update_many(
+        result = await db.messages.update_many(
             {
                 "conversation_id": conversation_id,
-                "sender_id": {"$ne": current_user_id},
-                "is_read": False,
+                "sender_id": {"$ne": current_user_id},  # Not sent by this user
+                "read_by": {"$ne": current_user_id},  # Not already read by this user
             },
             {
                 "$set": {
-                    "is_read": True,
+                    "is_read": True,  # Keep for backwards compatibility
                     "read_at": now,
+                },
+                "$addToSet": {
+                    "read_by": current_user_id  # Add user to read_by array (no duplicates)
                 }
             }
         )
         
+        logger.info(f"Marked {result.modified_count} messages as read, added {current_user_id} to read_by")
+        
         # Reset unread count for current user
         await db.conversations.update_one(
             {"_id": ObjectId(conversation_id)},