fixed comments in establishment list or detail endpoints

apps/comment/serializers/common.py

@@ -17,6 +17,7 @@ class CommentBaseMixin(serializers.Serializer):
 class CommentSerializer(CommentBaseMixin, serializers.ModelSerializer):
     """Comment serializer"""
     is_mine = serializers.BooleanField(read_only=True)
+    profile_pic = serializers.SerializerMethodField()
 
     class Meta:
         """Serializer for model Comment"""
@@ -32,6 +33,10 @@ class CommentSerializer(CommentBaseMixin, serializers.ModelSerializer):
             'profile_pic'
         ]
 
+    def get_profile_pic(self, obj):
+        """Get profile picture URL"""
+        return obj.user.get_full_image_url(request=self.context.get('request'))
+
 
 class EstablishmentCommentCreateSerializer(CommentSerializer):
     """Create comment serializer"""

apps/establishment/serializers.py

@@ -186,10 +186,13 @@ class EstablishmentSerializer(serializers.ModelSerializer):
         """Serializer method for comment field"""
         request = self.context.get('request')
         if request.user.is_authenticated:
-            return CommentSerializer(obj.comments.all().annotate_is_mine_status(user=request.user),
+            return CommentSerializer(obj.comments.annotate_is_mine_status(user=request.user),
+                                     context={'request': self.context.get('request')},
                                      many=True).data
         else:
-            return CommentSerializer(obj.comments.all(), many=True).data
+            return CommentSerializer(obj.comments,
+                                     context={'request': self.context.get('request')},
+                                     many=True).data
 
     def get_preview_image(self, obj):
         """Get preview image"""