github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: total results for sub group pagination

Browse Source
This commit is contained in:
pablohashescobar 2024-03-25 13:07:42 +05:30
parent 6491b40e04
commit 24bdcb682b
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
apiserver/plane/utils/paginator.py
View File

@ -459,13 +459,16 @@ class SubGroupedOffsetPaginator(OffsetPaginator):
) )
def __get_subgroup_total_queryset(self): def __get_subgroup_total_queryset(self):
return self.queryset.values( return (
self.group_by_field_name, self.sub_group_by_field_name self.queryset.values(
).annotate( self.group_by_field_name, self.sub_group_by_field_name
count=Count( )
"id", .annotate(
filter=self.count_filter, count=Count("id", filter=self.count_filter, distinct=True)
distinct=True, )
.order_by()
.values(
self.group_by_field_name, self.sub_group_by_field_name, "count"
) )
) )
@ -479,29 +482,36 @@ class SubGroupedOffsetPaginator(OffsetPaginator):
) )
+ (1 if group.get("count") == 0 else group.get("count")) + (1 if group.get("count") == 0 else group.get("count"))
) )
for sub_group in self.__get_subgroup_total_queryset():
total_sub_group_dict[ # Sub group total values
str(sub_group.get(self.sub_group_by_field_name)) for item in self.__get_subgroup_total_queryset():
] = total_sub_group_dict.get( group = str(item[self.group_by_field_name])
str(sub_group.get(self.sub_group_by_field_name)), 0 subgroup = str(item[self.sub_group_by_field_name])
) + ( count = item["count"]
1 if sub_group.get("count") == 0 else sub_group.get("count")
) if group not in total_sub_group_dict:
total_sub_group_dict[str(group)] = {}
if subgroup not in total_sub_group_dict[group]:
total_sub_group_dict[str(group)][str(subgroup)] = {}
total_sub_group_dict[group][subgroup] = count
return total_group_dict, total_sub_group_dict return total_group_dict, total_sub_group_dict
def __get_field_dict(self): def __get_field_dict(self):
total_group_dict, total_sub_group_dict = self.__get_total_dict() total_group_dict, total_sub_group_dict = self.__get_total_dict()
return { return {
str(group): { str(group): {
"results": { "results": {
str(sub_group): { str(sub_group): {
"results": [], "results": [],
"total_results": total_sub_group_dict.get( "total_results": total_sub_group_dict.get(
str(sub_group), 0 str(group)
), ).get(str(sub_group), 0),
} }
for sub_group in total_sub_group_dict for sub_group in total_sub_group_dict.get(str(group))
}, },
"total_results": total_group_dict.get(str(group), 0), "total_results": total_group_dict.get(str(group), 0),
} }