From 8ad343e97cfe6f8f13618acbaa048aebfae44a84 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 21 Apr 2023 14:51:57 +0800 Subject: [PATCH] conversationID --- pkg/common/db/cache/conversation.go | 4 +- pkg/common/db/controller/conversation.go | 67 ++++++++------------ pkg/common/db/relation/conversation_model.go | 5 +- pkg/common/db/table/relation/conversation.go | 2 +- 4 files changed, 31 insertions(+), 47 deletions(-) diff --git a/pkg/common/db/cache/conversation.go b/pkg/common/db/cache/conversation.go index e57f774bc..ede6417ce 100644 --- a/pkg/common/db/cache/conversation.go +++ b/pkg/common/db/cache/conversation.go @@ -34,7 +34,7 @@ type ConversationCache interface { // get one conversation from cache GetConversation(ctx context.Context, ownerUserID, conversationID string) (*relationTb.ConversationModel, error) DelConvsersations(ownerUserID string, conversationIDs []string) ConversationCache - DelUsersConversation(ownerUserIDs []string, conversationID string) ConversationCache + DelUsersConversation(conversationID string, ownerUserIDs ...string) ConversationCache // get one conversation from cache GetConversations(ctx context.Context, ownerUserID string, conversationIDs []string) ([]*relationTb.ConversationModel, error) // get one user's all conversations from cache @@ -169,7 +169,7 @@ func (c *ConversationRedisCache) GetSuperGroupRecvMsgNotNotifyUserIDs(ctx contex }) } -func (c *ConversationRedisCache) DelUsersConversation(ownerUserIDs []string, conversationID string) ConversationCache { +func (c *ConversationRedisCache) DelUsersConversation(conversationID string, ownerUserIDs ...string) ConversationCache { var keys []string for _, ownerUserID := range ownerUserIDs { keys = append(keys, c.getConversationKey(ownerUserID, conversationID)) diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index 655293a38..008fbf80f 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -51,44 +51,45 @@ func (c *ConversationDataBase) SetUsersConversationFiledTx(ctx context.Context, if err != nil { return err } + cache := c.cache.NewCache() if len(haveUserIDs) > 0 { - err = conversationTx.UpdateByMap(ctx, haveUserIDs, conversation.ConversationID, filedMap) + _, err = conversationTx.UpdateByMap(ctx, haveUserIDs, conversation.ConversationID, filedMap) if err != nil { return err } + cache = cache.DelUsersConversation(conversation.ConversationID, haveUserIDs...) } NotUserIDs := utils.DifferenceString(haveUserIDs, userIDs) log.ZDebug(ctx, "SetUsersConversationFiledTx", "NotUserIDs", NotUserIDs, "haveUserIDs", haveUserIDs, "userIDs", userIDs) - var cList []*relationTb.ConversationModel + var conversations []*relationTb.ConversationModel for _, v := range NotUserIDs { temp := new(relationTb.ConversationModel) if err := utils.CopyStructFields(temp, conversation); err != nil { return err } temp.OwnerUserID = v - cList = append(cList, temp) + conversations = append(conversations, temp) } - cache := c.cache.NewCache() - if len(cList) > 0 { - err = conversationTx.Create(ctx, cList) + + if len(conversations) > 0 { + err = conversationTx.Create(ctx, conversations) if err != nil { return err } cache = cache.DelConversationIDs(NotUserIDs) - log.ZDebug(ctx, "SetUsersConversationFiledTx", "cache", cache.GetPreDelKeys(), "addr", &cache) } // clear cache log.ZDebug(ctx, "SetUsersConversationFiledTx", "cache", cache.GetPreDelKeys(), "addr", &cache) - return cache.DelUsersConversation(haveUserIDs, conversation.ConversationID).ExecDel(ctx) + return cache.ExecDel(ctx) }) } func (c *ConversationDataBase) UpdateUsersConversationFiled(ctx context.Context, userIDs []string, conversationID string, args map[string]interface{}) error { - err := c.conversationDB.UpdateByMap(ctx, userIDs, conversationID, args) + _, err := c.conversationDB.UpdateByMap(ctx, userIDs, conversationID, args) if err != nil { return err } - return c.cache.DelUsersConversation(userIDs, conversationID).ExecDel(ctx) + return c.cache.DelUsersConversation(conversationID, userIDs...).ExecDel(ctx) } func (c *ConversationDataBase) CreateConversation(ctx context.Context, conversations []*relationTb.ConversationModel) error { @@ -102,46 +103,28 @@ func (c *ConversationDataBase) CreateConversation(ctx context.Context, conversat func (c *ConversationDataBase) SyncPeerUserPrivateConversationTx(ctx context.Context, conversation *relationTb.ConversationModel) error { return c.tx.Transaction(func(tx any) error { - userIDs := []string{conversation.OwnerUserID, conversation.UserID} conversationTx := c.conversationDB.NewTx(tx) - haveUserIDs, err := conversationTx.FindUserID(ctx, userIDs, []string{conversation.ConversationID, utils.GetConversationIDBySessionType(conversation.UserID, constant.SingleChatType)}) - if err != nil { - return err - } - filedMap := map[string]interface{}{"is_private_chat": conversation.IsPrivateChat} - if len(haveUserIDs) > 0 { - err = conversationTx.UpdateByMap(ctx, haveUserIDs, conversation.ConversationID, filedMap) + cache := c.cache.NewCache() + for _, v := range [][3]string{{conversation.OwnerUserID, conversation.ConversationID, conversation.UserID}, {conversation.UserID, utils.GetConversationIDBySessionType(conversation.OwnerUserID, constant.SingleChatType), conversation.OwnerUserID}} { + rows, err := conversationTx.UpdateByMap(ctx, []string{v[0]}, v[1], map[string]interface{}{"is_private_chat": conversation.IsPrivateChat}) if err != nil { return err } - } - NotUserIDs := utils.DifferenceString(haveUserIDs, userIDs) - log.ZDebug(ctx, "SyncPeerUserPrivateConversationTx", "NotUserIDs", NotUserIDs, "haveUserIDs", haveUserIDs, "userIDs", userIDs) - var cList []*relationTb.ConversationModel - for _, v := range NotUserIDs { - temp := new(relationTb.ConversationModel) - if v == conversation.UserID { - temp.OwnerUserID = conversation.UserID - temp.ConversationID = utils.GetConversationIDBySessionType(conversation.OwnerUserID, constant.SingleChatType) - temp.ConversationType = constant.SingleChatType - temp.UserID = conversation.OwnerUserID - temp.IsPrivateChat = conversation.IsPrivateChat - } else { - if err := utils.CopyStructFields(temp, conversation); err != nil { + if rows == 0 { + newConversation := *conversation + newConversation.OwnerUserID = v[1] + newConversation.UserID = v[2] + newConversation.ConversationID = v[1] + newConversation.IsPrivateChat = conversation.IsPrivateChat + if err := conversationTx.Create(ctx, []*relationTb.ConversationModel{&newConversation}); err != nil { return err } - temp.OwnerUserID = v - } - cList = append(cList, temp) - } - if len(NotUserIDs) > 0 { - err = c.conversationDB.Create(ctx, cList) - if err != nil { - return err + cache = cache.DelConversationIDs([]string{v[0]}) + } else { + cache = cache.DelUsersConversation(v[1], v[0]) } } - // clear cache - return c.cache.DelConversationIDs(NotUserIDs).DelUsersConversation(haveUserIDs, conversation.ConversationID).ExecDel(ctx) + return c.cache.ExecDel(ctx) }) } diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go index ccdce96fd..f2963295f 100644 --- a/pkg/common/db/relation/conversation_model.go +++ b/pkg/common/db/relation/conversation_model.go @@ -29,8 +29,9 @@ 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{}) (err error) { - return utils.Wrap(c.db(ctx).Where("owner_user_id IN (?) and conversation_id=?", userIDList, conversationID).Updates(args).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) { diff --git a/pkg/common/db/table/relation/conversation.go b/pkg/common/db/table/relation/conversation.go index d368ff7c8..e0abfcd86 100644 --- a/pkg/common/db/table/relation/conversation.go +++ b/pkg/common/db/table/relation/conversation.go @@ -32,7 +32,7 @@ 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{}) (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) FindUserID(ctx context.Context, userIDs []string, conversationIDs []string) ([]string, error)