paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_groups: Work around django-cte bug with Django 4.2.

Browse Source 
https://github.com/dimagi/django-cte/issues/66

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2023-04-06 17:03:03 -07:00
committed by Tim Abbott
parent f1925487e8
commit 52266cbd41
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/user_groups.py
View File

@@ -1,6 +1,6 @@
from typing import Dict, Iterable, List, Sequence, TypedDict from typing import Dict, Iterable, List, Sequence, TypedDict
from django.db.models import QuerySet from django.db.models import F, QuerySet
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from django_cte import With from django_cte import With
from django_stubs_ext import ValuesQuerySet from django_stubs_ext import ValuesQuerySet
@@ -157,10 +157,10 @@ def get_direct_memberships_of_users(user_group: UserGroup, members: List[UserPro
def get_recursive_subgroups(user_group: UserGroup) -> QuerySet[UserGroup]: def get_recursive_subgroups(user_group: UserGroup) -> QuerySet[UserGroup]:
cte = With.recursive( cte = With.recursive(
lambda cte: UserGroup.objects.filter(id=user_group.id) lambda cte: UserGroup.objects.filter(id=user_group.id)
.values("id") .values(group_id=F("id"))
.union(cte.join(UserGroup, direct_supergroups=cte.col.id).values("id")) .union(cte.join(UserGroup, direct_supergroups=cte.col.group_id).values(group_id=F("id")))
) )
return cte.join(UserGroup, id=cte.col.id).with_cte(cte) return cte.join(UserGroup, id=cte.col.group_id).with_cte(cte)
def get_recursive_group_members(user_group: UserGroup) -> QuerySet[UserProfile]: def get_recursive_group_members(user_group: UserGroup) -> QuerySet[UserProfile]:
@@ -169,11 +169,11 @@ def get_recursive_group_members(user_group: UserGroup) -> QuerySet[UserProfile]:
def get_recursive_membership_groups(user_profile: UserProfile) -> QuerySet[UserGroup]: def get_recursive_membership_groups(user_profile: UserProfile) -> QuerySet[UserGroup]:
cte = With.recursive( cte = With.recursive(
lambda cte: user_profile.direct_groups.values("id").union( lambda cte: user_profile.direct_groups.values(group_id=F("id")).union(
cte.join(UserGroup, direct_subgroups=cte.col.id).values("id") cte.join(UserGroup, direct_subgroups=cte.col.group_id).values(group_id=F("id"))
) )
) )
return cte.join(UserGroup, id=cte.col.id).with_cte(cte) return cte.join(UserGroup, id=cte.col.group_id).with_cte(cte)
def is_user_in_group( def is_user_in_group(