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

* commit 'b55411c9':
  list and serializer

app/applicationlayer/cms/form/views.py

@@ -34,6 +34,8 @@ from django.forms.models import model_to_dict
 import json
 from django.shortcuts import get_object_or_404
 from django.db.models import Min
+from app.applicationlayer.utils import (CustomPagination,
+                                        status_message_response)
 
 
 APPROVER_MESSAGE = settings.APPROVER_MESSAGE
@@ -51,7 +53,8 @@ VENDOR_REJECT_MESSAGE = settings.VENDOR_REJECT_MESSAGE
 class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
 
     serializer_class = serializers.ChangeRequestFormHeaderSerializer
-    pagination_class = paginators.SimplePageNumberPagination
+    # pagination_class = paginators.SimplePageNumberPagination
+    pagination_class = CustomPagination
     queryset = models.ChangeRequestFormHeader.objects.all()
     lookup_field = 'form_code'
 
@@ -82,8 +85,29 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         
         self.queryset = self.queryset.order_by('-created')
         self.queryset = QuerySetHelper.Sort(self)
+
+        page = self.paginate_queryset(self.queryset)
+
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+
+            message = status_message_response(
+                200,
+                'success',
+                'List of Change Request Form found',
+                serializer.data
+            )
+
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(self.queryset, many=True)
+
+        return Response(
+            serializer.data,
+            status=status.HTTP_200_OK
+        )
         
-        return super(ChangeRequestFormsViewset, self).list(request)
+        # return super(ChangeRequestFormsViewset, self).list(request)
 
     @action(detail=False,
             methods=['get'],

app/applicationlayer/cms/template/header/views.py

@@ -278,7 +278,7 @@ class ChangeRequestTemplatePost(APIView):
 
             sp1 = transaction.savepoint()  # nothing will save to db
 
-            serializer = serializers.ChangeRequestTemplatesSerializer(
+            serializer = ChangeRequestTemplatesSerializer(
                 data=template_header_data)
             
             if serializer.is_valid(raise_exception=True):