Merge pull request #189 in RMS/api-main-service from red-develop to RMSv2

* commit '328a825e':
  fixed filterset on templates

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

@@ -29,7 +29,9 @@ class ChangeRequestTemplateApproversViewset(viewsets.ModelViewSet):
 
     def list(self, request, *args, **kwargs):
 
-        page = self.paginate_queryset(self.queryset)
+        queryset = self.filter_queryset(self.get_queryset())
+
+        page = self.paginate_queryset(queryset)
 
         if page is not None:
             serializer = self.get_serializer(page, many=True)

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

@@ -28,8 +28,9 @@ class ChangeRequestTemplateAttachmentsViewset(viewsets.ModelViewSet):
     )
 
     def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
         
-        page = self.paginate_queryset(self.queryset)
+        page = self.paginate_queryset(queryset)
         
         if page is not None:
             serializer = self.get_serializer(page, many=True)

app/applicationlayer/cms/template/details/table_filters.py

 from django_filters import rest_framework as filters
 from django.db.models import Count
-from app.entities.models import ChangeRequestTemplateStakeHolders
+from app.entities.models import ChangeRequestTemplateDetails
 from django.db.models import Q
 
 
 class DetailsFilter(filters.FilterSet):
 
     class Meta:
-        model = ChangeRequestTemplateStakeHolders
+        model = ChangeRequestTemplateDetails
         fields = '__all__'

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

@@ -26,7 +26,9 @@ class ChangeRequestTemplateDetailsViewset(viewsets.ModelViewSet):
 
     def list(self, request, *args, **kwargs):
 
-        page = self.paginate_queryset(self.queryset)
+        queryset = self.filter_queryset(self.get_queryset())
+        
+        page = self.paginate_queryset(queryset)
 
         if page is not None:
             serializer = self.get_serializer(page, many=True)

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

@@ -27,6 +27,7 @@ class ChangeRequestTemplateAttachmentsSerializer(
                 "contact_no": instance.uploaded_by.contact_no
             }
             ret['uploaded_by'] = user_object
+            ret['file_upload'] = instance.file_upload.url.url
             
             return ret
         except Exception as e:

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

@@ -4,7 +4,7 @@ from app.entities.models import ChangeRequestTemplateHeader
 from django.db.models import Q
 
 
-class headerFilter(filters.FilterSet):
+class HeaderFilterSet(filters.FilterSet):
 
     class Meta:
         model = ChangeRequestTemplateHeader

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

 from rest_framework.views import APIView
-from rest_framework import viewsets as meviewsets
+from rest_framework import viewsets
 from app.entities import models
 
 from rest_framework.response import Response
@@ -32,22 +32,26 @@ from app.applicationlayer.cms.template.details.serializers import ChangeRequestT
 from app.applicationlayer.cms.template.attachment.serializers import ChangeRequestTemplateAttachmentsSerializer
 from app.applicationlayer.cms.template.header.serializers import ChangeRequestTemplatesSerializer
 from app.applicationlayer.cms.template.header.serializers import ChangeRequestTemplatesSerializerList
-from app.applicationlayer.cms.template.header.table_filters import headerFilter
+from app.applicationlayer.cms.template.header.table_filters import HeaderFilterSet
 
 
+# from django_filters import rest_framework as filters
+# from rest_framework.filters import SearchFilter, OrderingFilter
+# from django_filters.rest_framework import DjangoFilterBackend
+
+from rest_framework.filters import SearchFilter, OrderingFilter
 from django_filters import rest_framework as filters
 from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.filters import SearchFilter, OrderingFilter
 
 
-class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
+class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
 
     queryset = models.ChangeRequestTemplateHeader.objects.all()
     serializer_class = ChangeRequestTemplatesSerializer
     pagination_class = CustomPagination
     lookup_field = 'template_no'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
-    filterset_class = headerFilter
+    filterset_class = HeaderFilterSet
     ordering_fields = '__all__'
     search_fields = (
         "template_no", "requested_to_template_id", "created_by_user__name",
@@ -59,9 +63,11 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
 
     def list(self, request, *args, **kwargs):
 
+        queryset = self.filter_queryset(self.get_queryset())
+
         self.serializer_class = ChangeRequestTemplatesSerializerList
         
-        page = self.paginate_queryset(self.queryset)
+        page = self.paginate_queryset(queryset)
 
         if page is not None:
             serializer = self.get_serializer(page, many=True)

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

@@ -29,7 +29,9 @@ class ChangeRequestTemplateStakeholdersViewset(viewsets.ModelViewSet):
 
     def list(self, request, *args, **kwargs):
 
-        page = self.paginate_queryset(self.queryset)
+        queryset = self.filter_queryset(self.get_queryset())
+        
+        page = self.paginate_queryset(queryset)
 
         if page is not None:
             serializer = self.get_serializer(page, many=True)