From 07dfde965c1987ab2c9fb44fabee4eb57c4f5e46 Mon Sep 17 00:00:00 2001 From: AndrewZuo01 Date: Thu, 11 Jan 2024 20:41:24 +0800 Subject: [PATCH] fix update friends --- internal/rpc/friend/friend.go | 29 ++++++------- pkg/common/db/cache/friend.go | 14 +++++++ pkg/common/db/controller/friend.go | 32 ++++----------- pkg/common/db/mgo/friend.go | 56 +++++++------------------- pkg/common/db/table/relation/friend.go | 8 +--- pkg/rpcclient/notification/friend.go | 2 +- 6 files changed, 52 insertions(+), 89 deletions(-) diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index c53cb88f5..84702f548 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -452,22 +452,19 @@ func (s *friendServer) UpdateFriends( return nil, err } - for _, friendID := range req.FriendUserIDs { - if req.IsPinned != nil { - if err = s.friendDatabase.UpdateFriendPinStatus(ctx, req.OwnerUserID, friendID, req.IsPinned.Value); err != nil { - return nil, err - } - } - if req.Remark != nil { - if err = s.friendDatabase.UpdateFriendRemark(ctx, req.OwnerUserID, friendID, req.Remark.Value); err != nil { - return nil, err - } - } - if req.Ex != nil { - if err = s.friendDatabase.UpdateFriendEx(ctx, req.OwnerUserID, friendID, req.Ex.Value); err != nil { - return nil, err - } - } + val := make(map[string]any) + + if req.IsPinned != nil { + val["is_pinned"] = req.IsPinned.Value + } + if req.Remark != nil { + val["remark"] = req.Remark.Value + } + if req.Ex != nil { + val["ex"] = req.Ex.Value + } + if err = s.friendDatabase.UpdateFriends(ctx, req.OwnerUserID, req.FriendUserIDs, val); err != nil { + return nil, err } resp := &pbfriend.UpdateFriendsResp{} diff --git a/pkg/common/db/cache/friend.go b/pkg/common/db/cache/friend.go index 1708f7664..a2b60d48f 100644 --- a/pkg/common/db/cache/friend.go +++ b/pkg/common/db/cache/friend.go @@ -44,6 +44,8 @@ type FriendCache interface { GetFriend(ctx context.Context, ownerUserID, friendUserID string) (friend *relationtb.FriendModel, err error) // Delete friend when friend info changed DelFriend(ownerUserID, friendUserID string) FriendCache + // Delete friends when friends' info changed + DelFriends(ownerUserID string, friendUserIDs []string) FriendCache } // FriendCacheRedis is an implementation of the FriendCache interface using Redis. @@ -152,3 +154,15 @@ func (f *FriendCacheRedis) DelFriend(ownerUserID, friendUserID string) FriendCac return newFriendCache } + +// DelFriends deletes multiple friend infos from the cache. +func (f *FriendCacheRedis) DelFriends(ownerUserID string, friendUserIDs []string) FriendCache { + newFriendCache := f.NewCache() + + for _, friendUserID := range friendUserIDs { + key := f.getFriendKey(ownerUserID, friendUserID) + newFriendCache.AddKeys(key) // Assuming AddKeys marks the keys for deletion + } + + return newFriendCache +} diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index 924a179ba..3b98f5d7b 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -74,15 +74,8 @@ type FriendDatabase interface { // FindBothFriendRequests finds friend requests sent and received FindBothFriendRequests(ctx context.Context, fromUserID, toUserID string) (friends []*relation.FriendRequestModel, err error) - // UpdateFriendPinStatus updates the pinned status of a friend - UpdateFriendPinStatus(ctx context.Context, ownerUserID string, friendUserID string, isPinned bool) (err error) - - // UpdateFriendRemark updates the remark for a friend - UpdateFriendRemark(ctx context.Context, ownerUserID string, friendUserID string, remark string) (err error) - - // UpdateFriendEx updates the 'ex' field for a friend - UpdateFriendEx(ctx context.Context, ownerUserID string, friendUserID string, ex string) (err error) - + // UpdateFriends updates fields for friends + UpdateFriends(ctx context.Context, ownerUserID string, friendUserIDs []string, val map[string]any) (err error) } type friendDatabase struct { @@ -323,21 +316,12 @@ func (f *friendDatabase) FindFriendUserIDs(ctx context.Context, ownerUserID stri func (f *friendDatabase) FindBothFriendRequests(ctx context.Context, fromUserID, toUserID string) (friends []*relation.FriendRequestModel, err error) { return f.friendRequest.FindBothFriendRequests(ctx, fromUserID, toUserID) } -func (f *friendDatabase) UpdateFriendPinStatus(ctx context.Context, ownerUserID string, friendUserID string, isPinned bool) (err error) { - if err := f.friend.UpdatePinStatus(ctx, ownerUserID, friendUserID, isPinned); err != nil { +func (f *friendDatabase) UpdateFriends(ctx context.Context, ownerUserID string, friendUserIDs []string, val map[string]any) (err error) { + if len(val) == 0 { + return nil + } + if err := f.friend.UpdateFriends(ctx, ownerUserID, friendUserIDs, val); err != nil { return err } - return f.cache.DelFriend(ownerUserID, friendUserID).ExecDel(ctx) -} -func (f *friendDatabase) UpdateFriendRemark(ctx context.Context, ownerUserID string, friendUserID string, remark string) (err error) { - if err := f.friend.UpdateFriendRemark(ctx, ownerUserID, friendUserID, remark); err != nil { - return err - } - return f.cache.DelFriend(ownerUserID, friendUserID).ExecDel(ctx) -} -func (f *friendDatabase) UpdateFriendEx(ctx context.Context, ownerUserID string, friendUserID string, ex string) (err error) { - if err := f.friend.UpdateFriendEx(ctx, ownerUserID, friendUserID, ex); err != nil { - return err - } - return f.cache.DelFriend(ownerUserID, friendUserID).ExecDel(ctx) + return f.cache.DelFriends(ownerUserID, friendUserIDs).ExecDel(ctx) } diff --git a/pkg/common/db/mgo/friend.go b/pkg/common/db/mgo/friend.go index 72289181b..b4172d0fb 100644 --- a/pkg/common/db/mgo/friend.go +++ b/pkg/common/db/mgo/friend.go @@ -16,7 +16,6 @@ package mgo import ( "context" - "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/mgoutil" "github.com/OpenIMSDK/tools/pagination" "go.mongodb.org/mongo-driver/mongo/options" @@ -144,49 +143,22 @@ func (f *FriendMgo) FindFriendUserIDs(ctx context.Context, ownerUserID string) ( return mgoutil.Find[string](ctx, f.coll, filter, options.Find().SetProjection(bson.M{"_id": 0, "friend_user_id": 1})) } -// UpdatePinStatus update friend's pin status -func (f *FriendMgo) UpdatePinStatus(ctx context.Context, ownerUserID string, friendUserID string, isPinned bool) (err error) { - - filter := bson.M{"owner_user_id": ownerUserID, "friend_user_id": friendUserID} - // Create an update operation to set the "is_pinned" field to isPinned for all documents. - update := bson.M{"$set": bson.M{"is_pinned": isPinned}} - - // Perform the update operation for all documents in the collection. - _, err = f.coll.UpdateMany(ctx, filter, update) - - if err != nil { - return errs.Wrap(err, "update pin error") +func (f *FriendMgo) UpdateFriends(ctx context.Context, ownerUserID string, friendUserIDs []string, val map[string]any) error { + // Ensure there are IDs to update + if len(friendUserIDs) == 0 { + return nil // Or return an error if you expect there to always be IDs } - return nil -} -func (f *FriendMgo) UpdateFriendRemark(ctx context.Context, ownerUserID string, friendUserID string, remark string) (err error) { - - filter := bson.M{"owner_user_id": ownerUserID, "friend_user_id": friendUserID} - // Create an update operation to set the "is_pinned" field to isPinned for all documents. - update := bson.M{"$set": bson.M{"remark": remark}} - - // Perform the update operation for all documents in the collection. - _, err = f.coll.UpdateMany(ctx, filter, update) - - if err != nil { - return errs.Wrap(err, "update remark error") + // Create a filter to match documents with the specified ownerUserID and any of the friendUserIDs + filter := bson.M{ + "owner_user_id": ownerUserID, + "friend_user_id": bson.M{"$in": friendUserIDs}, } - return nil -} -func (f *FriendMgo) UpdateFriendEx(ctx context.Context, ownerUserID string, friendUserID string, ex string) (err error) { - - filter := bson.M{"owner_user_id": ownerUserID, "friend_user_id": friendUserID} - // Create an update operation to set the "is_pinned" field to isPinned for all documents. - update := bson.M{"$set": bson.M{"ex": ex}} - - // Perform the update operation for all documents in the collection. - _, err = f.coll.UpdateMany(ctx, filter, update) - - if err != nil { - return errs.Wrap(err, "update ex error") - } - - return nil + // Create an update document + update := bson.M{"$set": val} + + // Perform the update operation for all matching documents + _, err := mgoutil.UpdateMany(ctx, f.coll, filter, update) + return err } diff --git a/pkg/common/db/table/relation/friend.go b/pkg/common/db/table/relation/friend.go index cc337701d..73f7454df 100644 --- a/pkg/common/db/table/relation/friend.go +++ b/pkg/common/db/table/relation/friend.go @@ -57,10 +57,6 @@ type FriendModelInterface interface { FindInWhoseFriends(ctx context.Context, friendUserID string, pagination pagination.Pagination) (total int64, friends []*FriendModel, err error) // FindFriendUserIDs retrieves a list of friend user IDs for a given owner. FindFriendUserIDs(ctx context.Context, ownerUserID string) (friendUserIDs []string, err error) - // UpdatePinStatus update friend's pin status - UpdatePinStatus(ctx context.Context, ownerUserID string, friendUserID string, isPinned bool) (err error) - // UpdateFriendRemark update friend's remark - UpdateFriendRemark(ctx context.Context, ownerUserID string, friendUserID string, remark string) (err error) - // UpdateFriendEx update friend's ex - UpdateFriendEx(ctx context.Context, ownerUserID string, friendUserID string, ex string) (err error) + // UpdateFriends update friends' fields + UpdateFriends(ctx context.Context, ownerUserID string, friendUserIDs []string, val map[string]any) (err error) } diff --git a/pkg/rpcclient/notification/friend.go b/pkg/rpcclient/notification/friend.go index 00759b1b2..b98a1d38e 100644 --- a/pkg/rpcclient/notification/friend.go +++ b/pkg/rpcclient/notification/friend.go @@ -197,7 +197,7 @@ func (f *FriendNotificationSender) FriendRemarkSetNotification(ctx context.Conte return f.Notification(ctx, fromUserID, toUserID, constant.FriendRemarkSetNotification, &tips) } func (f *FriendNotificationSender) FriendsInfoUpdateNotification(ctx context.Context, toUserID string, friendIDs []string) error { - tips := sdkws.FriendsInfoUpdateTips{} + tips := sdkws.FriendsInfoUpdateTips{FromToUserID: &sdkws.FromToUserID{}} tips.FromToUserID.ToUserID = toUserID tips.FriendIDs = friendIDs return f.Notification(ctx, toUserID, toUserID, constant.FriendsInfoUpdateNotification, &tips)