NotificationsYou must be signed in to change notification settings
Fork674
Star2.4k

Commit755e0a3

committed

fix(members): use new *All objects for *AllManager managers

Change it so that: GroupMemberAllManager uses GroupMemberAll object ProjectMemberAllManager uses ProjectMemberAll objectCreate GroupMemberAll and ProjectMemberAll objects that do not supportany Mixin type methods. Previously we were using GroupMember andProjectMember which support the `save()` and `delete()` methods butthose methods will not work with objects retrieved using the`/members/all/` API calls.`list()` API calls: [1] GET /groups/:id/members/all GET /projects/:id/members/all`get()` API calls: [2] GET /groups/:id/members/all/:user_id GET /projects/:id/members/all/:user_idCloses:#1825Closes:#848[1]https://docs.gitlab.com/ee/api/members.html#list-all-members-of-a-group-or-project-including-inherited-and-invited-members[2]https://docs.gitlab.com/ee/api/members.html#get-a-member-of-a-group-or-project-including-inherited-and-invited-members

1 parent4a000b6 commit755e0a3Copy full SHA for 755e0a3

File tree

2 files changed

+44

-6

lines changed

gitlab/v4/objects
- members.py
tests/functional/cli
- test_cli_v4.py

2 files changed

+44

-6

lines changed

`‎gitlab/v4/objects/members.py‎`

Lines changed: 16 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,11 @@`
`17`	`17`	`"GroupBillableMemberMembership",`
`18`	`18`	`"GroupBillableMemberMembershipManager",`
`19`	`19`	`"GroupMember",`
	`20`	`+"GroupMemberAll",`
`20`	`21`	`"GroupMemberManager",`
`21`	`22`	`"GroupMemberAllManager",`
`22`	`23`	`"ProjectMember",`
	`24`	`+"ProjectMemberAll",`
`23`	`25`	`"ProjectMemberManager",`
`24`	`26`	`"ProjectMemberAllManager",`
`25`	`27`	`]`
`@@ -70,15 +72,19 @@ class GroupBillableMemberMembershipManager(ListMixin, RESTManager):`
`70`	`72`	`_from_parent_attrs= {"group_id":"group_id","user_id":"id"}`
`71`	`73`
`72`	`74`
	`75`	`+classGroupMemberAll(RESTObject):`
	`76`	`+_short_print_attr="username"`
	`77`	`+`
	`78`	`+`
`73`	`79`	`classGroupMemberAllManager(RetrieveMixin,RESTManager):`
`74`	`80`	`_path="/groups/{group_id}/members/all"`
`75`		`-_obj_cls=GroupMember`
	`81`	`+_obj_cls=GroupMemberAll`
`76`	`82`	`_from_parent_attrs= {"group_id":"id"}`
`77`	`83`
`78`	`84`	`defget(`
`79`	`85`	`self,id:Union[str,int],lazy:bool=False,**kwargs:Any`
`80`		`- )->GroupMember:`
`81`		`-returncast(GroupMember,super().get(id=id,lazy=lazy,**kwargs))`
	`86`	`+ )->GroupMemberAll:`
	`87`	`+returncast(GroupMemberAll,super().get(id=id,lazy=lazy,**kwargs))`
`82`	`88`
`83`	`89`
`84`	`90`	`classProjectMember(SaveMixin,ObjectDeleteMixin,RESTObject):`
`@@ -103,12 +109,16 @@ def get(`
`103`	`109`	`returncast(ProjectMember,super().get(id=id,lazy=lazy,**kwargs))`
`104`	`110`
`105`	`111`
	`112`	`+classProjectMemberAll(RESTObject):`
	`113`	`+_short_print_attr="username"`
	`114`	`+`
	`115`	`+`
`106`	`116`	`classProjectMemberAllManager(RetrieveMixin,RESTManager):`
`107`	`117`	`_path="/projects/{project_id}/members/all"`
`108`		`-_obj_cls=ProjectMember`
	`118`	`+_obj_cls=ProjectMemberAll`
`109`	`119`	`_from_parent_attrs= {"project_id":"id"}`
`110`	`120`
`111`	`121`	`defget(`
`112`	`122`	`self,id:Union[str,int],lazy:bool=False,**kwargs:Any`
`113`		`- )->ProjectMember:`
`114`		`-returncast(ProjectMember,super().get(id=id,lazy=lazy,**kwargs))`
	`123`	`+ )->ProjectMemberAll:`
	`124`	`+returncast(ProjectMemberAll,super().get(id=id,lazy=lazy,**kwargs))`

`‎tests/functional/cli/test_cli_v4.py‎`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -701,6 +701,31 @@ def test_delete_group_deploy_token(gitlab_cli, group_deploy_token):`
`701`	`701`	`# TODO assert not in list`
`702`	`702`
`703`	`703`
	`704`	`+deftest_project_member_all(gitlab_cli,project):`
	`705`	`+cmd= [`
	`706`	`+"project-member-all",`
	`707`	`+"list",`
	`708`	`+"--project-id",`
	`709`	`+project.id,`
	`710`	`+ ]`
	`711`	`+ret=gitlab_cli(cmd)`
	`712`	`+`
	`713`	`+assertret.success`
	`714`	`+`
	`715`	`+`
	`716`	`+deftest_group_member_all(gitlab_cli,group):`
	`717`	`+cmd= [`
	`718`	`+"group-member-all",`
	`719`	`+"list",`
	`720`	`+"--group-id",`
	`721`	`+group.id,`
	`722`	`+ ]`
	`723`	`+ret=gitlab_cli(cmd)`
	`724`	`+`
	`725`	`+assertret.success`
	`726`	`+`
	`727`	`+`
	`728`	`+# Deleting the project and group. Add your tests above here.`
`704`	`729`	`deftest_delete_project(gitlab_cli,project):`
`705`	`730`	`cmd= ["project","delete","--id",project.id]`
`706`	`731`	`ret=gitlab_cli(cmd)`
`@@ -713,3 +738,6 @@ def test_delete_group(gitlab_cli, group):`
`713`	`738`	`ret=gitlab_cli(cmd)`
`714`	`739`
`715`	`740`	`assertret.success`
	`741`	`+`
	`742`	`+`
	`743`	`+# Don't add tests below here as the group and project have been deleted`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit755e0a3

File tree

2 files changed

2 files changed

`‎gitlab/v4/objects/members.py‎`

`‎tests/functional/cli/test_cli_v4.py‎`

0 commit comments