Skip to content

Commit

Permalink
Memberships with fines activated (#791)
Browse files Browse the repository at this point in the history
init
  • Loading branch information
MadsNyl committed Apr 12, 2024
1 parent 0544b2f commit ae483dd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
14 changes: 14 additions & 0 deletions app/content/views/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,20 @@ def get_user_memberships(self, request, pk, *args, **kwargs):
context={"request": request},
)

@action(detail=True, methods=["get"], url_path="memberships-with-fines")
def get_user_memberships_with_fines(self, request, pk, *args, **kwargs):
user = self._get_user(request, pk)
self.check_object_permissions(self.request, user)

memberships = user.memberships.filter(
group__type__in=GroupType.public_groups(), group__fines_activated=True
).order_by("-created_at")
return self.paginate_response(
data=memberships,
serializer=MembershipSerializer,
context={"request": request},
)

@action(detail=True, methods=["get"], url_path="membership-histories")
def get_user_membership_histories(self, request, pk, *args, **kwargs):
user = self._get_user(request, pk)
Expand Down
1 change: 1 addition & 0 deletions app/group/serializers/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Meta:
"viewer_is_member",
"image",
"image_alt",
"fines_activated",
)

def get_viewer_is_member(self, obj):
Expand Down
1 change: 1 addition & 0 deletions app/tests/content/test_user_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ def test_filter_only_users_with_active_strikes(
[
("/", status.HTTP_200_OK),
("/memberships/", status.HTTP_200_OK),
("/memberships-with-fines/", status.HTTP_200_OK),
("/membership-histories/", status.HTTP_200_OK),
("/badges/", status.HTTP_200_OK),
("/events/", status.HTTP_200_OK),
Expand Down

0 comments on commit ae483dd

Please sign in to comment.