message/views.py

@@ -9,12 +9,15 @@ from utils.page_utils import pagination

                 
              

                 
              

                 def message_list_api(request):
              

                +    user_id = request.GET.get('user_id', '')
              

                +
              

                     messages = UserMessageInfo.MESSAGE_TYPE_INFO
              

                 
              

                     final_messages = []
              

                     for message in messages:
              

                         type_messages = UserMessageInfo.objects.filter(
              

                -            msg_type=message['msg_type']
              

                +            to_uid=user_id,
              

                +            msg_type=message['msg_type'],
              

                         ).order_by(
              

                             '-updated_at'
              

                         )[:settings.MESSAGE_NUM_PER_PAGE]
              
@@ -32,11 +35,13 @@ def message_list_api(request):

                 
              

                 
              

                 def message_type_list_api(request, msg_type):
              

                +    user_id = request.GET.get('user_id', '')
              

                     page = int(request.GET.get('page', 1))
              

                     num = int(request.GET.get('num', settings.MESSAGE_NUM_PER_PAGE))
              

                 
              

                     type_messages = UserMessageInfo.objects.filter(
              

                -        msg_type=msg_type
              

                +        to_uid=user_id,
              

                +        msg_type=msg_type,
              

                     ).order_by(
              

                         '-updated_at'
              

                     )
              
@@ -55,9 +60,10 @@ def message_type_list_api(request, msg_type):

                 
              

                 def message_read_api(request):
              

                     pk = int(request.GET.get('pk', -1))
              

                +    user_id = request.GET.get('user_id', '')
              

                 
              

                     try:
              

                -        message = UserMessageInfo.objects.get(pk=pk)
              

                +        message = UserMessageInfo.objects.get(pk=pk, to_uid=user_id)
              

                     except UserMessageInfo.DoesNotExist:
              

                         return JsonResponse({
              

                             'status': 4091,