From bba7f47767aa6f62cfe8133bcdd068da9fac9159 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 20 Jun 2023 12:13:25 +0800 Subject: [PATCH] fix conversation created --- internal/rpc/conversation/conversaion.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 7a8775981..7d7b512a1 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -10,6 +10,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" tableRelation "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/tx" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation" @@ -261,14 +262,19 @@ func (c *conversationServer) CreateSingleChatConversations(ctx context.Context, var conversation tableRelation.ConversationModel conversation.ConversationID = utils.GetConversationIDBySessionType(constant.SingleChatType, req.RecvID, req.SendID) conversation.ConversationType = constant.SingleChatType + conversation.OwnerUserID = req.SendID + conversation.UserID = req.RecvID + err := c.conversationDatabase.CreateConversation(ctx, []*tableRelation.ConversationModel{&conversation}) + if err != nil { + log.ZWarn(ctx, "create conversation failed", err, "conversation", conversation) + } + conversation2 := conversation conversation2.OwnerUserID = req.RecvID conversation2.UserID = req.SendID - conversation.OwnerUserID = req.SendID - conversation.UserID = req.RecvID - err := c.conversationDatabase.CreateConversation(ctx, []*tableRelation.ConversationModel{&conversation, &conversation2}) + err = c.conversationDatabase.CreateConversation(ctx, []*tableRelation.ConversationModel{&conversation2}) if err != nil { - return nil, err + log.ZWarn(ctx, "create conversation failed", err, "conversation2", conversation) } return &pbConversation.CreateSingleChatConversationsResp{}, nil }