refactoring scheduled tasks

internal/rpc/conversation/conversation.go

@@ -769,7 +769,8 @@ func (c *conversationServer) ClearUserConversationMsg(ctx context.Context, req *
 	if err != nil {
 		return nil, err
 	}
-	for _, conversation := range conversations {
+	latestMsgDestructTime := time.UnixMilli(req.Timestamp)
+	for i, conversation := range conversations {
 		if conversation.IsMsgDestruct == false || conversation.MsgDestructTime == 0 {
 			continue
 		}
@@ -778,17 +779,37 @@ func (c *conversationServer) ClearUserConversationMsg(ctx context.Context, req *
 		if err != nil {
 			return nil, err
 		}
-		if resp.Seq == 0 {
+		if resp.Seq <= 0 {
+			log.ZDebug(ctx, "ClearUserConversationMsg GetLastMessageSeqByTime seq <= 0", "index", i, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID, "msgDestructTime", conversation.MsgDestructTime, "seq", resp.Seq)
+			if err := c.setConversationMinSeqAndLatestMsgDestructTime(ctx, conversation.ConversationID, conversation.OwnerUserID, -1, latestMsgDestructTime); err != nil {
+				return nil, err
+			}
 			continue
 		}
-		_, err = c.SetConversationMinSeq(ctx, &pbconversation.SetConversationMinSeqReq{
-			ConversationID: conversation.ConversationID,
-			OwnerUserID:    []string{conversation.OwnerUserID},
-			MinSeq:         resp.Seq + 1,
-		})
-		if err != nil {
+		resp.Seq++
+		if err := c.setConversationMinSeqAndLatestMsgDestructTime(ctx, conversation.ConversationID, conversation.OwnerUserID, resp.Seq, latestMsgDestructTime); err != nil {
 			return nil, err
 		}
+		log.ZDebug(ctx, "ClearUserConversationMsg set min seq", "index", i, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID, "seq", resp.Seq, "msgDestructTime", conversation.MsgDestructTime)
 	}
-	return &pbconversation.ClearUserConversationMsgResp{}, nil
+	return &pbconversation.ClearUserConversationMsgResp{Count: int32(len(conversations))}, nil
+}
+
+func (c *conversationServer) setConversationMinSeqAndLatestMsgDestructTime(ctx context.Context, conversationID string, ownerUserID string, minSeq int64, latestMsgDestructTime time.Time) error {
+	update := map[string]any{
+		"latest_msg_destruct_time": latestMsgDestructTime,
+	}
+	if minSeq >= 0 {
+		req := &pbmsg.SetUserConversationMinSeqReq{ConversationID: conversationID, OwnerUserID: []string{ownerUserID}, MinSeq: minSeq}
+		if _, err := pbmsg.SetUserConversationMinSeqCaller.Invoke(ctx, req); err != nil {
+			return err
+		}
+		update["min_seq"] = minSeq
+	}
+
+	if err := c.conversationDatabase.UpdateUsersConversationField(ctx, []string{ownerUserID}, conversationID, update); err != nil {
+		return err
+	}
+	c.conversationNotificationSender.ConversationChangeNotification(ctx, ownerUserID, []string{conversationID})
+	return nil
 }

internal/rpc/msg/clear.go

@@ -27,10 +27,11 @@ func (m *msgServer) DestructMsgs(ctx context.Context, req *msg.DestructMsgsReq)
 	if err != nil {
 		return nil, err
 	}
-	for _, doc := range docs {
+	for i, doc := range docs {
 		if err := m.MsgDatabase.DeleteDoc(ctx, doc.DocID); err != nil {
 			return nil, err
 		}
+		log.ZDebug(ctx, "DestructMsgs delete doc", "index", i, "docID", doc.DocID)
 		index := strings.LastIndex(doc.DocID, ":")
 		if index < 0 {
 			continue
@@ -51,9 +52,11 @@ func (m *msgServer) DestructMsgs(ctx context.Context, req *msg.DestructMsgsReq)
 		if conversationID == "" {
 			continue
 		}
+		minSeq++
 		if err := m.MsgDatabase.SetMinSeq(ctx, conversationID, minSeq); err != nil {
 			return nil, err
 		}
+		log.ZDebug(ctx, "DestructMsgs delete doc set min seq", "index", i, "docID", doc.DocID, "conversationID", conversationID, "setMinSeq", minSeq)
 	}
 	return &msg.DestructMsgsResp{Count: int32(len(docs))}, nil
 }

internal/rpc/third/s3.go

@@ -295,22 +295,19 @@ func (t *thirdServer) DeleteOutdatedData(ctx context.Context, req *third.DeleteO
 	if err != nil {
 		return nil, err
 	}
-	keyCount := make(map[string]int)
-	for _, obj := range models {
-		keyCount[obj.Key]++
-	}
-	for _, obj := range models {
-		count, err := t.s3dataBase.GetKeyCount(ctx, engine, obj.Key)
-		if err != nil {
-			return nil, err
-		}
+	for i, obj := range models {
 		if err := t.s3dataBase.DeleteSpecifiedData(ctx, engine, []string{obj.Name}); err != nil {
 			return nil, errs.Wrap(err)
 		}
 		if err := t.s3dataBase.DelS3Key(ctx, engine, obj.Name); err != nil {
 			return nil, err
 		}
-		if int(count) <= keyCount[obj.Key] {
+		count, err := t.s3dataBase.GetKeyCount(ctx, engine, obj.Key)
+		if err != nil {
+			return nil, err
+		}
+		log.ZDebug(ctx, "delete s3 object record", "index", i, "s3", obj, "count", count)
+		if count == 0 {
 			if err := t.s3.DeleteObject(ctx, obj.Key); err != nil {
 				return nil, err
 			}