diff --git a/apiserver/plane/app/views/user/base.py b/apiserver/plane/app/views/user/base.py index 27bfd3b7a60..5c036929cd7 100644 --- a/apiserver/plane/app/views/user/base.py +++ b/apiserver/plane/app/views/user/base.py @@ -32,7 +32,6 @@ Session, ) from plane.license.models import Instance, InstanceAdmin -from plane.utils.cache import cache_response, invalidate_cache from plane.utils.paginator import BasePaginator from plane.authentication.utils.host import user_ip from plane.bgtasks.user_deactivation_email_task import user_deactivation_email @@ -49,7 +48,6 @@ class UserEndpoint(BaseViewSet): def get_object(self): return self.request.user - @cache_response(60 * 60) @method_decorator(cache_control(private=True, max_age=12)) @method_decorator(vary_on_cookie) def retrieve(self, request): @@ -59,14 +57,12 @@ def retrieve(self, request): status=status.HTTP_200_OK, ) - @cache_response(60 * 60) @method_decorator(cache_control(private=True, max_age=12)) @method_decorator(vary_on_cookie) def retrieve_user_settings(self, request): serialized_data = UserMeSettingsSerializer(request.user).data return Response(serialized_data, status=status.HTTP_200_OK) - @cache_response(60 * 60) def retrieve_instance_admin(self, request): instance = Instance.objects.first() is_admin = InstanceAdmin.objects.filter( @@ -76,19 +72,9 @@ def retrieve_instance_admin(self, request): {"is_instance_admin": is_admin}, status=status.HTTP_200_OK ) - @invalidate_cache( - path="/api/users/me/", - ) - @invalidate_cache( - path="/api/users/me/settings/", - ) def partial_update(self, request, *args, **kwargs): return super().partial_update(request, *args, **kwargs) - @invalidate_cache(path="/api/users/me/") - @invalidate_cache( - path="/api/users/me/workspaces/", multiple=True, user=False - ) def deactivate(self, request): # Check all workspace user is active user = self.get_object() @@ -235,7 +221,6 @@ def get(self, request): class UpdateUserOnBoardedEndpoint(BaseAPIView): - @invalidate_cache(path="/api/users/me/") def patch(self, request): profile = Profile.objects.get(user_id=request.user.id) profile.is_onboarded = request.data.get("is_onboarded", False) @@ -247,7 +232,6 @@ def patch(self, request): class UpdateUserTourCompletedEndpoint(BaseAPIView): - @invalidate_cache(path="/api/users/me/") def patch(self, request): profile = Profile.objects.get(user_id=request.user.id) profile.is_tour_completed = request.data.get( @@ -305,7 +289,6 @@ def get(self, request): serializer = ProfileSerializer(profile) return Response(serializer.data, status=status.HTTP_200_OK) - @invalidate_cache("/api/users/me/settings/") def patch(self, request): profile = Profile.objects.get(user=request.user) serializer = ProfileSerializer( diff --git a/apiserver/plane/app/views/workspace/base.py b/apiserver/plane/app/views/workspace/base.py index dd6417a05b6..bd552368a5f 100644 --- a/apiserver/plane/app/views/workspace/base.py +++ b/apiserver/plane/app/views/workspace/base.py @@ -44,7 +44,6 @@ WorkspaceTheme, ) from plane.app.permissions import ROLE, allow_permission -from plane.utils.cache import cache_response, invalidate_cache from django.utils.decorators import method_decorator from django.views.decorators.cache import cache_control from django.views.decorators.vary import vary_on_cookie @@ -99,9 +98,6 @@ def get_queryset(self): .select_related("owner") ) - @invalidate_cache(path="/api/workspaces/", user=False) - @invalidate_cache(path="/api/users/me/workspaces/") - @invalidate_cache(path="/api/instances/", user=False) def create(self, request): try: serializer = WorkSpaceSerializer(data=request.data) @@ -147,7 +143,6 @@ def create(self, request): status=status.HTTP_410_GONE, ) - @cache_response(60 * 60 * 2) @allow_permission( [ ROLE.ADMIN, @@ -159,8 +154,6 @@ def create(self, request): def list(self, request, *args, **kwargs): return super().list(request, *args, **kwargs) - @invalidate_cache(path="/api/workspaces/", user=False) - @invalidate_cache(path="/api/users/me/workspaces/") @allow_permission( [ ROLE.ADMIN, @@ -170,13 +163,6 @@ def list(self, request, *args, **kwargs): def partial_update(self, request, *args, **kwargs): return super().partial_update(request, *args, **kwargs) - @invalidate_cache(path="/api/workspaces/", user=False) - @invalidate_cache( - path="/api/users/me/workspaces/", multiple=True, user=False - ) - @invalidate_cache( - path="/api/users/me/settings/", multiple=True, user=False - ) @allow_permission([ROLE.ADMIN], level="WORKSPACE") def destroy(self, request, *args, **kwargs): return super().destroy(request, *args, **kwargs) @@ -190,7 +176,6 @@ class UserWorkSpacesEndpoint(BaseAPIView): "owner", ] - @cache_response(60 * 60 * 2) @method_decorator(cache_control(private=True, max_age=12)) @method_decorator(vary_on_cookie) def get(self, request): diff --git a/apiserver/plane/app/views/workspace/member.py b/apiserver/plane/app/views/workspace/member.py index c71df21ac4d..e64c4e5ed2c 100644 --- a/apiserver/plane/app/views/workspace/member.py +++ b/apiserver/plane/app/views/workspace/member.py @@ -40,7 +40,7 @@ WorkspaceMember, DraftIssue, ) -from plane.utils.cache import cache_response, invalidate_cache +from plane.utils.cache import invalidate_cache from .. import BaseViewSet @@ -66,7 +66,6 @@ def get_queryset(self): .select_related("member") ) - @cache_response(60 * 60 * 2) @allow_permission( allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE" ) @@ -93,12 +92,6 @@ def list(self, request, slug): ) return Response(serializer.data, status=status.HTTP_200_OK) - @invalidate_cache( - path="/api/workspaces/:slug/members/", - url_params=True, - user=False, - multiple=True, - ) @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE") def partial_update(self, request, slug, pk): workspace_member = WorkspaceMember.objects.get( @@ -127,16 +120,6 @@ def partial_update(self, request, slug, pk): return Response(serializer.data, status=status.HTTP_200_OK) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - @invalidate_cache( - path="/api/workspaces/:slug/members/", - url_params=True, - user=False, - multiple=True, - ) - @invalidate_cache(path="/api/users/me/settings/", multiple=True) - @invalidate_cache( - path="/api/users/me/workspaces/", user=False, multiple=True - ) @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE") def destroy(self, request, slug, pk): # Check the user role who is deleting the user