msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

group

Browse Source
test-errcode
withchao 2 years ago
parent ccccf35344
commit f7d347ff4a
2 changed files with 75 additions and 63 deletions
Show Stats Download Patch File Download Diff File

6
internal/rpc/group/group.go
Unescape View File

@ -222,7 +222,8 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo
pageNumber = req.Pagination.PageNumber pageNumber = req.Pagination.PageNumber
showNumber = req.Pagination.ShowNumber showNumber = req.Pagination.ShowNumber
} }
total, members, err := s.GroupDatabase.PageGroupMember(ctx, nil, []string{req.FromUserID}, nil, pageNumber, showNumber) //total, members, err := s.GroupDatabase.PageGroupMember(ctx, nil, []string{req.FromUserID}, nil, pageNumber, showNumber)
total, members, err := s.GroupDatabase.PageGetJoinGroup(ctx, req.FromUserID, pageNumber, showNumber)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -383,7 +384,8 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbGroup.GetGroupMemberListReq) (*pbGroup.GetGroupMemberListResp, error) { func (s *groupServer) GetGroupMemberList(ctx context.Context, req *pbGroup.GetGroupMemberListReq) (*pbGroup.GetGroupMemberListResp, error) {
resp := &pbGroup.GetGroupMemberListResp{} resp := &pbGroup.GetGroupMemberListResp{}
//total, members, err := s.GroupDatabase.PageGroupMember(ctx, []string{req.GroupID}, nil, utils.If(req.Filter >= 0, []int32{req.Filter}, nil), req.Pagination.PageNumber, req.Pagination.ShowNumber) //total, members, err := s.GroupDatabase.PageGroupMember(ctx, []string{req.GroupID}, nil, utils.If(req.Filter >= 0, []int32{req.Filter}, nil), req.Pagination.PageNumber, req.Pagination.ShowNumber)
total, members, err := s.GroupDatabase.PageGroupMember(ctx, []string{req.GroupID}, nil, nil, req.Pagination.PageNumber, req.Pagination.ShowNumber) //total, members, err := s.GroupDatabase.PageGroupMember(ctx, []string{req.GroupID}, nil, nil, req.Pagination.PageNumber, req.Pagination.ShowNumber)
total, members, err := s.GroupDatabase.PageGetGroupMember(ctx, req.GroupID, req.Pagination.PageNumber, req.Pagination.ShowNumber)
if err != nil { if err != nil {
return nil, err return nil, err
} }

132
pkg/common/db/controller/group.go
Unescape View File

@ -32,7 +32,9 @@ type GroupDatabase interface {
TakeGroupOwner(ctx context.Context, groupID string) (*relationTb.GroupMemberModel, error) TakeGroupOwner(ctx context.Context, groupID string) (*relationTb.GroupMemberModel, error)
FindGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) ([]*relationTb.GroupMemberModel, error) FindGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) ([]*relationTb.GroupMemberModel, error)
FindGroupMemberUserID(ctx context.Context, groupID string) ([]string, error) FindGroupMemberUserID(ctx context.Context, groupID string) ([]string, error)
PageGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (uint32, []*relationTb.GroupMemberModel, error) //PageGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (uint32, []*relationTb.GroupMemberModel, error)
PageGetJoinGroup(ctx context.Context, userID string, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error)
PageGetGroupMember(ctx context.Context, groupID string, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error)
SearchGroupMember(ctx context.Context, keyword string, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (uint32, []*relationTb.GroupMemberModel, error) SearchGroupMember(ctx context.Context, keyword string, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (uint32, []*relationTb.GroupMemberModel, error)
HandlerGroupRequest(ctx context.Context, groupID string, userID string, handledMsg string, handleResult int32, member *relationTb.GroupMemberModel) error HandlerGroupRequest(ctx context.Context, groupID string, userID string, handledMsg string, handleResult int32, member *relationTb.GroupMemberModel) error
DeleteGroupMember(ctx context.Context, groupID string, userIDs []string) error DeleteGroupMember(ctx context.Context, groupID string, userIDs []string) error
@ -196,66 +198,74 @@ func (g *groupDatabase) FindGroupMember(ctx context.Context, groupIDs []string,
return g.groupMemberDB.Find(ctx, groupIDs, userIDs, roleLevels) return g.groupMemberDB.Find(ctx, groupIDs, userIDs, roleLevels)
} }
func (g *groupDatabase) PageGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error) { func (g *groupDatabase) PageGetJoinGroup(ctx context.Context, userID string, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error) {
if len(roleLevels) == 0 { return g.groupMemberDB.SearchMember(ctx, "", nil, []string{userID}, nil, pageNumber, showNumber)
if pageNumber == 0 || showNumber == 0 { }
if len(groupIDs) == 0 {
for _, userID := range userIDs { func (g *groupDatabase) PageGetGroupMember(ctx context.Context, groupID string, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error) {
groupIDs, err := g.cache.GetJoinedGroupIDs(ctx, userID) return g.groupMemberDB.SearchMember(ctx, groupID, nil, nil, nil, pageNumber, showNumber)
if err != nil { }
return 0, nil, err
} //func (g *groupDatabase) PageGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error) {
for _, groupID := range groupIDs { //if len(roleLevels) == 0 {
groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, []string{userID}) // if pageNumber == 0 || showNumber == 0 {
if err != nil { // if len(groupIDs) == 0 {
return 0, nil, err // for _, userID := range userIDs {
} // groupIDs, err := g.cache.GetJoinedGroupIDs(ctx, userID)
totalGroupMembers = append(totalGroupMembers, groupMembers...) // if err != nil {
} // return 0, nil, err
} // }
// for _, groupID := range groupIDs {
return uint32(len(totalGroupMembers)), totalGroupMembers, nil // groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, []string{userID})
} // if err != nil {
for _, groupID := range groupIDs { // return 0, nil, err
groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, userIDs) // }
if err != nil { // totalGroupMembers = append(totalGroupMembers, groupMembers...)
return 0, nil, err // }
} // }
totalGroupMembers = append(totalGroupMembers, groupMembers...) //
} // return uint32(len(totalGroupMembers)), totalGroupMembers, nil
return uint32(len(totalGroupMembers)), totalGroupMembers, nil // }
} else { // for _, groupID := range groupIDs {
if len(groupIDs) == 0 { // groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, userIDs)
for _, userID := range userIDs { // if err != nil {
groupIDs, err := g.cache.GetJoinedGroupIDs(ctx, userID) // return 0, nil, err
if err != nil { // }
return 0, nil, err // totalGroupMembers = append(totalGroupMembers, groupMembers...)
} // }
groupIDs = utils.Paginate(groupIDs, int(pageNumber), int(showNumber)) // return uint32(len(totalGroupMembers)), totalGroupMembers, nil
for _, groupID := range groupIDs { // } else {
groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, []string{userID}) // if len(groupIDs) == 0 {
if err != nil { // for _, userID := range userIDs {
return 0, nil, err // groupIDs, err := g.cache.GetJoinedGroupIDs(ctx, userID)
} // if err != nil {
totalGroupMembers = append(totalGroupMembers, groupMembers...) // return 0, nil, err
} // }
} // groupIDs = utils.Paginate(groupIDs, int(pageNumber), int(showNumber))
return uint32(len(groupIDs)), totalGroupMembers, nil // for _, groupID := range groupIDs {
} // groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, []string{userID})
var totalAll uint32 // if err != nil {
for _, groupID := range groupIDs { // return 0, nil, err
total, groupMembers, err := g.cache.GetGroupMembersPage(ctx, groupID, userIDs, pageNumber, showNumber) // }
if err != nil { // totalGroupMembers = append(totalGroupMembers, groupMembers...)
return 0, nil, err // }
} // }
totalAll += total // return uint32(len(groupIDs)), totalGroupMembers, nil
totalGroupMembers = append(totalGroupMembers, groupMembers...) // }
} // var totalAll uint32
return totalAll, totalGroupMembers, nil // for _, groupID := range groupIDs {
} // total, groupMembers, err := g.cache.GetGroupMembersPage(ctx, groupID, userIDs, pageNumber, showNumber)
} // if err != nil {
return g.groupMemberDB.SearchMember(ctx, "", groupIDs, userIDs, roleLevels, pageNumber, showNumber) // return 0, nil, err
} // }
// totalAll += total
// totalGroupMembers = append(totalGroupMembers, groupMembers...)
// }
// return totalAll, totalGroupMembers, nil
// }
//}
// return g.groupMemberDB.SearchMember(ctx, "", groupIDs, userIDs, roleLevels, pageNumber, showNumber)
//}
func (g *groupDatabase) SearchGroupMember(ctx context.Context, keyword string, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (uint32, []*relationTb.GroupMemberModel, error) { func (g *groupDatabase) SearchGroupMember(ctx context.Context, keyword string, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (uint32, []*relationTb.GroupMemberModel, error) {
return g.groupMemberDB.SearchMember(ctx, keyword, groupIDs, userIDs, roleLevels, pageNumber, showNumber) return g.groupMemberDB.SearchMember(ctx, keyword, groupIDs, userIDs, roleLevels, pageNumber, showNumber)

Write Preview
Loading…
Cancel
Save