fixup! feat(query): Add default filters on query

Author: susilnem

apps/contributor/graphql/queries.py

@@ -7,7 +7,7 @@
 from strawberry_django.pagination import OffsetPaginated
 from strawberry_django.permissions import IsAuthenticated
 
-from apps.contributor.models import ContributorTeam, ContributorUser, ContributorUserGroup
+from apps.contributor.models import ContributorTeam, ContributorUser, ContributorUserGroup, ContributorUserGroupMembership
 
 from .filters import (
     ContributorTeamFilter,
@@ -35,11 +35,6 @@ class Query:
 
     contributor_user_group: ContributorUserGroupType = strawberry_django.field()
 
-    contributor_user_group_members: OffsetPaginated[ContributorUserGroupMembershipType] = strawberry_django.offset_paginated(
-        order=ContributorUserGroupMembershipOrder,
-        filters=ContributorUserGroupMembershipFilter,
-    )
-
     # Team
     contributor_team: ContributorTeamType = strawberry_django.field()
 
@@ -66,6 +61,22 @@ def contributor_user_groups(
             return queryset
         return queryset.exclude(is_archived=True).all()
 
+    # --- Paginated
+    # --- ContributorUserGroupMembership
+    @strawberry_django.offset_paginated(
+        OffsetPaginated[ContributorUserGroupMembershipType],
+        order=ContributorUserGroupMembershipOrder,
+        filters=ContributorUserGroupMembershipFilter,
+    )
+    def contributor_user_group_members(
+        self,
+        include_all: bool = False,
+    ) -> QuerySet[ContributorUserGroupMembership]:
+        queryset = ContributorUserGroupMembership.objects.all()
+        if include_all:
+            return queryset
+        return queryset.exclude(is_active=False).all()
+
     # --- Paginated
     # --- Team
     @strawberry_django.offset_paginated(

schema.graphql

@@ -1534,10 +1534,10 @@ type Query {
   contributorUsers(pagination: OffsetPaginationInput, filters: ContributorUserFilter, order: ContributorUserOrder): ContributorUserTypeOffsetPaginated!
   contributorUser(id: ID!): ContributorUserType!
   contributorUserGroup(id: ID!): ContributorUserGroupType!
-  contributorUserGroupMembers(pagination: OffsetPaginationInput, filters: ContributorUserGroupMembershipFilter, order: ContributorUserGroupMembershipOrder): ContributorUserGroupMembershipTypeOffsetPaginated!
   contributorTeam(id: ID!): ContributorTeamType!
   contributorUserByUserId(userId: ID!): ContributorUserType!
   contributorUserGroups(includeAll: Boolean! = false, filters: ContributorUserGroupFilter, order: ContributorUserGroupOrder, pagination: OffsetPaginationInput): ContributorUserGroupTypeOffsetPaginated!
+  contributorUserGroupMembers(includeAll: Boolean! = false, filters: ContributorUserGroupMembershipFilter, order: ContributorUserGroupMembershipOrder, pagination: OffsetPaginationInput): ContributorUserGroupMembershipTypeOffsetPaginated!
   contributorTeams(includeAll: Boolean! = false, filters: ContributorTeamFilter, order: ContributorTeamOrder, pagination: OffsetPaginationInput): ContributorTeamTypeOffsetPaginated! @isAuthenticated
   communityStats: CommunityStatsType!