pythonDrive
diff --git a/‎bootcamp/notifications/consumers.py‎
Lines changed: 7 additions & 5 deletions b/‎bootcamp/notifications/consumers.py‎
Lines changed: 7 additions & 5 deletions
diff --git a/‎bootcamp/notifications/models.py‎
Lines changed: 15 additions & 4 deletions b/‎bootcamp/notifications/models.py‎
Lines changed: 15 additions & 4 deletions
diff --git a/‎bootcamp/static/js/bootcamp.js‎
Lines changed: 3 additions & 2 deletions b/‎bootcamp/static/js/bootcamp.js‎
Lines changed: 3 additions & 2 deletions
@@ -29,8 +29,10 @@ async def disconnect(self, close_code):
     async def receive(self, text_data):
         """Receive method implementation to redirect any new message received
         on the websocket to broadcast to all the clients."""
-        await self.send(text_data=json.dumps({
-            'key': text_data['key'],
-            'username': text_data['username'],
-            'id_value': text_data['id_value']
-        }))
+        payload = {
+                'key': text_data['key'],
+                'actor_name': text_data['actor_name'],
+                'id_value': text_data['id_value'],
+                'recipient': text_data['recipient']
+            }
+        await self.send(text_data=json.dumps(payload))
@@ -210,7 +210,9 @@ def notification_handler(actor, recipient, verb, **kwargs):
     :param verb: Notification attribute with the right choice from the list.
 
     :optional:
-    :action_object: Model instance on which the verb was executed.
+    :param action_object: Model instance on which the verb was executed.
+    :param key: String defining what kind of notification is going to be created.
+    :param id_value: UUID value assigned to a specific element in the DOM.
     """
     key = kwargs.pop('key', 'notification')
     id_value = kwargs.pop('id_value', None)
@@ -224,6 +226,8 @@ def notification_handler(actor, recipient, verb, **kwargs):
                 action_object=kwargs.pop('action_object', None)
             )
 
+        notification_broadcast(actor, key)
+
     elif isinstance(recipient, list):
         for user in recipient:
             Notification.objects.create(
@@ -240,13 +244,20 @@ def notification_handler(actor, recipient, verb, **kwargs):
             verb=verb,
             action_object=kwargs.pop('action_object', None)
         )
+        notification_broadcast(
+            actor, key, id_value=id_value, recipient=recipient)
 
     else:
         pass
-    notification_broadcast(actor, key, id_value)
 
 
-def notification_broadcast(actor, key, id_value):
+def notification_broadcast(actor, key, **kwargs):
     channel_layer = get_channel_layer()
-    payload = {'type': 'receive', 'key': key, 'id_value': id_value, 'username': actor.username }
+    payload = {
+                'type': 'receive',
+                'key': key,
+                'actor_name': actor.username,
+                'id_value': kwargs.pop('id_value', None),
+                'recipient': kwargs.pop('recipient', None)
+            }
     async_to_sync(channel_layer.group_send)('notifications', payload)
@@ -47,7 +47,6 @@ $(function () {
             type: 'POST',
             cache: false,
             success: function (data) {
-                console.log(data)
                 $(".like-count", newsToUpdate).text(data.likes);
                 $(".comment-count", newsToUpdate).text(data.comments);
             },
@@ -109,7 +108,9 @@ $(function () {
     webSocket.listen(function(event) {
         switch (event.key) {
             case "notification":
-            console.log(currentUser)
+                $("#notifications").addClass("btn-danger");
+
+            case "social_update":
                 $("#notifications").addClass("btn-danger");
                 update_social_activity(event.id_value);