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

* commit '2f2c01f4':
  revert POC

app/applicationlayer/cms/master/template/account/views.py

@@ -13,21 +13,20 @@ class UserListTemplate(APIView):
     pagination_class = CustomPagination
 
     def get(self, request, *args, **kwargs):
+         try:
 
-        try:
             serializer = ChangeRequestList
             dept = self.request.query_params['department_code']
-            # company = self.request.query_params['company_code']
-            # allowed = models.AllowedCompany.objects.filter(
-            #     Q(group_pivots=dept) &
-            #     Q()
-            # )
-            user_list = models.User.objects.filter(
+            user_codes = models.User.objects.filter(
                 department=dept
-            ).exclude(id=1)
-            # user_list = user_list.exclude(id=request.user.id)
-            print(user_list.query)
-            page = self.paginate_queryset(user_list)
+            ).values('code').exclude(id=1)
+
+            verified_users = models.AllowedCompany.objects.filter(
+                Q(id_number__in=user_codes) &
+                Q(create_change_request_template=True)
+            ).exclude(id=request.user.id)
+
+            page = self.paginate_queryset(verified_users)
 
             if page is not None:
 
@@ -40,9 +39,10 @@ class UserListTemplate(APIView):
                     serializer.data
                 )
                 return self.get_paginated_response(message)
+
         except Exception as e:
             return Response(
-                {"message": "this endpoint expect a query params department_code"},
+                {"message": "this endpoint expect a query params department_id"},
                 status=status.HTTP_400_BAD_REQUEST
             )