Skip to content

Commit faae116

Browse files
Updated giltab fetch member info func (#14)
* added list repo language in github * added check langugae support functionality in repo gitlab * added check langugae support functionality in repo gitlab * updated fitlab membership func
1 parent 7f5a047 commit faae116

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

scm/driver/github/org.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ func convertMemberships(from []*membership) []*scm.Membership {
9191

9292
func convertMembership(from *membership) *scm.Membership {
9393
to := new(scm.Membership)
94-
switch from.State {
95-
case "active":
94+
if from.State == "active" {
9695
to.Active = true
9796
}
9897
switch from.Role {

scm/driver/gitlab/org.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ func (s *organizationService) Find(ctx context.Context, name string) (*scm.Organ
2525
}
2626

2727
func (s *organizationService) FindMembership(ctx context.Context, name, userID string) (*scm.Membership, *scm.Response, error) {
28-
path := fmt.Sprintf("api/v4/groups/%s/billable_members/%s/memberships", name, userID)
28+
path := fmt.Sprintf("api/v4/groups/%s/members/%s", name, userID)
2929
out := new(membership)
3030
res, err := s.client.do(ctx, "GET", path, nil, out)
31+
out.OrgName = name
3132
return convertMembership(out), res, err
3233
}
3334

@@ -93,13 +94,16 @@ func convertOrganization(from *organization) *scm.Organization {
9394

9495
func convertMembership(from *membership) *scm.Membership {
9596
to := new(scm.Membership)
96-
to.Active = true
97+
9798
to.Organization.Name = from.OrgName
99+
if from.State == "active" {
100+
to.Active = true
101+
}
98102

99-
switch from.Access.Role {
100-
case "Owner":
103+
switch from.Access {
104+
case 50:
101105
to.Role = scm.RoleAdmin
102-
case "Maintainer", "Developer":
106+
case 40, 30:
103107
to.Role = scm.RoleMember
104108
default:
105109
to.Role = scm.RoleViewer
@@ -110,7 +114,6 @@ func convertMembership(from *membership) *scm.Membership {
110114

111115
type membership struct {
112116
OrgName string `json:"source_full_name"`
113-
Access struct {
114-
Role string `json:"string_value"`
115-
} `json:"access_level"`
117+
Access int `json:"access_level"`
118+
State string `json:"membership_state"`
116119
}

0 commit comments

Comments
 (0)