sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.21

Browse Source 
support chat v3
This commit is contained in:
SDE
2023-08-15 16:23:16 +03:00
parent 9d0998fb2b
commit 62c7694c50
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ChatServiceApp/websocket_views.py
View File

@@ -5,11 +5,11 @@ from asgiref.sync import async_to_sync, sync_to_async
from channels.layers import get_channel_layer from channels.layers import get_channel_layer
from django.template.loader import render_to_string from django.template.loader import render_to_string
def get_tickets_wo_manager_html(ticket, user_id, data): def get_tickets_wo_manager_html(ticket, user, data):
from .funcs import get_tickets_wo_manager from .funcs import get_tickets_wo_manager
# если не менеджер - возвращаем None # если не менеджер - возвращаем None
if ticket.manager.id != user_id: if not ticket or ticket.manager.id != user.id:
return None return None
Dict = { Dict = {
@@ -21,16 +21,16 @@ def get_tickets_wo_manager_html(ticket, user_id, data):
return tickets_wo_manager_html return tickets_wo_manager_html
def get_tickets_w_manager_html(ticket, user_id, data): def get_tickets_w_manager_html(ticket, user, data):
from .funcs import get_tickets_w_manager from .funcs import get_tickets_for_manager
# если не менеджер - возвращаем None # если не менеджер - возвращаем None
if ticket.manager.id != user_id: if not ticket or ticket.manager.id != user.id:
return None return None
Dict = { Dict = {
'ticket': ticket, 'ticket': ticket,
'tickets_w_manager': get_tickets_w_manager() 'tickets_w_manager': get_tickets_for_manager(user)
} }
tickets_w_manager_html = render_to_string('widgets/w_tickets_wo_manager.html', Dict) tickets_w_manager_html = render_to_string('widgets/w_tickets_wo_manager.html', Dict)
@@ -76,7 +76,8 @@ class ChatConsumer(WebsocketConsumer):
sender = data['sender'] sender = data['sender']
receiver = data['receiver'] receiver = data['receiver']
sender_obj = User.objects.get(id=sender)
receiver_obj = User.objects.get(id=receiver)
@@ -110,13 +111,14 @@ class ChatConsumer(WebsocketConsumer):
} }
tickets_wo_manager_html = get_tickets_wo_manager_html(ticket, sender, data) if ticket:
if tickets_wo_manager_html: tickets_wo_manager_html = get_tickets_wo_manager_html(ticket, sender_obj, data)
resDict.update({'tickets_wo_manager_html': tickets_wo_manager_html}) 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, sender, data) tickets_w_manager_html = get_tickets_w_manager_html(ticket, sender_obj, data)
if tickets_w_manager_html: if tickets_w_manager_html:
resDict.update({'tickets_w_manager_html': tickets_w_manager_html}) resDict.update({'tickets_w_manager_html': tickets_w_manager_html})
resDict.update(Dict) resDict.update(Dict)
@@ -145,13 +147,14 @@ class ChatConsumer(WebsocketConsumer):
'group_name': group_name, 'group_name': group_name,
} }
tickets_wo_manager_html = get_tickets_wo_manager_html(ticket, receiver, data) if ticket:
if tickets_wo_manager_html: tickets_wo_manager_html = get_tickets_wo_manager_html(ticket, receiver_obj, data)
resDict.update({'tickets_wo_manager_html': tickets_wo_manager_html}) 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, sender, data) tickets_w_manager_html = get_tickets_w_manager_html(ticket, receiver_obj, data)
if tickets_w_manager_html: if tickets_w_manager_html:
resDict.update({'tickets_w_manager_html': tickets_w_manager_html}) resDict.update({'tickets_w_manager_html': tickets_w_manager_html})
resDict.update(Dict) resDict.update(Dict)
async_to_sync(self.channel_layer.group_send)( async_to_sync(self.channel_layer.group_send)(