Merge pull request #221 from PROCOLLAB-github/dev

webhook online events and more

Author: VeryBigSad

chats/consumers/chat.py

@@ -46,13 +46,6 @@ async def connect(self):
         cache.set(
             get_user_channel_cache_key(self.user), self.channel_name, ONE_WEEK_IN_SECONDS
         )
-        # set user online
-        user_cache_key = get_user_online_cache_key(self.user)
-        cache.set(user_cache_key, True, ONE_DAY_IN_SECONDS)
-
-        online_users = cache.get(get_users_online_cache_key(), set())
-        online_users.add(self.user.id)
-        cache.set(get_users_online_cache_key(), online_users)
 
         # get all projects that user is a member of
         project_ids_list = Collaborator.objects.filter(user=self.user).values_list(
@@ -68,6 +61,18 @@ async def connect(self):
                 f"{EventGroupType.CHATS_RELATED}_{project_id}", self.channel_name
             )
 
+        # set user online
+        user_cache_key = get_user_online_cache_key(self.user)
+        cache.set(user_cache_key, True, ONE_DAY_IN_SECONDS)
+        online_users = cache.get(get_users_online_cache_key(), set())
+        online_users.add(self.user.id)
+        cache.set(get_users_online_cache_key(), online_users)
+        # notify everyone that this user is online
+        await self.channel_layer.group_send(
+            EventGroupType.GENERAL_EVENTS,
+            {"type": EventType.SET_OFFLINE, "user": {"id": self.user.id}},
+        )
+
         await self.channel_layer.group_add(
             EventGroupType.GENERAL_EVENTS, self.channel_name
         )
@@ -81,8 +86,9 @@ async def disconnect(self, close_code):
         cache.delete(get_user_online_cache_key(self.user))
         room_name = EventGroupType.GENERAL_EVENTS
 
+        # TODO: add a User extra-small serializer for this?
         await self.channel_layer.group_send(
-            room_name, {"type": EventType.SET_OFFLINE, "user_id": self.user.pk}
+            room_name, {"type": EventType.SET_OFFLINE, "user": {"id": self.user.id}}
         )
 
     async def receive_json(self, content, **kwargs):
@@ -99,7 +105,6 @@ async def receive_json(self, content, **kwargs):
             EventType.DELETE_MESSAGE,
             EventType.EDIT_MESSAGE,
         ]:
-
             if event.content["chat_type"] == ChatType.DIRECT:
                 self.event = DirectEvent(self.user, self.channel_layer, self.channel_name)
             elif event.content["chat_type"] == ChatType.PROJECT:

docker-compose.prod-ci.yml

@@ -66,4 +66,4 @@ volumes:
   prom-data:
   prom-configs:
   log:
-  redis_data:
+  redis-data: