Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: user caching when the user leaves/deletes the workspace (#3989)

Nikhil293854fb3a5c
diff --git a/apiserver/plane/app/views/workspace/base.py b/apiserver/plane/app/views/workspace/base.py
index 0fb8f2d803..4596662918 100644
--- a/apiserver/plane/app/views/workspace/base.py
+++ b/apiserver/plane/app/views/workspace/base.py
@@ -1,49 +1,51 @@
# Python imports
-from datetime import date
-from dateutil.relativedelta import relativedelta
import csv
import io
+from datetime import date
-
-# Django imports
-from django.http import HttpResponse
+from dateutil.relativedelta import relativedelta
from django.db import IntegrityError
-from django.utils import timezone
from django.db.models import (
- Prefetch,
- OuterRef,
- Func,
+ Count,
F,
+ Func,
+ OuterRef,
+ Prefetch,
Q,
- Count,
)
-from django.db.models.functions import ExtractWeek, Cast, ExtractDay
from django.db.models.fields import DateField
+from django.db.models.functions import Cast, ExtractDay, ExtractWeek
+
+# Django imports
+from django.http import HttpResponse
+from django.utils import timezone
# Third party modules
from rest_framework import status
from rest_framework.response import Response
+from plane.app.permissions import (
+ WorkSpaceAdminPermission,
+ WorkSpaceBasePermission,
+ WorkspaceEntityPermission,
+)
+
# Module imports
from plane.app.serializers import (
WorkSpaceSerializer,
WorkspaceThemeSerializer,
)
-from plane.app.views.base import BaseViewSet, BaseAPIView
+from plane.app.views.base import BaseAPIView, BaseViewSet
from plane.db.models import (
- Workspace,
- IssueActivity,
Issue,
- WorkspaceTheme,
+ IssueActivity,
+ Workspace,
WorkspaceMember,
-)
-from plane.app.permissions import (
- WorkSpaceBasePermission,
- WorkSpaceAdminPermission,
- WorkspaceEntityPermission,
+ WorkspaceTheme,
)
from plane.utils.cache import cache_response, invalidate_cache
+
class WorkSpaceViewSet(BaseViewSet):
model = Workspace
serializer_class = WorkSpaceSerializer
@@ -138,6 +140,7 @@ class WorkSpaceViewSet(BaseViewSet):
{"slug": "The workspace with the slug already exists"},
status=status.HTTP_410_GONE,
)
+
@cache_response(60 * 60 * 2)
def list(self, request, *args, **kwargs):
return super().list(request, *args, **kwargs)
@@ -149,6 +152,7 @@ class WorkSpaceViewSet(BaseViewSet):
@invalidate_cache(path="/api/workspaces/", user=False)
@invalidate_cache(path="/api/users/me/workspaces/")
+ @invalidate_cache(path="/api/users/me/settings/")
def destroy(self, request, *args, **kwargs):
return super().destroy(request, *args, **kwargs)
diff --git a/apiserver/plane/app/views/workspace/member.py b/apiserver/plane/app/views/workspace/member.py
index ff88e47f8a..5afe371442 100644
--- a/apiserver/plane/app/views/workspace/member.py
+++ b/apiserver/plane/app/views/workspace/member.py
@@ -1,41 +1,43 @@
# Django imports
from django.db.models import (
- Q,
+ CharField,
Count,
+ Q,
)
from django.db.models.functions import Cast
-from django.db.models import CharField
# Third party modules
from rest_framework import status
from rest_framework.response import Response
+from plane.app.permissions import (
+ WorkSpaceAdminPermission,
+ WorkspaceEntityPermission,
+ WorkspaceUserPermission,
+)
+
# Module imports
from plane.app.serializers import (
- WorkSpaceMemberSerializer,
+ ProjectMemberRoleSerializer,
TeamSerializer,
UserLiteSerializer,
WorkspaceMemberAdminSerializer,
WorkspaceMemberMeSerializer,
- ProjectMemberRoleSerializer,
+ WorkSpaceMemberSerializer,
)
from plane.app.views.base import BaseAPIView
-from .. import BaseViewSet
from plane.db.models import (
+ Project,
+ ProjectMember,
+ Team,
User,
Workspace,
- Team,
- ProjectMember,
- Project,
WorkspaceMember,
)
-from plane.app.permissions import (
- WorkSpaceAdminPermission,
- WorkspaceEntityPermission,
- WorkspaceUserPermission,
-)
from plane.utils.cache import cache_response, invalidate_cache
+from .. import BaseViewSet
+
class WorkSpaceMemberViewSet(BaseViewSet):
serializer_class = WorkspaceMemberAdminSerializer
@@ -147,6 +149,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
@invalidate_cache(
path="/api/workspaces/:slug/members/", url_params=True, user=False
)
+ @invalidate_cache(path="/api/users/me/settings/")
def destroy(self, request, slug, pk):
# Check the user role who is deleting the user
workspace_member = WorkspaceMember.objects.get(
@@ -214,6 +217,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
@invalidate_cache(
path="/api/workspaces/:slug/members/", url_params=True, user=False
)
+ @invalidate_cache(path="/api/users/me/settings/")
def leave(self, request, slug):
workspace_member = WorkspaceMember.objects.get(
workspace__slug=slug,