feat: merge v3dev into main

pkg/common/db/table/relation/conversation.go

@@ -1,40 +1,33 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 package relation
 
-import "context"
+import (
+	"context"
+	"time"
+)
 
 const (
 	conversationModelTableName = "conversations"
 )
 
 type ConversationModel struct {
-	OwnerUserID      string `gorm:"column:owner_user_id;primary_key;type:char(128)"   json:"OwnerUserID"`
-	ConversationID   string `gorm:"column:conversation_id;primary_key;type:char(128)" json:"conversationID"`
-	ConversationType int32  `gorm:"column:conversation_type"                          json:"conversationType"`
-	UserID           string `gorm:"column:user_id;type:char(64)"                      json:"userID"`
-	GroupID          string `gorm:"column:group_id;type:char(128)"                    json:"groupID"`
-	RecvMsgOpt       int32  `gorm:"column:recv_msg_opt"                               json:"recvMsgOpt"`
-	IsPinned         bool   `gorm:"column:is_pinned"                                  json:"isPinned"`
-	IsPrivateChat    bool   `gorm:"column:is_private_chat"                            json:"isPrivateChat"`
-	BurnDuration     int32  `gorm:"column:burn_duration;default:30"                   json:"burnDuration"`
-	GroupAtType      int32  `gorm:"column:group_at_type"                              json:"groupAtType"`
-	AttachedInfo     string `gorm:"column:attached_info;type:varchar(1024)"           json:"attachedInfo"`
-	Ex               string `gorm:"column:ex;type:varchar(1024)"                      json:"ex"`
-	MaxSeq           int64  `gorm:"column:max_seq"                                    json:"maxSeq"`
-	MinSeq           int64  `gorm:"column:min_seq"                                    json:"minSeq"`
+	OwnerUserID           string    `gorm:"column:owner_user_id;primary_key;type:char(128)" json:"OwnerUserID"`
+	ConversationID        string    `gorm:"column:conversation_id;primary_key;type:char(128)" json:"conversationID"`
+	ConversationType      int32     `gorm:"column:conversation_type" json:"conversationType"`
+	UserID                string    `gorm:"column:user_id;type:char(64)" json:"userID"`
+	GroupID               string    `gorm:"column:group_id;type:char(128)" json:"groupID"`
+	RecvMsgOpt            int32     `gorm:"column:recv_msg_opt" json:"recvMsgOpt"`
+	IsPinned              bool      `gorm:"column:is_pinned" json:"isPinned"`
+	IsPrivateChat         bool      `gorm:"column:is_private_chat" json:"isPrivateChat"`
+	BurnDuration          int32     `gorm:"column:burn_duration;default:30" json:"burnDuration"`
+	GroupAtType           int32     `gorm:"column:group_at_type" json:"groupAtType"`
+	AttachedInfo          string    `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
+	Ex                    string    `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+	MaxSeq                int64     `gorm:"column:max_seq" json:"maxSeq"`
+	MinSeq                int64     `gorm:"column:min_seq" json:"minSeq"`
+	CreateTime            time.Time `gorm:"column:create_time;index:create_time;autoCreateTime"`
+	IsMsgDestruct         bool      `gorm:"column:is_msg_destruct;default:false"`
+	MsgDestructTime       int64     `gorm:"column:msg_destruct_time;default:604800"`
+	LatestMsgDestructTime time.Time `gorm:"column:latest_msg_destruct_time;autoCreateTime"`
 }
 
 func (ConversationModel) TableName() string {
@@ -44,26 +37,13 @@ func (ConversationModel) TableName() string {
 type ConversationModelInterface interface {
 	Create(ctx context.Context, conversations []*ConversationModel) (err error)
 	Delete(ctx context.Context, groupIDs []string) (err error)
-	UpdateByMap(
-		ctx context.Context,
-		userIDs []string,
-		conversationID string,
-		args map[string]interface{},
-	) (rows int64, err error)
+	UpdateByMap(ctx context.Context, userIDs []string, conversationID string, args map[string]interface{}) (rows int64, err error)
 	Update(ctx context.Context, conversation *ConversationModel) (err error)
-	Find(
-		ctx context.Context,
-		ownerUserID string,
-		conversationIDs []string,
-	) (conversations []*ConversationModel, err error)
+	Find(ctx context.Context, ownerUserID string, conversationIDs []string) (conversations []*ConversationModel, err error)
 	FindUserID(ctx context.Context, userIDs []string, conversationIDs []string) ([]string, error)
 	FindUserIDAllConversationID(ctx context.Context, userID string) ([]string, error)
 	Take(ctx context.Context, userID, conversationID string) (conversation *ConversationModel, err error)
-	FindConversationID(
-		ctx context.Context,
-		userID string,
-		conversationIDs []string,
-	) (existConversationID []string, err error)
+	FindConversationID(ctx context.Context, userID string, conversationIDs []string) (existConversationID []string, err error)
 	FindUserIDAllConversations(ctx context.Context, userID string) (conversations []*ConversationModel, err error)
 	FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error)
 	GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error)
@@ -71,5 +51,6 @@ type ConversationModelInterface interface {
 	GetAllConversationIDs(ctx context.Context) ([]string, error)
 	GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (hashReadSeqs map[string]int64, err error)
 	GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*ConversationModel, error)
+	GetConversationIDsNeedDestruct(ctx context.Context) ([]*ConversationModel, error)
 	NewTx(tx any) ConversationModelInterface
 }

