diff --git a/internal/rpc/friend/black.go b/internal/rpc/friend/black.go index 2c8cb4dde..fd840c5a4 100644 --- a/internal/rpc/friend/black.go +++ b/internal/rpc/friend/black.go @@ -20,7 +20,7 @@ func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *pbFriend.Ge pageNumber = req.Pagination.PageNumber showNumber = req.Pagination.ShowNumber } - blacks, total, err := s.BlackDatabase.FindOwnerBlacks(ctx, req.UserID, pageNumber, showNumber) + blacks, total, err := s.blackDatabase.FindOwnerBlacks(ctx, req.UserID, pageNumber, showNumber) if err != nil { return nil, err } @@ -34,7 +34,7 @@ func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *pbFriend.Ge } func (s *friendServer) IsBlack(ctx context.Context, req *pbFriend.IsBlackReq) (*pbFriend.IsBlackResp, error) { - in1, in2, err := s.BlackDatabase.CheckIn(ctx, req.UserID1, req.UserID2) + in1, in2, err := s.blackDatabase.CheckIn(ctx, req.UserID1, req.UserID2) if err != nil { return nil, err } @@ -48,7 +48,7 @@ func (s *friendServer) RemoveBlack(ctx context.Context, req *pbFriend.RemoveBlac if err := s.userCheck.Access(ctx, req.OwnerUserID); err != nil { return nil, err } - if err := s.BlackDatabase.Delete(ctx, []*relation.BlackModel{{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID}}); err != nil { + if err := s.blackDatabase.Delete(ctx, []*relation.BlackModel{{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID}}); err != nil { return nil, err } s.notification.BlackDeletedNotification(ctx, req) @@ -64,7 +64,7 @@ func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) return nil, err } black := relation.BlackModel{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: mcontext.GetOpUserID(ctx), CreateTime: time.Now()} - if err := s.BlackDatabase.Create(ctx, []*relation.BlackModel{&black}); err != nil { + if err := s.blackDatabase.Create(ctx, []*relation.BlackModel{&black}); err != nil { return nil, err } s.notification.BlackAddedNotification(ctx, req) diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index f5a5e6839..3337b3089 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -22,8 +22,8 @@ import ( ) type friendServer struct { - controller.FriendDatabase - controller.BlackDatabase + friendDatabase controller.FriendDatabase + blackDatabase controller.BlackDatabase notification *notification.Check userCheck *check.UserCheck RegisterCenter registry.SvcDiscoveryRegistry @@ -44,8 +44,8 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error { blackDB := relation.NewBlackGorm(db) friendDB := relation.NewFriendGorm(db) pbfriend.RegisterFriendServer(server, &friendServer{ - FriendDatabase: controller.NewFriendDatabase(friendDB, relation.NewFriendRequestGorm(db), cache.NewFriendCacheRedis(rdb, friendDB, cache.GetDefaultOpt()), tx.NewGorm(db)), - BlackDatabase: controller.NewBlackDatabase(blackDB, cache.NewBlackCacheRedis(rdb, blackDB, cache.GetDefaultOpt())), + friendDatabase: controller.NewFriendDatabase(friendDB, relation.NewFriendRequestGorm(db), cache.NewFriendCacheRedis(rdb, friendDB, cache.GetDefaultOpt()), tx.NewGorm(db)), + blackDatabase: controller.NewBlackDatabase(blackDB, cache.NewBlackCacheRedis(rdb, blackDB, cache.GetDefaultOpt())), notification: notification.NewCheck(client), userCheck: check.NewUserCheck(client), RegisterCenter: client, @@ -69,14 +69,14 @@ func (s *friendServer) ApplyToAddFriend(ctx context.Context, req *pbfriend.Apply if _, err := s.userCheck.GetUsersInfoMap(ctx, []string{req.ToUserID, req.FromUserID}, true); err != nil { return nil, err } - in1, in2, err := s.FriendDatabase.CheckIn(ctx, req.FromUserID, req.ToUserID) + in1, in2, err := s.friendDatabase.CheckIn(ctx, req.FromUserID, req.ToUserID) if err != nil { return nil, err } if in1 && in2 { return nil, errs.ErrRelationshipAlready.Wrap() } - if err = s.FriendDatabase.AddFriendRequest(ctx, req.FromUserID, req.ToUserID, req.ReqMsg, req.Ex); err != nil { + if err = s.friendDatabase.AddFriendRequest(ctx, req.FromUserID, req.ToUserID, req.ReqMsg, req.Ex); err != nil { return nil, err } s.notification.FriendApplicationAddNotification(ctx, req) @@ -100,7 +100,7 @@ func (s *friendServer) ImportFriends(ctx context.Context, req *pbfriend.ImportFr return nil, errs.ErrArgs.Wrap("friend userID repeated") } - if err := s.FriendDatabase.BecomeFriends(ctx, req.OwnerUserID, req.FriendUserIDs, constant.BecomeFriendByImport); err != nil { + if err := s.friendDatabase.BecomeFriends(ctx, req.OwnerUserID, req.FriendUserIDs, constant.BecomeFriendByImport); err != nil { return nil, err } return &pbfriend.ImportFriendResp{}, nil @@ -113,9 +113,10 @@ func (s *friendServer) RespondFriendApply(ctx context.Context, req *pbfriend.Res if err := tokenverify.CheckAccessV3(ctx, req.FromUserID); err != nil { return nil, err } + friendRequest := tablerelation.FriendRequestModel{FromUserID: req.ToUserID, ToUserID: req.FromUserID, HandleMsg: req.HandleMsg, HandleResult: req.HandleResult} if req.HandleResult == constant.FriendResponseAgree { - err := s.AgreeFriendRequest(ctx, &friendRequest) + err := s.friendDatabase.AgreeFriendRequest(ctx, &friendRequest) if err != nil { return nil, err } @@ -123,7 +124,7 @@ func (s *friendServer) RespondFriendApply(ctx context.Context, req *pbfriend.Res return resp, nil } if req.HandleResult == constant.FriendResponseRefuse { - err := s.RefuseFriendRequest(ctx, &friendRequest) + err := s.friendDatabase.RefuseFriendRequest(ctx, &friendRequest) if err != nil { return nil, err } @@ -140,11 +141,11 @@ func (s *friendServer) DeleteFriend(ctx context.Context, req *pbfriend.DeleteFri if err := s.userCheck.Access(ctx, req.OwnerUserID); err != nil { return nil, err } - _, err = s.FindFriendsWithError(ctx, req.OwnerUserID, []string{req.FriendUserID}) + _, err = s.friendDatabase.FindFriendsWithError(ctx, req.OwnerUserID, []string{req.FriendUserID}) if err != nil { return nil, err } - if err := s.FriendDatabase.Delete(ctx, req.OwnerUserID, []string{req.FriendUserID}); err != nil { + if err := s.friendDatabase.Delete(ctx, req.OwnerUserID, []string{req.FriendUserID}); err != nil { return nil, err } s.notification.FriendDeletedNotification(ctx, req) @@ -158,11 +159,11 @@ func (s *friendServer) SetFriendRemark(ctx context.Context, req *pbfriend.SetFri if err := s.userCheck.Access(ctx, req.OwnerUserID); err != nil { return nil, err } - _, err = s.FindFriendsWithError(ctx, req.OwnerUserID, []string{req.FriendUserID}) + _, err = s.friendDatabase.FindFriendsWithError(ctx, req.OwnerUserID, []string{req.FriendUserID}) if err != nil { return nil, err } - if err := s.FriendDatabase.UpdateRemark(ctx, req.OwnerUserID, req.FriendUserID, req.Remark); err != nil { + if err := s.friendDatabase.UpdateRemark(ctx, req.OwnerUserID, req.FriendUserID, req.Remark); err != nil { return nil, err } s.notification.FriendRemarkSetNotification(ctx, req.OwnerUserID, req.FriendUserID) @@ -176,7 +177,7 @@ func (s *friendServer) GetDesignatedFriends(ctx context.Context, req *pbfriend.G if utils.Duplicate(req.FriendUserIDs) { return nil, errs.ErrArgs.Wrap("friend userID repeated") } - friends, err := s.FriendDatabase.FindFriendsWithError(ctx, req.OwnerUserID, req.FriendUserIDs) + friends, err := s.friendDatabase.FindFriendsWithError(ctx, req.OwnerUserID, req.FriendUserIDs) if err != nil { return nil, err } @@ -194,7 +195,7 @@ func (s *friendServer) GetPaginationFriendsApplyTo(ctx context.Context, req *pbf return nil, err } pageNumber, showNumber := utils.GetPage(req.Pagination) - friendRequests, total, err := s.FriendDatabase.PageFriendRequestToMe(ctx, req.UserID, pageNumber, showNumber) + friendRequests, total, err := s.friendDatabase.PageFriendRequestToMe(ctx, req.UserID, pageNumber, showNumber) if err != nil { return nil, err } @@ -214,7 +215,7 @@ func (s *friendServer) GetPaginationFriendsApplyFrom(ctx context.Context, req *p return nil, err } pageNumber, showNumber := utils.GetPage(req.Pagination) - friendRequests, total, err := s.FriendDatabase.PageFriendRequestFromMe(ctx, req.UserID, pageNumber, showNumber) + friendRequests, total, err := s.friendDatabase.PageFriendRequestFromMe(ctx, req.UserID, pageNumber, showNumber) if err != nil { return nil, err } @@ -230,7 +231,7 @@ func (s *friendServer) GetPaginationFriendsApplyFrom(ctx context.Context, req *p func (s *friendServer) IsFriend(ctx context.Context, req *pbfriend.IsFriendReq) (resp *pbfriend.IsFriendResp, err error) { defer log.ZInfo(ctx, utils.GetFuncName()+" Return") resp = &pbfriend.IsFriendResp{} - resp.InUser1Friends, resp.InUser2Friends, err = s.FriendDatabase.CheckIn(ctx, req.UserID1, req.UserID2) + resp.InUser1Friends, resp.InUser2Friends, err = s.friendDatabase.CheckIn(ctx, req.UserID1, req.UserID2) if err != nil { return nil, err } @@ -244,7 +245,7 @@ func (s *friendServer) GetPaginationFriends(ctx context.Context, req *pbfriend.G return nil, err } pageNumber, showNumber := utils.GetPage(req.Pagination) - friends, total, err := s.FriendDatabase.PageOwnerFriends(ctx, req.UserID, pageNumber, showNumber) + friends, total, err := s.friendDatabase.PageOwnerFriends(ctx, req.UserID, pageNumber, showNumber) if err != nil { return nil, err } @@ -263,7 +264,7 @@ func (s *friendServer) GetFriendIDs(ctx context.Context, req *pbfriend.GetFriend return nil, err } resp = &pbfriend.GetFriendIDsResp{} - resp.FriendIDs, err = s.FriendDatabase.FindFriendUserIDs(ctx, req.UserID) + resp.FriendIDs, err = s.friendDatabase.FindFriendUserIDs(ctx, req.UserID) if err != nil { return nil, err } diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index 09aaf5451..81f62c280 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -157,54 +157,77 @@ func (f *friendDatabase) RefuseFriendRequest(ctx context.Context, friendRequest // 同意好友申请 (1)检查是否有申请记录且为未处理状态 （没有记录返回错误） (2)检查是否好友（不返回错误） (3) 不是好友则建立双向好友关系 （4）修改申请记录 已同意 func (f *friendDatabase) AgreeFriendRequest(ctx context.Context, friendRequest *relation.FriendRequestModel) (err error) { return f.tx.Transaction(func(tx any) error { - _, err = f.friendRequest.NewTx(tx).Take(ctx, friendRequest.FromUserID, friendRequest.ToUserID) + fr, err := f.friendRequest.NewTx(tx).Take(ctx, friendRequest.FromUserID, friendRequest.ToUserID) if err != nil { return err } - friendRequest.HandlerUserID = friendRequest.FromUserID + _ = fr + //if fr.HandleResult != 0 { + // return errs.ErrArgs.Wrap("the friend request has been processed") + //} + friendRequest.HandlerUserID = mcontext.GetOpUserID(ctx) friendRequest.HandleResult = constant.FriendResponseAgree friendRequest.HandleTime = time.Now() err = f.friendRequest.NewTx(tx).Update(ctx, friendRequest) if err != nil { return err } - - ownerUserID := friendRequest.FromUserID - friendUserIDs := []string{friendRequest.ToUserID} - addSource := int32(constant.BecomeFriendByApply) - OperatorUserID := friendRequest.FromUserID - //先find 找出重复的 去掉重复的 - fs1, err := f.friend.NewTx(tx).FindFriends(ctx, ownerUserID, friendUserIDs) + exists, err := f.friend.NewTx(tx).FindUserState(ctx, friendRequest.FromUserID, friendRequest.ToUserID) if err != nil { return err } - for _, v := range friendUserIDs { - fs1 = append(fs1, &relation.FriendModel{OwnerUserID: ownerUserID, FriendUserID: v, AddSource: addSource, OperatorUserID: OperatorUserID}) + existsMap := utils.SliceSet(utils.Slice(exists, func(friend *relation.FriendModel) [2]string { + return [...]string{friend.OwnerUserID, friend.FriendUserID} // 自己 - 好友 + })) + var adds []*relation.FriendModel + if _, ok := existsMap[[...]string{friendRequest.ToUserID, friendRequest.FromUserID}]; !ok { // 自己 - 好友 + adds = append(adds, &relation.FriendModel{OwnerUserID: friendRequest.ToUserID, FriendUserID: friendRequest.FromUserID, AddSource: int32(constant.BecomeFriendByApply), OperatorUserID: friendRequest.FromUserID}) } - fs11 := utils.DistinctAny(fs1, func(e *relation.FriendModel) string { - return e.FriendUserID - }) - - err = f.friend.NewTx(tx).Create(ctx, fs11) - if err != nil { - return err + if _, ok := existsMap[[...]string{friendRequest.FromUserID, friendRequest.ToUserID}]; !ok { // 好友 - 自己 + adds = append(adds, &relation.FriendModel{OwnerUserID: friendRequest.FromUserID, FriendUserID: friendRequest.ToUserID, AddSource: int32(constant.BecomeFriendByApply), OperatorUserID: friendRequest.FromUserID}) } - - fs2, err := f.friend.NewTx(tx).FindReversalFriends(ctx, ownerUserID, friendUserIDs) - if err != nil { - return err + if len(adds) > 0 { + if err := f.friend.NewTx(tx).Create(ctx, adds); err != nil { + return err + } } - for _, v := range friendUserIDs { - fs2 = append(fs2, &relation.FriendModel{OwnerUserID: v, FriendUserID: ownerUserID, AddSource: addSource, OperatorUserID: OperatorUserID}) - } - fs22 := utils.DistinctAny(fs2, func(e *relation.FriendModel) string { - return e.OwnerUserID - }) - err = f.friend.NewTx(tx).Create(ctx, fs22) - if err != nil { - return err - } - return f.cache.DelFriendIDs(ownerUserID, friendRequest.ToUserID).ExecDel(ctx) + return f.cache.DelFriendIDs(friendRequest.ToUserID, friendRequest.FromUserID).ExecDel(ctx) + //ownerUserID := friendRequest.FromUserID + //friendUserIDs := []string{friendRequest.ToUserID} + //addSource := int32(constant.BecomeFriendByApply) + //OperatorUserID := friendRequest.FromUserID + ////先find 找出重复的 去掉重复的 + //fs1, err := f.friend.NewTx(tx).FindFriends(ctx, ownerUserID, friendUserIDs) + //if err != nil { + // return err + //} + //for _, v := range friendUserIDs { + // fs1 = append(fs1, &relation.FriendModel{OwnerUserID: ownerUserID, FriendUserID: v, AddSource: addSource, OperatorUserID: OperatorUserID}) + //} + //fs11 := utils.DistinctAny(fs1, func(e *relation.FriendModel) string { + // return e.FriendUserID + //}) + // + //err = f.friend.NewTx(tx).Create(ctx, fs11) + //if err != nil { + // return err + //} + // + //fs2, err := f.friend.NewTx(tx).FindReversalFriends(ctx, ownerUserID, friendUserIDs) + //if err != nil { + // return err + //} + //for _, v := range friendUserIDs { + // fs2 = append(fs2, &relation.FriendModel{OwnerUserID: v, FriendUserID: ownerUserID, AddSource: addSource, OperatorUserID: OperatorUserID}) + //} + //fs22 := utils.DistinctAny(fs2, func(e *relation.FriendModel) string { + // return e.OwnerUserID + //}) + //err = f.friend.NewTx(tx).Create(ctx, fs22) + //if err != nil { + // return err + //} + //return f.cache.DelFriendIDs(ownerUserID, friendRequest.ToUserID).ExecDel(ctx) }) }