0.3.8

chat v3

ChatServiceApp/websocket_views.py

@@ -22,16 +22,7 @@ class ChatConsumer(WebsocketConsumer):
         print(f'self.channel_name = {self.channel_name}')
         self.accept()
 
-    def ws_send_msg(self, msg_type, group_name, msg):
-        msgDict = {
-            'type': msg_type,
-            'message': msg,
-            # 'sender': resDict['sender']
-        }
-        async_to_sync(self.channel_layer.group_send)(
-            group_name,
-            msgDict
-        )
+
 
 
     def receive(self, text_data):
@@ -39,26 +30,36 @@ class ChatConsumer(WebsocketConsumer):
 
         data = json.loads(text_data)
 
-        from .funcs import send_msg
-        Dict = send_msg(text_data)
+        sender = data['sender']
+        receiver = data['receiver']
+
+        from .funcs import send_msg, update_chat
+        send_msg(data)
+        Dict = update_chat(data)
 
-        group_name = f'user_{data["receiver"]}'
         resDict = {
-            'type': 'echo',
-            'message': f'group = {group_name}',
+            'type': 'update_chat',
+            # 'message': Dict,
             # 'sender': resDict['sender']
         }
+        resDict.update(Dict)
+        group_name = f'user_{sender}'
         async_to_sync(self.channel_layer.group_send)(
             group_name,
             resDict
         )
 
+        data['sender'] = receiver
+        data['receiver'] = sender
+        Dict = update_chat(data)
+
+        group_name = f'user_{receiver}'
         resDict = {
-            'type': 'echo',
-            'message': Dict,
+            'type': 'update_chat',
+            # 'message': Dict,
             # 'sender': resDict['sender']
         }
-        group_name = f'user_{data["sender"]}'
+        resDict.update(Dict)
         async_to_sync(self.channel_layer.group_send)(
             group_name,
             resDict
@@ -69,9 +70,12 @@ class ChatConsumer(WebsocketConsumer):
 
         self.send(text_data=json.dumps(data))
 
+    def update_chat(self, data):
+        print('ws update_chat')
+
+        self.send(text_data=json.dumps(data))
+
     def ws_send_msg(self, data):
         print('ws ws_send_msg')
 
-        data['type'] = 'chat'
-
         self.send(text_data=json.dumps(data))