Merge branch 'dev'

Author: VeryBigSad

chats/serializers.py

@@ -18,7 +18,9 @@ class DirectChatListSerializer(serializers.ModelSerializer):
 
     def get_opponent(self, chat: DirectChat):
         user = self.context.get("opponent")
-        return UserDetailSerializer(user).data
+        return UserDetailSerializer(
+            user, context={"request": self.context.get("request")}
+        ).data
 
     def get_name(self, chat: DirectChat):
         user = self.context.get("opponent")
@@ -42,7 +44,9 @@ class DirectChatDetailSerializer(serializers.ModelSerializer):
 
     def get_opponent(self, chat: DirectChat):
         user = self.context.get("opponent")
-        return UserDetailSerializer(user).data
+        return UserDetailSerializer(
+            user, context={"request": self.context.get("request")}
+        ).data
 
     class Meta:
         model = DirectChat
@@ -87,9 +91,10 @@ def get_image_address(cls, chat: ProjectChat):
     def get_name(cls, chat: ProjectChat):
         return chat.project.name
 
-    @classmethod
-    def get_users(cls, chat: ProjectChat):
-        return UserListSerializer(chat.get_users(), many=True).data
+    def get_users(self, chat: ProjectChat):
+        return UserListSerializer(
+            chat.get_users(), context={"request": self.context.get("request")}, many=True
+        ).data
 
     class Meta:
         model = ProjectChat

users/serializers.py

@@ -104,8 +104,10 @@ def get_projects(cls, user: CustomUser):
     def get_links(cls, user: CustomUser):
         return [user_link.link for user_link in user.links.all()]
 
-    @classmethod
-    def get_is_online(cls, user: CustomUser):
+    def get_is_online(self, user: CustomUser):
+        request = self.context.get("request")
+        if request and request.user.is_authenticated and request.user.id == user.id:
+            return True
         cache_key = get_user_online_cache_key(user)
         return cache.get(cache_key, False)
 
@@ -240,8 +242,11 @@ class UserListSerializer(serializers.ModelSerializer):
     key_skills = KeySkillsField(required=False)
     is_online = serializers.SerializerMethodField()
 
-    @classmethod
-    def get_is_online(cls, user: CustomUser) -> bool:
+    def get_is_online(self, user: CustomUser) -> bool:
+        request = self.context.get("request")
+        if request and request.user.is_authenticated and request.user.id == user.id:
+            return True
+
         cache_key = get_user_online_cache_key(user)
         is_online = cache.get(cache_key, False)
         return is_online

users/views.py

@@ -317,7 +317,9 @@ def put(self, request: Request, pk):
             request.user.onboarding_stage = new_stage
             request.user.save()
 
-            serialized_user = UserListSerializer(request.user)
+            serialized_user = UserListSerializer(
+                request.user, context={"request": request}
+            )
             data = serialized_user.data
             return Response(status=status.HTTP_200_OK, data=data)
         except Exception: