vynte-infra/plane
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WEB-4966] fix: Forwarding filtered query set to grouping to reuse it #4249

Browse Source
This commit is contained in:
Dheeraj Kumar Ketireddy
2025-09-18 18:27:07 +05:30
committed by GitHub
parent 0550cc5de6
commit d74ea41b5e
7 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/plane/app/views/cycle/issue.py
+3
View File
@@ -170,12 +170,14 @@ class CycleIssueViewSet(BaseViewSet):
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
sub_group_by_fields=issue_group_values(
field=sub_group_by,
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
group_by_field_name=group_by,
sub_group_by_field_name=sub_group_by,
@@ -205,6 +207,7 @@ class CycleIssueViewSet(BaseViewSet):
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
group_by_field_name=group_by,
count_filter=Q(
apps/api/plane/app/views/issue/archive.py
+3
View File
@@ -168,12 +168,14 @@ class IssueArchiveViewSet(BaseViewSet):
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
sub_group_by_fields=issue_group_values(
field=sub_group_by,
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
group_by_field_name=group_by,
sub_group_by_field_name=sub_group_by,
@@ -203,6 +205,7 @@ class IssueArchiveViewSet(BaseViewSet):
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
group_by_field_name=group_by,
count_filter=Q(
apps/api/plane/ee/views/app/epic/archive.py
+3
View File
@@ -165,6 +165,7 @@ class EpicArchiveViewSet(BaseViewSet):
project_id=project_id,
filters=filters,
epic=True,
queryset=filtered_issue_queryset,
),
sub_group_by_fields=issue_group_values(
field=sub_group_by,
@@ -172,6 +173,7 @@ class EpicArchiveViewSet(BaseViewSet):
project_id=project_id,
filters=filters,
epic=True,
queryset=filtered_issue_queryset,
),
group_by_field_name=group_by,
sub_group_by_field_name=sub_group_by,
@@ -202,6 +204,7 @@ class EpicArchiveViewSet(BaseViewSet):
project_id=project_id,
filters=filters,
epic=True,
queryset=filtered_issue_queryset,
),
group_by_field_name=group_by,
count_filter=Q(
apps/api/plane/ee/views/app/epic/base.py
+3
View File
@@ -331,6 +331,7 @@ class EpicViewSet(BaseViewSet):
project_id=project_id,
filters=filters,
epic=True,
queryset=filtered_issue_queryset,
),
sub_group_by_fields=issue_group_values(
field=sub_group_by,
@@ -338,6 +339,7 @@ class EpicViewSet(BaseViewSet):
project_id=project_id,
filters=filters,
epic=True,
queryset=filtered_issue_queryset,
),
group_by_field_name=group_by,
sub_group_by_field_name=sub_group_by,
@@ -371,6 +373,7 @@ class EpicViewSet(BaseViewSet):
project_id=project_id,
filters=filters,
epic=True,
queryset=filtered_issue_queryset,
),
group_by_field_name=group_by,
count_filter=Q(
apps/api/plane/ee/views/app/teamspace/issue.py
+3 -9
View File
@@ -116,15 +116,6 @@ class TeamspaceIssueEndpoint(TeamspaceBaseEndpoint):
group_by = request.GET.get("group_by", False)
sub_group_by = request.GET.get("sub_group_by", False)
# Issue queryset
issue_queryset, order_by_param = order_issue_queryset(
issue_queryset=issue_queryset, order_by_param=order_by_param
)
# Group by
group_by = request.GET.get("group_by", False)
sub_group_by = request.GET.get("sub_group_by", False)
# issue queryset
issue_queryset = issue_queryset_grouper(
queryset=issue_queryset, group_by=group_by, sub_group_by=sub_group_by
@@ -154,12 +145,14 @@ class TeamspaceIssueEndpoint(TeamspaceBaseEndpoint):
slug=slug,
filters=filters,
team_id=team_space_id,
queryset=filtered_issue_queryset,
),
sub_group_by_fields=issue_group_values(
field=sub_group_by,
slug=slug,
filters=filters,
team_id=team_space_id,
queryset=filtered_issue_queryset,
),
group_by_field_name=group_by,
sub_group_by_field_name=sub_group_by,
@@ -188,6 +181,7 @@ class TeamspaceIssueEndpoint(TeamspaceBaseEndpoint):
slug=slug,
filters=filters,
team_id=team_space_id,
queryset=filtered_issue_queryset,
),
group_by_field_name=group_by,
count_filter=Q(
apps/api/plane/ee/views/space/views.py
+3
View File
@@ -217,12 +217,14 @@ class IssueViewsPublicEndpoint(BaseAPIView):
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
sub_group_by_fields=issue_group_values(
field=sub_group_by,
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
group_by_field_name=group_by,
sub_group_by_field_name=sub_group_by,
@@ -251,6 +253,7 @@ class IssueViewsPublicEndpoint(BaseAPIView):
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
group_by_field_name=group_by,
count_filter=Q(
apps/api/plane/space/views/issue.py
+3
View File
@@ -188,12 +188,14 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
sub_group_by_fields=issue_group_values(
field=sub_group_by,
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
group_by_field_name=group_by,
sub_group_by_field_name=sub_group_by,
@@ -222,6 +224,7 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
slug=slug,
project_id=project_id,
filters=filters,
queryset=total_issue_queryset,
),
group_by_field_name=group_by,
count_filter=Q(