From f7d347ff4a59e45f85d5f2aa7046ec6988ec54d8 Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Mon, 15 May 2023 11:55:41 +0800
Subject: [PATCH] group

---
 internal/rpc/group/group.go       |   6 +-
 pkg/common/db/controller/group.go | 130 ++++++++++++++++--------------
 2 files changed, 74 insertions(+), 62 deletions(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 2f325b774..f588ba28c 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -222,7 +222,8 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo
 		pageNumber = req.Pagination.PageNumber
 		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 {
 		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) {
 	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, 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 {
 		return nil, err
 	}
diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go
index 8f6c6d2db..ec2359642 100644
--- a/pkg/common/db/controller/group.go
+++ b/pkg/common/db/controller/group.go
@@ -32,7 +32,9 @@ type GroupDatabase interface {
 	TakeGroupOwner(ctx context.Context, groupID string) (*relationTb.GroupMemberModel, error)
 	FindGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) ([]*relationTb.GroupMemberModel, 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)
 	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
@@ -196,67 +198,75 @@ func (g *groupDatabase) FindGroupMember(ctx context.Context, groupIDs []string,
 	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) {
-	if len(roleLevels) == 0 {
-		if pageNumber == 0 || showNumber == 0 {
-			if len(groupIDs) == 0 {
-				for _, userID := range userIDs {
-					groupIDs, err := g.cache.GetJoinedGroupIDs(ctx, userID)
-					if err != nil {
-						return 0, nil, err
-					}
-					for _, groupID := range groupIDs {
-						groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, []string{userID})
-						if err != nil {
-							return 0, nil, err
-						}
-						totalGroupMembers = append(totalGroupMembers, groupMembers...)
-					}
-				}
-
-				return uint32(len(totalGroupMembers)), totalGroupMembers, nil
-			}
-			for _, groupID := range groupIDs {
-				groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, userIDs)
-				if err != nil {
-					return 0, nil, err
-				}
-				totalGroupMembers = append(totalGroupMembers, groupMembers...)
-			}
-			return uint32(len(totalGroupMembers)), totalGroupMembers, nil
-		} else {
-			if len(groupIDs) == 0 {
-				for _, userID := range userIDs {
-					groupIDs, err := g.cache.GetJoinedGroupIDs(ctx, userID)
-					if err != nil {
-						return 0, nil, err
-					}
-					groupIDs = utils.Paginate(groupIDs, int(pageNumber), int(showNumber))
-					for _, groupID := range groupIDs {
-						groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, []string{userID})
-						if err != nil {
-							return 0, nil, err
-						}
-						totalGroupMembers = append(totalGroupMembers, groupMembers...)
-					}
-				}
-				return uint32(len(groupIDs)), totalGroupMembers, nil
-			}
-			var totalAll uint32
-			for _, groupID := range groupIDs {
-				total, groupMembers, err := g.cache.GetGroupMembersPage(ctx, groupID, userIDs, pageNumber, showNumber)
-				if err != nil {
-					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) PageGetJoinGroup(ctx context.Context, userID string, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error) {
+	return g.groupMemberDB.SearchMember(ctx, "", nil, []string{userID}, nil, pageNumber, showNumber)
 }
 
+func (g *groupDatabase) PageGetGroupMember(ctx context.Context, groupID string, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error) {
+	return g.groupMemberDB.SearchMember(ctx, groupID, nil, nil, nil, pageNumber, showNumber)
+}
+
+//func (g *groupDatabase) PageGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (total uint32, totalGroupMembers []*relationTb.GroupMemberModel, err error) {
+//if len(roleLevels) == 0 {
+//	if pageNumber == 0 || showNumber == 0 {
+//		if len(groupIDs) == 0 {
+//			for _, userID := range userIDs {
+//				groupIDs, err := g.cache.GetJoinedGroupIDs(ctx, userID)
+//				if err != nil {
+//					return 0, nil, err
+//				}
+//				for _, groupID := range groupIDs {
+//					groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, []string{userID})
+//					if err != nil {
+//						return 0, nil, err
+//					}
+//					totalGroupMembers = append(totalGroupMembers, groupMembers...)
+//				}
+//			}
+//
+//			return uint32(len(totalGroupMembers)), totalGroupMembers, nil
+//		}
+//		for _, groupID := range groupIDs {
+//			groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, userIDs)
+//			if err != nil {
+//				return 0, nil, err
+//			}
+//			totalGroupMembers = append(totalGroupMembers, groupMembers...)
+//		}
+//		return uint32(len(totalGroupMembers)), totalGroupMembers, nil
+//	} else {
+//		if len(groupIDs) == 0 {
+//			for _, userID := range userIDs {
+//				groupIDs, err := g.cache.GetJoinedGroupIDs(ctx, userID)
+//				if err != nil {
+//					return 0, nil, err
+//				}
+//				groupIDs = utils.Paginate(groupIDs, int(pageNumber), int(showNumber))
+//				for _, groupID := range groupIDs {
+//					groupMembers, err := g.cache.GetGroupMembersInfo(ctx, groupID, []string{userID})
+//					if err != nil {
+//						return 0, nil, err
+//					}
+//					totalGroupMembers = append(totalGroupMembers, groupMembers...)
+//				}
+//			}
+//			return uint32(len(groupIDs)), totalGroupMembers, nil
+//		}
+//		var totalAll uint32
+//		for _, groupID := range groupIDs {
+//			total, groupMembers, err := g.cache.GetGroupMembersPage(ctx, groupID, userIDs, pageNumber, showNumber)
+//			if err != nil {
+//				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) {
 	return g.groupMemberDB.SearchMember(ctx, keyword, groupIDs, userIDs, roleLevels, pageNumber, showNumber)
 }