From 8e8ee2b9687467463601b852b6c05c3e5d0538a2 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 13 Jan 2023 14:39:23 +0800 Subject: [PATCH] Error code standardization --- .../db/mysql_model/im_mysql_model/friend_model_k.go | 10 +++++----- .../db/mysql_model/im_mysql_model/user_model_k.go | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) 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 2f7433fcc..14384dff9 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 @@ -58,9 +58,9 @@ func (*Friend) Find(ctx context.Context, ownerUserID string) (friends []*Friend, return friends, err } -func (*Friend) Take(ctx context.Context, ownerUserID, friendUserID string) (group *Group, err error) { - group = &Group{} - defer trace_log.SetCtxDebug(ctx, utils.GetSelfFuncName(), err, "ownerUserID", ownerUserID, "friendUserID", friendUserID, "group", *group) - err = utils.Wrap(FriendDB.Where("owner_user_id = ? and friend_user_id", ownerUserID, friendUserID).Take(group).Error, "") - return group, err +func (*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) + err = utils.Wrap(FriendDB.Where("owner_user_id = ? and friend_user_id", ownerUserID, friendUserID).Take(friend).Error, "") + return friend, err } diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model_k.go b/pkg/common/db/mysql_model/im_mysql_model/user_model_k.go index 71fb601d8..5c0e6e26b 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/user_model_k.go +++ b/pkg/common/db/mysql_model/im_mysql_model/user_model_k.go @@ -56,10 +56,11 @@ func (*User) Find(ctx context.Context, userIDs []string) (users []*User, err err return users, err } -func (*User) Take(ctx context.Context, userIDs []string) (users []*User, err error) { +func (*User) Take(ctx context.Context, userID string) (user *User, err error) { + user = &User{} defer func() { - trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "userIDs", userIDs, "users", users) + trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "userID", userID, "user", *user) }() - err = utils.Wrap(userDB.Where("user_id in (?)", userIDs).Take(&users).Error, "") - return users, err + err = utils.Wrap(userDB.Where("user_id = ?", userID).Take(&user).Error, "") + return user, err }