blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace find with take

Browse Source
This commit is contained in:
skiffer-git 2022-02-28 17:20:40 +08:00
parent 05fbbfcf39
commit ed65ad842f
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/common/db/mysql_model/im_mysql_model/group_member_model.go
View File

@ -4,6 +4,7 @@ import (
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db" "Open_IM/pkg/common/db"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"errors"
"fmt" "fmt"
"time" "time"
) )
@ -43,6 +44,7 @@ func GetGroupMemberListByUserID(userID string) ([]db.GroupMember, error) {
} }
var groupMemberList []db.GroupMember var groupMemberList []db.GroupMember
err = dbConn.Table("group_members").Where("user_id=?", userID).Find(&groupMemberList).Error err = dbConn.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 { if err != nil {
return nil, err return nil, err
} }
@ -82,7 +84,7 @@ func GetGroupMemberInfoByGroupIDAndUserID(groupID, userID string) (*db.GroupMemb
return nil, err return nil, err
} }
var groupMember db.GroupMember var groupMember db.GroupMember
err = dbConn.Table("group_members").Where("group_id=? and user_id=? ", groupID, userID).Limit(1).Find(&groupMember).Error err = dbConn.Table("group_members").Where("group_id=? and user_id=? ", groupID, userID).Limit(1).Take(&groupMember).Error
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -149,7 +151,8 @@ func GetGroupOwnerInfoByGroupID(groupID string) (*db.GroupMember, error) {
return &v, nil return &v, nil
} }
} }
return nil, nil
return nil, utils.Wrap(errors.New("no owner"), "")
} }
func IsExistGroupMember(groupID, userID string) bool { func IsExistGroupMember(groupID, userID string) bool {

17
pkg/common/db/mysql_model/im_mysql_model/group_model.go
View File

@ -45,7 +45,7 @@ func GetGroupInfoByGroupID(groupId string) (*db.Group, error) {
return nil, utils.Wrap(err, "") return nil, utils.Wrap(err, "")
} }
var groupInfo db.Group var groupInfo db.Group
err = dbConn.Table("groups").Where("group_id=?", groupId).Find(&groupInfo).Error err = dbConn.Table("groups").Where("group_id=?", groupId).Take(&groupInfo).Error
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -86,11 +86,10 @@ func GetGroups(pageNumber, showNumber int) ([]db.Group, error) {
return groups, nil return groups, nil
} }
func OperateGroupStatus(groupId string, groupStatus int32) error { func OperateGroupStatus(groupId string, groupStatus int32) error {
group := db.Group{ group := db.Group{
GroupID: groupId, GroupID: groupId,
Status: groupStatus, Status: groupStatus,
} }
if err := SetGroupInfo(group); err != nil { if err := SetGroupInfo(group); err != nil {
return err return err
@ -98,7 +97,6 @@ func OperateGroupStatus(groupId string, groupStatus int32) error {
return nil return nil
} }
func DeleteGroup(groupId string) error { func DeleteGroup(groupId string) error {
dbConn, err := db.DB.MysqlDB.DefaultGormDB() dbConn, err := db.DB.MysqlDB.DefaultGormDB()
if err != nil { if err != nil {
@ -129,15 +127,14 @@ func OperateGroupRole(userId, groupId string, roleLevel int32) (string, string,
updateInfo := db.GroupMember{ updateInfo := db.GroupMember{
RoleLevel: roleLevel, RoleLevel: roleLevel,
} }
groupMaster := db.GroupMember{ groupMaster := db.GroupMember{}
}
switch roleLevel { switch roleLevel {
case constant.GroupOwner: case constant.GroupOwner:
err = dbConn.Transaction(func(tx *gorm.DB) error { err = dbConn.Transaction(func(tx *gorm.DB) error {
result := dbConn.Table("group_members").Where("group_id = ? and role_level = ?", groupId, constant.GroupOwner).First(&groupMaster).Update(&db.GroupMember{ result := dbConn.Table("group_members").Where("group_id = ? and role_level = ?", groupId, constant.GroupOwner).First(&groupMaster).Update(&db.GroupMember{
RoleLevel: constant.GroupOrdinaryUsers, RoleLevel: constant.GroupOrdinaryUsers,
}) })
if result.Error != nil { if result.Error != nil {
return result.Error return result.Error
} }
if result.RowsAffected == 0 { if result.RowsAffected == 0 {
@ -145,7 +142,7 @@ func OperateGroupRole(userId, groupId string, roleLevel int32) (string, string,
} }
result = dbConn.Table("group_members").First(&groupMember).Update(updateInfo) result = dbConn.Table("group_members").First(&groupMember).Update(updateInfo)
if result.Error != nil { if result.Error != nil {
return result.Error return result.Error
} }
if result.RowsAffected == 0 { if result.RowsAffected == 0 {
@ -161,7 +158,7 @@ func OperateGroupRole(userId, groupId string, roleLevel int32) (string, string,
return result.Error return result.Error
} }
if result.RowsAffected == 0 { if result.RowsAffected == 0 {
return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId)) return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
} }
if groupMaster.UserID == userId { if groupMaster.UserID == userId {
return errors.New(fmt.Sprintf("user %s is master of %s, cant set to ordinary user", userId, groupId)) return errors.New(fmt.Sprintf("user %s is master of %s, cant set to ordinary user", userId, groupId))
@ -171,7 +168,7 @@ func OperateGroupRole(userId, groupId string, roleLevel int32) (string, string,
return result.Error return result.Error
} }
if result.RowsAffected == 0 { if result.RowsAffected == 0 {
return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId)) return errors.New(fmt.Sprintf("user %s not exist in group %s or already operate", userId, groupId))
} }
} }
return nil return nil

3
pkg/common/db/mysql_model/im_mysql_model/group_request_model.go
View File

@ -63,7 +63,7 @@ func GetGroupRequestByGroupIDAndUserID(groupID, userID string) (*db.GroupRequest
return nil, err return nil, err
} }
var groupRequest db.GroupRequest var groupRequest db.GroupRequest
err = dbConn.Table("group_requests").Where("user_id=? and group_id=?", userID, groupID).Find(&groupRequest).Error err = dbConn.Table("group_requests").Where("user_id=? and group_id=?", userID, groupID).Take(&groupRequest).Error
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -128,7 +128,6 @@ func GetUserReqGroupByUserID(userID string) ([]db.GroupRequest, error) {
return groupRequestList, err return groupRequestList, err
} }
// //
//func GroupApplicationResponse(pb *group.GroupApplicationResponseReq) (*group.CommonResp, error) { //func GroupApplicationResponse(pb *group.GroupApplicationResponseReq) (*group.CommonResp, error) {
// //