fix: copier.Copy missing field (openimsdk#1066)

Author: withchao

internal/conversation_msg/conversation_msg.go

@@ -8,24 +8,23 @@ import (
 	"math"
 	"sync"
 
-	"github.com/openimsdk/openim-sdk-core/v3/pkg/api"
-	"github.com/openimsdk/openim-sdk-core/v3/pkg/cache"
-	"github.com/openimsdk/protocol/msg"
-	"github.com/openimsdk/tools/utils/stringutil"
-
 	"github.com/openimsdk/openim-sdk-core/v3/internal/group"
 	"github.com/openimsdk/openim-sdk-core/v3/internal/interaction"
 	"github.com/openimsdk/openim-sdk-core/v3/internal/relation"
 	"github.com/openimsdk/openim-sdk-core/v3/internal/third/file"
 	"github.com/openimsdk/openim-sdk-core/v3/internal/user"
 	"github.com/openimsdk/openim-sdk-core/v3/open_im_sdk_callback"
+	"github.com/openimsdk/openim-sdk-core/v3/pkg/api"
+	"github.com/openimsdk/openim-sdk-core/v3/pkg/cache"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/common"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/constant"
+	"github.com/openimsdk/openim-sdk-core/v3/pkg/converter"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/db/db_interface"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/db/model_struct"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/page"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/syncer"
 	pbConversation "github.com/openimsdk/protocol/conversation"
+	"github.com/openimsdk/protocol/msg"
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
@@ -233,15 +232,30 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 	conversationSet := make(map[string]*model_struct.LocalConversation)
 	phConversationChangedSet := make(map[string]*model_struct.LocalConversation)
 	phNewConversationSet := make(map[string]*model_struct.LocalConversation)
+	conversationIDs := make([]string, 0, len(allMsg))
 
 	log.ZDebug(ctx, "message come here conversation ch", "conversation length", len(allMsg))
 	b := time.Now()
 
 	onlineMap := make(map[onlineMsgKey]struct{})
 
 	for conversationID, msgs := range allMsg {
-		log.ZDebug(ctx, "parse message in one conversation", "conversationID",
-			conversationID, "message length", len(msgs.Msgs))
+		conversationIDs = append(conversationIDs, conversationID)
+		log.ZDebug(ctx, "parse message in one conversation", "conversationID", conversationID, "message length", len(msgs.Msgs), "data", msgs.Msgs)
+
+		clientIDs := make([]string, 0, len(msgs.Msgs))
+		for _, msg := range msgs.Msgs {
+			clientIDs = append(clientIDs, msg.ClientMsgID)
+		}
+
+		clientMsgs, err := c.db.GetMessagesByClientMsgIDs(ctx, conversationID, clientIDs)
+		if err != nil {
+			log.ZWarn(ctx, "GetMessagesByClientMsgIDs failed", err, "conversationID", conversationID, "clientIDs", clientIDs)
+		}
+		clientMsgMap := datautil.SliceToMap(clientMsgs, func(e *model_struct.LocalChatLog) string {
+			return e.ClientMsgID
+		})
+
 		var insertMessage, selfInsertMessage, othersInsertMessage []*model_struct.LocalChatLog
 		var updateMessage []*model_struct.LocalChatLog
 
@@ -257,17 +271,11 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 
 			isSenderConversationUpdate = utils.GetSwitchFromOptions(v.Options, constant.IsSenderConversationUpdate)
 
-			msg := &sdk_struct.MsgStruct{}
-			copier.Copy(msg, v)
-			msg.Content = string(v.Content)
-
-			var attachedInfo sdk_struct.AttachedInfoElem
-			_ = utils.JsonStringToStruct(v.AttachedInfo, &attachedInfo)
-			msg.AttachedInfoElem = &attachedInfo
+			msg := converter.MsgDataToMsgStruct(v)
 
 			//When the message has been marked and deleted by the cloud, it is directly inserted locally without any conversation and message update.
 			if msg.Status == constant.MsgStatusHasDeleted {
-				dbMessage := MsgStructToLocalChatLog(msg)
+				dbMessage := converter.MsgStructToLocalChatLog(msg)
 				c.handleExceptionMessages(ctx, nil, dbMessage)
 				exceptionMsg = append(exceptionMsg, dbMessage)
 				insertMessage = append(insertMessage, dbMessage)
@@ -277,7 +285,7 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 			msg.Status = constant.MsgStatusSendSuccess
 
 			//De-analyze data
-			err := msgHandleByContentType(msg)
+			err := converter.MsgHandleByContentType(msg)
 			if err != nil {
 				log.ZError(ctx, "Parsing data error:", err, "type: ", msg.ContentType, "msg", msg)
 				continue
@@ -298,16 +306,16 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 			log.ZDebug(ctx, "decode message", "msg", msg)
 			if v.SendID == c.loginUserID { //seq
 				// Messages sent by myself  //if  sent through  this terminal
-				existingMsg, err := c.db.GetMessage(ctx, conversationID, msg.ClientMsgID)
-				if err == nil {
+				existingMsg, ok := clientMsgMap[msg.ClientMsgID]
+				if ok {
 					log.ZInfo(ctx, "have message", "msg", msg)
 					if existingMsg.Seq == 0 {
 						if !isConversationUpdate {
 							msg.Status = constant.MsgStatusFiltered
 						}
-						updateMessage = append(updateMessage, MsgStructToLocalChatLog(msg))
+						updateMessage = append(updateMessage, converter.MsgStructToLocalChatLog(msg))
 					} else {
-						dbMessage := MsgStructToLocalChatLog(msg)
+						dbMessage := converter.MsgStructToLocalChatLog(msg)
 						c.handleExceptionMessages(ctx, existingMsg, dbMessage)
 						insertMessage = append(insertMessage, dbMessage)
 						exceptionMsg = append(exceptionMsg, dbMessage)
@@ -334,11 +342,12 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 						newMessages = append(newMessages, msg)
 					}
 					if isHistory {
-						selfInsertMessage = append(selfInsertMessage, MsgStructToLocalChatLog(msg))
+						selfInsertMessage = append(selfInsertMessage, converter.MsgStructToLocalChatLog(msg))
 					}
 				}
 			} else { //Sent by others
-				if existingMsg, err := c.db.GetMessage(ctx, conversationID, msg.ClientMsgID); err != nil {
+				existingMsg, ok := clientMsgMap[msg.ClientMsgID]
+				if !ok {
 					lc := model_struct.LocalConversation{
 						ConversationType:  v.SessionType,
 						LatestMsg:         utils.StructToJsonString(msg),
@@ -368,11 +377,11 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 						newMessages = append(newMessages, msg)
 					}
 					if isHistory {
-						othersInsertMessage = append(othersInsertMessage, MsgStructToLocalChatLog(msg))
+						othersInsertMessage = append(othersInsertMessage, converter.MsgStructToLocalChatLog(msg))
 					}
 
 				} else {
-					dbMessage := MsgStructToLocalChatLog(msg)
+					dbMessage := converter.MsgStructToLocalChatLog(msg)
 					c.handleExceptionMessages(ctx, existingMsg, dbMessage)
 					insertMessage = append(insertMessage, dbMessage)
 					exceptionMsg = append(exceptionMsg, dbMessage)
@@ -390,19 +399,23 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 	c.conversationSyncMutex.Lock()
 	defer c.conversationSyncMutex.Unlock()
 
-	list, err := c.db.GetAllConversationListDB(ctx)
+	list, err := c.db.GetMultipleConversationDB(ctx, conversationIDs)
 	if err != nil {
-		log.ZError(ctx, "GetAllConversationListDB", err)
+		log.ZError(ctx, "GetMultipleConversationDB", err, "conversationIDs", conversationIDs)
+		return
 	}
 
-	m := make(map[string]*model_struct.LocalConversation)
-	listToMap(list, m)
-	log.ZDebug(ctx, "listToMap: ", "local conversation", list, "generated c map",
-		string(stringutil.StructToJsonBytes(conversationSet)))
+	var hList []*model_struct.LocalConversation
+	m := datautil.SliceToMap(list, func(e *model_struct.LocalConversation) string {
+		if e.LatestMsgSendTime == 0 {
+			hList = append(hList, e)
+		}
+		return e.ConversationID
+	})
+	log.ZDebug(ctx, "listToMap: ", "local conversation", list, "generated c map", conversationSet)
 
 	c.diff(ctx, m, conversationSet, conversationChangedSet, newConversationSet)
-	log.ZInfo(ctx, "trigger map is :", "newConversations", string(stringutil.StructToJsonBytes(newConversationSet)),
-		"changedConversations", string(stringutil.StructToJsonBytes(conversationChangedSet)))
+	log.ZInfo(ctx, "trigger map is :", "newConversations", newConversationSet, "changedConversations", conversationChangedSet)
 
 	//seq sync message update
 	if err := c.batchUpdateMessageList(ctx, updateMsg); err != nil {
@@ -412,7 +425,6 @@ func (c *Conversation) doMsgNew(c2v common.Cmd2Value) {
 	//Normal message storage
 	_ = c.batchInsertMessageList(ctx, insertMsg)
 
-	hList, _ := c.db.GetHiddenConversationList(ctx)
 	for _, v := range hList {
 		if nc, ok := newConversationSet[v.ConversationID]; ok {
 			phConversationChangedSet[v.ConversationID] = nc