fix:correct record is who like

Author: nk-akun

api/guest/articles.go

@@ -45,6 +45,7 @@ func PostArticle(c *gin.Context) {
 // GetArticleList is the api that returns a list of articles
 // if you want to add parameter like limit, please use url like /article?limit=10
 func GetArticleList(c *gin.Context) {
+	user := service.UserService.GetCurrentUser(c)
 	limit := c.DefaultQuery("limit", "10")
 	sortby := c.DefaultQuery("sortby", "create_time")
 	order := c.DefaultQuery("order", "desc")
@@ -62,7 +63,7 @@ func GetArticleList(c *gin.Context) {
 		setAPIResponse(c, nil, err.Error(), false)
 	}
 
-	resp, err := service.ArticleService.GetArticleList(limitNum, cursorTime, sortby, order)
+	resp, err := service.ArticleService.GetArticleList(user, limitNum, cursorTime, sortby, order)
 	if err != nil {
 		setAPIResponse(c, nil, err.Error(), false)
 	} else {
@@ -72,6 +73,7 @@ func GetArticleList(c *gin.Context) {
 
 // GetArticleByID finds the article with ID
 func GetArticleByID(c *gin.Context) {
+	user := service.UserService.GetCurrentUser(c)
 	id := c.Param("id")
 
 	var err error
@@ -81,7 +83,7 @@ func GetArticleByID(c *gin.Context) {
 		return
 	}
 
-	resp, err := service.ArticleService.GetArticleByID(articleID)
+	resp, err := service.ArticleService.GetArticleByID(user, articleID)
 	if err != nil {
 		setAPIResponse(c, nil, err.Error(), false)
 		return

model/response.go

@@ -51,6 +51,7 @@ type ArticleResponse struct {
 	Title        string         `json:"title"`
 	User         *UserBriefInfo `json:"user"`
 	Content      string         `json:"content"`
+	Liked        bool           `json:"liked"`
 	CommentCount int            `json:"commnet_count"`
 	LikeCount    int            `json:"like_count"`
 	CreateTime   int64          `json:"create_time"`

service/articles.go

@@ -45,12 +45,12 @@ func (s *articleService) BuildArticle(user *model.User, title string, content st
 	return article, nil
 }
 
-func (s *articleService) GetArticleList(limit int, cursorTime int64, sortby string, order string) (*model.ArticleListResponse, error) {
+func (s *articleService) GetArticleList(currentUser *model.User, limit int, cursorTime int64, sortby string, order string) (*model.ArticleListResponse, error) {
 	resp := &model.ArticleListResponse{}
 	fields := []string{"id", "title", "create_time", "user_id", "view_count", "comment_count", "like_count", "content"}
 	articles := repository.ArticleRepository.GetArticleFields(util.DB(), fields, cursorTime, limit, sortby, order)
 
-	briefList, minCursorTime := buildArticleList(articles)
+	briefList, minCursorTime := buildArticleList(currentUser, articles)
 
 	resp.Cursor = minCursorTime
 	for i := range briefList {
@@ -63,7 +63,7 @@ func (s *articleService) GetArticleList(limit int, cursorTime int64, sortby stri
 	return resp, nil
 }
 
-func (s *articleService) GetArticleByID(id int64) (*model.ArticleResponse, error) {
+func (s *articleService) GetArticleByID(currentUser *model.User, id int64) (*model.ArticleResponse, error) {
 	articleInfo, err := repository.ArticleRepository.GetArticleByID(util.DB(), id)
 	if err != nil {
 		return nil, errors.New("查询文章信息出错")
@@ -78,14 +78,15 @@ func (s *articleService) GetArticleByID(id int64) (*model.ArticleResponse, error
 		Title:        articleInfo.Title,
 		User:         BuildUserBriefInfo(userInfo),
 		Content:      util.MarkdownToHTML(articleInfo.Content),
+		Liked:        LCService.JudgeArticleLiked(articleInfo, currentUser),
 		CommentCount: articleInfo.CommentCount,
 		LikeCount:    articleInfo.LikeCount,
 		CreateTime:   articleInfo.CreateTime,
 	}
 	return resp, nil
 }
 
-func buildArticleList(articles []model.Article) ([]*model.ArticleBriefInfo, int64) {
+func buildArticleList(currentUser *model.User, articles []model.Article) ([]*model.ArticleBriefInfo, int64) {
 	var minCursorTime int64 = model.MAXCursorTime
 	briefList := make([]*model.ArticleBriefInfo, len(articles))
 	for i := range articles {
@@ -99,8 +100,8 @@ func buildArticleList(articles []model.Article) ([]*model.ArticleBriefInfo, int6
 		briefList[i].LikeCount = articles[i].LikeCount
 		briefList[i].ViewCount = articles[i].ViewCount
 		briefList[i].CreateTime = articles[i].CreateTime
+		briefList[i].Liked = LCService.JudgeArticleLiked(&articles[i], currentUser)
 		user, _ := repository.UserRepository.GetUserByUserID(util.DB(), articles[i].UserID)
-		briefList[i].Liked = LCService.JudgeArticleLiked(&articles[i], user)
 		briefList[i].User = BuildUserBriefInfo(user)
 	}
 

service/like_collection.go

@@ -49,7 +49,7 @@ func (s *lcService) PostLikeArticle(userID int64, articleID int64) error {
 		if err != nil {
 			return err
 		}
-		err = util.DB().Exec("update t_article set like_count = like_count+1 where id = ? and user_id = ?", articleID, userID).Error
+		err = util.DB().Exec("update t_article set like_count = like_count+1 where id = ?", articleID).Error
 		return err
 	})
 	if err != nil {
@@ -60,6 +60,9 @@ func (s *lcService) PostLikeArticle(userID int64, articleID int64) error {
 
 // JudgeArticleLiked judge user has liked the article or not.
 func (s *lcService) JudgeArticleLiked(article *model.Article, user *model.User) bool {
+	if user == nil {
+		return false
+	}
 	lcStatus, _ := repository.LCRepository.GetUserLikeOperation(util.DB(), user.ID, article.ID)
 	return lcStatus.Status == LikeArticle
 }
@@ -82,7 +85,7 @@ func (s *lcService) PostDelLikeArticle(userID int64, articleID int64) error {
 		if err != nil {
 			return err
 		}
-		err = util.DB().Exec("update t_article set like_count = like_count-1 where id = ? and user_id = ?", articleID, userID).Error
+		err = util.DB().Exec("update t_article set like_count = like_count-1 where id = ?", articleID).Error
 		return err
 	})
 	if err != nil {

site/components/TopicList.vue

@@ -82,9 +82,17 @@ export default {
   methods: {
     async like(article) {
       try {
+        if (article.liked) {
+          this.$message.success('已赞过，请勿重复点赞')
+          return
+        }
+        if (this.$store.state.user.current == null) {
+          this.$message.success('请登录后操作')
+          return
+        }
         let data = {
           article_id: article.article_id,
-          user_id: article.user.id,
+          user_id: this.$store.state.user.current.id,
         }
         await this.$axios.post('/api/topics/like', data)
         article.liked = true

site/pages/topic/_id.vue

@@ -231,7 +231,7 @@ export default {
     return {
       topic,
       commentsPage,
-      liked: false,
+      liked: topic.liked,
       favorited: false,
     }
   },
@@ -275,6 +275,10 @@ export default {
         if (this.liked) {
           return
         }
+        if (this.$store.state.user.current == null) {
+          this.$message.error('请登录后操作')
+          return
+        }
         await this.$axios.post('/api/topics/like', {
           article_id: topic.article_id,
           user_id: this.$store.state.user.current.id,