Skip to content

Commit 910d8fd

Browse files
committed
fix: Some list parameters were skipping the default list options
The Schema we were using for those classes was not mentioning default pagination attributes so they were never rendered. Issue: COR-4373
1 parent 0287061 commit 910d8fd

File tree

7 files changed

+23
-9
lines changed

7 files changed

+23
-9
lines changed

pygitguardian/models.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
FromDictMixin,
3131
FromDictWithBase,
3232
PaginationParameter,
33+
PaginationParameterSchema,
34+
SearchParameterSchema,
3335
SearchParameter,
3436
ToDictMixin,
3537
)
@@ -1113,7 +1115,11 @@ class MembersParameters(PaginationParameter, SearchParameter, ToDictMixin):
11131115
] = None
11141116

11151117

1116-
class MembersParametersSchema(BaseSchema):
1118+
class MembersParametersSchema(
1119+
PaginationParameterSchema,
1120+
SearchParameterSchema,
1121+
BaseSchema,
1122+
):
11171123
access_level = fields.Enum(AccessLevel, by_value=True, allow_none=True)
11181124
active = fields.Bool(allow_none=True)
11191125
ordering = fields.Str(allow_none=True)
@@ -1298,7 +1304,11 @@ class TeamInvitationParameters(PaginationParameter, ToDictMixin):
12981304
incident_permission: Optional[IncidentPermission] = None
12991305

13001306

1301-
class TeamInvitationParameterSchema(BaseSchema):
1307+
class TeamInvitationParameterSchema(
1308+
PaginationParameterSchema,
1309+
SearchParameterSchema,
1310+
BaseSchema,
1311+
):
13021312
invitation_id = fields.Int(allow_none=True)
13031313
is_team_leader = fields.Bool(allow_none=True)
13041314
incident_permission = fields.Enum(
@@ -1374,7 +1384,11 @@ class TeamMemberParameters(PaginationParameter, SearchParameter, ToDictMixin):
13741384
member_id: Optional[int] = None
13751385

13761386

1377-
class TeamMembershipParameterSchema(BaseSchema):
1387+
class TeamMembershipParameterSchema(
1388+
PaginationParameterSchema,
1389+
SearchParameterSchema,
1390+
BaseSchema,
1391+
):
13781392
is_team_leader = fields.Bool(allow_none=True)
13791393
incident_permission = fields.Enum(
13801394
IncidentPermission, by_value=True, allow_none=True

tests/cassettes/test_delete_member.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interactions:
1111
User-Agent:
1212
- pygitguardian/1.18.0 (Darwin;py3.11.8)
1313
method: GET
14-
uri: https://api.gitguardian.com/v1/members?access_level=member
14+
uri: https://api.gitguardian.com/v1/members?cursor=&per_page=20&access_level=member
1515
response:
1616
body:
1717
string:

tests/cassettes/test_delete_team_member.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ interactions:
125125
User-Agent:
126126
- pygitguardian/1.18.0 (Darwin;py3.11.8)
127127
method: GET
128-
uri: https://api.gitguardian.com/v1/teams/19/team_memberships?is_team_leader=False
128+
uri: https://api.gitguardian.com/v1/teams/19/team_memberships?cursor=&per_page=20&is_team_leader=False
129129
response:
130130
body:
131131
string: '[{"id":29,"team_id":19,"member_id":17,"is_team_leader":false,"team_permission":"cannot_manage","incident_permission":"can_view"}]'

tests/cassettes/test_list_members_parameters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interactions:
1111
User-Agent:
1212
- pygitguardian/1.18.0 (Darwin;py3.11.8)
1313
method: GET
14-
uri: https://api.gitguardian.com/v1/members?access_level=manager
14+
uri: https://api.gitguardian.com/v1/members?cursor=&per_page=20&access_level=manager
1515
response:
1616
body:
1717
string: '[]'

tests/cassettes/test_search_team_invitations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ interactions:
6868
User-Agent:
6969
- pygitguardian/1.18.0 (Darwin;py3.11.8)
7070
method: GET
71-
uri: https://api.gitguardian.com/v1/teams/19/team_invitations?incident_permission=can_view
71+
uri: https://api.gitguardian.com/v1/teams/19/team_invitations?cursor=&per_page=20&incident_permission=can_view
7272
response:
7373
body:
7474
string: '[{"id":7,"team_id":19,"invitation_id":13,"is_team_leader":true,"team_permission":"can_manage","incident_permission":"can_view"}]'

tests/cassettes/test_search_team_members.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ interactions:
6868
User-Agent:
6969
- pygitguardian/1.18.0 (Darwin;py3.11.8)
7070
method: GET
71-
uri: https://api.gitguardian.com/v1/teams/19/team_memberships?is_team_leader=True
71+
uri: https://api.gitguardian.com/v1/teams/19/team_memberships?cursor=&per_page=20&is_team_leader=True
7272
response:
7373
body:
7474
string: '[{"id":23,"team_id":19,"member_id":6,"is_team_leader":true,"team_permission":"can_manage","incident_permission":"full_access"}]'

tests/cassettes/test_update_member.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interactions:
1111
User-Agent:
1212
- pygitguardian/1.18.0 (Darwin;py3.11.8)
1313
method: GET
14-
uri: https://api.gitguardian.com/v1/members?access_level=manager
14+
uri: https://api.gitguardian.com/v1/members?cursor=&per_page=20&access_level=manager
1515
response:
1616
body:
1717
string:

0 commit comments

Comments
 (0)