0.3.20
support chat v3
This commit is contained in:
@@ -3,6 +3,39 @@ from channels.generic.websocket import WebsocketConsumer, AsyncWebsocketConsumer
|
||||
from asgiref.sync import async_to_sync, sync_to_async
|
||||
# from channels.auth import channel_session_user, channel_session_user_from_http
|
||||
from channels.layers import get_channel_layer
|
||||
from django.template.loader import render_to_string
|
||||
|
||||
def get_tickets_wo_manager_html(ticket, user_id, data):
|
||||
from .funcs import get_tickets_wo_manager
|
||||
|
||||
# если не менеджер - возвращаем None
|
||||
if ticket.manager.id != user_id:
|
||||
return None
|
||||
|
||||
Dict = {
|
||||
'ticket': ticket,
|
||||
'tickets_wo_manager': get_tickets_wo_manager()
|
||||
}
|
||||
tickets_wo_manager_html = render_to_string('widgets/w_tickets_wo_manager.html', Dict)
|
||||
|
||||
return tickets_wo_manager_html
|
||||
|
||||
|
||||
def get_tickets_w_manager_html(ticket, user_id, data):
|
||||
from .funcs import get_tickets_w_manager
|
||||
|
||||
# если не менеджер - возвращаем None
|
||||
if ticket.manager.id != user_id:
|
||||
return None
|
||||
|
||||
Dict = {
|
||||
'ticket': ticket,
|
||||
'tickets_w_manager': get_tickets_w_manager()
|
||||
}
|
||||
tickets_w_manager_html = render_to_string('widgets/w_tickets_wo_manager.html', Dict)
|
||||
|
||||
return tickets_w_manager_html
|
||||
|
||||
|
||||
class ChatConsumer(WebsocketConsumer):
|
||||
|
||||
@@ -35,19 +68,39 @@ class ChatConsumer(WebsocketConsumer):
|
||||
def receive(self, text_data):
|
||||
print(f'ws receive text_data = {text_data}')
|
||||
|
||||
from AuthApp.models import User
|
||||
from .models import Message, MsgGroup
|
||||
|
||||
|
||||
data = json.loads(text_data)
|
||||
|
||||
sender = data['sender']
|
||||
receiver = data['receiver']
|
||||
|
||||
|
||||
|
||||
|
||||
from .funcs import send_msg, get_update_chat_Dict
|
||||
data.update({
|
||||
'cur_user': sender,
|
||||
'required_beep': False,
|
||||
})
|
||||
send_msg(data)
|
||||
|
||||
ticket = None
|
||||
|
||||
if 'ticket_id' in data and data['ticket_id']:
|
||||
ticket = MsgGroup.objects.get(id=data['ticket_id'])
|
||||
# receiver_obj = User.objects.get(id=receiver)
|
||||
msgs = Message.objects.filter(
|
||||
receiver__id=sender, group__id=data['ticket_id']
|
||||
)
|
||||
msgs.update(status='seen')
|
||||
|
||||
Dict = get_update_chat_Dict(data)
|
||||
|
||||
|
||||
|
||||
group_name = f'user_{sender}'
|
||||
resDict = {
|
||||
'type': 'update_chat',
|
||||
@@ -56,6 +109,16 @@ class ChatConsumer(WebsocketConsumer):
|
||||
'group_name': group_name,
|
||||
|
||||
}
|
||||
|
||||
tickets_wo_manager_html = get_tickets_wo_manager_html(ticket, sender, 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, sender, 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,
|
||||
@@ -81,12 +144,23 @@ class ChatConsumer(WebsocketConsumer):
|
||||
'receiver': sender,
|
||||
'group_name': group_name,
|
||||
}
|
||||
|
||||
tickets_wo_manager_html = get_tickets_wo_manager_html(ticket, receiver, 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, sender, 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
|
||||
)
|
||||
|
||||
|
||||
|
||||
def echo(self, data):
|
||||
print('ws echo')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user