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

Error code standardization

Browse Source
This commit is contained in:
skiffer-git 2023-01-17 15:28:25 +08:00
parent ffd306f25c
commit 87d0e296c1
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/rpc/group/callback.go
View File

@ -4,7 +4,7 @@ import (
cbApi "Open_IM/pkg/callback_struct" cbApi "Open_IM/pkg/callback_struct"
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model" imdb "Open_IM/pkg/common/db/mysql"
"Open_IM/pkg/common/http" "Open_IM/pkg/common/http"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/common/trace_log" "Open_IM/pkg/common/trace_log"
@ -77,7 +77,7 @@ func callbackBeforeCreateGroup(ctx context.Context, req *pbGroup.CreateGroupReq)
return err return err
} }
func CallbackBeforeMemberJoinGroup(ctx context.Context, operationID string, groupMember *im_mysql_model.GroupMember, groupEx string) (err error) { func CallbackBeforeMemberJoinGroup(ctx context.Context, operationID string, groupMember *imdb.GroupMember, groupEx string) (err error) {
defer func() { defer func() {
trace_log.SetCtxInfo(ctx, utils.GetFuncName(1), err, "groupMember", *groupMember, "groupEx", groupEx) trace_log.SetCtxInfo(ctx, utils.GetFuncName(1), err, "groupMember", *groupMember, "groupEx", groupEx)
}() }()

27
internal/rpc/group/group.go
View File

@ -6,15 +6,15 @@ import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db" "Open_IM/pkg/common/db"
imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" imdb "Open_IM/pkg/common/db/mysql"
rocksCache "Open_IM/pkg/common/db/rocks_cache"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/common/middleware" "Open_IM/pkg/common/middleware"
promePkg "Open_IM/pkg/common/prometheus" promePkg "Open_IM/pkg/common/prometheus"
"Open_IM/pkg/common/token_verify" "Open_IM/pkg/common/token_verify"
"Open_IM/pkg/common/tools" "Open_IM/pkg/common/tools"
"Open_IM/pkg/common/trace_log" "Open_IM/pkg/common/trace_log"
cp "Open_IM/pkg/common/utils"
cp "Open_IM/internal/utils"
"Open_IM/pkg/getcdv3" "Open_IM/pkg/getcdv3"
pbCache "Open_IM/pkg/proto/cache" pbCache "Open_IM/pkg/proto/cache"
pbConversation "Open_IM/pkg/proto/conversation" pbConversation "Open_IM/pkg/proto/conversation"
@ -131,39 +131,26 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
for _, adminUserID := range req.AdminUserIDs { for _, adminUserID := range req.AdminUserIDs {
userIDs = append(userIDs, adminUserID) userIDs = append(userIDs, adminUserID)
} }
if utils.IsRepeatID(userIDs) { if utils.IsDuplicateID(userIDs) {
return nil, constant.ErrArgs.Wrap("group member is repeated") return nil, constant.ErrArgs.Wrap("group member is repeated")
} }
users, err := getUsersInfo(ctx, userIDs) users, err := getUsersInfo(ctx, userIDs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
userMap := make(map[string]*open_im_sdk.UserInfo) userMap := make(map[string]*open_im_sdk.UserInfo)
for i, user := range users { for i, user := range users {
userMap[user.UserID] = users[i] userMap[user.UserID] = users[i]
} }
if err := callbackBeforeCreateGroup(ctx, req); err != nil { if err := callbackBeforeCreateGroup(ctx, req); err != nil {
return nil, err return nil, err
} }
groupId := genGroupID(ctx, req.GroupInfo.GroupID) groupInfo, err := (&cp.PBGroup{req.GroupInfo}).Convert()
groupInfo.GroupID = genGroupID(ctx, req.GroupInfo.GroupID)
groupInfo := imdb.Group{}
utils.CopyStructFields(&groupInfo, req.GroupInfo)
groupInfo.CreatorUserID = tools.OpUserID(ctx)
groupInfo.GroupID = groupId
groupInfo.CreateTime = time.Now()
if groupInfo.NotificationUpdateTime.Unix() < 0 {
groupInfo.NotificationUpdateTime = utils.UnixSecondToTime(0)
}
if req.GroupInfo.GroupType != constant.SuperGroup { if req.GroupInfo.GroupType != constant.SuperGroup {
var groupMembers []*imdb.GroupMember var groupMembers []*imdb.GroupMember
joinGroup := func(userID string, roleLevel int32) error { joinGroup := func(userID string, roleLevel int32) error {
groupMember := &imdb.GroupMember{GroupID: groupId, RoleLevel: roleLevel, OperatorUserID: tools.OpUserID(ctx), JoinSource: constant.JoinByInvitation, InviterUserID: tools.OpUserID(ctx)} groupMember := &imdb.GroupMember{GroupID: groupInfo.GroupID, RoleLevel: roleLevel, OperatorUserID: tools.OpUserID(ctx), JoinSource: constant.JoinByInvitation, InviterUserID: tools.OpUserID(ctx)}
user := userMap[userID] user := userMap[userID]
utils.CopyStructFields(&groupMember, user) utils.CopyStructFields(&groupMember, user)
if err := CallbackBeforeMemberJoinGroup(ctx, tools.OperationID(ctx), groupMember, groupInfo.Ex); err != nil { if err := CallbackBeforeMemberJoinGroup(ctx, tools.OperationID(ctx), groupMember, groupInfo.Ex); err != nil {

2
internal/utils/convert.go
View File

@ -120,7 +120,7 @@ type PBGroup struct {
*sdk.GroupInfo *sdk.GroupInfo
} }
func (pb *PBGroup) convert() (*imdb.Group, error) { func (pb *PBGroup) Convert() (*imdb.Group, error) {
dst := &imdb.Group{} dst := &imdb.Group{}
utils.CopyStructFields(dst, pb) utils.CopyStructFields(dst, pb)
return dst, nil return dst, nil

4
pkg/utils/strings.go
View File

@ -122,7 +122,7 @@ func RemoveDuplicateElement(idList []string) []string {
return result return result
} }
func IsRepeatStringSlice(arr []string) bool { func IsDuplicateStringSlice(arr []string) bool {
t := make(map[string]struct{}) t := make(map[string]struct{})
for _, s := range arr { for _, s := range arr {
if _, ok := t[s]; ok { if _, ok := t[s]; ok {
@ -133,6 +133,6 @@ func IsRepeatStringSlice(arr []string) bool {
return false return false
} }
func IsRepeatID(args ...interface{}) bool { func IsDuplicateID(args ...interface{}) bool {
return false return false
} }