From 3a41ec74427bb9bcdad0ebe2eac7f4ec4c880180 Mon Sep 17 00:00:00 2001
From: Nikhil <118773738+pablohashescobar@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:35:13 +0530
Subject: [PATCH] chore: update user activity endpoint to return only workspace
 activities (#1980)

---
 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 a6beac693..64fb4b025 100644
--- a/apiserver/plane/api/urls.py
+++ b/apiserver/plane/api/urls.py
@@ -235,7 +235,7 @@ urlpatterns = [
         UpdateUserTourCompletedEndpoint.as_view(),
         name="user-tour",
     ),
-    path("users/activities/", UserActivityEndpoint.as_view(), name="user-activities"),
+    path("users/workspaces/<str:slug>/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 84ee47e42..68958e504 100644
--- a/apiserver/plane/api/views/user.py
+++ b/apiserver/plane/api/views/user.py
@@ -137,11 +137,11 @@ class UpdateUserTourCompletedEndpoint(BaseAPIView):
 
 
 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,