Merge 'feature/paylist_with_postgre' to develop

Author: ariebrainware

.gitignore

@@ -1 +1,3 @@
 gin-bin
+archieve-bin/
+*.idea

config/config.go

@@ -8,23 +8,18 @@ import (
 	"os"
 
 	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/mysql"
+	_ "github.com/jinzhu/gorm/dialects/postgres"
 
 	"github.com/ariebrainware/paylist-api/model"
 )
 
 // Config is a configuration model
 type Config struct {
-	Db struct {
-		Host     string
-		User     string
-		Password string
-		Database string
-	}
-	Listen struct {
-		Address string
-		Port    string
-	}
+	Host     string
+	User     string
+	Password string
+	Database string
+	Port     int
 }
 
 var (
@@ -47,12 +42,14 @@ func Conf() {
 	if err != nil {
 		log.Fatal("can't decode config json", err)
 	}
-	log.Println(config.Db.Database)
-	connString := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=True&loc=Local", config.Db.User, config.Db.Password, config.Db.Host, config.Listen.Port, config.Db.Database)
-	DB, err = gorm.Open("mysql", connString)
+	log.Println(config.Database)
+	connString := fmt.Sprintf(`user=%s password=%s host=%s port=%d dbname=%s sslmode=disable`, config.User, config.Password, config.Host, config.Port, config.Database)
+	DB, err = gorm.Open("postgres", connString)
+	DB.LogMode(true)
 	if err != nil {
+		fmt.Println(err)
 		panic("failed connect to database")
 	}
-	DB.AutoMigrate(&model.Paylist{}, &model.User{})
+	DB.AutoMigrate(&model.Paylist{}, &model.User{}, &model.Logging{})
 	fmt.Println("Schema migrated!!")
 }

config/config.json

@@ -1,12 +1,7 @@
 {
-    "Db": {
-        "Host": "localhost",
-        "User": "rob0ne",
-        "Password": "@_L0c4lDB",
-        "Database": "paylist"
-    },
-    "Listen": {
-        "Address": "*",
-        "Port": "3306"
-    }
+    "Host": "localhost",
+    "User": "postgres",
+    "Password": "",
+    "Database": "paylist",
+    "Port": 5432
 }

endpoint/paylist.go

@@ -80,7 +80,6 @@ func CreateUserPaylist(c *gin.Context) {
 		return
 	}
 	username := tk.Username
-
 	// Decrease user balance
 	amount, _ := strconv.Atoi(c.PostForm("amount"))
 	err = config.DB.Model(&users).Where("username  = ?", username).First(&users).Error
@@ -162,7 +161,6 @@ func UpdateUserPaylist(c *gin.Context) {
 
 // UpdateUserPaylistStatus is a function to mark the paylist completed or not
 func UpdateUserPaylistStatus(c *gin.Context) {
-	status := c.PostForm("status")
 	paylist := model.Paylist{}
 	user := model.User{}
 	tk := User{}
@@ -179,14 +177,6 @@ func UpdateUserPaylistStatus(c *gin.Context) {
 	username := tk.Username
 
 	// Check User balance
-	if err = config.DB.Model(&paylist).Where("username = ?", username).First(&paylist).Error; err != nil {
-		util.CallErrorNotFound(c, "no paylist found", nil)
-		return
-	}
-	if tk.Username != paylist.Username {
-		util.CallServerError(c, "not authorized", nil)
-		return
-	}
 	id, _ := strconv.Atoi(c.Param("id"))
 	if err := config.DB.Model(&paylist).Where("ID = ? AND username = ?", id, username).First(&paylist).Error; err != nil || err == gorm.ErrRecordNotFound {
 		util.CallErrorNotFound(c, "no paylist found", nil)
@@ -198,24 +188,21 @@ func UpdateUserPaylistStatus(c *gin.Context) {
 	}
 
 	// Update the paylist status
-	s, _ := strconv.ParseBool(status)
-	if err = config.DB.Model(&paylist).Where("username = ?", tk.Username).Update("completed", s).Error; err != nil {
-		fmt.Println(err)
-		util.CallServerError(c, "fail to update paylist status", err)
-		return
+	if user.Balance >= 0 && paylist.Completed == false {
+		paylist.Completed = true
+		config.DB.Model(&paylist).Where("ID = ? and username = ?", id, username).Update(&paylist)
+	} else if user.Balance < 0 && paylist.Completed == false {
+		paylist.Completed = false
+		config.DB.Model(&paylist).Where("ID = ? and username = ?", id, username).Update(&paylist)
 	}
-	if !s {
-		util.CallSuccessOK(c, "paylist uncompleted!", paylist)
-		return
-	}
-	util.CallSuccessOK(c, "paylist completed!", paylist)
+	util.CallSuccessOK(c, "successfully update user paylist", paylist.Completed)
 }
 
 //DeleteUserPaylist handle deleted user paylist
 func DeleteUserPaylist(c *gin.Context) {
 	paylistID, _ := strconv.Atoi(c.Param("id"))
-	paylist := model.Paylist{}
-	user := model.User{}
+	paylist := &model.Paylist{}
+	user := &model.User{}
 	tk := User{}
 
 	if paylistID == 0 {
@@ -232,15 +219,15 @@ func DeleteUserPaylist(c *gin.Context) {
 		util.CallUserError(c, "fail to parse the token, make sure the token is valid", err)
 	}
 	username := tk.Username
-	config.DB.Model(&paylist).Where("username = ?", username).First(&paylist)
-	if tk.Username != paylist.Username {
-		util.CallServerError(c, "user not authorized", nil)
+	if err = config.DB.Where("ID = ?", paylistID).Find(&paylist).Error; err != nil {
+		util.CallErrorNotFound(c, "no paylist found!", err)
 		c.Abort()
 		return
 	}
 
-	if err = config.DB.Where("id = ?", paylistID).First(&paylist).Error; err != nil {
-		util.CallErrorNotFound(c, "no paylist found!", nil)
+	config.DB.Model(&paylist).Where("username = ?", username).First(&paylist)
+	if tk.Username != paylist.Username {
+		util.CallServerError(c, "user not authorized", nil)
 		c.Abort()
 		return
 	}