feature: #11评论模块以及#33整合服务接口之间的调用 (X-Engineer#35)

videoService和likeService两个部分互相调用应该不会产生冲突，下面记录一下DeBug之旅：

Author: coder-zc

Diff for: controller/comment.go

@@ -3,45 +3,117 @@ package controller
 import (
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"strconv"
+	"x-tiktok/dao"
+	"x-tiktok/service"
 )
 
 type CommentListResponse struct {
 	Response
-	CommentList []Comment `json:"comment_list,omitempty"`
+	CommentList []service.Comment `json:"comment_list,omitempty"`
 }
 
 type CommentActionResponse struct {
 	Response
-	Comment Comment `json:"comment,omitempty"`
+	Comment service.Comment `json:"comment,omitempty"`
 }
 
 // CommentAction no practical effect, just check if token is valid
 func CommentAction(c *gin.Context) {
-	token := c.Query("token")
-	actionType := c.Query("action_type")
+	// 获取userId
+	userId := c.GetInt64("userId")
+	videoId, err := strconv.ParseInt(c.Query("video_id"), 10, 64)
+	if err != nil {
+		c.JSON(http.StatusOK, CommentActionResponse{
+			Response: Response{StatusCode: -1,
+				StatusMsg: "comment videoId json invalid"},
+		})
+		return
+	}
+	actionType, err := strconv.ParseInt(c.Query("action_type"), 10, 64)
+	if err != nil || actionType < 1 || actionType > 2 {
+		c.JSON(http.StatusOK, CommentActionResponse{
+			Response: Response{StatusCode: -1,
+				StatusMsg: "comment actionType json invalid"},
+		})
+		return
+	}
+	commentService := service.GetCommentServiceInstance()
+	switch {
+	// 评论
+	case actionType == 1:
+		content := c.Query("comment_text")
+		var comment dao.Comment
+		comment.UserId = userId
+		comment.VideoId = videoId
+		comment.Content = content
+		comment.ActionType = 1
+		commentRes, err := commentService.CommentAction(comment)
+		if err != nil {
+			c.JSON(http.StatusOK, CommentActionResponse{
+				Response: Response{StatusCode: -1,
+					StatusMsg: "comment failed"},
+			})
+			return
+		}
+		c.JSON(http.StatusOK, CommentActionResponse{
+			Response: Response{StatusCode: 0,
+				StatusMsg: "comment success"},
+			Comment: commentRes,
+		})
+		return
 
-	if user, exist := usersLoginInfo[token]; exist {
-		if actionType == "1" {
-			text := c.Query("comment_text")
-			c.JSON(http.StatusOK, CommentActionResponse{Response: Response{StatusCode: 0},
-				Comment: Comment{
-					Id:         1,
-					User:       user,
-					Content:    text,
-					CreateDate: "05-01",
-				}})
+	// 取消评论
+	case actionType == 2:
+		commentId, err := strconv.ParseInt(c.Query("comment_id"), 10, 64)
+		if err != nil {
+			c.JSON(http.StatusOK, CommentActionResponse{
+				Response: Response{StatusCode: -1,
+					StatusMsg: "delete commentId invalid"},
+			})
 			return
 		}
-		c.JSON(http.StatusOK, Response{StatusCode: 0})
-	} else {
-		c.JSON(http.StatusOK, Response{StatusCode: 1, StatusMsg: "User doesn't exist"})
+		err = commentService.DeleteCommentAction(commentId)
+		if err != nil {
+			c.JSON(http.StatusOK, CommentActionResponse{
+				Response: Response{StatusCode: -1,
+					StatusMsg: err.Error()},
+			})
+			return
+		}
+		c.JSON(http.StatusOK, CommentActionResponse{
+			Response: Response{StatusCode: 0,
+				StatusMsg: "delete commentId success"},
+		})
+		return
 	}
 }
 
 // CommentList all videos have same demo comment list
 func CommentList(c *gin.Context) {
+	userId := c.GetInt64("userId")
+	videoId, err := strconv.ParseInt(c.Query("video_id"), 10, 64)
+	if err != nil {
+		c.JSON(http.StatusOK, CommentListResponse{
+			Response: Response{StatusCode: -1,
+				StatusMsg: "comment videoId json invalid"},
+		})
+		return
+	}
+	commentService := service.GetCommentServiceInstance()
+	commentList, err := commentService.GetCommentList(videoId, userId)
+	// 获取评论列表失败
+	if err != nil {
+		c.JSON(http.StatusOK, CommentListResponse{
+			Response: Response{StatusCode: -1,
+				StatusMsg: err.Error()},
+		})
+		return
+	}
+	// 获取评论列表成功
 	c.JSON(http.StatusOK, CommentListResponse{
 		Response:    Response{StatusCode: 0},
-		CommentList: DemoComments,
+		CommentList: commentList,
 	})
+	return
 }

Diff for: controller/favorite.go

@@ -17,7 +17,7 @@ type GetFavouriteListResponse struct {
 	VideoList []service.Video `json:"video_list"`
 }
 
-// FavoriteAction 点赞操作
+// FavoriteAction 赞操作
 func FavoriteAction(c *gin.Context) {
 	videoId, _ := strconv.ParseInt(c.Query("video_id"), 10, 64)
 	actionType, _ := strconv.ParseInt(c.Query("action_type"), 10, 32)
@@ -42,26 +42,14 @@ func FavoriteAction(c *gin.Context) {
 	}
 }
 
-// FavoriteList 获取用户的点赞视频列表
+// FavoriteList 获取点赞列表
 func FavoriteList(c *gin.Context) {
 	strUserId := c.Query("user_id")
 	//likeCnt:=dao.VideoLikedCount()
 	userId, _ := strconv.ParseInt(strUserId, 10, 64)
 	Fni := service.NewLikeServImpInstance()
-
-	_, err := Fni.GetLikesList(userId)
-	//video类型数组的假数据
-	//var video_list []service.Video
-	videoList := make([]service.Video, 1, 2)
-	videoList[0].Id = 1
-	videoList[0].IsFavorite = true
-	videoList[0].AuthorId = 1
-	videoList[0].CoverUrl = ""
-	videoList[0].PlayUrl = ""
-	videoList[0].Title = ""
-	videoList[0].CommentCount = 10
-	videoList[0].FavoriteCount = 100
-	videoList[0].IsFavorite = true
+	// 返回视频列表信息
+	videoList, err := Fni.GetLikesList(userId)
 	if err == nil {
 		log.Printf("方法like.GetFavouriteList(userid) 成功")
 		c.JSON(http.StatusOK, GetFavouriteListResponse{

Diff for: controller/feed.go

@@ -32,7 +32,8 @@ func Feed(c *gin.Context) {
 	}
 	//log.Println("返回视频的最新投稿时间:", convTime)
 	// 获取登录用户的 id（等待用户模块存入用户id到context）
-	userId, _ := strconv.ParseInt(c.GetString("userId"), 10, 64)
+	//userId, _ := strconv.ParseInt(c.GetString("userId"), 10, 64)
+	userId := c.GetInt64("userId")
 	videoService := service.GetVideoServiceInstance()
 	videos, nextTime, err := videoService.Feed(convTime, userId)
 	if err != nil {

Diff for: controller/publish.go

@@ -18,6 +18,7 @@ type VideoListResponse struct {
 func Publish(c *gin.Context) {
 	token := c.PostForm("token")
 	log.Println("token:", token)
+	userId := c.GetInt64("userId")
 	data, err := c.FormFile("data")
 	if err != nil {
 		c.JSON(http.StatusOK, Response{
@@ -30,7 +31,6 @@ func Publish(c *gin.Context) {
 	log.Printf("视频 title: %v\n", title)
 	videoService := service.GetVideoServiceInstance()
 	// 从 token 中获取 userId
-	userId := c.GetInt64("userId")
 	err = videoService.Publish(data, title, userId)
 	if err != nil {
 		log.Println("上传文件失败")
@@ -49,8 +49,10 @@ func Publish(c *gin.Context) {
 
 // PublishList 用户的视频发布列表，直接列出用户所有投稿过的视频
 func PublishList(c *gin.Context) {
+	// 获取到的userId，被访问的用户id
 	reqUserId := c.Query("user_id")
 	userId, _ := strconv.ParseInt(reqUserId, 10, 64)
+	//userId := c.GetInt64("userId")
 	log.Println("获取到用户 Id：", userId)
 	token := c.Query("token")
 	log.Println("获取到用户 token：", token)

Diff for: controller/user.go

@@ -10,21 +10,6 @@ import (
 	"x-tiktok/util"
 )
 
-// usersLoginInfo use map to store user info, and key is username+password for demo
-// user data will be cleared every time the server starts
-// test data: username=zhanglei, password=douyin
-var usersLoginInfo = map[string]User{
-	"zhangleidouyin": {
-		Id:            1,
-		Name:          "zhanglei",
-		FollowCount:   10,
-		FollowerCount: 5,
-		IsFollow:      true,
-	},
-}
-
-var userIdSequence = int64(1)
-
 type UserLoginResponse struct {
 	Response
 	UserId int64  `json:"user_id,omitempty"`
@@ -33,13 +18,13 @@ type UserLoginResponse struct {
 
 type UserResponse struct {
 	Response
-	User User `json:"user"`
+	User service.User `json:"user"`
 }
 
 func Register(c *gin.Context) {
 	username := c.Query("username")
 	password := c.Query("password")
-	usi := service.UserServiceImpl{}
+	usi := service.GetUserServiceInstance()
 	user := usi.GetUserBasicInfoByName(username)
 	if username == user.Name {
 		c.JSON(http.StatusOK, UserLoginResponse{
@@ -73,7 +58,7 @@ func Login(c *gin.Context) {
 	encoderPassword := service.EnCoder(password)
 	//log.Println("encoderPassword:", encoderPassword)
 	// 登录逻辑：使用jwt，根据用户信息生成token
-	usi := service.UserServiceImpl{}
+	usi := service.GetUserServiceInstance()
 
 	user := usi.GetUserBasicInfoByName(username)
 	userId := user.Id
@@ -95,7 +80,7 @@ func Login(c *gin.Context) {
 func UserInfo(c *gin.Context) {
 	userId := c.Query("user_id")
 	// 使用中间件，做token权限校验
-	usi := service.UserServiceImpl{}
+	usi := service.GetUserServiceInstance()
 	id, _ := strconv.ParseInt(userId, 10, 64)
 	if user, err := usi.GetUserLoginInfoById(id); err != nil {
 		c.JSON(http.StatusOK, UserResponse{
@@ -104,7 +89,7 @@ func UserInfo(c *gin.Context) {
 	} else {
 		c.JSON(http.StatusOK, UserResponse{
 			Response: Response{StatusCode: 0, StatusMsg: "Query Success"},
-			User:     User(user),
+			User:     user,
 		})
 	}
 }

Diff for: dao/commentDao.go

@@ -0,0 +1,70 @@
+package dao
+
+import (
+	"errors"
+	"log"
+	"time"
+)
+
+type Comment struct {
+	Id         int64     //评论id
+	UserId     int64     //评论用户id
+	VideoId    int64     //视频id
+	Content    string    //评论内容
+	ActionType int64     //发布评论为1，取消评论为2
+	CreatedAt  time.Time //评论发布的日期mm-dd
+	UpdatedAt  time.Time
+}
+
+// TableName 修改表名映射
+func (Comment) TableName() string {
+	return "comment"
+}
+
+func InsertComment(comment Comment) (Comment, error) {
+	if err := Db.Model(Comment{}).Create(&comment).Error; err != nil {
+		log.Println(err.Error())
+		return Comment{}, err
+	}
+	return comment, nil
+}
+
+func DeleteComment(commentId int64) error {
+	var comment Comment
+	// 先查询是否有此评论
+	result := Db.Where("id = ?", commentId).
+		First(&comment)
+	if result.Error != nil {
+		return errors.New("del comment is not exist")
+	}
+	// 删除评论，将action_type置为2
+	result = Db.Model(Comment{}).
+		Where("id=?", commentId).
+		Update("action_type", 2)
+	if result.Error != nil {
+		return result.Error
+	}
+	return nil
+}
+
+func GetCommentList(videoId int64) ([]Comment, error) {
+	var commentList []Comment
+	result := Db.Model(Comment{}).Where(map[string]interface{}{"video_id": videoId, "action_type": 1}).
+		Order("created_at desc").
+		Find(&commentList)
+	if result.Error != nil {
+		log.Println(result.Error)
+		return commentList, errors.New("get comment list failed")
+	}
+	return commentList, nil
+}
+
+func GetCommentCnt(videoId int64) (int64, error) {
+	var count int64
+	result := Db.Model(Comment{}).Where(map[string]interface{}{"video_id": videoId, "action_type": 1}).
+		Count(&count)
+	if result.Error != nil {
+		return 0, errors.New("find comments count failed")
+	}
+	return count, nil
+}

Diff for: dao/commentDao_test.go

@@ -0,0 +1,40 @@
+package dao
+
+import (
+	"log"
+	"testing"
+)
+
+func TestInsertComment(t *testing.T) {
+	var comment Comment = Comment{
+		UserId:  5,
+		VideoId: 14,
+		Content: "这条评论来自单元测试TestInsertComment",
+	}
+	commentRes, err := InsertComment(comment)
+	if err != nil {
+		log.Println(err)
+	}
+	log.Println("返回的评论是", commentRes)
+}
+
+func TestDeleteComment(t *testing.T) {
+	err := DeleteComment(1)
+	if err == nil {
+		log.Println("delete comment success")
+	}
+}
+
+func TestGetCommentList(t *testing.T) {
+	commentList, err := GetCommentList(21)
+	if err == nil {
+		log.Println(commentList)
+	}
+}
+
+func TestGetCommentCnt(t *testing.T) {
+	count, err := GetCommentCnt(21)
+	if err == nil {
+		log.Println(count)
+	}
+}