Merge pull request #464 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '2e6acaa7':
  search ordering extract

app/applicationlayer/management/batchupload/views.py

@@ -20,7 +20,7 @@ from app.entities.models import (
 )
 from app.applicationlayer.utils import (
     CustomPagination, status_message_response,
-    main_threading
+    main_threading, CustomPaginationUserHistory
 )
 from rest_framework.exceptions import ParseError
 from django.db.models import Q
@@ -35,7 +35,7 @@ from app.applicationlayer.management.batchupload.table_filters import ExtractTra
 class BatchUploadViewSet(viewsets.ModelViewSet):
     queryset = ExtractTransformLoad.objects.all()
     serializer_class = ExtractTransformLoadSerializer
-    pagination_class = CustomPagination
+    pagination_class = CustomPaginationUserHistory
     lookup_field = 'code'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = ExtractTransformLoadFilter
@@ -45,10 +45,11 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
     search_fields = (
         'file_name', 'model_type', 'code'
     )
-    
+
     def list(self, request, *args, **kwargs):
         logged_user = request.user.username
-        queryset = self.get_queryset().filter(createdby=logged_user)
+        queryset = self.filter_queryset(self.get_queryset().filter(createdby=logged_user))
+        # queryset = self.get_queryset().filter(createdby=logged_user)
 
         page = self.paginate_queryset(queryset)
 

app/applicationlayer/utils.py

@@ -53,6 +53,24 @@ class CustomPagination(PageNumberPagination):
             'results': data['results']
         })
 
+class CustomPaginationUserHistory(PageNumberPagination):
+    page_size = 100
+    max_page_size = 100
+    page_query_param = 'page'
+    page_size_query_param = 'page_size'
+
+    def get_paginated_response(self, data):
+        return Response({
+            'page_number': self.page.number,
+            'size_per_page': self.page.paginator.per_page,
+            'total_pages': self.page.paginator.num_pages,
+            'total': self.page.paginator.count,
+            'code': data['code'],
+            'status': data['status'],
+            'message': data['message'],
+            'results': data['results']
+        })
+
 
 # def entitylogs_decorator(function):
 #     @wraps(function)