1

pkg/common/db/model/black.go

@@ -0,0 +1,40 @@
+package model
+
+import (
+	"Open_IM/pkg/common/db/cache"
+	"Open_IM/pkg/common/db/mysql"
+	"context"
+)
+
+type BlackModel struct {
+	db    *mysql.Black
+	cache *cache.GroupCache
+}
+
+func (b *BlackModel) Create(ctx context.Context, blacks []*mysql.Black) (err error) {
+	return b.db.Create(ctx, blacks)
+}
+
+func (b *BlackModel) Delete(ctx context.Context, blacks []*mysql.Black) (err error) {
+	return b.db.Delete(ctx, blacks)
+}
+
+func (b *BlackModel) UpdateByMap(ctx context.Context, ownerUserID, blockUserID string, args map[string]interface{}) (err error) {
+	return b.db.UpdateByMap(ctx, ownerUserID, blockUserID, args)
+}
+
+func (b *BlackModel) Update(ctx context.Context, blacks []*mysql.Black) (err error) {
+	return b.db.Update(ctx, blacks)
+}
+
+func (b *BlackModel) Find(ctx context.Context, blacks []*mysql.Black) (blackList []*mysql.Black, err error) {
+	return b.db.Find(ctx, blacks)
+}
+
+func (b *BlackModel) Take(ctx context.Context, blackID string) (black *mysql.Black, err error) {
+	return b.db.Take(ctx, blackID)
+}
+
+func (b *BlackModel) FindByOwnerUserID(ctx context.Context, ownerUserID string) (blackList []*mysql.Black, err error) {
+	return b.db.FindByOwnerUserID(ctx, ownerUserID)
+}

pkg/common/db/model/friend.go

@@ -0,0 +1,60 @@
+package model
+
+import (
+	"Open_IM/pkg/common/db/cache"
+	"Open_IM/pkg/common/db/mysql"
+	"context"
+	"errors"
+	"gorm.io/gorm"
+)
+
+type FriendModel struct {
+	db    *mysql.Friend
+	cache *cache.GroupCache
+}
+
+func (f *FriendModel) Create(ctx context.Context, friends []*mysql.Friend) (err error) {
+	return f.db.Create(ctx, friends)
+}
+
+func (f *FriendModel) Delete(ctx context.Context, ownerUserID string, friendUserIDs string) (err error) {
+	return f.db.Delete(ctx, ownerUserID, friendUserIDs)
+}
+
+func (f *FriendModel) UpdateByMap(ctx context.Context, ownerUserID string, args map[string]interface{}) (err error) {
+	return f.db.UpdateByMap(ctx, ownerUserID, args)
+}
+
+func (f *FriendModel) Update(ctx context.Context, friends []*mysql.Friend) (err error) {
+	return f.db.Update(ctx, friends)
+}
+
+func (f *FriendModel) UpdateRemark(ctx context.Context, ownerUserID, friendUserID, remark string) (err error) {
+	return f.db.UpdateRemark(ctx, ownerUserID, friendUserID, remark)
+}
+
+func (f *FriendModel) FindOwnerUserID(ctx context.Context, ownerUserID string) (friends []*mysql.Friend, err error) {
+	return f.db.FindOwnerUserID(ctx, ownerUserID)
+}
+
+func (f *FriendModel) FindFriendUserID(ctx context.Context, friendUserID string) (friends []*mysql.Friend, err error) {
+	return f.db.FindFriendUserID(ctx, friendUserID)
+}
+
+func (f *FriendModel) Take(ctx context.Context, ownerUserID, friendUserID string) (friend *mysql.Friend, err error) {
+	return f.db.Take(ctx, ownerUserID, friendUserID)
+}
+
+func (f *FriendModel) FindUserState(ctx context.Context, userID1, userID2 string) (friends []*mysql.Friend, err error) {
+	return f.db.FindUserState(ctx, userID1, userID2)
+}
+
+func (f *FriendModel) IsExist(ctx context.Context, ownerUserID, friendUserID string) (bool, error) {
+	if _, err := f.Take(ctx, ownerUserID, friendUserID); err == nil {
+		return true, nil
+	} else if errors.Is(err, gorm.ErrRecordNotFound) {
+		return false, nil
+	} else {
+		return false, err
+	}
+}

pkg/common/db/model/friend_request.go

