feat: merge v3dev into main

pkg/common/db/relation/conversation_model.go

@@ -1,27 +1,12 @@
-// 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"
 
-	"gorm.io/gorm"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"gorm.io/gorm"
 )
 
 type ConversationGorm struct {
@@ -44,173 +29,66 @@ func (c *ConversationGorm) Delete(ctx context.Context, groupIDs []string) (err e
 	return utils.Wrap(c.db(ctx).Where("group_id in (?)", groupIDs).Delete(&relation.ConversationModel{}).Error, "")
 }
 
-func (c *ConversationGorm) UpdateByMap(
-	ctx context.Context,
-	userIDList []string,
-	conversationID string,
-	args map[string]interface{},
-) (rows int64, err error) {
+func (c *ConversationGorm) UpdateByMap(ctx context.Context, userIDList []string, conversationID string, args map[string]interface{}) (rows int64, err error) {
 	result := c.db(ctx).Where("owner_user_id IN (?) and  conversation_id=?", userIDList, conversationID).Updates(args)
 	return result.RowsAffected, utils.Wrap(result.Error, "")
 }
 
 func (c *ConversationGorm) Update(ctx context.Context, conversation *relation.ConversationModel) (err error) {
-	return utils.Wrap(
-		c.db(ctx).
-			Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).
-			Updates(conversation).
-			Error,
-		"",
-	)
+	return utils.Wrap(c.db(ctx).Where("owner_user_id = ? and conversation_id = ?", conversation.OwnerUserID, conversation.ConversationID).Updates(conversation).Error, "")
 }
 
-func (c *ConversationGorm) Find(
-	ctx context.Context,
-	ownerUserID string,
-	conversationIDs []string,
-) (conversations []*relation.ConversationModel, err error) {
-	err = utils.Wrap(
-		c.db(ctx).
-			Where("owner_user_id=? and conversation_id IN (?)", ownerUserID, conversationIDs).
-			Find(&conversations).
-			Error,
-		"",
-	)
+func (c *ConversationGorm) Find(ctx context.Context, ownerUserID string, conversationIDs []string) (conversations []*relation.ConversationModel, err error) {
+	err = utils.Wrap(c.db(ctx).Where("owner_user_id=? and conversation_id IN (?)", ownerUserID, conversationIDs).Find(&conversations).Error, "")
 	return conversations, err
 }
 
-func (c *ConversationGorm) Take(
-	ctx context.Context,
-	userID, conversationID string,
-) (conversation *relation.ConversationModel, err error) {
+func (c *ConversationGorm) Take(ctx context.Context, userID, conversationID string) (conversation *relation.ConversationModel, err error) {
 	cc := &relation.ConversationModel{}
-	return cc, utils.Wrap(
-		c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, userID).Take(cc).Error,
-		"",
-	)
+	return cc, utils.Wrap(c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, userID).Take(cc).Error, "")
 }
 
-func (c *ConversationGorm) FindUserID(
-	ctx context.Context,
-	userIDs []string,
-	conversationIDs []string,
-) (existUserID []string, err error) {
-	return existUserID, utils.Wrap(
-		c.db(ctx).
-			Where(" owner_user_id IN (?) and conversation_id in (?)", userIDs, conversationIDs).
-			Pluck("owner_user_id", &existUserID).
-			Error,
-		"",
-	)
+func (c *ConversationGorm) FindUserID(ctx context.Context, userIDs []string, conversationIDs []string) (existUserID []string, err error) {
+	return existUserID, utils.Wrap(c.db(ctx).Where(" owner_user_id IN (?) and conversation_id in (?)", userIDs, conversationIDs).Pluck("owner_user_id", &existUserID).Error, "")
 }
 
-func (c *ConversationGorm) FindConversationID(
-	ctx context.Context,
-	userID string,
-	conversationIDList []string,
-) (existConversationID []string, err error) {
-	return existConversationID, utils.Wrap(
-		c.db(ctx).
-			Where(" conversation_id IN (?) and owner_user_id=?", conversationIDList, userID).
-			Pluck("conversation_id", &existConversationID).
-			Error,
-		"",
-	)
+func (c *ConversationGorm) FindConversationID(ctx context.Context, userID string, conversationIDList []string) (existConversationID []string, err error) {
+	return existConversationID, utils.Wrap(c.db(ctx).Where(" conversation_id IN (?) and owner_user_id=?", conversationIDList, userID).Pluck("conversation_id", &existConversationID).Error, "")
 }
 
-func (c *ConversationGorm) FindUserIDAllConversationID(
-	ctx context.Context,
-	userID string,
-) (conversationIDList []string, err error) {
-	return conversationIDList, utils.Wrap(
-		c.db(ctx).Where("owner_user_id=?", userID).Pluck("conversation_id", &conversationIDList).Error,
-		"",
-	)
+func (c *ConversationGorm) FindUserIDAllConversationID(ctx context.Context, userID string) (conversationIDList []string, err error) {
+	return conversationIDList, utils.Wrap(c.db(ctx).Where("owner_user_id=?", userID).Pluck("conversation_id", &conversationIDList).Error, "")
 }
 
-func (c *ConversationGorm) FindUserIDAllConversations(
-	ctx context.Context,
-	userID string,
-) (conversations []*relation.ConversationModel, err error) {
+func (c *ConversationGorm) FindUserIDAllConversations(ctx context.Context, userID string) (conversations []*relation.ConversationModel, err error) {
 	return conversations, utils.Wrap(c.db(ctx).Where("owner_user_id=?", userID).Find(&conversations).Error, "")
 }
 
-func (c *ConversationGorm) FindRecvMsgNotNotifyUserIDs(
-	ctx context.Context,
-	groupID string,
-) (userIDs []string, err error) {
-	return userIDs, utils.Wrap(
-		c.db(ctx).
-			Where("group_id = ? and recv_msg_opt = ?", groupID, constant.ReceiveNotNotifyMessage).
-			Pluck("user_id", &userIDs).
-			Error,
-		"",
-	)
+func (c *ConversationGorm) FindRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
+	return userIDs, utils.Wrap(c.db(ctx).Where("group_id = ? and recv_msg_opt = ?", groupID, constant.ReceiveNotNotifyMessage).Pluck("user_id", &userIDs).Error, "")
 }
 
-func (c *ConversationGorm) FindSuperGroupRecvMsgNotNotifyUserIDs(
-	ctx context.Context,
-	groupID string,
-) (userIDs []string, err error) {
-	return userIDs, utils.Wrap(
-		c.db(ctx).
-			Where("group_id = ? and recv_msg_opt = ? and conversation_type = ?", groupID, constant.ReceiveNotNotifyMessage, constant.SuperGroupChatType).
-			Pluck("user_id", &userIDs).
-			Error,
-		"",
-	)
+func (c *ConversationGorm) FindSuperGroupRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) (userIDs []string, err error) {
+	return userIDs, utils.Wrap(c.db(ctx).Where("group_id = ? and recv_msg_opt = ? and conversation_type = ?", groupID, constant.ReceiveNotNotifyMessage, constant.SuperGroupChatType).Pluck("user_id", &userIDs).Error, "")
 }
 
-func (c *ConversationGorm) GetUserRecvMsgOpt(
-	ctx context.Context,
-	ownerUserID, conversationID string,
-) (opt int, err error) {
+func (c *ConversationGorm) GetUserRecvMsgOpt(ctx context.Context, ownerUserID, conversationID string) (opt int, err error) {
 	var conversation relation.ConversationModel
-	return int(
-			conversation.RecvMsgOpt,
-		), utils.Wrap(
-			c.db(ctx).
-				Where("conversation_id = ? And owner_user_id = ?", conversationID, ownerUserID).
-				Select("recv_msg_opt").
-				Find(&conversation).
-				Error,
-			"",
-		)
+	return int(conversation.RecvMsgOpt), utils.Wrap(c.db(ctx).Where("conversation_id = ? And owner_user_id = ?", conversationID, ownerUserID).Select("recv_msg_opt").Find(&conversation).Error, "")
 }
 
 func (c *ConversationGorm) GetAllConversationIDs(ctx context.Context) (conversationIDs []string, err error) {
-	return conversationIDs, utils.Wrap(
-		c.db(ctx).Distinct("conversation_id").Pluck("conversation_id", &conversationIDs).Error,
-		"",
-	)
+	return conversationIDs, utils.Wrap(c.db(ctx).Distinct("conversation_id").Pluck("conversation_id", &conversationIDs).Error, "")
 }
 
-func (c *ConversationGorm) GetUserAllHasReadSeqs(
-	ctx context.Context,
-	ownerUserID string,
-) (hasReadSeqs map[string]int64, err error) {
-	var conversations []*relation.ConversationModel
-	err = utils.Wrap(
-		c.db(ctx).
-			Where("owner_user_id = ?", ownerUserID).
-			Select("conversation_id", "has_read_seq").
-			Find(&conversations).
-			Error,
-		"",
-	)
-	hasReadSeqs = make(map[string]int64, len(conversations))
-	// for _, conversation := range conversations {
-	// 	hasReadSeqs[conversation.ConversationID] = conversation.HasReadSeq
-	// }
-	return hasReadSeqs, err
+func (c *ConversationGorm) GetUserAllHasReadSeqs(ctx context.Context, ownerUserID string) (hasReadSeqs map[string]int64, err error) {
+	return nil, nil
 }
 
-func (c *ConversationGorm) GetConversationsByConversationID(
-	ctx context.Context,
-	conversationIDs []string,
-) (conversations []*relation.ConversationModel, err error) {
-	return conversations, utils.Wrap(
-		c.db(ctx).Where("conversation_id IN (?)", conversationIDs).Find(&conversations).Error,
-		"",
-	)
+func (c *ConversationGorm) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) (conversations []*relation.ConversationModel, err error) {
+	return conversations, utils.Wrap(c.db(ctx).Where("conversation_id IN (?)", conversationIDs).Find(&conversations).Error, "")
+}
+
+func (c *ConversationGorm) GetConversationIDsNeedDestruct(ctx context.Context) (conversations []*relation.ConversationModel, err error) {
+	return conversations, utils.Wrap(c.db(ctx).Where("is_msg_destruct = 1 && UNIX_TIMESTAMP(NOW()) > (msg_destruct_time + UNIX_TIMESTAMP(latest_msg_destruct_time)) && msg_destruct_time != 0").Find(&conversations).Error, "")
 }

pkg/common/db/relation/group_model.go

@@ -1,27 +1,13 @@
-// 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"
-
-	"gorm.io/gorm"
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/ormutil"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"gorm.io/gorm"
+	"time"
 )
 
 var _ relation.GroupModelInterface = (*GroupGorm)(nil)
@@ -47,13 +33,7 @@ func (g *GroupGorm) UpdateMap(ctx context.Context, groupID string, args map[stri
 }
 
 func (g *GroupGorm) UpdateStatus(ctx context.Context, groupID string, status int32) (err error) {
-	return utils.Wrap(
-		g.DB.Where("group_id = ?", groupID).
-			Model(&relation.GroupModel{}).
-			Updates(map[string]any{"status": status}).
-			Error,
-		"",
-	)
+	return utils.Wrap(g.DB.Where("group_id = ?", groupID).Model(&relation.GroupModel{}).Updates(map[string]any{"status": status}).Error, "")
 }
 
 func (g *GroupGorm) Find(ctx context.Context, groupIDs []string) (groups []*relation.GroupModel, err error) {
@@ -65,17 +45,37 @@ func (g *GroupGorm) Take(ctx context.Context, groupID string) (group *relation.G
 	return group, utils.Wrap(g.DB.Where("group_id = ?", groupID).Take(group).Error, "")
 }
 
-func (g *GroupGorm) Search(
-	ctx context.Context,
-	keyword string,
-	pageNumber, showNumber int32,
-) (total uint32, groups []*relation.GroupModel, err error) {
+func (g *GroupGorm) Search(ctx context.Context, keyword string, pageNumber, showNumber int32) (total uint32, groups []*relation.GroupModel, err error) {
 	return ormutil.GormSearch[relation.GroupModel](g.DB, []string{"name"}, keyword, pageNumber, showNumber)
 }
 
 func (g *GroupGorm) GetGroupIDsByGroupType(ctx context.Context, groupType int) (groupIDs []string, err error) {
-	return groupIDs, utils.Wrap(
-		g.DB.Model(&relation.GroupModel{}).Where("group_type = ? ", groupType).Pluck("group_id", &groupIDs).Error,
-		"",
-	)
+	return groupIDs, utils.Wrap(g.DB.Model(&relation.GroupModel{}).Where("group_type = ? ", groupType).Pluck("group_id", &groupIDs).Error, "")
+}
+
+func (g *GroupGorm) CountTotal(ctx context.Context, before *time.Time) (count int64, err error) {
+	db := g.db(ctx).Model(&relation.GroupModel{})
+	if before != nil {
+		db = db.Where("create_time < ?", before)
+	}
+	if err := db.Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func (g *GroupGorm) CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error) {
+	var res []struct {
+		Date  time.Time `gorm:"column:date"`
+		Count int64     `gorm:"column:count"`
+	}
+	err := g.db(ctx).Model(&relation.GroupModel{}).Select("DATE(create_time) AS date, count(1) AS count").Where("create_time >= ? and create_time < ?", start, end).Group("date").Find(&res).Error
+	if err != nil {
+		return nil, errs.Wrap(err)
+	}
+	v := make(map[string]int64)
+	for _, r := range res {
+		v[r.Date.Format("2006-01-02")] = r.Count
+	}
+	return v, nil
 }

pkg/common/db/relation/object_hash_model.go

@@ -1,66 +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"
-
-	"gorm.io/gorm"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-)
-
-type ObjectHashGorm struct {
-	*MetaDB
-}
-
-func NewObjectHash(db *gorm.DB) relation.ObjectHashModelInterface {
-	return &ObjectHashGorm{
-		NewMetaDB(db, &relation.ObjectHashModel{}),
-	}
-}
-
-func (o *ObjectHashGorm) NewTx(tx any) relation.ObjectHashModelInterface {
-	return &ObjectHashGorm{
-		NewMetaDB(tx.(*gorm.DB), &relation.ObjectHashModel{}),
-	}
-}
-
-func (o *ObjectHashGorm) Take(
-	ctx context.Context,
-	hash string,
-	engine string,
-) (oh *relation.ObjectHashModel, err error) {
-	oh = &relation.ObjectHashModel{}
-	return oh, utils.Wrap1(o.DB.Where("hash = ? and engine = ?", hash, engine).Take(oh).Error)
-}
-
-func (o *ObjectHashGorm) Create(ctx context.Context, h []*relation.ObjectHashModel) (err error) {
-	return utils.Wrap1(o.DB.Create(h).Error)
-}
-
-func (o *ObjectHashGorm) DeleteNoCitation(
-	ctx context.Context,
-	engine string,
-	num int,
-) (list []*relation.ObjectHashModel, err error) {
-	err = o.DB.Table(relation.ObjectHashModelTableName, "as h").Select("h.*").
-		Joins("LEFT JOIN "+relation.ObjectInfoModelTableName+" as i ON h.hash = i.hash").
-		Where("h.engine = ? AND i.hash IS NULL", engine).
-		Limit(num).
-		Find(&list).Error
-	return list, utils.Wrap1(err)
-}

pkg/common/db/relation/object_info_model.go

@@ -1,69 +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"
-
-	"gorm.io/gorm"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-)
-
-type ObjectInfoGorm struct {
-	*MetaDB
-}
-
-func NewObjectInfo(db *gorm.DB) relation.ObjectInfoModelInterface {
-	return &ObjectInfoGorm{
-		NewMetaDB(db, &relation.ObjectInfoModel{}),
-	}
-}
-
-func (o *ObjectInfoGorm) NewTx(tx any) relation.ObjectInfoModelInterface {
-	return &ObjectInfoGorm{
-		NewMetaDB(tx.(*gorm.DB), &relation.ObjectInfoModel{}),
-	}
-}
-
-func (o *ObjectInfoGorm) SetObject(ctx context.Context, obj *relation.ObjectInfoModel) (err error) {
-	if err := o.DB.WithContext(ctx).Where("name = ?", obj.Name).Delete(&relation.ObjectInfoModel{}).Error; err != nil {
-		return errs.Wrap(err)
-	}
-	return errs.Wrap(o.DB.WithContext(ctx).Create(obj).Error)
-	//return errs.Wrap(o.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-	//	if err := tx.Where("name = ?", obj.Name).Delete(&relation.ObjectInfoModel{}).Error; err != nil {
-	//		return errs.Wrap(err)
-	//	}
-	//	return errs.Wrap(tx.Create(obj).Error)
-	//}))
-}
-
-func (o *ObjectInfoGorm) Take(ctx context.Context, name string) (info *relation.ObjectInfoModel, err error) {
-	info = &relation.ObjectInfoModel{}
-	return info, utils.Wrap1(o.DB.WithContext(ctx).Where("name = ?", name).Take(info).Error)
-}
-
-func (o *ObjectInfoGorm) DeleteExpiration(ctx context.Context, expiration time.Time) (err error) {
-	return utils.Wrap1(
-		o.DB.WithContext(ctx).
-			Where("expiration_time IS NOT NULL AND expiration_time <= ?", expiration).
-			Delete(&relation.ObjectInfoModel{}).
-			Error,
-	)
-}

pkg/common/db/relation/object_model.go

@@ -0,0 +1,36 @@
+package relation
+
+import (
+	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
+	"gorm.io/gorm"
+)
+
+type ObjectInfoGorm struct {
+	*MetaDB
+}
+
+func NewObjectInfo(db *gorm.DB) relation.ObjectInfoModelInterface {
+	return &ObjectInfoGorm{
+		NewMetaDB(db, &relation.ObjectModel{}),
+	}
+}
+
+func (o *ObjectInfoGorm) NewTx(tx any) relation.ObjectInfoModelInterface {
+	return &ObjectInfoGorm{
+		NewMetaDB(tx.(*gorm.DB), &relation.ObjectModel{}),
+	}
+}
+
+func (o *ObjectInfoGorm) SetObject(ctx context.Context, obj *relation.ObjectModel) (err error) {
+	if err := o.DB.WithContext(ctx).Where("name = ?", obj.Name).FirstOrCreate(obj).Error; err != nil {
+		return errs.Wrap(err)
+	}
+	return nil
+}
+
+func (o *ObjectInfoGorm) Take(ctx context.Context, name string) (info *relation.ObjectModel, err error) {
+	info = &relation.ObjectModel{}
+	return info, errs.Wrap(o.DB.WithContext(ctx).Where("name = ?", name).Take(info).Error)
+}

pkg/common/db/relation/object_put_model.go

@@ -1,67 +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"
-
-	"gorm.io/gorm"
-
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-)
-
-type ObjectPutGorm struct {
-	*MetaDB
-}
-
-func NewObjectPut(db *gorm.DB) relation.ObjectPutModelInterface {
-	return &ObjectPutGorm{
-		NewMetaDB(db, &relation.ObjectPutModel{}),
-	}
-}
-
-func (o *ObjectPutGorm) NewTx(tx any) relation.ObjectPutModelInterface {
-	return &ObjectPutGorm{
-		NewMetaDB(tx.(*gorm.DB), &relation.ObjectPutModel{}),
-	}
-}
-
-func (o *ObjectPutGorm) Create(ctx context.Context, m []*relation.ObjectPutModel) (err error) {
-	return utils.Wrap1(o.DB.Create(m).Error)
-}
-
-func (o *ObjectPutGorm) Take(ctx context.Context, putID string) (put *relation.ObjectPutModel, err error) {
-	put = &relation.ObjectPutModel{}
-	return put, utils.Wrap1(o.DB.Where("put_id = ?", putID).Take(put).Error)
-}
-
-func (o *ObjectPutGorm) SetCompleted(ctx context.Context, putID string) (err error) {
-	return utils.Wrap1(o.DB.Model(&relation.ObjectPutModel{}).Where("put_id = ?", putID).Update("complete", true).Error)
-}
-
-func (o *ObjectPutGorm) FindExpirationPut(
-	ctx context.Context,
-	expirationTime time.Time,
-	num int,
-) (list []*relation.ObjectPutModel, err error) {
-	err = o.DB.Where("effective_time <= ?", expirationTime).Limit(num).Find(&list).Error
-	return list, utils.Wrap1(err)
-}
-
-func (o *ObjectPutGorm) DelPut(ctx context.Context, ids []string) (err error) {
-	return utils.Wrap1(o.DB.Where("put_id IN ?", ids).Delete(&relation.ObjectPutModel{}).Error)
-}

pkg/common/db/relation/user_model.go

@@ -41,7 +41,7 @@ func (u *UserGorm) Create(ctx context.Context, users []*relation.UserModel) (err
 
 // 更新用户信息 零值
 func (u *UserGorm) UpdateByMap(ctx context.Context, userID string, args map[string]interface{}) (err error) {
-	return utils.Wrap(u.db(ctx).Where("user_id = ?", userID).Updates(args).Error, "")
+	return utils.Wrap(u.db(ctx).Model(&relation.UserModel{}).Where("user_id = ?", userID).Updates(args).Error, "")
 }
 
 // 更新多个用户信息 非零值
@@ -94,9 +94,15 @@ func (u *UserGorm) GetUserGlobalRecvMsgOpt(ctx context.Context, userID string) (
 	return opt, err
 }
 
-func (u *UserGorm) CountTotal(ctx context.Context) (count int64, err error) {
-	err = u.db(ctx).Model(&relation.UserModel{}).Count(&count).Error
-	return count, errs.Wrap(err)
+func (u *UserGorm) CountTotal(ctx context.Context, before *time.Time) (count int64, err error) {
+	db := u.db(ctx).Model(&relation.UserModel{})
+	if before != nil {
+		db = db.Where("create_time < ?", before)
+	}
+	if err := db.Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
 }
 
 func (u *UserGorm) CountRangeEverydayTotal(