Commit 8cdc401f authored by John Red Medrano's avatar John Red Medrano

added query params at master list of users

parent 0c0adb9d
...@@ -39,5 +39,7 @@ urlpatterns = ( ...@@ -39,5 +39,7 @@ urlpatterns = (
path('', include(router.urls)), path('', include(router.urls)),
path('template-post/', crtemplate_views.ChangeRequestTemplatePost.as_view()), path('template-post/', crtemplate_views.ChangeRequestTemplatePost.as_view()),
path('form-post/', crform_views.ChangeRequestFormPost.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"), path('user-list/', crtemplate_views.UserList.as_view(), name="User List"),
# filter endpoints under Allowed Companies table
) )
...@@ -29,8 +29,16 @@ class AdminAccountViewSet(viewsets.ModelViewSet): ...@@ -29,8 +29,16 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
# @rms.department_list # @rms.department_list
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
try:
queryset = self.filter_queryset(self.get_queryset()) 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) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
...@@ -46,3 +54,8 @@ class AdminAccountViewSet(viewsets.ModelViewSet): ...@@ -46,3 +54,8 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
serializer = self.get_serializer(queryset, many=True) serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data) 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
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment