mirror of
https://github.com/ae-utbm/sith.git
synced 2026-06-28 02:38:44 +00:00
modif des changement demandé
This commit is contained in:
+17
-31
@@ -65,52 +65,38 @@ class UserClubController(ControllerBase):
|
||||
)
|
||||
|
||||
|
||||
@api_controller("/club_members/{since_date}")
|
||||
class ClubMembersController(ControllerBase):
|
||||
@api_controller("/clubs/{club_id}/members/{since_date}")
|
||||
class ClubMembershipController(ControllerBase):
|
||||
@route.get(
|
||||
"/new",
|
||||
response=list[UserMembershipSchema],
|
||||
auth=[ApiKeyAuth(), SessionAuth()],
|
||||
permissions=[HasPerm("club.view_club")],
|
||||
url_name="get_new_club_members_since_date",
|
||||
url_name="get_new_clubs_members_since_date",
|
||||
)
|
||||
def fetch_new_club_members(self, filters: Query[MembershipFilterSchema]):
|
||||
"""give all the members of a club that have joined since a given date"""
|
||||
"""give all the members of all clubs that have joined since a given date"""
|
||||
memberships = Membership.objects.ongoing().filter(
|
||||
start_date__gte=filters.since_date, end_date__isnull=True
|
||||
)
|
||||
club_ids = memberships.values_list("club_id")
|
||||
clubs = Club.objects.filter(id__in=club_ids)
|
||||
return [
|
||||
{
|
||||
"club": club,
|
||||
"user": membership.user,
|
||||
"role": membership.role,
|
||||
"joined_at": membership.start_date,
|
||||
}
|
||||
for club in clubs
|
||||
for membership in memberships.filter(club=club)
|
||||
]
|
||||
if filters.clubs_id is None:
|
||||
return memberships.order_by("start_date")
|
||||
|
||||
return memberships.filter(club_id__in=filters.clubs_id)
|
||||
|
||||
@route.get(
|
||||
"/former",
|
||||
response=list[UserMembershipSchema],
|
||||
auth=[ApiKeyAuth(), SessionAuth()],
|
||||
permissions=[HasPerm("club.view_club")],
|
||||
url_name="get_former_club_members_since_date",
|
||||
url_name="get_former_clubs_members_since_date",
|
||||
)
|
||||
def fetch_former_club_members(self, filters: Query[MembershipFilterSchema]):
|
||||
"""give all the former members of a club that have left since a given date"""
|
||||
memberships = Membership.objects.filter(end_date__gte=filters.since_date)
|
||||
club_ids = memberships.values_list("club_id")
|
||||
clubs = Club.objects.filter(id__in=club_ids)
|
||||
return [
|
||||
{
|
||||
"club": club,
|
||||
"user": membership.user,
|
||||
"role": membership.role,
|
||||
"left_at": membership.end_date,
|
||||
}
|
||||
for club in clubs
|
||||
for membership in memberships.filter(club=club)
|
||||
]
|
||||
"""give all the former members of all clubs that have left since a given date"""
|
||||
memberships = Membership.objects.filter(
|
||||
end_date__gte=filters.since_date,
|
||||
)
|
||||
if filters.clubs_id is None:
|
||||
return memberships.order_by("start_date")
|
||||
|
||||
return memberships.filter(club_id__in=filters.clubs_id)
|
||||
|
||||
Reference in New Issue
Block a user