From 57028450dfd2303e6f14146301176e308b986e8c Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Mon, 29 May 2023 20:02:15 +0800
Subject: [PATCH] findMsgInfoBySeq

---
 pkg/common/db/controller/msg.go      |  4 ++--
 pkg/common/db/controller/msg_test.go | 17 +++++++++--------
 pkg/common/db/unrelation/msg.go      |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go
index 7fb59ec94..d779c81b2 100644
--- a/pkg/common/db/controller/msg.go
+++ b/pkg/common/db/controller/msg.go
@@ -341,7 +341,7 @@ func (db *commonMsgDatabase) BatchInsertChat2Cache(ctx context.Context, conversa
 func (db *commonMsgDatabase) getMsgBySeqs(ctx context.Context, userID, conversationID string, seqs []int64) (totalMsgs []*sdkws.MsgData, err error) {
 	var totalUnExistSeqs []int64
 	for docID, seqs := range db.msg.GetDocIDSeqsMap(conversationID, seqs) {
-		log.ZDebug(ctx, "getMsgBySeqs", "docID", docID, "seqs", seqs)
+		//log.ZDebug(ctx, "getMsgBySeqs", "docID", docID, "seqs", seqs)
 		msgs, unexistSeqs, err := db.findMsgInfoBySeq(ctx, userID, docID, seqs)
 		if err != nil {
 			return nil, err
@@ -396,7 +396,7 @@ func (db *commonMsgDatabase) getMsgBySeqs(ctx context.Context, userID, conversat
 // }
 
 func (db *commonMsgDatabase) findMsgInfoBySeq(ctx context.Context, userID, docID string, seqs []int64) (totalMsgs []*unRelationTb.MsgInfoModel, unExistSeqs []int64, err error) {
-	msgs, err := db.msgDocDatabase.GetMsgBySeqIndexIn1Doc(ctx, docID, userID, seqs)
+	msgs, err := db.msgDocDatabase.GetMsgBySeqIndexIn1Doc(ctx, userID, docID, seqs)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/pkg/common/db/controller/msg_test.go b/pkg/common/db/controller/msg_test.go
index 3d1f117cd..b1c8415f3 100644
--- a/pkg/common/db/controller/msg_test.go
+++ b/pkg/common/db/controller/msg_test.go
@@ -2,7 +2,6 @@ package controller
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"math/rand"
 	"strconv"
@@ -165,7 +164,7 @@ func Test_Insert(t *testing.T) {
 			Content: fmt.Sprintf("test-%d", i),
 		})
 	}
-	if err := db.BatchInsertBlock(ctx, "test", arr, updateKeyMsg, 0); err != nil {
+	if err := db.BatchInsertBlock(ctx, "test", arr, updateKeyMsg, 1); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -189,12 +188,14 @@ func Test_Revoke(t *testing.T) {
 func Test_FindBySeq(t *testing.T) {
 	db := GetDB()
 	ctx := context.Background()
-	res, err := db.msgDocDatabase.GetMsgBySeqIndexIn1Doc(ctx, "123456", "test:0", []int64{1, 2, 3})
-	if err != nil {
-		t.Fatal(err)
-	}
-	data, _ := json.Marshal(res)
-	fmt.Println(string(data))
+	fmt.Println(db.getMsgBySeqs(ctx, "100", "si_100_101", []int64{1}))
+	//res, err := db.msgDocDatabase.GetMsgBySeqIndexIn1Doc(ctx, "123456", "test:0", []int64{1, 2, 3})
+	//if err != nil {
+	//	t.Fatal(err)
+	//}
+	//db.GetMsgBySeqs(ctx, "100", "si_100_101:0", []int64{6})
+	//data, _ := json.Marshal(res)
+	//fmt.Println(string(data))
 }
 
 //func Test_Delete(t *testing.T) {
diff --git a/pkg/common/db/unrelation/msg.go b/pkg/common/db/unrelation/msg.go
index 75d888105..7f55d9cc9 100644
--- a/pkg/common/db/unrelation/msg.go
+++ b/pkg/common/db/unrelation/msg.go
@@ -191,6 +191,7 @@ func (m *MsgMongoDriver) GetMsgBySeqIndexIn1Doc(ctx context.Context, userID stri
 		{
 			{"$project", bson.D{
 				{"_id", 0},
+				{"doc_id", 1},
 				{"msgs", bson.D{
 					{"$map", bson.D{
 						{"input", indexs},
@@ -219,7 +220,6 @@ func (m *MsgMongoDriver) GetMsgBySeqIndexIn1Doc(ctx context.Context, userID stri
 		},
 		{
 			{"$project", bson.D{
-				{"doc_id", 0},
 				{"msgs.del_list", 0},
 			}},
 		},