pkg/common/db/table/relation/group.go

@@ -58,4 +58,8 @@ type GroupModelInterface interface {
 		pageNumber, showNumber int32,
 	) (total uint32, groups []*GroupModel, err error)
 	GetGroupIDsByGroupType(ctx context.Context, groupType int) (groupIDs []string, err error)
+	// 获取群总数
+	CountTotal(ctx context.Context, before *time.Time) (count int64, err error)
+	// 获取范围内群增量
+	CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error)
 }

pkg/common/db/table/relation/object.go

@@ -0,0 +1,31 @@
+package relation
+
+import (
+	"context"
+	"time"
+)
+
+const (
+	ObjectInfoModelTableName = "object"
+)
+
+type ObjectModel struct {
+	Name        string    `gorm:"column:name;primary_key"`
+	UserID      string    `gorm:"column:user_id"`
+	Hash        string    `gorm:"column:hash"`
+	Key         string    `gorm:"column:key"`
+	Size        int64     `gorm:"column:size"`
+	ContentType string    `gorm:"column:content_type"`
+	Cause       string    `gorm:"column:cause"`
+	CreateTime  time.Time `gorm:"column:create_time"`
+}
+
+func (ObjectModel) TableName() string {
+	return ObjectInfoModelTableName
+}
+
+type ObjectInfoModelInterface interface {
+	NewTx(tx any) ObjectInfoModelInterface
+	SetObject(ctx context.Context, obj *ObjectModel) error
+	Take(ctx context.Context, name string) (*ObjectModel, error)
+}

pkg/common/db/table/relation/object_hash.go

@@ -1,44 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package relation
-
-import (
-	"context"
-	"time"
-)
-
-const (
-	ObjectHashModelTableName = "object_hash"
-)
-
-type ObjectHashModel struct {
-	Hash       string    `gorm:"column:hash;primary_key;size:32"`
-	Engine     string    `gorm:"column:engine;primary_key;size:16"`
-	Size       int64     `gorm:"column:size"`
-	Bucket     string    `gorm:"column:bucket"`
-	Name       string    `gorm:"column:name"`
-	CreateTime time.Time `gorm:"column:create_time"`
-}
-
-func (ObjectHashModel) TableName() string {
-	return ObjectHashModelTableName
-}
-
-type ObjectHashModelInterface interface {
-	NewTx(tx any) ObjectHashModelInterface
-	Take(ctx context.Context, hash string, engine string) (*ObjectHashModel, error)
-	Create(ctx context.Context, h []*ObjectHashModel) error
-	DeleteNoCitation(ctx context.Context, engine string, num int) (list []*ObjectHashModel, err error)
-}

pkg/common/db/table/relation/object_info.go

@@ -1,43 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package relation
-
-import (
-	"context"
-	"time"
-)
-
-const (
-	ObjectInfoModelTableName = "object_info"
-)
-
-type ObjectInfoModel struct {
-	Name        string     `gorm:"column:name;primary_key"`
-	Hash        string     `gorm:"column:hash"`
-	ContentType string     `gorm:"column:content_type"`
-	ValidTime   *time.Time `gorm:"column:valid_time"`
-	CreateTime  time.Time  `gorm:"column:create_time"`
-}
-
-func (ObjectInfoModel) TableName() string {
-	return ObjectInfoModelTableName
-}
-
-type ObjectInfoModelInterface interface {
-	NewTx(tx any) ObjectInfoModelInterface
-	SetObject(ctx context.Context, obj *ObjectInfoModel) error
-	Take(ctx context.Context, name string) (*ObjectInfoModel, error)
-	DeleteExpiration(ctx context.Context, expiration time.Time) error
-}

