Merge pull request #92 from sobhanvn7/fix-last-message-bug

Fix last message bug

Author: jitendra-ky

README.md

@@ -21,3 +21,4 @@ In this project **Dragonfly**, I am developing a fully functional open-source ch
 Thanks to valuable contributors 💖
 
 - [@jitendra-ky](https://github.com/jitendra-ky)
+- [@sobhanvn7](https://github.com/sobhanvn7)

static/js/home.js

@@ -168,7 +168,10 @@ function rerender_contacts_view() {
         const profile = $('<div>').addClass('chat-item-profile')
         const details = $('<div>').addClass('chat-item-details')
         details.append($('<h4>').text(contact.email))
-        details.append($('<p>').text('Hey, how are you?'))
+        // Append the actual last message from the contact if available
+        if (contact.last_message) {
+          details.append($('<p>').text(contact.last_message))
+        }
         contactContent.append(profile, details)
         contactElement.append(contactContent)
         chatList.append(contactElement)

zserver/serializers/user_profile.py

@@ -1,10 +1,20 @@
+from django.db.models import Q  # Import Q object for building complex queries using OR conditions
 from rest_framework import serializers
 
-from zserver.models import Session, SignUpOTP, UnverifiedUserProfile, UserProfile, VerifyUserOTP
+from zserver.models import (
+    Message,
+    Session,
+    SignUpOTP,
+    UnverifiedUserProfile,
+    UserProfile,
+    VerifyUserOTP,
+)
 
 
 # Serializer class for the UserProfile model
 class UserProfileSerializer(serializers.ModelSerializer):
+    # Add dynamic field for last message between the user and the contact
+    last_message = serializers.SerializerMethodField()
     class Meta:
         """Meta class to specify the model and fields to be serialized."""
 
@@ -14,11 +24,27 @@ class Meta:
             "fullname",
             "email",
             "password",
+            "last_message",
         ]  # Fields to be included in the serialization
         extra_kwargs = {
             "password": {"write_only": True},  # Make the password field write-only
         }
 
+    def get_last_message(self, contact: UserProfile) -> str:
+        """Retrieve the last message exchanged with the given contact."""
+        # Get the authenticated user from serializer context
+        user = self.context.get("user")
+        if not user:
+            return None
+
+        # Fetch the latest message between user and this contact
+        last_msg = Message.objects.filter(
+            Q(sender=user, receiver=contact) | Q(sender=contact, receiver=user),
+        ).order_by("-timestamp").first()
+
+        # Return message text if available, else None
+        return last_msg.content if last_msg else None
+
     def update(self, instance: UserProfile, validated_data: dict) -> UserProfile:
         """Update an existing user profile."""
         instance.fullname = validated_data.get("fullname", instance.fullname)

zserver/views/message.py

@@ -67,7 +67,8 @@ def get(self, request: Request) -> Response:
         contacts_sender = { msg.receiver for msg in Message.objects.filter(sender=user) }
         contacts_receiver = { msg.sender for msg in Message.objects.filter(receiver=user) }
         contacts = contacts_sender.union(contacts_receiver)
-        serializer = UserProfileSerializer(contacts, many=True)
+        # With this one — pass the authenticated user via context for custom field logic
+        serializer = UserProfileSerializer(contacts, many=True, context={"user": user})
         return Response(serializer.data)