Merge remote-tracking branch 'origin/main'

ChatServiceApp/websocket_views.py

@@ -21,32 +21,33 @@ class ChatConsumer(WebsocketConsumer):
 
         from .funcs import send_msg
         resDict = send_msg(text_data)
-        # resDict.update({
-        #     'type': 'chat_message',
-        #
-        # })
-        print(f'send_msg res = {resDict}')
+        resDict.update({
+            'type': 'ws_send_msg',
+            'message': resDict,
+            # 'sender': sender
+        })
+        print(f'send_msg res = {len(resDict)}')
 
         self.send(json.dumps(resDict))
 
-        # async_to_sync(self.channel_layer.group_send)(
-        #     self.room_group_name,
-        #     resDict
-        #     # {
-        #     #     'type': 'chat_message',
-        #     #     'message': message,
-        #     #     'sender': sender
-        #     # }
-        # )
+        async_to_sync(self.channel_layer.group_send)(
+            self.room_group_name,
+            resDict
+            # {
+            #     'type': 'chat_message',
+            #     'message': message,
+            #     'sender': sender
+            # }
+        )
 
-    def chat_message(self, event):
-        print('ws chat_message')
+    def ws_send_msg(self, event):
+        print('ws ws_send_msg')
 
         message = event['message']
-        sender = event['sender']
+        # sender = event['sender']
 
         self.send(text_data=json.dumps({
             'type': 'chat',
             'message': message,
-            'sender': sender
+            # 'sender': sender
         }))