aboutsummaryrefslogtreecommitdiff
path: root/internal/route/api
diff options
context:
space:
mode:
authorJoe Chen <jc@unknwon.io>2022-11-05 13:12:53 +0800
committerGitHub <noreply@github.com>2022-11-05 13:12:53 +0800
commita66c90462da24a916ee62afcb5a1f79d06ed8399 (patch)
treeac193502864d4f9309e82adf2b883f2d6cdfe879 /internal/route/api
parent3af5a424f0e1afa9e77a60376bca97bc5c3b5f8b (diff)
refactor(db): migrate methods off `user.go` and `org.go` (#7219) (#7227)
Diffstat (limited to 'internal/route/api')
-rw-r--r--internal/route/api/v1/org/org.go17
1 files changed, 12 insertions, 5 deletions
diff --git a/internal/route/api/v1/org/org.go b/internal/route/api/v1/org/org.go
index 4d987dbf..cefe5cc6 100644
--- a/internal/route/api/v1/org/org.go
+++ b/internal/route/api/v1/org/org.go
@@ -43,14 +43,21 @@ func CreateOrgForUser(c *context.APIContext, apiForm api.CreateOrgOption, user *
}
func listUserOrgs(c *context.APIContext, u *db.User, all bool) {
- if err := u.GetOrganizations(all); err != nil {
- c.Error(err, "get organization")
+ orgs, err := db.Orgs.List(
+ c.Req.Context(),
+ db.ListOrgOptions{
+ MemberID: u.ID,
+ IncludePrivateMembers: all,
+ },
+ )
+ if err != nil {
+ c.Error(err, "list organizations")
return
}
- apiOrgs := make([]*api.Organization, len(u.Orgs))
- for i := range u.Orgs {
- apiOrgs[i] = convert.ToOrganization(u.Orgs[i])
+ apiOrgs := make([]*api.Organization, len(orgs))
+ for i := range orgs {
+ apiOrgs[i] = convert.ToOrganization(orgs[i])
}
c.JSONSuccess(&apiOrgs)
}