From 8c39062998d6c5911f2c7525a1da685e50374c2c Mon Sep 17 00:00:00 2001 From: Michael Li Date: Fri, 18 Aug 2023 14:55:29 +0800 Subject: [PATCH] sqlx: follow item add created_on field --- internal/dao/sakila/following.go | 21 +++++++++++---------- internal/dao/sakila/yesql/cc/yesql.go | 6 +++--- internal/dao/sakila/yesql/yesql.sql | 6 ++++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/internal/dao/sakila/following.go b/internal/dao/sakila/following.go index e1a7cc12..f257254a 100644 --- a/internal/dao/sakila/following.go +++ b/internal/dao/sakila/following.go @@ -22,6 +22,7 @@ type followItem struct { Username string Nickname string Avatar string + CreateOn int64 } type followingManageSrv struct { @@ -51,11 +52,11 @@ func (s *followingManageSrv) ListFollows(userId int64, limit, offset int) (res * } for _, f := range follows { res.Contacts = append(res.Contacts, ms.ContactItem{ - UserId: f.UserId, - Username: f.Username, - Nickname: f.Nickname, - Avatar: f.Avatar, - IsFollow: true, + UserId: f.UserId, + Username: f.Username, + Nickname: f.Nickname, + Avatar: f.Avatar, + CreatedOn: f.CreateOn, }) } return @@ -69,11 +70,11 @@ func (s *followingManageSrv) ListFollowings(userId int64, limit, offset int) (re } for _, f := range followings { res.Contacts = append(res.Contacts, ms.ContactItem{ - UserId: f.UserId, - Username: f.Username, - Nickname: f.Nickname, - Avatar: f.Avatar, - IsFollow: s.IsFollow(userId, f.UserId), + UserId: f.UserId, + Username: f.Username, + Nickname: f.Nickname, + Avatar: f.Avatar, + CreatedOn: f.CreateOn, }) } return diff --git a/internal/dao/sakila/yesql/cc/yesql.go b/internal/dao/sakila/yesql/cc/yesql.go index 39b4a01f..0833bb47 100644 --- a/internal/dao/sakila/yesql/cc/yesql.go +++ b/internal/dao/sakila/yesql/cc/yesql.go @@ -54,9 +54,9 @@ const ( _FollowingManager_CountFollows = `SELECT count(*) FROM @following WHERE user_id=? AND is_del=0` _FollowingManager_CreateFollowing = `INSERT INTO @following (user_id, follow_id, created_on) VALUES (?, ?, ?)` _FollowingManager_DeleteFollowing = `UPDATE @following SET is_del=0, deleted_on=? WHERE user_id=? AND follow_id=? AND is_del=0` - _FollowingManager_ExistFollowing = `SELECT 1 FROM @following WHERE user_id=? AND follow_id AND is_del=0` - _FollowingManager_ListFollowings = `SELECT u.user_id user_id, u.username username, u.nickname nickname, u.avatar avatar FROM @following f JOIN @user u ON f.user_id=u.id WHERE f.follow_id=? AND f.is_del=0 ORDER BY u.nickname ASC LIMIT ? OFFSET ?` - _FollowingManager_ListFollows = `SELECT u.user_id user_id, u.username username, u.nickname nickname, u.avatar avatar FROM @following f JOIN @user u ON f.follow_id=u.id WHERE f.user_id=? AND f.is_del=0 ORDER BY u.nickname ASC LIMIT ? OFFSET ?` + _FollowingManager_ExistFollowing = `SELECT 1 FROM @following WHERE user_id=? AND follow_id=? AND is_del=0` + _FollowingManager_ListFollowings = `SELECT u.user_id user_id, u.username username, u.nickname nickname, u.avatar avatar, u.created_on created_on FROM @following f JOIN @user u ON f.user_id=u.id WHERE f.follow_id=? AND f.is_del=0 ORDER BY u.nickname ASC LIMIT ? OFFSET ?` + _FollowingManager_ListFollows = `SELECT u.user_id user_id, u.username username, u.nickname nickname, u.avatar avatar, u.created_on created_on FROM @following f JOIN @user u ON f.follow_id=u.id WHERE f.user_id=? AND f.is_del=0 ORDER BY u.nickname ASC LIMIT ? OFFSET ?` _Message_CreateMessage = `INSERT INTO @message (sender_user_id, receiver_user_id, type, brief, content, post_id, comment_id, reply_id, created_on) VALUES (:sender_user_id, :receiver_user_id, :type, :brief, :content, :post_id, :comment_id, :reply_id, :created_on)` _Message_GetMessageById = `SELECT * FROM @message WHERE id=? AND is_del=0` _Message_GetMessageCount = `SELECT count(*) FROM @message WHERE receiver_user_id=:recerver_user_id AND is_del=0` diff --git a/internal/dao/sakila/yesql/yesql.sql b/internal/dao/sakila/yesql/yesql.sql index e0da193e..713b008d 100644 --- a/internal/dao/sakila/yesql/yesql.sql +++ b/internal/dao/sakila/yesql/yesql.sql @@ -164,7 +164,8 @@ WHERE user_id=? AND follow_id=? AND is_del=0; SELECT u.user_id user_id, u.username username, u.nickname nickname, - u.avatar avatar + u.avatar avatar, + u.created_on created_on FROM @following f JOIN @user u ON f.follow_id=u.id WHERE f.user_id=? AND f.is_del=0 ORDER BY u.nickname ASC @@ -179,7 +180,8 @@ SELECT count(*) FROM @following WHERE user_id=? AND is_del=0; SELECT u.user_id user_id, u.username username, u.nickname nickname, - u.avatar avatar + u.avatar avatar, + u.created_on created_on FROM @following f JOIN @user u ON f.user_id=u.id WHERE f.follow_id=? AND f.is_del=0 ORDER BY u.nickname ASC