From 21ea555183900eb1ed474fa7645082fb23eb280b Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Mon, 16 Jan 2023 18:50:05 +0800 Subject: [PATCH] 1 --- .../im_mysql_model/friend_model.go | 162 +++++++++--------- .../im_mysql_model/friend_model_k.go | 2 +- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/friend_model.go b/pkg/common/db/mysql_model/im_mysql_model/friend_model.go index 4bba5931d..b5ef1306a 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/friend_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/friend_model.go @@ -1,83 +1,83 @@ package im_mysql_model -import ( - "fmt" - "time" -) - -func InsertToFriend(toInsertFollow *Friend) error { - toInsertFollow.CreateTime = time.Now() - err := FriendDB.Table("friends").Create(toInsertFollow).Error - if err != nil { - return err - } - return nil -} - -func GetFriendRelationshipFromFriend(OwnerUserID, FriendUserID string) (*Friend, error) { - var friend Friend - err := FriendDB.Table("friends").Where("owner_user_id=? and friend_user_id=?", OwnerUserID, FriendUserID).Take(&friend).Error - if err != nil { - return nil, err - } - return &friend, err -} - -func GetFriendListByUserID(OwnerUserID string) ([]Friend, error) { - var friends []Friend - var x Friend - x.OwnerUserID = OwnerUserID - err := FriendDB.Table("friends").Where("owner_user_id=?", OwnerUserID).Find(&friends).Error - if err != nil { - return nil, err - } - return friends, nil -} - -func GetFriendIDListByUserID(OwnerUserID string) ([]string, error) { - var friendIDList []string - err := FriendDB.Table("friends").Where("owner_user_id=?", OwnerUserID).Pluck("friend_user_id", &friendIDList).Error - if err != nil { - return nil, err - } - return friendIDList, nil -} - -func UpdateFriendComment(OwnerUserID, FriendUserID, Remark string) error { - return FriendDB.Exec("update friends set remark=? where owner_user_id=? and friend_user_id=?", Remark, OwnerUserID, FriendUserID).Error -} - -func DeleteSingleFriendInfo(OwnerUserID, FriendUserID string) error { - return FriendDB.Table("friends").Where("owner_user_id=? and friend_user_id=?", OwnerUserID, FriendUserID).Delete(Friend{}).Error -} - -type FriendUser struct { - Friend - Nickname string `gorm:"column:name;size:255"` -} - -func GetUserFriendsCMS(ownerUserID, friendUserName string, pageNumber, showNumber int32) (friendUserList []*FriendUser, count int64, err error) { - db := FriendDB.Table("friends"). - Select("friends.*, users.name"). - Where("friends.owner_user_id=?", ownerUserID).Limit(int(showNumber)). - Joins("left join users on friends.friend_user_id = users.user_id"). - Offset(int(showNumber * (pageNumber - 1))) - if friendUserName != "" { - db = db.Where("users.name like ?", fmt.Sprintf("%%%s%%", friendUserName)) - } - if err = db.Count(&count).Error; err != nil { - return - } - err = db.Find(&friendUserList).Error - return -} - -func GetFriendByIDCMS(ownerUserID, friendUserID string) (friendUser *FriendUser, err error) { - friendUser = &FriendUser{} - err = FriendDB.Table("friends"). - Select("friends.*, users.name"). - Where("friends.owner_user_id=? and friends.friend_user_id=?", ownerUserID, friendUserID). - Joins("left join users on friends.friend_user_id = users.user_id"). - Take(friendUser).Error - return friendUser, err -} +//import ( +// "fmt" +// "time" +//) +// +//func InsertToFriend(toInsertFollow *Friend) error { +// toInsertFollow.CreateTime = time.Now() +// err := FriendDB.Table("friends").Create(toInsertFollow).Error +// if err != nil { +// return err +// } +// return nil +//} +// +//func GetFriendRelationshipFromFriend(OwnerUserID, FriendUserID string) (*Friend, error) { +// var friend Friend +// err := FriendDB.Table("friends").Where("owner_user_id=? and friend_user_id=?", OwnerUserID, FriendUserID).Take(&friend).Error +// if err != nil { +// return nil, err +// } +// return &friend, err +//} +// +//func GetFriendListByUserID(OwnerUserID string) ([]Friend, error) { +// var friends []Friend +// var x Friend +// x.OwnerUserID = OwnerUserID +// err := FriendDB.Table("friends").Where("owner_user_id=?", OwnerUserID).Find(&friends).Error +// if err != nil { +// return nil, err +// } +// return friends, nil +//} +// +//func GetFriendIDListByUserID(OwnerUserID string) ([]string, error) { +// var friendIDList []string +// err := FriendDB.Table("friends").Where("owner_user_id=?", OwnerUserID).Pluck("friend_user_id", &friendIDList).Error +// if err != nil { +// return nil, err +// } +// return friendIDList, nil +//} +// +//func UpdateFriendComment(OwnerUserID, FriendUserID, Remark string) error { +// return FriendDB.Exec("update friends set remark=? where owner_user_id=? and friend_user_id=?", Remark, OwnerUserID, FriendUserID).Error +//} +// +//func DeleteSingleFriendInfo(OwnerUserID, FriendUserID string) error { +// return FriendDB.Table("friends").Where("owner_user_id=? and friend_user_id=?", OwnerUserID, FriendUserID).Delete(Friend{}).Error +//} +// +//type FriendUser struct { +// Friend +// Nickname string `gorm:"column:name;size:255"` +//} +// +//func GetUserFriendsCMS(ownerUserID, friendUserName string, pageNumber, showNumber int32) (friendUserList []*FriendUser, count int64, err error) { +// db := FriendDB.Table("friends"). +// Select("friends.*, users.name"). +// Where("friends.owner_user_id=?", ownerUserID).Limit(int(showNumber)). +// Joins("left join users on friends.friend_user_id = users.user_id"). +// Offset(int(showNumber * (pageNumber - 1))) +// if friendUserName != "" { +// db = db.Where("users.name like ?", fmt.Sprintf("%%%s%%", friendUserName)) +// } +// if err = db.Count(&count).Error; err != nil { +// return +// } +// err = db.Find(&friendUserList).Error +// return +//} +// +//func GetFriendByIDCMS(ownerUserID, friendUserID string) (friendUser *FriendUser, err error) { +// friendUser = &FriendUser{} +// err = FriendDB.Table("friends"). +// Select("friends.*, users.name"). +// Where("friends.owner_user_id=? and friends.friend_user_id=?", ownerUserID, friendUserID). +// Joins("left join users on friends.friend_user_id = users.user_id"). +// Take(friendUser).Error +// return friendUser, err +//} diff --git a/pkg/common/db/mysql_model/im_mysql_model/friend_model_k.go b/pkg/common/db/mysql_model/im_mysql_model/friend_model_k.go index cdb317db9..dfbae4e87 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/friend_model_k.go +++ b/pkg/common/db/mysql_model/im_mysql_model/friend_model_k.go @@ -68,7 +68,7 @@ func (f *Friend) Find(ctx context.Context, ownerUserID string) (friends []*Frien 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, "group", *friend) + defer trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friendUserID", friendUserID, "friend", friend) return friend, utils.Wrap(f.db.Where("owner_user_id = ? and friend_user_id", ownerUserID, friendUserID).Take(friend).Error, "") }