Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions internal/rpc/group/group.go
Original file line number Diff line number Diff line change
Expand Up @@ -1112,22 +1112,25 @@ func (g *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInf
num := len(update)
if req.GroupInfoForSet.Notification != "" {
num -= 3
func() {
conversation := &pbconv.ConversationReq{
ConversationID: msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSet.GroupID),
ConversationType: constant.ReadGroupChatType,
GroupID: req.GroupInfoForSet.GroupID,
}
resp, err := g.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
if err != nil {
log.ZWarn(ctx, "GetGroupMemberIDs is failed.", err)
return
}
conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.GroupNotification}
if err := g.conversationClient.SetConversations(ctx, resp.UserIDs, conversation); err != nil {
log.ZWarn(ctx, "SetConversations", err, "UserIDs", resp.UserIDs, "conversation", conversation)
}
}()
conversation := &pbconv.ConversationReq{
ConversationID: msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSet.GroupID),
ConversationType: constant.ReadGroupChatType,
GroupID: req.GroupInfoForSet.GroupID,
}
resp, err := g.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
if err != nil {
log.ZWarn(ctx, "GetGroupMemberIDs is failed.", err)
return nil, err
}
conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.GroupNotification}
convCtx := ctx
if len(g.adminUserIDs) > 0 {
convCtx = mcontext.WithOpUserIDContext(ctx, g.adminUserIDs[0])
}
if err := g.conversationClient.SetConversations(convCtx, resp.UserIDs, conversation); err != nil {
log.ZWarn(ctx, "SetConversations", err, "UserIDs", resp.UserIDs, "conversation", conversation)
return nil, err
}
notficationFlag := true
g.notification.GroupInfoSetAnnouncementNotification(ctx, &sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser}, &notficationFlag)
}
Expand Down Expand Up @@ -1233,8 +1236,13 @@ func (g *groupServer) SetGroupInfoEx(ctx context.Context, req *pbgroup.SetGroupI
}

conversation.GroupAtType = &wrapperspb.Int32Value{Value: constant.GroupNotification}
if err := g.conversationClient.SetConversations(ctx, resp.UserIDs, conversation); err != nil {
convCtx := ctx
if len(g.adminUserIDs) > 0 {
convCtx = mcontext.WithOpUserIDContext(ctx, g.adminUserIDs[0])
}
if err := g.conversationClient.SetConversations(convCtx, resp.UserIDs, conversation); err != nil {
log.ZWarn(ctx, "SetConversations", err, "UserIDs", resp.UserIDs, "conversation", conversation)
return nil, err
}

g.notification.GroupInfoSetAnnouncementNotification(ctx, &sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser}, &notificationFlag)
Expand Down
154 changes: 154 additions & 0 deletions internal/rpc/group/group_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
package group

import (
"context"
"errors"
"testing"

"github.com/openimsdk/open-im-server/v3/pkg/authverify"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/controller"
"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
pbconv "github.com/openimsdk/protocol/conversation"
pbgroup "github.com/openimsdk/protocol/group"
"github.com/openimsdk/protocol/sdkws"
"github.com/openimsdk/protocol/wrapperspb"
"github.com/openimsdk/tools/mcontext"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc"
)

type mockGroupDB struct {
controller.GroupDatabase
}

func (m *mockGroupDB) TakeGroup(ctx context.Context, groupID string) (*model.Group, error) {
return &model.Group{GroupID: groupID, GroupName: "testGroup"}, nil
}

func (m *mockGroupDB) FindGroupMemberNum(ctx context.Context, groupID string) (uint32, error) {
return 2, nil
}

func (m *mockGroupDB) TakeGroupOwner(ctx context.Context, groupID string) (*model.GroupMember, error) {
return &model.GroupMember{GroupID: groupID, UserID: "alice", Nickname: "alice", FaceURL: "http://example.com/face.png"}, nil
}

func (m *mockGroupDB) TakeGroupMember(ctx context.Context, groupID string, userID string) (*model.GroupMember, error) {
return &model.GroupMember{GroupID: groupID, UserID: userID, Nickname: userID, FaceURL: "http://example.com/face.png", RoleLevel: 100}, nil
}

func (m *mockGroupDB) UpdateGroup(ctx context.Context, groupID string, data map[string]any) error {
return nil
}

