From de661a54cd4f6c092c7ea49e832fd52f6a311ced Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 27 Mar 2023 18:31:25 +0800 Subject: [PATCH 1/4] group --- internal/rpc/group/group.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 42fd892cb..97ad9e800 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -547,6 +547,7 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string { return e.GroupID }) + log.ZDebug(ctx, "groups return", "groups", groups) resp.GroupInfos = utils.Slice(groups, func(e *relationTb.GroupModel) *sdkws.GroupInfo { return DbToPbGroupInfo(e, ownerMap[e.GroupID].UserID, groupMemberNumMap[e.GroupID]) }) From 82a33d1c8c78961eebfc263fe91d01e604ce6bc6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 27 Mar 2023 18:59:06 +0800 Subject: [PATCH 2/4] group --- internal/rpc/group/group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 97ad9e800..92913c140 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -547,7 +547,7 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string { return e.GroupID }) - log.ZDebug(ctx, "groups return", "groups", groups) + log.ZDebug(ctx, "groups return", "groups", groups, "ownerMap", ownerMap, "groupMemberNumMap", groupMemberNumMap) resp.GroupInfos = utils.Slice(groups, func(e *relationTb.GroupModel) *sdkws.GroupInfo { return DbToPbGroupInfo(e, ownerMap[e.GroupID].UserID, groupMemberNumMap[e.GroupID]) }) From 7becc2cfdd11dabbbccebeff83dd7203d7e5e71b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 27 Mar 2023 19:09:58 +0800 Subject: [PATCH 3/4] group --- internal/rpc/group/group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 92913c140..82e894cd9 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -547,7 +547,7 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI ownerMap := utils.SliceToMap(owners, func(e *relationTb.GroupMemberModel) string { return e.GroupID }) - log.ZDebug(ctx, "groups return", "groups", groups, "ownerMap", ownerMap, "groupMemberNumMap", groupMemberNumMap) + log.ZDebug(ctx, "groups return", "groups", groups, "owners", owners, "ownerMap", ownerMap, "groupMemberNumMap", groupMemberNumMap) resp.GroupInfos = utils.Slice(groups, func(e *relationTb.GroupModel) *sdkws.GroupInfo { return DbToPbGroupInfo(e, ownerMap[e.GroupID].UserID, groupMemberNumMap[e.GroupID]) }) From 01f4a206c77f38366621df9f6496a9e9ee4a29d5 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 27 Mar 2023 19:24:16 +0800 Subject: [PATCH 4/4] group --- pkg/common/db/controller/group.go | 5 ++++- pkg/common/db/relation/group_member_model.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index e620ca1c6..f38e31314 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -178,7 +178,10 @@ func (g *groupDatabase) TakeGroupOwner(ctx context.Context, groupID string) (*re } func (g *groupDatabase) FindGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) ([]*relationTb.GroupMemberModel, error) { - return g.cache.GetGroupMembersInfo(ctx, groupIDs[0], userIDs, roleLevels) // todo cache group find + if roleLevels == nil { + return g.cache.GetGroupMembersInfo(ctx, groupIDs[0], userIDs, nil) + } + return g.groupMemberDB.Find(ctx, groupIDs, userIDs, roleLevels) } func (g *groupDatabase) PageGroupMember(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32, pageNumber, showNumber int32) (uint32, []*relationTb.GroupMemberModel, error) { diff --git a/pkg/common/db/relation/group_member_model.go b/pkg/common/db/relation/group_member_model.go index a3e8994d6..68062e2e3 100644 --- a/pkg/common/db/relation/group_member_model.go +++ b/pkg/common/db/relation/group_member_model.go @@ -48,7 +48,7 @@ func (g *GroupMemberGorm) UpdateRoleLevel(ctx context.Context, groupID string, u } func (g *GroupMemberGorm) Find(ctx context.Context, groupIDs []string, userIDs []string, roleLevels []int32) (groupMembers []*relation.GroupMemberModel, err error) { - db := g.DB + db := g.db(ctx) if len(groupIDs) > 0 { db = db.Where("group_id in (?)", groupIDs) }