pkg/common/db/table/relation/object_put.go

@@ -1,51 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package relation
-
-import (
-	"context"
-	"time"
-)
-
-const (
-	ObjectPutModelTableName = "object_put"
-)
-
-type ObjectPutModel struct {
-	PutID         string     `gorm:"column:put_id;primary_key"`
-	Hash          string     `gorm:"column:hash"`
-	Path          string     `gorm:"column:path"`
-	Name          string     `gorm:"column:name"`
-	ContentType   string     `gorm:"column:content_type"`
-	ObjectSize    int64      `gorm:"column:object_size"`
-	FragmentSize  int64      `gorm:"column:fragment_size"`
-	PutURLsHash   string     `gorm:"column:put_urls_hash"`
-	ValidTime     *time.Time `gorm:"column:valid_time"`
-	EffectiveTime time.Time  `gorm:"column:effective_time"`
-	CreateTime    time.Time  `gorm:"column:create_time"`
-}
-
-func (ObjectPutModel) TableName() string {
-	return ObjectPutModelTableName
-}
-
-type ObjectPutModelInterface interface {
-	NewTx(tx any) ObjectPutModelInterface
-	Create(ctx context.Context, m []*ObjectPutModel) error
-	Take(ctx context.Context, putID string) (*ObjectPutModel, error)
-	SetCompleted(ctx context.Context, putID string) error
-	FindExpirationPut(ctx context.Context, expirationTime time.Time, num int) ([]*ObjectPutModel, error)
-	DelPut(ctx context.Context, ids []string) error
-}

pkg/common/db/table/relation/user.go

@@ -28,7 +28,7 @@ type UserModel struct {
 	Nickname         string    `gorm:"column:name;size:255"`
 	FaceURL          string    `gorm:"column:face_url;size:255"`
 	Ex               string    `gorm:"column:ex;size:1024"`
-	CreateTime       time.Time `gorm:"column:create_time;index:create_time; autoCreateTime"`
+	CreateTime       time.Time `gorm:"column:create_time;index:create_time;autoCreateTime"`
 	AppMangerLevel   int32     `gorm:"column:app_manger_level;default:18"`
 	GlobalRecvMsgOpt int32     `gorm:"column:global_recv_msg_opt"`
 }
@@ -66,7 +66,7 @@ type UserModelInterface interface {
 	GetAllUserID(ctx context.Context) (userIDs []string, err error)
 	GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (opt int, err error)
 	// 获取用户总数
-	CountTotal(ctx context.Context) (count int64, err error)
+	CountTotal(ctx context.Context, before *time.Time) (count int64, err error)
 	// 获取范围内用户增量
 	CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error)
 }

pkg/common/db/table/unrelation/extend_msg_set.go

