From 652cd92ef07f578de1922119bdb17d1e4e2a3f77 Mon Sep 17 00:00:00 2001 From: Kunal Tiwary Date: Tue, 12 Dec 2023 09:17:27 +0530 Subject: [PATCH 1/2] removed body parameters --- backend/tasks/views.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/backend/tasks/views.py b/backend/tasks/views.py index 509df9e2f..063c1a319 100644 --- a/backend/tasks/views.py +++ b/backend/tasks/views.py @@ -1071,17 +1071,14 @@ def delete_project_tasks(self, request, pk=None): ) def get_users_recent_tasks(self, request): try: - user_id = request.data.get("user_id") - task_type = request.data.get("task_type", "annotation") - + user = request.user + task_type = request.query_params.get("task_type", "annotation") project_id = request.query_params.get("Project ID", "") task_id = request.query_params.get("Task ID", "") updated_at = request.query_params.get("Updated at", "") annotated_at = request.query_params.get("Annotated at", "") created_at = request.query_params.get("Created at", "") - user = User.objects.get(pk=user_id) - annotations = Annotation.objects.filter(completed_by=user) if task_type == "review": annotations = annotations.filter(annotation_type=REVIEWER_ANNOTATION) From 4030d7b8c8c1192ef078c3a7c018f9fc90fe1029 Mon Sep 17 00:00:00 2001 From: Kunal Tiwary Date: Tue, 12 Dec 2023 09:58:51 +0530 Subject: [PATCH 2/2] added query params --- backend/tasks/views.py | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/backend/tasks/views.py b/backend/tasks/views.py index 063c1a319..1bdc62c21 100644 --- a/backend/tasks/views.py +++ b/backend/tasks/views.py @@ -1090,22 +1090,37 @@ def get_users_recent_tasks(self, request): annotations = annotations.filter(annotation_type=ANNOTATOR_ANNOTATION) if project_id: - annotations = annotations.filter(task__project_id=project_id) + try: + annotations = annotations.filter(task__project_id=project_id) + except Exception as e: + pass if task_id: - annotations = annotations.filter(task__id=task_id) + try: + annotations = annotations.filter(task__id=task_id) + except Exception as e: + pass if updated_at: - date_obj = datetime.strptime(updated_at, "%d-%m-%Y") - annotations = annotations.filter(updated_at__date=date_obj.date()) + try: + date_obj = datetime.strptime(updated_at, "%d-%m-%Y") + annotations = annotations.filter(updated_at__date=date_obj.date()) + except Exception as e: + pass if annotated_at: - date_obj = datetime.strptime(annotated_at, "%d-%m-%Y") - annotations = annotations.filter(annotated_at__date=date_obj.date()) + try: + date_obj = datetime.strptime(annotated_at, "%d-%m-%Y") + annotations = annotations.filter(annotated_at__date=date_obj.date()) + except Exception as e: + pass if created_at: - date_obj = datetime.strptime(created_at, "%d-%m-%Y") - annotations = annotations.filter(created_at__date=date_obj.date()) + try: + date_obj = datetime.strptime(created_at, "%d-%m-%Y") + annotations = annotations.filter(created_at__date=date_obj.date()) + except Exception as e: + pass annotations = annotations.order_by("-updated_at") annotations = self.paginate_queryset(annotations)