added vote feature on comments (upvote, downvote)

articles/models.go

@@ -1,11 +1,17 @@
 package articles
 
 import (
+ "fmt"
  _ "fmt"
- "github.com/jinzhu/gorm"
- "github.com/wangzitian0/golang-gin-starter-kit/common"
- "github.com/wangzitian0/golang-gin-starter-kit/users"
+ "golang-gin-realworld-example-app/common"
+ "golang-gin-realworld-example-app/users"
  "strconv"
+ "time"
+
+ "github.com/jinzhu/gorm"
+ // "github.com/wangzitian0/golang-gin-starter-kit/users"
+ // "github.com/wangzitian0/golang-gin-starter-kit/common"
+ // "github.com/wangzitian0/golang-gin-starter-kit/users"
 )
 
 type ArticleModel struct {
@@ -44,11 +50,22 @@ type TagModel struct {
 
 type CommentModel struct {
  gorm.Model
- Article ArticleModel
- ArticleID uint
- Author ArticleUserModel
- AuthorID uint
- Body string `gorm:"size:2048"`
+ Article ArticleModel
+ ArticleID uint
+ Author ArticleUserModel
+ CommentVote []CommentModelVote `gorm:"foreignkey:CommentID"`
+ AuthorID uint
+ Body string `gorm:"size:2048"`
+}
+
+type CommentModelVote struct {
+ CreatedAt time.Time
+ UpdatedAt time.Time
+ DeletedAt *time.Time
+ UserID uint `gorm:"primary_key;auto_increment:false"`
+ CommentID uint `gorm:"primary_key;auto_increment:false"`
+ UpVote bool
+ DownVote bool
 }
 
 func GetArticleUserModel(userModel users.UserModel) ArticleUserModel {
@@ -267,3 +284,41 @@ func DeleteCommentModel(condition interface{}) error {
  err := db.Where(condition).Delete(CommentModel{}).Error
  return err
 }
+
+func GetCommentVote(vote CommentVoteValidator, userId uint) (CommentModelVote, error) {
+ db := common.GetDB()
+ var commentVote CommentModelVote
+ err := db.Where("user_id = ? AND comment_id = ?", userId, vote.CommentID).First(&commentVote).Error
+ return commentVote, err
+}
+
+func CreateCommentVote(vote CommentVoteValidator, userId uint) (CommentModelVote, error) {
+ db := common.GetDB()
+ commentVote := CommentModelVote{
+ CommentID: vote.CommentID,
+ UserID: userId,
+ UpVote: vote.UpVote,
+ DownVote: vote.DownVote,
+ }
+ err := db.Create(&commentVote).Error
+ fmt.Printf("\n\nthis is in CreateCommentVote: %+v\n\n", commentVote)
+ return commentVote, err
+}
+
+func DeleteCommentVote(commentVote CommentModelVote) error {
+ db := common.GetDB()
+ err := db.Unscoped().Delete(&commentVote).Error
+ return err
+}
+
+func UpdateCommentVote(vote CommentVoteValidator, userId uint) (CommentModelVote, error) {
+ db := common.GetDB()
+ voteModel, err := GetCommentVote(vote, userId)
+ if err != nil {
+ return voteModel, err
+ }
+ voteModel.UpVote = vote.UpVote
+ voteModel.DownVote = vote.DownVote
+ err2 := db.Save(&voteModel).Error
+ return voteModel, err2
+}

articles/routers.go

@@ -2,11 +2,17 @@ package articles
 
 import (
  "errors"
- "github.com/wangzitian0/golang-gin-starter-kit/common"
- "github.com/wangzitian0/golang-gin-starter-kit/users"
- "gopkg.in/gin-gonic/gin.v1"
+ "fmt"
+ "golang-gin-realworld-example-app/common"
+ "golang-gin-realworld-example-app/users"
  "net/http"
  "strconv"
+
+ // "github.com/wangzitian0/golang-gin-starter-kit/common"
+ // "github.com/wangzitian0/golang-gin-starter-kit/users"
+
+ // "gopkg.in/gin-gonic/gin.v1"
+ "github.com/gin-gonic/gin"
 )
 
 func ArticlesRegister(router *gin.RouterGroup) {
@@ -17,8 +23,74 @@ func ArticlesRegister(router *gin.RouterGroup) {
  router.DELETE("/:slug/favorite", ArticleUnfavorite)
  router.POST("/:slug/comments", ArticleCommentCreate)
  router.DELETE("/:slug/comments/:id", ArticleCommentDelete)
+ router.POST("/:slug/comments/:id/vote", ArticleCommentVotePost)
+ router.DELETE("/:slug/comments/:id/vote", ArticleCommentVoteDelete)
+ router.PUT("/:slug/comments/:id/vote", ArticleCommentVoteUpdate)
 }
 
+func ArticleCommentVotePost(c *gin.Context) {
+ commentVoteValidator := CommentVoteValidator{}
+ if err := commentVoteValidator.Bind(c); err != nil {
+ c.JSON(http.StatusBadRequest, err.Error())
+ return
+ }
+ userId := c.MustGet("my_user_id").(uint)
+ vote, err := CreateCommentVote(commentVoteValidator, userId)
+ if err != nil {
+ c.JSON(http.StatusConflict, gin.H{
+ "error": err.Error(),
+ })
+ return
+ }
+ serial := VoteSerializer{vote: vote}
+ c.JSON(http.StatusCreated, gin.H{
+ "vote": serial.Response(),
+ })
+}
+func ArticleCommentVoteUpdate(c *gin.Context) {
+ commentVoteValidator := CommentVoteValidator{}
+ if err := commentVoteValidator.Bind(c); err != nil {
+ c.JSON(http.StatusBadRequest, err.Error())
+ return
+ }
+ userId := c.MustGet("my_user_id").(uint)
+ vote, err := UpdateCommentVote(commentVoteValidator, userId)
+ if err != nil {
+ c.JSON(http.StatusConflict, gin.H{
+ "error": err.Error(),
+ })
+ return
+ }
+ serial := VoteSerializer{vote: vote}
+ c.JSON(http.StatusOK, gin.H{
+ "vote": serial.Response(),
+ })
+}
+func ArticleCommentVoteDelete(c *gin.Context) {
+ commentVoteValidator := CommentVoteValidator{}
+ if err := commentVoteValidator.BindCommentId(c); err != nil {
+ c.JSON(http.StatusBadRequest, err.Error())
+ return
+ }
+ userId := c.MustGet("my_user_id").(uint)
+ vote, err := GetCommentVote(commentVoteValidator, userId)
+ if err != nil {
+ c.JSON(http.StatusNotFound, gin.H{
+ "error": err.Error(),
+ })
+ return
+ }
+ if err := DeleteCommentVote(vote); err != nil {
+ c.JSON(http.StatusForbidden, gin.H{
+ "error": err.Error(),
+ })
+ return
+ }
+ c.JSON(http.StatusOK, gin.H{
+ "success": "comment got deleted",
+ })
+
+}
 func ArticlesAnonymousRegister(router *gin.RouterGroup) {
  router.GET("/", ArticleList)
  router.GET("/:slug", ArticleRetrieve)
@@ -35,6 +107,7 @@ func ArticleCreate(c *gin.Context) {
  c.JSON(http.StatusUnprocessableEntity, common.NewValidatorError(err))
  return
  }
+ fmt.Printf("ArticleModelValidator: %+v\n", articleModelValidator)
  //fmt.Println(articleModelValidator.articleModel.Author.UserModel)
 
  if err := SaveOne(&articleModelValidator.articleModel); err != nil {

articles/serializers.go

@@ -1,9 +1,12 @@
 package articles
 
 import (
+ "golang-gin-realworld-example-app/users"
+
  "github.com/gosimple/slug"
- "github.com/wangzitian0/golang-gin-starter-kit/users"
- "gopkg.in/gin-gonic/gin.v1"
+ // "github.com/wangzitian0/golang-gin-starter-kit/users"
+ // "gopkg.in/gin-gonic/gin.v1"
+ "github.com/gin-gonic/gin"
 )
 
 type TagSerializer struct {
@@ -134,3 +137,25 @@ func (s *CommentsSerializer) Response() []CommentResponse {
  }
  return response
 }
+
+type VoteSerializer struct {
+ vote CommentModelVote
+}
+
+type VoteResponse struct {
+ UserID uint `json:"user_id"`
+ CommentID uint `json:"comment_id"`
+ UpVote bool `json:"up_vote"`
+ DownVote bool `json:"down_vote"`
+}
+
+func (self VoteSerializer) Response() VoteResponse {
+ voteModel := self.vote
+ voteResponse := VoteResponse{
+ UserID: voteModel.UserID,
+ CommentID: voteModel.CommentID,
+ UpVote: voteModel.UpVote,
+ DownVote: voteModel.DownVote,
+ }
+ return voteResponse
+}

articles/validators.go

@@ -1,22 +1,41 @@
 package articles
 
 import (
+ "fmt"
+ "golang-gin-realworld-example-app/common"
+ "golang-gin-realworld-example-app/users"
+
  "github.com/gosimple/slug"
- "github.com/wangzitian0/golang-gin-starter-kit/common"
- "github.com/wangzitian0/golang-gin-starter-kit/users"
- "gopkg.in/gin-gonic/gin.v1"
+ // "github.com/wangzitian0/golang-gin-starter-kit/common"
+ // "github.com/wangzitian0/golang-gin-starter-kit/users"
+ // "gopkg.in/gin-gonic/gin.v1"
+ "github.com/gin-gonic/gin"
 )
 
 type ArticleModelValidator struct {
  Article struct {
- Title string `form:"title" json:"title" binding:"exists,min=4"`
+ Title string `form:"title" json:"title" binding:"required"`
  Description string `form:"description" json:"description" binding:"max=2048"`
  Body string `form:"body" json:"body" binding:"max=2048"`
  Tags []string `form:"tagList" json:"tagList"`
  } `json:"article"`
  articleModel ArticleModel `json:"-"`
 }
 
+type CommentVoteValidator struct {
+ CommentID uint `uri:"id" binding:"required"`
+ UpVote bool `json:"up_vote"`
+ DownVote bool `json:"down_vote"`
+}
+
+type CommentVoteError struct {
+ err string
+}
+
+func (e CommentVoteError) Error() string {
+ return e.err
+}
+
 func NewArticleModelValidator() ArticleModelValidator {
  return ArticleModelValidator{}
 }
@@ -70,3 +89,31 @@ func (s *CommentModelValidator) Bind(c *gin.Context) error {
  s.commentModel.Author = GetArticleUserModel(myUserModel)
  return nil
 }
+
+func (s *CommentVoteValidator) Bind(c *gin.Context) error {
+ // commentID := c.Param("id")(int)
+ // s.CommentID = commentID
+ if err := c.ShouldBindUri(s); err != nil {
+ return err
+ }
+ err := common.Bind(c, s)
+ if err != nil {
+ return err
+ }
+ fmt.Printf("\n\n In Bind: %+v \n\n", s)
+ if (s.DownVote && s.UpVote) || !(s.UpVote || s.DownVote) {
+ err := CommentVoteError{err: "Either one of the UpVote or DownVote can be true not both."}
+ return err
+ }
+ return nil
+}
+
+func (s *CommentVoteValidator) BindCommentId(c *gin.Context) error {
+ // commentID := c.Param("id")(int)
+ // s.CommentID = commentID
+ if err := c.ShouldBindUri(s); err != nil {
+ return err
+ }
+ fmt.Printf("\n\n In Bind: %+v \n\n", s)
+ return nil
+}

common/database.go

@@ -2,9 +2,12 @@ package common
 
 import (
  "fmt"
+
+ "os"
+
  "github.com/jinzhu/gorm"
+ _ "github.com/jinzhu/gorm/dialects/postgres"
  _ "github.com/jinzhu/gorm/dialects/sqlite"
- "os"
 )
 
 type Database struct {
@@ -15,13 +18,15 @@ var DB *gorm.DB
 
 // Opening a database and save the reference to `Database` struct.
 func Init() *gorm.DB {
- db, err := gorm.Open("sqlite3", "./../gorm.db")
+ // db, err := gorm.Open("sqlite3", "./../gorm.db")
+ db, err := gorm.Open("postgres", "host=localhost port=5432 user=postgres dbname=realworld password=postgres")
  if err != nil {
  fmt.Println("db err: ", err)
  }
  db.DB().SetMaxIdleConns(10)
- //db.LogMode(true)
+ db.LogMode(true)
  DB = db
+ fmt.Printf("db is: %+v\n", *DB)
  return DB
 }
 

common/unit_test.go

@@ -3,12 +3,14 @@ package common
 import (
  "bytes"
  "errors"
- "github.com/stretchr/testify/assert"
- "gopkg.in/gin-gonic/gin.v1"
+
  "net/http"
  "net/http/httptest"
  "os"
  "testing"
+
+ "github.com/stretchr/testify/assert"
+ "gopkg.in/gin-gonic/gin.v1"
 )
 
 func TestConnectingDatabase(t *testing.T) {
@@ -83,8 +85,8 @@ func TestNewValidatorError(t *testing.T) {
  asserts := assert.New(t)
 
  type Login struct {
- Username string `form:"username" json:"username" binding:"exists,alphanum,min=4,max=255"`
- Password string `form:"password" json:"password" binding:"exists,min=8,max=255"`
+ Username string `form:"username" json:"username" binding:"required,alphanum,min=4,max=255"`
+ Password string `form:"password" json:"password" binding:"required,min=8,max=255"`
  }
 
  var requestTests = []struct {

common/utils.go

@@ -6,11 +6,12 @@ import (
  "math/rand"
  "time"
 
- "github.com/dgrijalva/jwt-go"
+ jwt "github.com/dgrijalva/jwt-go"
  "gopkg.in/go-playground/validator.v8"
 
  "github.com/gin-gonic/gin/binding"
- "gopkg.in/gin-gonic/gin.v1"
+ // "gopkg.in/gin-gonic/gin.v1"
+ "github.com/gin-gonic/gin"
 )
 
 var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")