Skip to content

Commit 51eaa9d

Browse files
authored
Merge pull request #216 from PROCOLLAB-github/dev
attempt to fix is_online for user serializers
2 parents 8ba8fb7 + 77d4fe2 commit 51eaa9d

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

chats/consumers/chat.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ async def connect(self):
4747
get_user_channel_cache_key(self.user), self.channel_name, ONE_WEEK_IN_SECONDS
4848
)
4949
# set user online
50-
cache.delete(get_user_online_cache_key(self.user))
50+
user_cache_key = get_user_online_cache_key(self.user)
51+
cache.set(user_cache_key, True, ONE_DAY_IN_SECONDS)
52+
5153
online_users = cache.get(get_users_online_cache_key(), set())
5254
online_users.add(self.user.id)
5355
cache.set(get_users_online_cache_key(), online_users)
@@ -78,6 +80,9 @@ async def disconnect(self, close_code):
7880
online_users.discard(self.user.id)
7981
cache.set(get_users_online_cache_key(), online_users)
8082

83+
user_cache_key = get_user_online_cache_key(self.user)
84+
cache.set(user_cache_key, False, ONE_DAY_IN_SECONDS)
85+
8186
async def receive_json(self, content, **kwargs):
8287
"""Receive message from WebSocket in JSON format"""
8388

@@ -229,8 +234,3 @@ async def decode_json(self, text_data) -> dict:
229234
except JSONDecodeError as error:
230235
await self.disconnect(400)
231236
raise error
232-
233-
234-
"""
235-
236-
"""

chats/views.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,12 @@ def get(self, request, *args, **kwargs):
221221
direct_messages = user.direct_chats.all().prefetch_related("messages")
222222
project_messages = user.get_project_chats().prefetch_related("messages")
223223

224-
has_direct_messages_unread = direct_messages.filter(messages__is_read=False).exists()
225-
has_project_messages_unread = project_messages.filter(messages__is_read=False).exists()
224+
has_direct_messages_unread = direct_messages.filter(
225+
messages__is_read=False
226+
).exists()
227+
has_project_messages_unread = project_messages.filter(
228+
messages__is_read=False
229+
).exists()
226230
return Response(
227231
{"has_unreads": has_direct_messages_unread or has_project_messages_unread}
228232
)

partner_programs/serializers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class Meta:
8383
"cover_image_address",
8484
"presentation_address",
8585
"views_count",
86-
"datetime_registration_ends"
86+
"datetime_registration_ends",
8787
)
8888

8989

@@ -101,7 +101,7 @@ class Meta:
101101
"cover_image_address",
102102
"advertisement_image_address",
103103
"presentation_address",
104-
"datetime_registration_ends"
104+
"datetime_registration_ends",
105105
)
106106

107107

0 commit comments

Comments
 (0)