func (m *mockGroupDB) FindGroupMemberUserID(ctx context.Context, groupID string) ([]string, error) {
return []string{"alice", "bob"}, nil
}

type mockConversationRpcClient struct {
pbconv.ConversationClient
setConversationsFunc func(ctx context.Context, in *pbconv.SetConversationsReq, opts ...grpc.CallOption) (*pbconv.SetConversationsResp, error)
}

func (m *mockConversationRpcClient) SetConversations(ctx context.Context, in *pbconv.SetConversationsReq, opts ...grpc.CallOption) (*pbconv.SetConversationsResp, error) {
if m.setConversationsFunc != nil {
return m.setConversationsFunc(ctx, in, opts...)
}
return &pbconv.SetConversationsResp{}, nil
}

func TestSetGroupInfo_SetConversationsError(t *testing.T) {
expectedErr := errors.New("rpc conversation unavailable")
mockConvRpc := &mockConversationRpcClient{
setConversationsFunc: func(ctx context.Context, in *pbconv.SetConversationsReq, opts ...grpc.CallOption) (*pbconv.SetConversationsResp, error) {
return nil, expectedErr
},
}

gs := &groupServer{
db: &mockGroupDB{},
notification: &NotificationSender{},
conversationClient: &rpcli.ConversationClient{ConversationClient: mockConvRpc},
adminUserIDs: []string{"imAdmin"},
config: &Config{},
webhookClient: webhook.NewWebhookClient(""),
}

ctx := authverify.WithTempAdmin(context.Background())
ctx = mcontext.WithOpUserIDContext(ctx, "alice")

req := &pbgroup.SetGroupInfoReq{
GroupInfoForSet: &sdkws.GroupInfoForSet{
GroupID: "test_group_1",
Notification: "announcement text",
},
}

resp, err := gs.SetGroupInfo(ctx, req)
assert.Nil(t, resp)
assert.ErrorIs(t, err, expectedErr)
}

func TestSetGroupInfoEx_SetConversationsError(t *testing.T) {
expectedErr := errors.New("rpc conversation unavailable")
mockConvRpc := &mockConversationRpcClient{
setConversationsFunc: func(ctx context.Context, in *pbconv.SetConversationsReq, opts ...grpc.CallOption) (*pbconv.SetConversationsResp, error) {
return nil, expectedErr
},
}

gs := &groupServer{
db: &mockGroupDB{},
notification: &NotificationSender{},
conversationClient: &rpcli.ConversationClient{ConversationClient: mockConvRpc},
adminUserIDs: []string{"imAdmin"},
config: &Config{},
webhookClient: webhook.NewWebhookClient(""),
}

ctx := authverify.WithTempAdmin(context.Background())
ctx = mcontext.WithOpUserIDContext(ctx, "alice")

req := &pbgroup.SetGroupInfoExReq{
GroupID: "test_group_1",
Notification: &wrapperspb.StringValue{Value: "announcement text"},
}

resp, err := gs.SetGroupInfoEx(ctx, req)
assert.Nil(t, resp)
assert.ErrorIs(t, err, expectedErr)
}

func TestSetGroupInfo_SetConversationsAdminContext(t *testing.T) {
var capturedOpUserID string
mockConvRpc := &mockConversationRpcClient{
setConversationsFunc: func(ctx context.Context, in *pbconv.SetConversationsReq, opts ...grpc.CallOption) (*pbconv.SetConversationsResp, error) {
capturedOpUserID = mcontext.GetOpUserID(ctx)
return nil, errors.New("check admin context")
},
}

gs := &groupServer{
db: &mockGroupDB{},
notification: &NotificationSender{},
conversationClient: &rpcli.ConversationClient{ConversationClient: mockConvRpc},
adminUserIDs: []string{"imAdmin"},
config: &Config{},
webhookClient: webhook.NewWebhookClient(""),
}

ctx := authverify.WithTempAdmin(context.Background())
ctx = mcontext.WithOpUserIDContext(ctx, "alice")

req := &pbgroup.SetGroupInfoReq{
GroupInfoForSet: &sdkws.GroupInfoForSet{
GroupID: "test_group_1",
Notification: "announcement text",
},
}

_, _ = gs.SetGroupInfo(ctx, req)
assert.Equal(t, "imAdmin", capturedOpUserID, "SetConversations must be called with Admin context")
}
Loading