0.1.35

chat routines

ChatServiceApp/funcs.py

@@ -8,20 +8,21 @@ def get_msgs_for_chat_w_users(user1, user2):
         Q(sender=user1) | Q(receiver=user1),
         Q(sender=user2) | Q(receiver=user2),
         group=None
-    )
+    ).order_by('-modifiedDT')
     return msgs
 
 def get_chat_receivers_for_user(user):
     receivers = Message.objects.filter(
         Q(sender=user) | Q(receiver=user),
         group=None
-    ).order_by('-modifiedDT').values('sender', 'receiver')
+    ).order_by('-modifiedDT')#.select_related('sender', 'receiver').values('sender', 'receiver').distinct()
 
     receivers_list = []
-    receivers_list.extend([item['sender'] for item in receivers if item['sender'] != user])
-    receivers_list.extend([item['receiver'] for item in receivers if item['receiver'] != user])
 
-    return receivers_list
+    receivers_list.extend((item.sender for item in receivers if item.sender != user))
+    receivers_list.extend((item.receiver for item in receivers if item.receiver != user))
+
+    return list(set(receivers_list))
 
 def get_messages_for_ticket(ticket):
     return ticket.rel_messages_for_group.filter(enable=True).order_by('-modifiedDT')