blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-03 19:02:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1449 from withchao/mongo

Browse Source 
Mongo
This commit is contained in:
Xinwei Xiong 2023-11-21 09:09:37 +08:00 committed by GitHub
commit c69420e1f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 52 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/group/db_map.go
View File

@ -27,7 +27,7 @@ import (
func UpdateGroupInfoMap(ctx context.Context, group *sdkws.GroupInfoForSet) map[string]any { func UpdateGroupInfoMap(ctx context.Context, group *sdkws.GroupInfoForSet) map[string]any {
m := make(map[string]any) m := make(map[string]any)
if group.GroupName != "" { if group.GroupName != "" {
m["name"] = group.GroupName m["group_name"] = group.GroupName
} }
if group.Notification != "" { if group.Notification != "" {
m["notification"] = group.Notification m["notification"] = group.Notification

136
internal/rpc/group/fill.go
View File

@ -20,142 +20,6 @@ import (
relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
) )
//func (s *groupServer) FindGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) ([]*relationtb.GroupMemberModel, error) {
// members, err := s.db.FindGroupMember(ctx, groupIDs, userIDs, roleLevels)
// if err != nil {
// return nil, err
// }
// emptyUserIDs := make(map[string]struct{})
// for _, member := range members {
// if member.Nickname == "" || member.FaceURL == "" {
// emptyUserIDs[member.UserID] = struct{}{}
// }
// }
// if len(emptyUserIDs) > 0 {
// users, err := s.User.GetPublicUserInfoMap(ctx, utils.Keys(emptyUserIDs), true)
// if err != nil {
// return nil, err
// }
// for i, member := range members {
// user, ok := users[member.UserID]
// if !ok {
// continue
// }
// if member.Nickname == "" {
// members[i].Nickname = user.Nickname
// }
// if member.FaceURL == "" {
// members[i].FaceURL = user.FaceURL
// }
// }
// }
// return members, nil
//}
func (s *groupServer) PopulateGroupMember(ctx context.Context, members ...*relationtb.GroupMemberModel) error { func (s *groupServer) PopulateGroupMember(ctx context.Context, members ...*relationtb.GroupMemberModel) error {
return s.Notification.PopulateGroupMember(ctx, members...) return s.Notification.PopulateGroupMember(ctx, members...)
//if len(members) == 0 {
// return nil
//}
//emptyUserIDs := make(map[string]struct{})
//for _, member := range members {
// if member.Nickname == "" || member.FaceURL == "" {
// emptyUserIDs[member.UserID] = struct{}{}
// }
//}
//if len(emptyUserIDs) > 0 {
// users, err := s.User.GetPublicUserInfoMap(ctx, utils.Keys(emptyUserIDs), true)
// if err != nil {
// return err
// }
// for i, member := range members {
// user, ok := users[member.UserID]
// if !ok {
// continue
// }
// if member.Nickname == "" {
// members[i].Nickname = user.Nickname
// }
// if member.FaceURL == "" {
// members[i].FaceURL = user.FaceURL
// }
// }
//}
//return nil
} }
//func (s *groupServer) TakeGroupMembers(ctx context.Context, groupID string, userID string) (*relationtb.GroupMemberModel, error) {
// member, err := s.db.TakeGroupMember(ctx, groupID, userID)
// if err != nil {
// return nil, err
// }
// if member.Nickname == "" || member.FaceURL == "" {
// user, err := s.User.GetPublicUserInfo(ctx, userID)
// if err != nil {
// return nil, err
// }
// if member.Nickname == "" {
// member.Nickname = user.Nickname
// }
// if member.FaceURL == "" {
// member.FaceURL = user.FaceURL
// }
// }
// return member, nil
//}
//func (s *groupServer) TakeGroupOwner(ctx context.Context, groupID string) (*relationtb.GroupMemberModel, error) {
// owner, err := s.db.TakeGroupOwner(ctx, groupID)
// if err != nil {
// return nil, err
// }
// if owner.Nickname == "" || owner.FaceURL == "" {
// user, err := s.User.GetUserInfo(ctx, owner.UserID)
// if err != nil {
// return nil, err
// }
// if owner.Nickname == "" {
// owner.Nickname = user.Nickname
// }
// if owner.FaceURL == "" {
// owner.FaceURL = user.FaceURL
// }
// }
// return owner, nil
//}
//
//func (s *groupServer) PageGetGroupMember(
// ctx context.Context,
// groupID string,
// pageNumber, showNumber int32,
//) (uint32, []*relationtb.GroupMemberModel, error) {
// total, members, err := s.db.PageGetGroupMember(ctx, groupID, pageNumber, showNumber)
// if err != nil {
// return 0, nil, err
// }
// emptyUserIDs := make(map[string]struct{})
// for _, member := range members {
// if member.Nickname == "" || member.FaceURL == "" {
// emptyUserIDs[member.UserID] = struct{}{}
// }
// }
// if len(emptyUserIDs) > 0 {
// users, err := s.User.GetPublicUserInfoMap(ctx, utils.Keys(emptyUserIDs), true)
// if err != nil {
// return 0, nil, err
// }
// for i, member := range members {
// user, ok := users[member.UserID]
// if !ok {
// continue
// }
// if member.Nickname == "" {
// members[i].Nickname = user.Nickname
// }
// if member.FaceURL == "" {
// members[i].FaceURL = user.FaceURL
// }
// }
// }
// return total, members, nil
//}

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

@ -17,6 +17,8 @@ package group
import ( import (
"context" "context"
"fmt" "fmt"
pbconversation "github.com/OpenIMSDK/protocol/conversation"
"github.com/OpenIMSDK/protocol/wrapperspb"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/newmgo" "github.com/openimsdk/open-im-server/v3/pkg/common/db/newmgo"
tx2 "github.com/openimsdk/open-im-server/v3/pkg/common/db/tx" tx2 "github.com/openimsdk/open-im-server/v3/pkg/common/db/tx"
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient/grouphash" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/grouphash"
@ -29,9 +31,6 @@ import (
"github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/authverify"
"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
pbconversation "github.com/OpenIMSDK/protocol/conversation"
"github.com/OpenIMSDK/protocol/wrapperspb"
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification"
"github.com/OpenIMSDK/tools/mw/specialerror" "github.com/OpenIMSDK/tools/mw/specialerror"
@ -449,7 +448,7 @@ func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbgroup.GetGr
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err != nil { if err := s.PopulateGroupMember(ctx, members...); err != nil {
return nil, err return nil, err
} }
resp.Total = uint32(total) resp.Total = uint32(total)
@ -512,10 +511,14 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
if err != nil { if err != nil {
return nil, err return nil, err
} }
owner, err := s.db.TakeGroupOwner(ctx, req.GroupID) ownerUserIDs, err := s.db.GetGroupRoleLevelMemberIDs(ctx, req.GroupID, constant.GroupOwner)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var ownerUserID string
if len(ownerUserIDs) > 0 {
ownerUserID = ownerUserIDs[0]
}
if err := s.db.DeleteGroupMember(ctx, group.GroupID, req.KickedUserIDs); err != nil { if err := s.db.DeleteGroupMember(ctx, group.GroupID, req.KickedUserIDs); err != nil {
return nil, err return nil, err
} }
@ -526,7 +529,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
Notification: group.Notification, Notification: group.Notification,
Introduction: group.Introduction, Introduction: group.Introduction,
FaceURL: group.FaceURL, FaceURL: group.FaceURL,
OwnerUserID: owner.UserID, OwnerUserID: ownerUserID,
CreateTime: group.CreateTime.UnixMilli(), CreateTime: group.CreateTime.UnixMilli(),
MemberCount: num, MemberCount: num,
Ex: group.Ex, Ex: group.Ex,
@ -875,11 +878,11 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInf
if err := s.PopulateGroupMember(ctx, owner); err != nil { if err := s.PopulateGroupMember(ctx, owner); err != nil {
return nil, err return nil, err
} }
data := UpdateGroupInfoMap(ctx, req.GroupInfoForSet) update := UpdateGroupInfoMap(ctx, req.GroupInfoForSet)
if len(data) == 0 { if len(update) == 0 {
return resp, nil return resp, nil
} }
if err := s.db.UpdateGroup(ctx, group.GroupID, data); err != nil { if err := s.db.UpdateGroup(ctx, group.GroupID, update); err != nil {
return nil, err return nil, err
} }
group, err = s.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID) group, err = s.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID)
@ -894,34 +897,32 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInf
if opMember != nil { if opMember != nil {
tips.OpUser = s.groupMemberDB2PB(opMember, 0) tips.OpUser = s.groupMemberDB2PB(opMember, 0)
} }
var notified bool num := len(update)
if len(data) == 1 && req.GroupInfoForSet.Notification != "" { if req.GroupInfoForSet.Notification != "" {
switch { num--
case req.GroupInfoForSet.Notification != "": func() {
func() { conversation := &pbconversation.ConversationReq{
conversation := &pbconversation.ConversationReq{ ConversationID: msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, req.GroupInfoForSet.GroupID),
ConversationID: msgprocessor.GetConversationIDBySessionType(constant.SuperGroupChatType, req.GroupInfoForSet.GroupID), ConversationType: constant.SuperGroupChatType,
ConversationType: constant.SuperGroupChatType, GroupID: req.GroupInfoForSet.GroupID,
GroupID: req.GroupInfoForSet.GroupID, }
} resp, err := s.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
resp, err := s.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID}) if err != nil {
if err != nil { log.ZWarn(ctx, "GetGroupMemberIDs", err)
log.ZWarn(ctx, "GetGroupMemberIDs", err) return
return }
} conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.GroupNotification}
conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.GroupNotification} if err := s.conversationRpcClient.SetConversations(ctx, resp.UserIDs, conversation); err != nil {
if err := s.conversationRpcClient.SetConversations(ctx, resp.UserIDs, conversation); err != nil { log.ZWarn(ctx, "SetConversations", err, resp.UserIDs, conversation)
log.ZWarn(ctx, "SetConversations", err, resp.UserIDs, conversation) }
} }()
}() _ = s.Notification.GroupInfoSetAnnouncementNotification(ctx, &sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser})
_ = s.Notification.GroupInfoSetAnnouncementNotification(ctx, &sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser})
notified = true
case req.GroupInfoForSet.GroupName != "":
_ = s.Notification.GroupInfoSetNameNotification(ctx, &sdkws.GroupInfoSetNameTips{Group: tips.Group, OpUser: tips.OpUser})
notified = true
}
} }
if !notified { if req.GroupInfoForSet.GroupName != "" {
num--
_ = s.Notification.GroupInfoSetNameNotification(ctx, &sdkws.GroupInfoSetNameTips{Group: tips.Group, OpUser: tips.OpUser})
}
if num > 0 {
_ = s.Notification.GroupInfoSetNotification(ctx, tips) _ = s.Notification.GroupInfoSetNotification(ctx, tips)
} }
return resp, nil return resp, nil
@ -1016,7 +1017,6 @@ func (s *groupServer) GetGroups(ctx context.Context, req *pbgroup.GetGroupsReq)
} }
func (s *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbgroup.GetGroupMembersCMSReq) (*pbgroup.GetGroupMembersCMSResp, error) { func (s *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbgroup.GetGroupMembersCMSReq) (*pbgroup.GetGroupMembersCMSResp, error) {
// todo
resp := &pbgroup.GetGroupMembersCMSResp{} resp := &pbgroup.GetGroupMembersCMSResp{}
total, members, err := s.db.SearchGroupMember(ctx, req.UserName, req.GroupID, req.Pagination) total, members, err := s.db.SearchGroupMember(ctx, req.UserName, req.GroupID, req.Pagination)
if err != nil { if err != nil {
@ -1215,143 +1215,6 @@ func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbgroup.CancelMu
return resp, nil return resp, nil
} }
//func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGroupMemberInfoReq) (*pbgroup.SetGroupMemberInfoResp, error) {
// resp := &pbgroup.SetGroupMemberInfoResp{}
// if len(req.Members) == 0 {
// return nil, errs.ErrArgs.Wrap("members empty")
// }
// for i := range req.Members {
// req.Members[i].FaceURL = nil
// }
// duplicateMap := make(map[[2]string]struct{})
// userIDMap := make(map[string]struct{})
// groupIDMap := make(map[string]struct{})
// for _, member := range req.Members {
// key := [...]string{member.GroupID, member.UserID}
// if _, ok := duplicateMap[key]; ok {
// return nil, errs.ErrArgs.Wrap("group user duplicate")
// }
// duplicateMap[key] = struct{}{}
// userIDMap[member.UserID] = struct{}{}
// groupIDMap[member.GroupID] = struct{}{}
// }
// groupIDs := utils.Keys(groupIDMap)
// userIDs := utils.Keys(userIDMap)
// // todo
// members, err := s.FindGroupMember(ctx, groupIDs, append(userIDs, mcontext.GetOpUserID(ctx)), nil)
// if err != nil {
// return nil, err
// }
// for _, member := range members {
// delete(duplicateMap, [...]string{member.GroupID, member.UserID})
// }
// if len(duplicateMap) > 0 {
// return nil, errs.ErrArgs.Wrap("user not found" + strings.Join(utils.Slice(utils.Keys(duplicateMap), func(e [2]string) string {
// return fmt.Sprintf("[group: %s user: %s]", e[0], e[1])
// }), ","))
// }
// memberMap := utils.SliceToMap(members, func(e *relationtb.GroupMemberModel) [2]string {
// return [...]string{e.GroupID, e.UserID}
// })
// if !authverify.IsAppManagerUid(ctx) {
// opUserID := mcontext.GetOpUserID(ctx)
// for _, member := range req.Members {
// if member.RoleLevel != nil {
// switch member.RoleLevel.Value {
// case constant.GroupOrdinaryUsers, constant.GroupAdmin:
// default:
// return nil, errs.ErrArgs.Wrap("invalid role level")
// }
// }
// opMember, ok := memberMap[[...]string{member.GroupID, opUserID}]
// if !ok {
// return nil, errs.ErrArgs.Wrap(fmt.Sprintf("user %s not in group %s", opUserID, member.GroupID))
// }
// if member.UserID == opUserID {
// if member.RoleLevel != nil {
// return nil, errs.ErrNoPermission.Wrap("can not change self role level")
// }
// continue
// }
// if opMember.RoleLevel == constant.GroupOrdinaryUsers {
// return nil, errs.ErrNoPermission.Wrap("ordinary users can not change other role level")
// }
// dbMember, ok := memberMap[[...]string{member.GroupID, member.UserID}]
// if !ok {
// return nil, errs.ErrRecordNotFound.Wrap(fmt.Sprintf("user %s not in group %s", member.UserID, member.GroupID))
// }
// //if opMember.RoleLevel == constant.GroupOwner {
// // continue
// //}
// //if dbMember.RoleLevel == constant.GroupOwner {
// // return nil, errs.ErrNoPermission.Wrap("change group owner")
// //}
// //if opMember.RoleLevel == constant.GroupAdmin && dbMember.RoleLevel == constant.GroupAdmin {
// // return nil, errs.ErrNoPermission.Wrap("admin can not change other admin role info")
// //}
// switch opMember.RoleLevel {
// case constant.GroupOrdinaryUsers:
// return nil, errs.ErrNoPermission.Wrap("ordinary users can not change other role level")
// case constant.GroupAdmin:
// if dbMember.RoleLevel != constant.GroupOrdinaryUsers {
// return nil, errs.ErrNoPermission.Wrap("admin can not change other role level")
// }
// if member.RoleLevel != nil {
// return nil, errs.ErrNoPermission.Wrap("admin can not change other role level")
// }
// case constant.GroupOwner:
// //if member.RoleLevel != nil && member.RoleLevel.Value == constant.GroupOwner {
// // return nil, errs.ErrNoPermission.Wrap("owner only one")
// //}
// }
// }
// }
// for _, member := range req.Members {
// if member.RoleLevel == nil {
// continue
// }
// if memberMap[[...]string{member.GroupID, member.UserID}].RoleLevel == constant.GroupOwner {
// return nil, errs.ErrArgs.Wrap(fmt.Sprintf("group %s user %s is owner", member.GroupID, member.UserID))
// }
// }
// for i := 0; i < len(req.Members); i++ {
// if err := CallbackBeforeSetGroupMemberInfo(ctx, req.Members[i]); err != nil {
// return nil, err
// }
// }
// if err = s.db.UpdateGroupMembers(ctx, utils.Slice(req.Members, func(e *pbgroup.SetGroupMemberInfo) *relationtb.BatchUpdateGroupMember {
// return &relationtb.BatchUpdateGroupMember{
// GroupID: e.GroupID,
// UserID: e.UserID,
// Map: UpdateGroupMemberMap(e),
// }
// })); err != nil {
// return nil, err
// }
// for _, member := range req.Members {
// if member.RoleLevel != nil {
// switch member.RoleLevel.Value {
// case constant.GroupAdmin:
// s.Notification.GroupMemberSetToAdminNotification(ctx, member.GroupID, member.UserID)
// case constant.GroupOrdinaryUsers:
// s.Notification.GroupMemberSetToOrdinaryUserNotification(ctx, member.GroupID, member.UserID)
// }
// }
// if member.Nickname != nil || member.FaceURL != nil || member.Ex != nil {
// log.ZDebug(ctx, "setGroupMemberInfo notification", "member", member.UserID)
// if err := s.Notification.GroupMemberInfoSetNotification(ctx, member.GroupID, member.UserID); err != nil {
// log.ZError(ctx, "setGroupMemberInfo notification failed", err, "member", member.UserID, "groupID", member.GroupID)
// }
// }
// }
// return resp, nil
//}
func (s *groupServer) setGroupMemberInfo(ctx context.Context, memberCache map[string]*relationtb.GroupMemberModel, member *pbgroup.SetGroupMemberInfo) error {
return nil
}
func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGroupMemberInfoReq) (*pbgroup.SetGroupMemberInfoResp, error) { func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGroupMemberInfoReq) (*pbgroup.SetGroupMemberInfoResp, error) {
resp := &pbgroup.SetGroupMemberInfoResp{} resp := &pbgroup.SetGroupMemberInfoResp{}
if len(req.Members) == 0 { if len(req.Members) == 0 {
@ -1380,7 +1243,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGr
} }
for groupID, members := range groupMembers { for groupID, members := range groupMembers {
temp := make(map[string]struct{}) temp := make(map[string]struct{})
userIDs := make([]string, len(members)+1) userIDs := make([]string, 0, len(members)+1)
for _, member := range members { for _, member := range members {
if _, ok := temp[member.UserID]; ok { if _, ok := temp[member.UserID]; ok {
return nil, errs.ErrArgs.Wrap(fmt.Sprintf("repeat group %s user %s", member.GroupID, member.UserID)) return nil, errs.ErrArgs.Wrap(fmt.Sprintf("repeat group %s user %s", member.GroupID, member.UserID))
@ -1595,37 +1458,3 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *
resp.Total = int64(len(resp.GroupRequests)) resp.Total = int64(len(resp.GroupRequests))
return resp, nil return resp, nil
} }
//func (s *groupServer) groupMemberHashCode(ctx context.Context, groupID string) (uint64, error) {
// userIDs, err := s.db.FindGroupMemberUserID(ctx, groupID)
// if err != nil {
// return 0, err
// }
// var members []*sdkws.GroupMemberFullInfo
// if len(userIDs) > 0 {
// resp, err := s.GetGroupMembersInfo(ctx, &pbgroup.GetGroupMembersInfoReq{GroupID: groupID, UserIDs: userIDs})
// if err != nil {
// return 0, err
// }
// members = resp.Members
// utils.Sort(userIDs, true)
// }
// memberMap := utils.SliceToMap(members, func(e *sdkws.GroupMemberFullInfo) string {
// return e.UserID
// })
// res := make([]*sdkws.GroupMemberFullInfo, 0, len(members))
// for _, userID := range userIDs {
// member, ok := memberMap[userID]
// if !ok {
// continue
// }
// member.AppMangerLevel = 0
// res = append(res, member)
// }
// data, err := json.Marshal(res)
// if err != nil {
// return 0, err
// }
// sum := md5.Sum(data)
// return binary.BigEndian.Uint64(sum[:]), nil
//}

1
pkg/common/db/cache/group.go vendored
View File

@ -73,6 +73,7 @@ type GroupCache interface {
GetGroupMembersPage(ctx context.Context, groupID string, userID []string, showNumber, pageNumber int32) (total uint32, groupMembers []*relationtb.GroupMemberModel, err error) GetGroupMembersPage(ctx context.Context, groupID string, userID []string, showNumber, pageNumber int32) (total uint32, groupMembers []*relationtb.GroupMemberModel, err error)
FindGroupMemberUser(ctx context.Context, groupIDs []string, userID string) ([]*relationtb.GroupMemberModel, error) FindGroupMemberUser(ctx context.Context, groupIDs []string, userID string) ([]*relationtb.GroupMemberModel, error)
GetGroupRoleLevelMemberIDs(ctx context.Context, groupID string, roleLevel int32) ([]string, error)
GetGroupOwner(ctx context.Context, groupID string) (*relationtb.GroupMemberModel, error) GetGroupOwner(ctx context.Context, groupID string) (*relationtb.GroupMemberModel, error)
GetGroupsOwner(ctx context.Context, groupIDs []string) ([]*relationtb.GroupMemberModel, error) GetGroupsOwner(ctx context.Context, groupIDs []string) ([]*relationtb.GroupMemberModel, error)
DelGroupRoleLevel(groupID string, roleLevel []int32) GroupCache DelGroupRoleLevel(groupID string, roleLevel []int32) GroupCache

5
pkg/common/db/controller/group.go
View File

@ -49,6 +49,7 @@ type GroupDatabase interface {
FindGroupMemberNum(ctx context.Context, groupID string) (uint32, error) FindGroupMemberNum(ctx context.Context, groupID string) (uint32, error)
FindUserManagedGroupID(ctx context.Context, userID string) (groupIDs []string, err error) FindUserManagedGroupID(ctx context.Context, userID string) (groupIDs []string, err error)
PageGroupRequest(ctx context.Context, groupIDs []string, pagination pagination.Pagination) (int64, []*relationtb.GroupRequestModel, error) PageGroupRequest(ctx context.Context, groupIDs []string, pagination pagination.Pagination) (int64, []*relationtb.GroupRequestModel, error)
GetGroupRoleLevelMemberIDs(ctx context.Context, groupID string, roleLevel int32) ([]string, error)
PageGetJoinGroup(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, totalGroupMembers []*relationtb.GroupMemberModel, err error) PageGetJoinGroup(ctx context.Context, userID string, pagination pagination.Pagination) (total int64, totalGroupMembers []*relationtb.GroupMemberModel, err error)
PageGetGroupMember(ctx context.Context, groupID string, pagination pagination.Pagination) (total int64, totalGroupMembers []*relationtb.GroupMemberModel, err error) PageGetGroupMember(ctx context.Context, groupID string, pagination pagination.Pagination) (total int64, totalGroupMembers []*relationtb.GroupMemberModel, err error)
@ -114,6 +115,10 @@ func (g *groupDatabase) FindGroupsOwner(ctx context.Context, groupIDs []string)
return g.cache.GetGroupsOwner(ctx, groupIDs) return g.cache.GetGroupsOwner(ctx, groupIDs)
} }
func (g *groupDatabase) GetGroupRoleLevelMemberIDs(ctx context.Context, groupID string, roleLevel int32) ([]string, error) {
return g.cache.GetGroupRoleLevelMemberIDs(ctx, groupID, roleLevel)
}
func (g *groupDatabase) CreateGroup(ctx context.Context, groups []*relationtb.GroupModel, groupMembers []*relationtb.GroupMemberModel) error { func (g *groupDatabase) CreateGroup(ctx context.Context, groups []*relationtb.GroupModel, groupMembers []*relationtb.GroupMemberModel) error {
if len(groups)+len(groupMembers) == 0 { if len(groups)+len(groupMembers) == 0 {
return nil return nil

23
pkg/rpcclient/notification/group.go
View File

@ -112,17 +112,21 @@ func (g *GroupNotificationSender) getGroupInfo(ctx context.Context, groupID stri
if err != nil { if err != nil {
return nil, err return nil, err
} }
owner, err := g.db.TakeGroupOwner(ctx, groupID) ownerUserIDs, err := g.db.GetGroupRoleLevelMemberIDs(ctx, groupID, constant.GroupOwner)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var ownerUserID string
if len(ownerUserIDs) > 0 {
ownerUserID = ownerUserIDs[0]
}
return &sdkws.GroupInfo{ return &sdkws.GroupInfo{
GroupID: gm.GroupID, GroupID: gm.GroupID,
GroupName: gm.GroupName, GroupName: gm.GroupName,
Notification: gm.Notification, Notification: gm.Notification,
Introduction: gm.Introduction, Introduction: gm.Introduction,
FaceURL: gm.FaceURL, FaceURL: gm.FaceURL,
OwnerUserID: owner.UserID, OwnerUserID: ownerUserID,
CreateTime: gm.CreateTime.UnixMilli(), CreateTime: gm.CreateTime.UnixMilli(),
MemberCount: num, MemberCount: num,
Ex: gm.Ex, Ex: gm.Ex,
@ -146,22 +150,9 @@ func (g *GroupNotificationSender) getGroupMembers(ctx context.Context, groupID s
return nil, err return nil, err
} }
log.ZDebug(ctx, "getGroupMembers", "members", members) log.ZDebug(ctx, "getGroupMembers", "members", members)
users, err := g.getUsersInfoMap(ctx, userIDs)
if err != nil {
return nil, err
}
log.ZDebug(ctx, "getUsersInfoMap", "users", users)
res := make([]*sdkws.GroupMemberFullInfo, 0, len(members)) res := make([]*sdkws.GroupMemberFullInfo, 0, len(members))
for _, member := range members { for _, member := range members {
user, ok := users[member.UserID] res = append(res, g.groupMemberDB2PB(member, 0))
if !ok {
return nil, errs.ErrUserIDNotFound.Wrap(fmt.Sprintf("group %s member %s not in user", member.GroupID, member.UserID))
}
if member.Nickname == "" {
member.Nickname = user.Nickname
}
res = append(res, g.groupMemberDB2PB(member, user.AppMangerLevel))
delete(users, member.UserID)
} }
return res, nil return res, nil
} }