Merge pull request #152 from KiwiTechLLC/ZBKADM-69

task list api modified

guardian/views.py

@@ -10,6 +10,8 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework import viewsets, status
 from rest_framework.pagination import PageNumberPagination
 from django.contrib.auth.models import User
+from rest_framework.filters import SearchFilter
+
 from django.utils import timezone
 
 # Import guardian's model,
@@ -127,37 +129,69 @@ class AllTaskListAPIView(viewsets.ModelViewSet):
         serializer = TaskDetailsSerializer(queryset, many=True)
         return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
 
+# class TaskListAPIView(viewsets.ModelViewSet):
+#     """Update guardian profile"""
+#     serializer_class = TaskDetailsSerializer
+#     permission_classes = [IsAuthenticated]
+#     pagination_class = PageNumberPagination
+#     http_method_names = ('get',)
+#
+#     def list(self, request, *args, **kwargs):
+#         """Create guardian profile"""
+#         try:
+#             status_value = self.request.GET.get('status')
+#             search = self.request.GET.get('search')
+#             if search and str(status_value) == '0':
+#                 queryset = JuniorTask.objects.filter(guardian__user=request.user,
+#                                                      task_name__icontains=search).order_by('due_date', 'created_at')
+#             elif search and str(status_value) != '0':
+#                 queryset = JuniorTask.objects.filter(guardian__user=request.user,task_name__icontains=search,
+#                                                      task_status=status_value).order_by('due_date', 'created_at')
+#             if search is None and str(status_value) == '0':
+#                 queryset = JuniorTask.objects.filter(guardian__user=request.user).order_by('due_date', 'created_at')
+#             elif search is None and str(status_value) != '0':
+#                 queryset = JuniorTask.objects.filter(guardian__user=request.user,
+#                                                      task_status=status_value).order_by('due_date','created_at')
+#             paginator = self.pagination_class()
+#             # use Pagination
+#             paginated_queryset = paginator.paginate_queryset(queryset, request)
+#             # use TaskDetailsSerializer serializer
+#             serializer = TaskDetailsSerializer(paginated_queryset, many=True)
+#             return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
+#         except Exception as e:
+#             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
+
+
 class TaskListAPIView(viewsets.ModelViewSet):
     """Update guardian profile"""
     serializer_class = TaskDetailsSerializer
     permission_classes = [IsAuthenticated]
+    filter_backends = (SearchFilter,)
+    search_fields = ['task_name', ]
     pagination_class = PageNumberPagination
     http_method_names = ('get',)
 
+    def get_queryset(self):
+        queryset = JuniorTask.objects.filter(guardian__user=self.request.user
+                                             ).prefetch_related('junior', 'junior__auth'
+                                                                ).order_by('due_date', 'created_at')
+
+        queryset = self.filter_queryset(queryset)
+        return queryset
+
     def list(self, request, *args, **kwargs):
         """Create guardian profile"""
-        try:
-            status_value = self.request.GET.get('status')
-            search = self.request.GET.get('search')
-            if search and str(status_value) == '0':
-                queryset = JuniorTask.objects.filter(guardian__user=request.user,
-                                                     task_name__icontains=search).order_by('due_date', 'created_at')
-            elif search and str(status_value) != '0':
-                queryset = JuniorTask.objects.filter(guardian__user=request.user,task_name__icontains=search,
-                                                     task_status=status_value).order_by('due_date', 'created_at')
-            if search is None and str(status_value) == '0':
-                queryset = JuniorTask.objects.filter(guardian__user=request.user).order_by('due_date', 'created_at')
-            elif search is None and str(status_value) != '0':
-                queryset = JuniorTask.objects.filter(guardian__user=request.user,
-                                                     task_status=status_value).order_by('due_date','created_at')
-            paginator = self.pagination_class()
-            # use Pagination
-            paginated_queryset = paginator.paginate_queryset(queryset, request)
-            # use TaskDetailsSerializer serializer
-            serializer = TaskDetailsSerializer(paginated_queryset, many=True)
-            return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
-        except Exception as e:
-            return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
+        status_value = self.request.GET.get('status')
+        queryset = self.get_queryset()
+        if status_value and status_value != '0':
+            queryset = queryset.filter(task_status=status_value)
+        paginator = self.pagination_class()
+        # use Pagination
+        paginated_queryset = paginator.paginate_queryset(queryset, request)
+        # use TaskDetailsSerializer serializer
+        serializer = self.serializer_class(paginated_queryset, many=True)
+        return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
+
 
 class CreateTaskAPIView(viewsets.ModelViewSet):
     """create task for junior"""