diff --git a/ChatServiceApp/websocket_views.py b/ChatServiceApp/websocket_views.py index 4a95734..25b3de0 100644 --- a/ChatServiceApp/websocket_views.py +++ b/ChatServiceApp/websocket_views.py @@ -185,40 +185,40 @@ class ChatConsumer(WebsocketConsumer): resDict ) - # group_name = f'user_{receiver}' - # # if group_name in self.channel_layer.groups.keys(): - # data.update({ - # 'cur_user': receiver, - # 'required_beep': True, - # }) - # Dict = get_update_chat_Dict(data) - # - # if 'support_chat_html' in Dict: - # msg_type = 'update_support_chat' - # else: - # msg_type = 'update_chat' - # - # resDict = { - # 'type': msg_type, - # 'sender': receiver, - # 'receiver': sender, - # 'group_name': group_name, - # } - # - # if ticket: - # tickets_wo_manager_html = get_tickets_wo_manager_html(ticket, receiver_obj, data) - # if tickets_wo_manager_html: - # resDict.update({'tickets_wo_manager_html': tickets_wo_manager_html}) - # - # tickets_w_manager_html = get_tickets_w_manager_html(ticket, receiver_obj, data) - # if tickets_w_manager_html: - # resDict.update({'tickets_w_manager_html': tickets_w_manager_html}) - # - # resDict.update(Dict) - # async_to_sync(self.channel_layer.group_send)( - # group_name, - # resDict - # ) + group_name = f'user_{receiver}' + # if group_name in self.channel_layer.groups.keys(): + data.update({ + 'cur_user': receiver, + 'required_beep': True, + }) + Dict = get_update_chat_Dict(data) + + if 'support_chat_html' in Dict: + msg_type = 'update_support_chat' + else: + msg_type = 'update_chat' + + resDict = { + 'type': msg_type, + 'sender': receiver, + 'receiver': sender, + 'group_name': group_name, + } + + if ticket: + tickets_wo_manager_html = get_tickets_wo_manager_html(ticket, receiver_obj, data) + if tickets_wo_manager_html: + resDict.update({'tickets_wo_manager_html': tickets_wo_manager_html}) + + tickets_w_manager_html = get_tickets_w_manager_html(ticket, receiver_obj, data) + if tickets_w_manager_html: + resDict.update({'tickets_w_manager_html': tickets_w_manager_html}) + + resDict.update(Dict) + async_to_sync(self.channel_layer.group_send)( + group_name, + resDict + )