Skip to content

Commit 59981c6

Browse files
authored
fix: fix the membership endpoint broken after organization deleted (#178)
Because - The membership endpoint will be broken after organization deleted. This commit - Fixes the bug.
1 parent 94ff2df commit 59981c6

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

pkg/service/service.go

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -618,28 +618,26 @@ func (s *service) ListUserMemberships(ctx context.Context, ctxUserUID uuid.UUID,
618618
memberships := []*mgmtPB.UserMembership{}
619619
for _, orgRelation := range orgRelations {
620620
org, err := s.repository.GetOrganizationByUID(ctx, orgRelation.UID)
621-
if err != nil {
622-
return nil, fmt.Errorf("organizations/%s: %w", org.ID, err)
623-
}
624-
pbOrg, err := s.DBOrg2PBOrg(ctx, org)
625-
if err != nil {
626-
return nil, err
627-
}
628-
629-
role := orgRelation.Relation
630-
state := mgmtPB.MembershipState_MEMBERSHIP_STATE_ACTIVE
631-
if strings.HasPrefix(role, "pending") {
632-
role = strings.Replace(role, "pending_", "", -1)
633-
state = mgmtPB.MembershipState_MEMBERSHIP_STATE_PENDING
621+
if err == nil {
622+
pbOrg, err := s.DBOrg2PBOrg(ctx, org)
623+
if err != nil {
624+
return nil, err
625+
}
626+
role := orgRelation.Relation
627+
state := mgmtPB.MembershipState_MEMBERSHIP_STATE_ACTIVE
628+
if strings.HasPrefix(role, "pending") {
629+
role = strings.Replace(role, "pending_", "", -1)
630+
state = mgmtPB.MembershipState_MEMBERSHIP_STATE_PENDING
631+
}
632+
633+
memberships = append(memberships, &mgmtPB.UserMembership{
634+
Name: fmt.Sprintf("users/%s/memberships/%s", user.ID, org.ID),
635+
Role: role,
636+
User: pbUser,
637+
Organization: pbOrg,
638+
State: state,
639+
})
634640
}
635-
636-
memberships = append(memberships, &mgmtPB.UserMembership{
637-
Name: fmt.Sprintf("users/%s/memberships/%s", user.ID, org.ID),
638-
Role: role,
639-
User: pbUser,
640-
Organization: pbOrg,
641-
State: state,
642-
})
643641
}
644642
return memberships, nil
645643
}

0 commit comments

Comments
 (0)