Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions apps/api/plane/api/serializers/issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -818,14 +818,26 @@ class IssueExpandSerializer(BaseSerializer):
labels, assignees, and states for comprehensive data representation.
"""

cycle = CycleLiteSerializer(source="issue_cycle.cycle", read_only=True)
module = ModuleLiteSerializer(source="issue_module.module", read_only=True)
cycle = serializers.SerializerMethodField()
module = serializers.SerializerMethodField()

labels = serializers.SerializerMethodField()
assignees = serializers.SerializerMethodField()
state = StateLiteSerializer(read_only=True)
description = serializers.JSONField(source="description_json", read_only=True)

def get_cycle(self, obj):
expand = self.context.get("expand", [])
if "cycle" in expand:
return CycleLiteSerializer([ic.cycle for ic in obj.issue_cycle.all()], many=True).data
return [ic.cycle_id for ic in obj.issue_cycle.all()]

def get_module(self, obj):
expand = self.context.get("expand", [])
if "module" in expand:
return ModuleLiteSerializer([im.module for im in obj.issue_module.all()], many=True).data
return [im.module_id for im in obj.issue_module.all()]

def get_labels(self, obj):
expand = self.context.get("expand", [])
if "labels" in expand:
Expand Down
4 changes: 3 additions & 1 deletion apps/api/plane/bgtasks/webhook_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ def get_issue_prefetches():
return [
Prefetch("label_issue", queryset=IssueLabel.objects.select_related("label")),
Prefetch("issue_assignee", queryset=IssueAssignee.objects.select_related("assignee")),
Prefetch("issue_module", queryset=ModuleIssue.objects.select_related("module")),
Prefetch("issue_cycle", queryset=CycleIssue.objects.select_related("cycle")),
]


Expand Down Expand Up @@ -161,7 +163,7 @@ def get_model_data(event: str, event_id: Union[str, List[str]], many: bool = Fal
issue_id = queryset.id
queryset = model.objects.filter(pk=issue_id).prefetch_related(*issue_prefetches).first()

return serializer(queryset, many=many, context={"expand": ["labels", "assignees"]}).data
return serializer(queryset, many=many, context={"expand": ["labels", "assignees", "module", "cycle"]}).data
else:
return serializer(queryset, many=many).data
except ObjectDoesNotExist:
Expand Down
Loading