From 634e8f75ebfdcb206f1e6a9c80ec3531baadbb13 Mon Sep 17 00:00:00 2001 From: NarayanBavisetti Date: Mon, 9 Dec 2024 14:18:46 +0530 Subject: [PATCH] chore: change the response --- .../plane/app/views/notification/base.py | 69 ------------------- apiserver/plane/ee/views/app/inbox/base.py | 29 +++----- 2 files changed, 10 insertions(+), 88 deletions(-) diff --git a/apiserver/plane/app/views/notification/base.py b/apiserver/plane/app/views/notification/base.py index 442d1f0353..d2aa1a02d7 100644 --- a/apiserver/plane/app/views/notification/base.py +++ b/apiserver/plane/app/views/notification/base.py @@ -168,27 +168,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator): allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE" ) def partial_update(self, request, slug, pk): - - notification_ids = request.data.get("notification_ids") - if notification_ids: - notifications = Notification.objects.filter( - workspace__slug=slug, - receiver=request.user, - id__in=request.data.get("notification_ids"), - ) - for notification in notifications: - notification_data = { - "snoozed_till": request.data.get("snoozed_till", None) - } - serializer = NotificationSerializer( - notification, data=notification_data, partial=True - ) - if serializer.is_valid(): - serializer.save() - else: - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) notification = Notification.objects.get( workspace__slug=slug, pk=pk, receiver=request.user ) @@ -207,18 +186,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator): allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE" ) def mark_read(self, request, slug, pk): - notification_ids = request.data.get("notification_ids") - if notification_ids: - notifications = Notification.objects.filter( - workspace__slug=slug, - receiver=request.user, - id__in=request.data.get("notification_ids"), - ) - for notification in notifications: - notification.read_at = timezone.now() - notification.save() - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) notification = Notification.objects.get( receiver=request.user, workspace__slug=slug, pk=pk ) @@ -231,18 +198,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator): allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE" ) def mark_unread(self, request, slug, pk): - notification_ids = request.data.get("notification_ids") - if notification_ids: - notifications = Notification.objects.filter( - workspace__slug=slug, - receiver=request.user, - id__in=request.data.get("notification_ids"), - ) - for notification in notifications: - notification.read_at = None - notification.save() - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) notification = Notification.objects.get( receiver=request.user, workspace__slug=slug, pk=pk ) @@ -255,18 +210,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator): allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE" ) def archive(self, request, slug, pk): - notification_ids = request.data.get("notification_ids") - if notification_ids: - notifications = Notification.objects.filter( - workspace__slug=slug, - receiver=request.user, - id__in=request.data.get("notification_ids"), - ) - for notification in notifications: - notification.archived_at = timezone.now() - notification.save() - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) notification = Notification.objects.get( receiver=request.user, workspace__slug=slug, pk=pk ) @@ -279,18 +222,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator): allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE" ) def unarchive(self, request, slug, pk): - notification_ids = request.data.get("notification_ids") - if notification_ids: - notifications = Notification.objects.filter( - workspace__slug=slug, - receiver=request.user, - id__in=request.data.get("notification_ids"), - ) - for notification in notifications: - notification.archived_at = None - notification.save() - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) notification = Notification.objects.get( receiver=request.user, workspace__slug=slug, pk=pk ) diff --git a/apiserver/plane/ee/views/app/inbox/base.py b/apiserver/plane/ee/views/app/inbox/base.py index 5c954a89b0..d950752759 100644 --- a/apiserver/plane/ee/views/app/inbox/base.py +++ b/apiserver/plane/ee/views/app/inbox/base.py @@ -60,8 +60,7 @@ class InboxViewSet(BaseViewSet, BasePaginator): return Response( serializer.errors, status=status.HTTP_400_BAD_REQUEST ) - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) notification = Notification.objects.get( workspace__slug=slug, receiver=request.user ) @@ -75,7 +74,7 @@ class InboxViewSet(BaseViewSet, BasePaginator): if serializer.is_valid(): serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) @check_feature_flag(FeatureFlag.INBOX_STACKING) @@ -93,15 +92,13 @@ class InboxViewSet(BaseViewSet, BasePaginator): for notification in notifications: notification.read_at = timezone.now() notification.save() - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) notification = Notification.objects.get( receiver=request.user, workspace__slug=slug ) notification.read_at = timezone.now() notification.save() - serializer = NotificationSerializer(notification) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) @check_feature_flag(FeatureFlag.INBOX_STACKING) @allow_permission( @@ -118,15 +115,13 @@ class InboxViewSet(BaseViewSet, BasePaginator): for notification in notifications: notification.read_at = None notification.save() - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) notification = Notification.objects.get( receiver=request.user, workspace__slug=slug ) notification.read_at = None notification.save() - serializer = NotificationSerializer(notification) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) @allow_permission( allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE" @@ -142,15 +137,13 @@ class InboxViewSet(BaseViewSet, BasePaginator): for notification in notifications: notification.archived_at = timezone.now() notification.save() - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) notification = Notification.objects.get( receiver=request.user, workspace__slug=slug ) notification.archived_at = timezone.now() notification.save() - serializer = NotificationSerializer(notification) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) @allow_permission( allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE" @@ -166,12 +159,10 @@ class InboxViewSet(BaseViewSet, BasePaginator): for notification in notifications: notification.archived_at = None notification.save() - serializer = NotificationSerializer(notifications, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT) notification = Notification.objects.get( receiver=request.user, workspace__slug=slug ) notification.archived_at = None notification.save() - serializer = NotificationSerializer(notification) - return Response(serializer.data, status=status.HTTP_200_OK) + return Response(status=status.HTTP_204_NO_CONTENT)