From 2a3872077c57c840158d962ba865a630cbf96c5c Mon Sep 17 00:00:00 2001 From: NarayanBavisetti Date: Wed, 1 Nov 2023 17:18:11 +0530 Subject: [PATCH] fix: optimised code --- apiserver/plane/api/views/issue.py | 28 ++++++++----------- .../plane/bgtasks/issue_activites_task.py | 4 +-- .../plane/bgtasks/issue_automation_task.py | 2 +- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py index f9eb5ef09..ae785578f 100644 --- a/apiserver/plane/api/views/issue.py +++ b/apiserver/plane/api/views/issue.py @@ -235,10 +235,7 @@ class IssueViewSet(BaseViewSet): status=status.HTTP_200_OK, ) - return Response( - issues, status=status.HTTP_200_OK - ) - + return Response(issues, status=status.HTTP_200_OK) def create(self, request, slug, project_id): project = Project.objects.get(pk=project_id) @@ -443,9 +440,7 @@ class UserWorkSpaceIssues(BaseAPIView): status=status.HTTP_200_OK, ) - return Response( - issues, status=status.HTTP_200_OK - ) + return Response(issues, status=status.HTTP_200_OK) class WorkSpaceIssuesEndpoint(BaseAPIView): @@ -623,13 +618,12 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView): serializer = IssuePropertySerializer(issue_property) return Response(serializer.data, status=status.HTTP_201_CREATED) - def get(self, request, slug, project_id): - issue_property, _ = IssueProperty.objects.get_or_create( - user=request.user, project_id=project_id - ) - serializer = IssuePropertySerializer(issue_property) - return Response(serializer.data, status=status.HTTP_200_OK) + issue_property, _ = IssueProperty.objects.get_or_create( + user=request.user, project_id=project_id + ) + serializer = IssuePropertySerializer(issue_property) + return Response(serializer.data, status=status.HTTP_200_OK) class LabelViewSet(BaseViewSet): @@ -1100,7 +1094,9 @@ class IssueArchiveViewSet(BaseViewSet): actor_id=str(request.user.id), issue_id=str(issue.id), project_id=str(project_id), - current_instance=json.dumps(IssueSerializer(issue).data, cls=DjangoJSONEncoder), + current_instance=json.dumps( + IssueSerializer(issue).data, cls=DjangoJSONEncoder + ), epoch=int(timezone.now().timestamp()), ) @@ -2160,9 +2156,7 @@ class IssueDraftViewSet(BaseViewSet): status=status.HTTP_200_OK, ) - return Response( - issues, status=status.HTTP_200_OK - ) + return Response(issues, status=status.HTTP_200_OK) def create(self, request, slug, project_id): project = Project.objects.get(pk=project_id) diff --git a/apiserver/plane/bgtasks/issue_activites_task.py b/apiserver/plane/bgtasks/issue_activites_task.py index 7517bb121..b1277cb3d 100644 --- a/apiserver/plane/bgtasks/issue_activites_task.py +++ b/apiserver/plane/bgtasks/issue_activites_task.py @@ -425,7 +425,7 @@ def track_archive_at( issue_id=issue_id, project_id=project_id, workspace_id=workspace_id, - comment=f"has restored the issue", + comment="has restored the issue", verb="updated", actor_id=actor_id, field="archived_at", @@ -440,7 +440,7 @@ def track_archive_at( issue_id=issue_id, project_id=project_id, workspace_id=workspace_id, - comment=f"Plane has archived the issue", + comment="Plane has archived the issue", verb="updated", actor_id=actor_id, field="archived_at", diff --git a/apiserver/plane/bgtasks/issue_automation_task.py b/apiserver/plane/bgtasks/issue_automation_task.py index 1f40f48e5..b2f7476a5 100644 --- a/apiserver/plane/bgtasks/issue_automation_task.py +++ b/apiserver/plane/bgtasks/issue_automation_task.py @@ -71,7 +71,7 @@ def archive_old_issues(): Issue.objects.bulk_update( issues_to_update, ["archived_at"], batch_size=100 ) - [ + _ = [ issue_activity.delay( type="issue.activity.updated", requested_data=json.dumps({"archived_at": str(archive_at)}),