From bd31c3fa6f0aa60b208694cc6bfda1b9cc29b6af Mon Sep 17 00:00:00 2001
From: Joe Chen <jc@unknwon.io>
Date: Fri, 3 Nov 2023 22:27:29 -0400
Subject: [PATCH] Delete `GetOrgsByUserID`

---
 internal/db/org.go             | 15 ---------------
 internal/route/user/profile.go | 10 ++++++++--
 internal/route/user/setting.go | 10 ++++++++--
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/internal/db/org.go b/internal/db/org.go
index 5c791adf9..b0301c7b1 100644
--- a/internal/db/org.go
+++ b/internal/db/org.go
@@ -11,21 +11,6 @@ import (
 	"xorm.io/xorm"
 )
 
-func getOrgsByUserID(sess *xorm.Session, userID int64, showAll bool) ([]*User, error) {
-	orgs := make([]*User, 0, 10)
-	if !showAll {
-		sess.And("`org_user`.is_public=?", true)
-	}
-	return orgs, sess.And("`org_user`.uid=?", userID).
-		Join("INNER", "`org_user`", "`org_user`.org_id=`user`.id").Find(&orgs)
-}
-
-// GetOrgsByUserID returns a list of organizations that the given user ID
-// has joined.
-func GetOrgsByUserID(userID int64, showAll bool) ([]*User, error) {
-	return getOrgsByUserID(x.NewSession(), userID, showAll)
-}
-
 // getOwnedOrgsByUserID returns a list of organizations are owned by given user ID.
 func getOwnedOrgsByUserID(sess *xorm.Session, userID int64) ([]*User, error) {
 	orgs := make([]*User, 0, 10)
diff --git a/internal/route/user/profile.go b/internal/route/user/profile.go
index 799868ca2..546ed0089 100644
--- a/internal/route/user/profile.go
+++ b/internal/route/user/profile.go
@@ -42,9 +42,15 @@ func Profile(c *context.Context, puser *context.ParamsUser) {
 	c.PageIs("UserProfile")
 	c.Data["Owner"] = puser
 
-	orgs, err := db.GetOrgsByUserID(puser.ID, c.IsLogged && (c.User.IsAdmin || c.User.ID == puser.ID))
+	orgs, err := db.Organizations.List(
+		c.Req.Context(),
+		db.ListOrganizationsOptions{
+			MemberID:              puser.ID,
+			IncludePrivateMembers: c.IsLogged && (c.User.IsAdmin || c.User.ID == puser.ID),
+		},
+	)
 	if err != nil {
-		c.Error(err, "get organizations by user ID")
+		c.Error(err, "list organizations by user ID")
 		return
 	}
 
diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go
index fd5d1ff16..4f4c0f181 100644
--- a/internal/route/user/setting.go
+++ b/internal/route/user/setting.go
@@ -555,9 +555,15 @@ func SettingsOrganizations(c *context.Context) {
 	c.Title("settings.orgs")
 	c.PageIs("SettingsOrganizations")
 
-	orgs, err := db.GetOrgsByUserID(c.User.ID, true)
+	orgs, err := db.Organizations.List(
+		c.Req.Context(),
+		db.ListOrganizationsOptions{
+			MemberID:              c.User.ID,
+			IncludePrivateMembers: true,
+		},
+	)
 	if err != nil {
-		c.Errorf(err, "get organizations by user ID")
+		c.Errorf(err, "list organizations by user ID")
 		return
 	}
 	c.Data["Orgs"] = orgs