Error code standardization

pkg/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -4,7 +4,6 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/utils"
-	"errors"
 	"fmt"
 	"time"
 )
@@ -49,7 +48,6 @@ func BatchInsertIntoGroupMember(toInsertInfoList []*db.GroupMember) error {
 func GetGroupMemberListByUserID(userID string) ([]db.GroupMember, error) {
 	var groupMemberList []db.GroupMember
 	err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("user_id=?", userID).Find(&groupMemberList).Error
-	//err = dbConn.Table("group_members").Where("user_id=?", userID).Take(&groupMemberList).Error
 	if err != nil {
 		return nil, err
 	}
@@ -136,8 +134,7 @@ func GetGroupOwnerInfoByGroupID(groupID string) (*db.GroupMember, error) {
 			return &v, nil
 		}
 	}
-
-	return nil, utils.Wrap(errors.New("no owner"), "")
+	return nil, utils.Wrap(constant.ErrNoGroupOwner, "")
 }
 
 func IsExistGroupMember(groupID, userID string) bool {

pkg/common/db/mysql_model/im_mysql_model/group_model.go

@@ -38,6 +38,12 @@ func InsertIntoGroup(groupInfo db.Group) error {
 	return nil
 }
 
+func TakeGroupInfoByGroupID(groupID string) (*db.Group, error) {
+	var groupInfo db.Group
+	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupID).Take(&groupInfo).Error
+	return &groupInfo, err
+}
+
 func GetGroupInfoByGroupID(groupID string) (*db.Group, error) {
 	var groupInfo db.Group
 	err := db.DB.MysqlDB.DefaultGormDB().Table("groups").Where("group_id=?", groupID).Take(&groupInfo).Error

pkg/common/db/mysql_model/im_mysql_model/group_request_model.go

@@ -70,8 +70,8 @@ func GetGroupRequestByGroupID(groupID string) ([]db.GroupRequest, error) {
 	return groupRequestList, nil
 }
 
-//received
-func GetGroupApplicationList(userID string) ([]db.GroupRequest, error) {
+// received
+func GetRecvGroupApplicationList(userID string) ([]db.GroupRequest, error) {
 	var groupRequestList []db.GroupRequest
 	memberList, err := GetGroupMemberListByUserID(userID)
 	if err != nil {
@@ -81,12 +81,9 @@ func GetGroupApplicationList(userID string) ([]db.GroupRequest, error) {
 		if v.RoleLevel > constant.GroupOrdinaryUsers {
 			list, err := GetGroupRequestByGroupID(v.GroupID)
 			if err != nil {
-				//		fmt.Println("111 GetGroupRequestByGroupID failed ", err.Error())
 				continue
 			}
-			//	fmt.Println("222 GetGroupRequestByGroupID ok ", list)
 			groupRequestList = append(groupRequestList, list...)
-			//	fmt.Println("333 GetGroupRequestByGroupID ok ", groupRequestList)
 		}
 	}
 	return groupRequestList, nil

pkg/common/db/mysql_model/im_mysql_model/user_model.go

@@ -55,6 +55,15 @@ func GetAllUser() ([]db.User, error) {
 	return userList, err
 }
 
+func TakeUserByUserID(userID string) (*db.User, error) {
+	var user db.User
+	err := db.DB.MysqlDB.DefaultGormDB().Table("users").Where("user_id=?", userID).Take(&user).Error
+	if err != nil {
+		return nil, err
+	}
+	return &user, nil
+}
+
 func GetUserByUserID(userID string) (*db.User, error) {
 	var user db.User
 	err := db.DB.MysqlDB.DefaultGormDB().Table("users").Where("user_id=?", userID).Take(&user).Error