From 3dd2053e3fb4794cd19a3a1cc33378f786de9929 Mon Sep 17 00:00:00 2001 From: pablohashescobar Date: Fri, 25 Aug 2023 16:12:43 +0530 Subject: [PATCH] chore: update user activity endpoint to return only workspace activities --- apiserver/plane/api/urls.py | 2 +- apiserver/plane/api/views/user.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apiserver/plane/api/urls.py b/apiserver/plane/api/urls.py index a6beac6931d..64fb4b0256a 100644 --- a/apiserver/plane/api/urls.py +++ b/apiserver/plane/api/urls.py @@ -235,7 +235,7 @@ UpdateUserTourCompletedEndpoint.as_view(), name="user-tour", ), - path("users/activities/", UserActivityEndpoint.as_view(), name="user-activities"), + path("users/workspaces//activities/", UserActivityEndpoint.as_view(), name="user-activities"), # user workspaces path( "users/me/workspaces/", diff --git a/apiserver/plane/api/views/user.py b/apiserver/plane/api/views/user.py index 84ee47e4258..68958e5041c 100644 --- a/apiserver/plane/api/views/user.py +++ b/apiserver/plane/api/views/user.py @@ -137,11 +137,11 @@ def patch(self, request): class UserActivityEndpoint(BaseAPIView, BasePaginator): - def get(self, request): + def get(self, request, slug): try: - queryset = IssueActivity.objects.filter(actor=request.user).select_related( - "actor", "workspace", "issue", "project" - ) + queryset = IssueActivity.objects.filter( + actor=request.user, workspace__slug=slug + ).select_related("actor", "workspace", "issue", "project") return self.paginate( request=request,