From 6508d96162b9b9ef138be2db7917958af20898c3 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sun, 16 May 2021 22:58:30 +0800
Subject: [PATCH] Remove GetOrganizationByName().

---
 controllers/account.go      |  2 +-
 controllers/verification.go |  4 ++--
 object/check.go             |  2 +-
 object/organization.go      | 15 +--------------
 object/user.go              |  6 +++---
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/controllers/account.go b/controllers/account.go
index 4852fa32..e3618cbb 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -152,7 +152,7 @@ func (c *ApiController) GetAccount() {
 
 	username := c.GetSessionUser()
 	user := object.GetUser(username)
-	organization := object.GetOrganization(util.GetId(user.Owner))
+	organization := object.GetOrganizationByUser(user)
 	resp = Response{Status: "ok", Msg: "", Data: user, Data2: organization}
 
 	c.Data["json"] = resp
diff --git a/controllers/verification.go b/controllers/verification.go
index dfa90c77..11b08d68 100644
--- a/controllers/verification.go
+++ b/controllers/verification.go
@@ -58,7 +58,7 @@ func (c *ApiController) SendVerificationCode() {
 			c.ResponseError("Invalid phone number")
 			return
 		}
-		org := object.GetOrganizationByName(user.Owner)
+		org := object.GetOrganizationByUser(user)
 		phonePrefix := "86"
 		if org != nil && org.PhonePrefix != "" {
 			phonePrefix = org.PhonePrefix
@@ -98,7 +98,7 @@ func (c *ApiController) ResetEmailOrPhone() {
 
 	checkDest := dest
 	if destType == "phone" {
-		org := object.GetOrganizationByName(user.Owner)
+		org := object.GetOrganizationByUser(user)
 		phonePrefix := "86"
 		if org != nil && org.PhonePrefix != "" {
 			phonePrefix = org.PhonePrefix
diff --git a/object/check.go b/object/check.go
index d32f0350..3449f0e2 100644
--- a/object/check.go
+++ b/object/check.go
@@ -58,7 +58,7 @@ func CheckUserSignup(organizationName string, username string, password string,
 }
 
 func CheckPassword(user *User, password string) string {
-	organization := getOrganizationByUser(user)
+	organization := GetOrganizationByUser(user)
 
 	if organization.PasswordType == "plain" {
 		if password == user.Password {
diff --git a/object/organization.go b/object/organization.go
index 44e33668..eb7b45f8 100644
--- a/object/organization.go
+++ b/object/organization.go
@@ -93,19 +93,6 @@ func DeleteOrganization(organization *Organization) bool {
 	return affected != 0
 }
 
-func GetOrganizationByName(name string) *Organization {
-	var ret Organization
-	ret.Name = name
-	has, err := adapter.Engine.Get(&ret)
-	if err != nil {
-		panic(err)
-	}
-	if !has {
-		return nil
-	}
-	return &ret
-}
-
-func getOrganizationByUser(user *User) *Organization {
+func GetOrganizationByUser(user *User) *Organization {
 	return getOrganization("admin", user.Owner)
 }
diff --git a/object/user.go b/object/user.go
index 78d047cd..418b2ecf 100644
--- a/object/user.go
+++ b/object/user.go
@@ -116,7 +116,7 @@ func UpdateUserForOriginal(user *User) bool {
 func AddUser(user *User) bool {
 	user.Id = util.GenerateId()
 
-	organization := getOrganizationByUser(user)
+	organization := GetOrganizationByUser(user)
 	user.UpdateUserPassword(organization)
 
 	user.UpdateUserHash()
@@ -135,7 +135,7 @@ func AddUsers(users []*User) bool {
 		return false
 	}
 
-	organization := getOrganizationByUser(users[0])
+	organization := GetOrganizationByUser(users[0])
 	for _, user := range users {
 		user.UpdateUserPassword(organization)
 
@@ -227,7 +227,7 @@ func GetUserByFields(organization string, field string) *User {
 
 func SetUserField(user *User, field string, value string) bool {
 	if field == "password" {
-		organization := getOrganizationByUser(user)
+		organization := GetOrganizationByUser(user)
 		user.UpdateUserPassword(organization)
 		value = user.Password
 	}