From 89539bea9650614d1ddc1622c1cec4cd82edac50 Mon Sep 17 00:00:00 2001 From: sangeethailango Date: Fri, 31 Jan 2025 12:22:51 +0530 Subject: [PATCH 1/2] fix: subscribed issues count --- apiserver/plane/app/views/workspace/user.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apiserver/plane/app/views/workspace/user.py b/apiserver/plane/app/views/workspace/user.py index cc1caa92c09..61d8215f552 100644 --- a/apiserver/plane/app/views/workspace/user.py +++ b/apiserver/plane/app/views/workspace/user.py @@ -425,6 +425,8 @@ def get(self, request, slug, user_id): project__project_projectmember__member=request.user, project__project_projectmember__is_active=True, created_by_id=user_id, + project__deleted_at__isnull=True, + deleted_at__isnull=True, ) .filter(**filters) .count() @@ -481,6 +483,8 @@ def get(self, request, slug, user_id): project__project_projectmember__member=request.user, project__project_projectmember__is_active=True, project__archived_at__isnull=True, + issue__deleted_at__isnull=True, + project__deleted_at__isnull=True, ) .filter(**filters) .count() From e2b1cf3952e9776f0fdad210f4d65cf6b09f8ac8 Mon Sep 17 00:00:00 2001 From: sangeethailango Date: Fri, 31 Jan 2025 15:55:03 +0530 Subject: [PATCH 2/2] fix: listing deleted projects epic in subscribed issues --- apiserver/plane/app/views/workspace/user.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apiserver/plane/app/views/workspace/user.py b/apiserver/plane/app/views/workspace/user.py index 61d8215f552..b59915e22ef 100644 --- a/apiserver/plane/app/views/workspace/user.py +++ b/apiserver/plane/app/views/workspace/user.py @@ -104,6 +104,7 @@ def get(self, request, slug, user_id): project__project_projectmember__member=request.user, project__project_projectmember__is_active=True, ) + .filter(project__deleted_at__isnull=True) .filter(**filters) .select_related("workspace", "project", "state", "parent") .prefetch_related("assignees", "labels", "issue_module__module")