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.

[WEB-3513] fix: return cycle start and end dates in project's timezone

Dheeraj Kumar Ketireddy75a9b71edbe5
diff --git a/apiserver/plane/api/serializers/cycle.py b/apiserver/plane/api/serializers/cycle.py
index ea3c4eb3d6..c828195d2d 100644
--- a/apiserver/plane/api/serializers/cycle.py
+++ b/apiserver/plane/api/serializers/cycle.py
@@ -1,4 +1,5 @@
# Third party imports
+import pytz
from rest_framework import serializers
# Module imports
@@ -18,6 +19,14 @@ class CycleSerializer(BaseSerializer):
completed_estimates = serializers.FloatField(read_only=True)
started_estimates = serializers.FloatField(read_only=True)
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ project = self.context.get("project")
+ if project and project.timezone:
+ project_timezone = pytz.timezone(project.timezone)
+ self.fields["start_date"].timezone = project_timezone
+ self.fields["end_date"].timezone = project_timezone
+
def validate(self, data):
if (
data.get("start_date", None) is not None
diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.py
index 3665e3b0f2..e0f44f9845 100644
--- a/apiserver/plane/api/views/cycle.py
+++ b/apiserver/plane/api/views/cycle.py
@@ -137,10 +137,12 @@ class CycleAPIEndpoint(BaseAPIView):
)
def get(self, request, slug, project_id, pk=None):
+ project = Project.objects.get(workspace__slug=slug, pk=project_id)
if pk:
queryset = self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
data = CycleSerializer(
- queryset, fields=self.fields, expand=self.expand
+ queryset, fields=self.fields,
+ expand=self.expand, context={"project": project}
).data
return Response(data, status=status.HTTP_200_OK)
queryset = self.get_queryset().filter(archived_at__isnull=True)
@@ -152,7 +154,8 @@ class CycleAPIEndpoint(BaseAPIView):
start_date__lte=timezone.now(), end_date__gte=timezone.now()
)
data = CycleSerializer(
- queryset, many=True, fields=self.fields, expand=self.expand
+ queryset, many=True, fields=self.fields,
+ expand=self.expand, context={"project": project}
).data
return Response(data, status=status.HTTP_200_OK)
@@ -163,7 +166,8 @@ class CycleAPIEndpoint(BaseAPIView):
request=request,
queryset=(queryset),
on_results=lambda cycles: CycleSerializer(
- cycles, many=True, fields=self.fields, expand=self.expand
+ cycles, many=True, fields=self.fields,
+ expand=self.expand, context={"project": project}
).data,
)
@@ -174,7 +178,8 @@ class CycleAPIEndpoint(BaseAPIView):
request=request,
queryset=(queryset),
on_results=lambda cycles: CycleSerializer(
- cycles, many=True, fields=self.fields, expand=self.expand
+ cycles, many=True, fields=self.fields,
+ expand=self.expand, context={"project": project}
).data,
)
@@ -185,7 +190,8 @@ class CycleAPIEndpoint(BaseAPIView):
request=request,
queryset=(queryset),
on_results=lambda cycles: CycleSerializer(
- cycles, many=True, fields=self.fields, expand=self.expand
+ cycles, many=True, fields=self.fields,
+ expand=self.expand, context={"project": project}
).data,
)
@@ -198,14 +204,16 @@ class CycleAPIEndpoint(BaseAPIView):
request=request,
queryset=(queryset),
on_results=lambda cycles: CycleSerializer(
- cycles, many=True, fields=self.fields, expand=self.expand
+ cycles, many=True, fields=self.fields,
+ expand=self.expand, context={"project": project}
).data,
)
return self.paginate(
request=request,
queryset=(queryset),
on_results=lambda cycles: CycleSerializer(
- cycles, many=True, fields=self.fields, expand=self.expand
+ cycles, many=True, fields=self.fields,
+ expand=self.expand, context={"project": project}
).data,
)
diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.py
index 84a161619b..45b6f94d87 100644
--- a/apiserver/plane/app/views/cycle/base.py
+++ b/apiserver/plane/app/views/cycle/base.py
@@ -268,7 +268,7 @@ class CycleViewSet(BaseViewSet):
)
datetime_fields = ["start_date", "end_date"]
data = user_timezone_converter(
- data, datetime_fields, request.user.user_timezone
+ data, datetime_fields, project_timezone
)
return Response(data, status=status.HTTP_200_OK)
@@ -318,9 +318,13 @@ class CycleViewSet(BaseViewSet):
.first()
)
+ # Fetch the project timezone
+ project = Project.objects.get(id=self.kwargs.get("project_id"))
+ project_timezone = project.timezone
+
datetime_fields = ["start_date", "end_date"]
cycle = user_timezone_converter(
- cycle, datetime_fields, request.user.user_timezone
+ cycle, datetime_fields, project_timezone
)
# Send the model activity
@@ -407,9 +411,13 @@ class CycleViewSet(BaseViewSet):
"created_by",
).first()
+ # Fetch the project timezone
+ project = Project.objects.get(id=self.kwargs.get("project_id"))
+ project_timezone = project.timezone
+
datetime_fields = ["start_date", "end_date"]
cycle = user_timezone_converter(
- cycle, datetime_fields, request.user.user_timezone
+ cycle, datetime_fields, project_timezone
)
# Send the model activity
@@ -480,10 +488,11 @@ class CycleViewSet(BaseViewSet):
)
queryset = queryset.first()
+ # Fetch the project timezone
+ project = Project.objects.get(id=self.kwargs.get("project_id"))
+ project_timezone = project.timezone
datetime_fields = ["start_date", "end_date"]
- data = user_timezone_converter(
- data, datetime_fields, request.user.user_timezone
- )
+ data = user_timezone_converter(data, datetime_fields, project_timezone)
recent_visited_task.delay(
slug=slug,