@@ -1,125 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unrelation
-
-import (
-	"context"
-	"strconv"
-	"strings"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-)
-
-const (
-	CExtendMsgSet = "extend_msgs"
-
-	ExtendMsgMaxNum = 100
-)
-
-type ExtendMsgSetModel struct {
-	ConversationID   string                    `bson:"source_id"           json:"conversationID"`
-	SessionType      int32                     `bson:"session_type"        json:"sessionType"`
-	ExtendMsgs       map[string]ExtendMsgModel `bson:"extend_msgs"         json:"extendMsgs"`
-	ExtendMsgNum     int32                     `bson:"extend_msg_num"      json:"extendMsgNum"`
-	CreateTime       int64                     `bson:"create_time"         json:"createTime"`       // this block's create time
-	MaxMsgUpdateTime int64                     `bson:"max_msg_update_time" json:"maxMsgUpdateTime"` // index find msg
-}
-
-type KeyValueModel struct {
-	TypeKey          string `bson:"type_key"           json:"typeKey"`
-	Value            string `bson:"value"              json:"value"`
-	LatestUpdateTime int64  `bson:"latest_update_time" json:"latestUpdateTime"`
-}
-
-type ExtendMsgModel struct {
-	ReactionExtensionList map[string]KeyValueModel `bson:"reaction_extension_list" json:"reactionExtensionList"`
-	ClientMsgID           string                   `bson:"client_msg_id"           json:"clientMsgID"`
-	MsgFirstModifyTime    int64                    `bson:"msg_first_modify_time"   json:"msgFirstModifyTime"` // this extendMsg create time
-	AttachedInfo          string                   `bson:"attached_info"           json:"attachedInfo"`
-	Ex                    string                   `bson:"ex"                      json:"ex"`
-}
-
-type ExtendMsgSetModelInterface interface {
-	CreateExtendMsgSet(ctx context.Context, set *ExtendMsgSetModel) error
-	GetAllExtendMsgSet(
-		ctx context.Context,
-		conversationID string,
-		opts *GetAllExtendMsgSetOpts,
-	) (sets []*ExtendMsgSetModel, err error)
-	GetExtendMsgSet(
-		ctx context.Context,
-		conversationID string,
-		sessionType int32,
-		maxMsgUpdateTime int64,
-	) (*ExtendMsgSetModel, error)
-	InsertExtendMsg(ctx context.Context, conversationID string, sessionType int32, msg *ExtendMsgModel) error
-	InsertOrUpdateReactionExtendMsgSet(
-		ctx context.Context,
-		conversationID string,
-		sessionType int32,
-		clientMsgID string,
-		msgFirstModifyTime int64,
-		reactionExtensionList map[string]*KeyValueModel,
-	) error
-	DeleteReactionExtendMsgSet(
-		ctx context.Context,
-		conversationID string,
-		sessionType int32,
-		clientMsgID string,
-		msgFirstModifyTime int64,
-		reactionExtensionList map[string]*KeyValueModel,
-	) error
-	TakeExtendMsg(
-		ctx context.Context,
-		conversationID string,
-		sessionType int32,
-		clientMsgID string,
-		maxMsgUpdateTime int64,
-	) (extendMsg *ExtendMsgModel, err error)
-}
-
-func (ExtendMsgSetModel) TableName() string {
-	return CExtendMsgSet
-}
-
-func (ExtendMsgSetModel) GetExtendMsgMaxNum() int32 {
-	return ExtendMsgMaxNum
-}
-
-func (ExtendMsgSetModel) GetConversationID(ID string, index int32) string {
-	return ID + ":" + strconv.Itoa(int(index))
-}
-
-func (e *ExtendMsgSetModel) SplitConversationIDAndGetIndex() int32 {
-	l := strings.Split(e.ConversationID, ":")
-	index, _ := strconv.Atoi(l[len(l)-1])
-	return int32(index)
-}
-
-type GetAllExtendMsgSetOpts struct {
-	ExcludeExtendMsgs bool
-}
-
-func (ExtendMsgSetModel) Pb2Model(reactionExtensionList map[string]*sdkws.KeyValue) map[string]*KeyValueModel {
-	r := make(map[string]*KeyValueModel)
-	for key, value := range reactionExtensionList {
-		r[key] = &KeyValueModel{
-			TypeKey:          value.TypeKey,
-			Value:            value.Value,
-			LatestUpdateTime: value.LatestUpdateTime,
-		}
-	}
-	return r
-}

pkg/common/db/table/unrelation/msg.go

@@ -17,6 +17,7 @@ package unrelation
 import (
 	"context"
 	"strconv"
+	"time"
 
 	"go.mongodb.org/mongo-driver/mongo"
 
@@ -36,7 +37,6 @@ type MsgDocModel struct {
 }
 
 type RevokeModel struct {
-	ID       string `bson:"id"`
 	Role     int32  `bson:"role"`
 	UserID   string `bson:"user_id"`
 	Nickname string `bson:"nickname"`
@@ -83,6 +83,16 @@ type MsgInfoModel struct {
 	IsRead  bool          `bson:"is_read"`
 }
 
+type UserCount struct {
+	UserID string `bson:"user_id"`
+	Count  int64  `bson:"count"`
+}
+
+type GroupCount struct {
+	GroupID string `bson:"group_id"`
+	Count   int64  `bson:"count"`
+}
+
 type MsgDocModelInterface interface {
 	PushMsgsToDoc(ctx context.Context, docID string, msgsToMongo []MsgInfoModel) error
 	Create(ctx context.Context, model *MsgDocModel) error
@@ -98,6 +108,8 @@ type MsgDocModelInterface interface {
 	GetMsgDocModelByIndex(ctx context.Context, conversationID string, index, sort int64) (*MsgDocModel, error)
 	DeleteMsgsInOneDocByIndex(ctx context.Context, docID string, indexes []int) error
 	MarkSingleChatMsgsAsRead(ctx context.Context, userID string, docID string, indexes []int64) error
+	RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*UserCount, dateCount map[string]int64, err error)
+	RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*GroupCount, dateCount map[string]int64, err error)
 }
 
 func (MsgDocModel) TableName() string {