Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into gladys-dev2

app/applicationlayer/cms/template/views.py

@@ -56,7 +56,8 @@ class UserList(APIView):
             user_list = models.AllowedCompany.objects.filter(
                 Q(company_pivot=company) &
                 Q(group_pivots=dept)
-            ).values('id_number')
+            )
+            user_list = user_list.exclude(id=1).values('id_number')
             queryset = models.User.objects.filter(code__in=user_list).order_by('name')
 
             page = self.paginate_queryset(queryset)

app/applicationlayer/cms/urls_cms.py

@@ -39,5 +39,7 @@ urlpatterns = (
     path('', include(router.urls)),
     path('template-post/', crtemplate_views.ChangeRequestTemplatePost.as_view()),
     path('form-post/', crform_views.ChangeRequestFormPost.as_view()),
+    # filter endpoints under Allowed Companies table
     path('user-list/', crtemplate_views.UserList.as_view(), name="User List"),
+    # filter endpoints under Allowed Companies table
 )

app/applicationlayer/master/Account/views.py

@@ -12,6 +12,7 @@ from django_filters.rest_framework import DjangoFilterBackend
 from app.applicationlayer.master.Account import serializer
 from app.applicationlayer.management.account.table_filters import AccountFilterset
 from app.helper.decorators import rms
+from django.db.models import Q
 
 
 class AdminAccountViewSet(viewsets.ModelViewSet):
@@ -29,20 +30,34 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
 
     # @rms.department_list
     def list(self, request, *args, **kwargs):
-
-        queryset = self.filter_queryset(self.get_queryset())
-        page = self.paginate_queryset(queryset)
-
-        if page is not None:
-            serializer = self.get_serializer(page, many=True)
-
-            message = status_message_response(
-                200,
-                'success',
-                'list of User found',
-                serializer.data
-            )
-            return self.get_paginated_response(message)
-
-        serializer = self.get_serializer(queryset, many=True)
-        return Response(serializer.data)
+        # try:
+
+            queryset = self.filter_queryset(self.get_queryset())
+            if len(self.request.query_params) > 0:
+                dept = self.request.query_params['department_code']
+                company = self.request.query_params['company_code']
+                queryset = queryset.filter(
+                    Q(department__company=company) &
+                    Q(department=dept)
+                )
+                queryset = queryset.exclude(id=1)
+            page = self.paginate_queryset(queryset)
+
+            if page is not None:
+                serializer = self.get_serializer(page, many=True)
+
+                message = status_message_response(
+                    200,
+                    'success',
+                    'list of User found',
+                    serializer.data
+                )
+                return self.get_paginated_response(message)
+
+            serializer = self.get_serializer(queryset, many=True)
+            return Response(serializer.data)
+        # except Exception as e:
+        #     return Response(
+        #         {'message': "query params department_code and company_code are both expected"},
+        #         status=status.HTTP_400_BAD_REQUEST
+        #     )