Add opponent field to DirectChatListSerializer

Author: yakser

chats/serializers.py

@@ -12,11 +12,11 @@
 
 class DirectChatListSerializer(serializers.ModelSerializer):
     last_message = serializers.SerializerMethodField()
-    users = serializers.SerializerMethodField(read_only=True)
+    opponent = serializers.SerializerMethodField()
 
-    @classmethod
-    def get_users(cls, chat: ProjectChat):
-        return UserListSerializer(chat.get_users(), many=True).data
+    def get_opponent(self):
+        user = self.context.get("opponent")
+        return UserDetailSerializer(user).data
 
     @classmethod
     def get_last_message(cls, chat: DirectChat):
@@ -26,7 +26,7 @@ class Meta:
         model = DirectChat
         fields = [
             "id",
-            "users",
+            "opponent",
             "last_message",
         ]
 
@@ -35,7 +35,7 @@ class DirectChatDetailSerializer(serializers.ModelSerializer):
     users = serializers.SerializerMethodField(read_only=True)
 
     @classmethod
-    def get_users(cls, chat: ProjectChat):
+    def get_users(cls, chat: DirectChat):
         return UserListSerializer(chat.get_users(), many=True).data
 
     class Meta:

chats/views.py

@@ -70,16 +70,19 @@ def get(self, request, *args, **kwargs) -> Response:
             user1 = User.objects.get(pk=user1_id)
             user2 = User.objects.get(pk=user2_id)
 
-            data = DirectChatDetailSerializer(DirectChat.get_chat(user1, user2)).data
-
             if user1 == request.user:
+                opponent = user2
                 # may be is better to use serializer or return dict -
                 # {"first_name": user2.first_name, "last_name": user2.last_name}
-                data["name"] = f"{user2.first_name} {user2.last_name}"
-                data["image_address"] = user2.avatar
             else:
-                data["name"] = f"{user1.first_name} {user1.last_name}"
-                data["image_address"] = user1.avatar
+                opponent = user1
+            context = {"opponent": opponent}
+            data = DirectChatDetailSerializer(
+                DirectChat.get_chat(user1, user2), context=context
+            ).data
+
+            data["name"] = f"{opponent.first_name} {opponent.last_name}"
+            data["image_address"] = opponent.avatar
 
             return Response(
                 status=status.HTTP_200_OK,