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

* commit '9712c84b':
  added query params at master list of users

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

@@ -29,20 +29,33 @@ 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
+        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 = models.AllowedCompany.objects.filter(
+                    Q(department__company=company) &
+                    Q(department=dept)
+                )
+            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
             )
-            return self.get_paginated_response(message)
-
-        serializer = self.get_serializer(queryset, many=True)
-        return Response(serializer.data)