Merge remote-tracking branch 'origin/main'

ChatServiceApp/js_views.py

@@ -51,6 +51,7 @@ def send_msg_ajax(request):
         raise Http404
 
     res_Dict = {}
+    msg = None
 
     try:
 
@@ -68,6 +69,8 @@ def send_msg_ajax(request):
             sender = User.objects.get(id=data['sender'])
             receiver = User.objects.get(id=data['receiver'])
 
+            msg_create_kwargs = {}
+
             # если только что манагер присоединился к тикету
             if ticket:
                 if not ticket.manager:
@@ -81,7 +84,7 @@ def send_msg_ajax(request):
                     kwargs = {
                         'sender': ticket.owner,
                         'receiver': ticket.manager,
-                    'text': data['text'],
+                        'text': ticket.text,
                     }
 
                     kwargs.update({'group': ticket})
@@ -91,27 +94,35 @@ def send_msg_ajax(request):
 
                 res_Dict.update({
                     'ticket': ticket,
-                    'cur_receiver': receiver,
-                    'messages': get_messages_for_ticket(ticket),
-                    'text': data['text'],
-                    'modifiedDT': msg.modifiedDT
+                    # 'cur_receiver': receiver,
+                    # 'messages': get_messages_for_ticket(ticket),
+                    # 'text': data['text'],
+                    # 'modifiedDT': msg.modifiedDT
                 })
+
+                msg_create_kwargs.update({
+                    'group': ticket,
+                })
+
                 res_Dict.update(get_ticketsDict_for_staff(request.user))
 
-                # tpl_name = 'blocks/profile/b_support_chat.html'
 
-            else:
-
-                kwargs = {
+            # if not msg:
+            msg_create_kwargs.update({
                 'sender': sender,
                 'receiver': receiver,
                 'text': data['text']
-                }
+            })
 
-                msg = Message.objects.create(**kwargs)
+            msg = Message.objects.create(**msg_create_kwargs)
+
+            if ticket:
+                msgs = get_messages_for_ticket(ticket)
+            else:
+                msgs = get_msgs_for_chat_w_users(sender, receiver)
 
             receivers = get_chat_receivers_for_user(request.user)
-                msgs = get_msgs_for_chat_w_users(sender, receiver)
+
 
             res_Dict.update({
                 'messages': msgs,
@@ -122,8 +133,6 @@ def send_msg_ajax(request):
             })
 
 
-
-
         html = render_to_string(tpl_name, res_Dict, request=request)
         return JsonResponse({'html': html}, status=200)