@@ -0,0 +1,44 @@
+package model
+
+import (
+	"Open_IM/pkg/common/db/cache"
+	"Open_IM/pkg/common/db/mysql"
+	"context"
+)
+
+type FriendRequestModel struct {
+	db    *mysql.FriendRequest
+	cache *cache.GroupCache
+}
+
+func (f *FriendRequestModel) Create(ctx context.Context, friends []*mysql.FriendRequest) (err error) {
+	return f.db.Create(ctx, friends)
+}
+
+func (f *FriendRequestModel) Delete(ctx context.Context, fromUserID, toUserID string) (err error) {
+	return f.db.Delete(ctx, fromUserID, toUserID)
+}
+
+func (f *FriendRequestModel) UpdateByMap(ctx context.Context, ownerUserID string, args map[string]interface{}) (err error) {
+	return f.db.UpdateByMap(ctx, ownerUserID, args)
+}
+
+func (f *FriendRequestModel) Update(ctx context.Context, friends []*mysql.FriendRequest) (err error) {
+	return f.db.Update(ctx, friends)
+}
+
+func (f *FriendRequestModel) Find(ctx context.Context, ownerUserID string) (friends []*mysql.FriendRequest, err error) {
+	return f.db.Find(ctx, ownerUserID)
+}
+
+func (f *FriendRequestModel) Take(ctx context.Context, fromUserID, toUserID string) (friend *mysql.FriendRequest, err error) {
+	return f.db.Take(ctx, fromUserID, toUserID)
+}
+
+func (f *FriendRequestModel) FindToUserID(ctx context.Context, toUserID string) (friends []*mysql.FriendRequest, err error) {
+	return f.db.FindToUserID(ctx, toUserID)
+}
+
+func (f *FriendRequestModel) FindFromUserID(ctx context.Context, fromUserID string) (friends []*mysql.FriendRequest, err error) {
+	return f.db.FindFromUserID(ctx, fromUserID)
+}

pkg/common/db/mysql/black.go

@@ -52,7 +52,7 @@ func (b *Black) Update(ctx context.Context, blacks []*Black) (err error) {
 	return utils.Wrap(b.DB.Updates(&blacks).Error, "")
 }
 
-func (b *Black) Find(ctx context.Context, blacks []Black) (blackList []*Black, err error) {
+func (b *Black) Find(ctx context.Context, blacks []*Black) (blackList []*Black, err error) {
 	defer func() {
 		trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "blacks", blacks, "blackList", blackList)
 	}()

pkg/common/db/mysql/friend_model_k.go

@@ -61,13 +61,20 @@ func (f *Friend) UpdateRemark(ctx context.Context, ownerUserID, friendUserID, re
 	return utils.Wrap(f.DB.Model(f).Where("owner_user_id = ? and friend_user_id = ?", ownerUserID, friendUserID).Update("remark", remark).Error, "")
 }
 
-func (f *Friend) Find(ctx context.Context, ownerUserID string) (friends []*Friend, err error) {
+func (f *Friend) FindOwnerUserID(ctx context.Context, ownerUserID string) (friends []*Friend, err error) {
 	defer func() {
 		trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friends", friends)
 	}()
 	return friends, utils.Wrap(f.DB.Where("owner_user_id = ?", ownerUserID).Find(&friends).Error, "")
 }
 
+func (f *Friend) FindFriendUserID(ctx context.Context, friendUserID string) (friends []*Friend, err error) {
+	defer func() {
+		trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "friendUserID", friendUserID, "friends", friends)
+	}()
+	return friends, utils.Wrap(f.DB.Where("friend_user_id = ?", friendUserID).Find(&friends).Error, "")
+}
+
 func (f *Friend) Take(ctx context.Context, ownerUserID, friendUserID string) (friend *Friend, err error) {
 	friend = &Friend{}
 	defer trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friendUserID", friendUserID, "friend", friend)

pkg/common/db/mysql/friend_request_model.go

@@ -33,16 +33,14 @@ func (f *FriendRequest) Create(ctx context.Context, friends []*FriendRequest) (e
 	defer func() {
 		trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "friends", friends)
 	}()
-	err = utils.Wrap(f.DB.Create(&friends).Error, "")
-	return err
+	return utils.Wrap(f.DB.Create(&friends).Error, "")
 }
 
 func (f *FriendRequest) Delete(ctx context.Context, fromUserID, toUserID string) (err error) {
 	defer func() {
 		trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "fromUserID", fromUserID, "toUserID", toUserID)
 	}()
-	err = utils.Wrap(f.DB.Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Delete(&FriendRequest{}).Error, "")
-	return err
+	return utils.Wrap(f.DB.Where("from_user_id = ? and to_user_id = ?", fromUserID, toUserID).Delete(&FriendRequest{}).Error, "")
 }
 
 func (f *FriendRequest) UpdateByMap(ctx context.Context, ownerUserID string, args map[string]interface{}) (err error) {
@@ -63,15 +61,13 @@ func (f *FriendRequest) Find(ctx context.Context, ownerUserID string) (friends [
 	defer func() {
 		trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friends", friends)
 	}()
-	err = utils.Wrap(f.DB.Where("owner_user_id = ?", ownerUserID).Find(&friends).Error, "")
-	return friends, err
+	return friends, utils.Wrap(f.DB.Where("owner_user_id = ?", ownerUserID).Find(&friends).Error, "")
 }
 
 func (f *FriendRequest) Take(ctx context.Context, fromUserID, toUserID string) (friend *FriendRequest, err error) {
 	friend = &FriendRequest{}
 	defer trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "fromUserID", fromUserID, "toUserID", toUserID, "friend", friend)
-	err = utils.Wrap(f.DB.Where("from_user_id = ? and to_user_id", fromUserID, toUserID).Take(friend).Error, "")
-	return friend, err
+	return friend, utils.Wrap(f.DB.Where("from_user_id = ? and to_user_id", fromUserID, toUserID).Take(friend).Error, "")
 }
 
 func (f *FriendRequest) FindToUserID(ctx context.Context, toUserID string) (friends []*FriendRequest, err error) {