make voucher balance fixed

Author: rawdaGastan

server/app/setup.go

@@ -76,7 +76,8 @@ func SetUp(t testing.TB) *App {
 		"medium_vm": 20,
 		"large_vm": 30
 	},
-	"stripe_secret": "sk_test"
+	"stripe_secret": "sk_test",
+	"voucher_balance": 10
 }
 	`, dbPath)
 

server/app/user_handler.go

@@ -65,8 +65,7 @@ type EmailInput struct {
 
 // ApplyForVoucherInput struct for user to apply for voucher
 type ApplyForVoucherInput struct {
-	Balance uint64 `json:"balance" binding:"required" validate:"min=0"`
-	Reason  string `json:"reason" binding:"required" validate:"nonzero"`
+	Reason string `json:"reason" binding:"required" validate:"nonzero"`
 }
 
 // AddVoucherInput struct for voucher applied by user
@@ -711,7 +710,7 @@ func (a *App) ApplyForVoucherHandler(req *http.Request) (interface{}, Response)
 	voucher := models.Voucher{
 		Voucher: v,
 		UserID:  userID,
-		Balance: input.Balance,
+		Balance: a.config.VoucherBalance,
 		Reason:  input.Reason,
 	}
 

server/app/user_handler_test.go

@@ -870,8 +870,6 @@ func TestApplyForVoucherHandler(t *testing.T) {
 	assert.NoError(t, err)
 
 	voucherBody := []byte(`{
-		"vms":10,
-		"public_ips":1,
 		"reason":"strongReason"
 	}`)
 

server/docs/docs.go

@@ -2712,14 +2712,9 @@ const docTemplate = `{
         "app.ApplyForVoucherInput": {
             "type": "object",
             "required": [
-                "balance",
                 "reason"
             ],
             "properties": {
-                "balance": {
-                    "type": "integer",
-                    "minimum": 0
-                },
                 "reason": {
                     "type": "string"
                 }

server/docs/swagger.yaml

@@ -35,13 +35,9 @@ definitions:
     type: object
   app.ApplyForVoucherInput:
     properties:
-      balance:
-        minimum: 0
-        type: integer
       reason:
         type: string
     required:
-    - balance
     - reason
     type: object
   app.ChangePasswordInput:

server/internal/config_parser.go

@@ -24,6 +24,7 @@ type Configuration struct {
 	PricesPerMonth            Prices      `json:"prices"`
 	Currency                  string      `json:"currency" validate:"nonzero"`
 	StripeSecret              string      `json:"stripe_secret" validate:"nonzero"`
+	VoucherBalance            uint64      `json:"voucher_balance" validate:"nonzero"`
 }
 
 // Server struct to hold server's information

server/internal/config_parser_test.go

@@ -42,7 +42,8 @@ var rightConfig = `
 		"medium_vm": 20,
 		"large_vm": 30
 	},
-	"stripe_secret": "sk_test"
+	"stripe_secret": "sk_test",
+	"voucher_balance": 10
 }
 	`
 

server/models/deployments_count.go

@@ -23,13 +23,13 @@ func (d *DB) CountAllDeployments() (DeploymentsCount, error) {
 	dlsCount := k8sCount + vmsCount
 
 	var vmIPsCount int64
-	result = d.db.Table("vms").Where("public_ip = true").Count(&vmIPsCount)
+	result = d.db.Table("vms").Where("public = true").Count(&vmIPsCount)
 	if result.Error != nil {
 		return DeploymentsCount{}, result.Error
 	}
 
 	var k8sIPsCount int64
-	result = d.db.Table("masters").Where("public_ip = true").Count(&k8sIPsCount)
+	result = d.db.Table("masters").Where("public = true").Count(&k8sIPsCount)
 	if result.Error != nil {
 		return DeploymentsCount{}, result.Error
 	}
@@ -61,14 +61,14 @@ func (d *DB) CountUserDeployments(userID string) (DeploymentsCount, error) {
 	dlsCount := k8sCount + vmsCount
 
 	var vmIPsCount int64
-	result = d.db.Table("vms").Where("public_ip = true").Where("user_id = ?", userID).Count(&vmIPsCount)
+	result = d.db.Table("vms").Where("public = true").Where("user_id = ?", userID).Count(&vmIPsCount)
 	if result.Error != nil {
 		return DeploymentsCount{}, result.Error
 	}
 
 	var k8sIPsCount int64
 	result = d.db.Table("k8s_clusters").Joins("JOIN masters ON k8s_clusters.id = masters.cluster_id").
-		Where("public_ip = true").Where("user_id = ?", userID).Count(&k8sIPsCount)
+		Where("public = true").Where("user_id = ?", userID).Count(&k8sIPsCount)
 	if result.Error != nil {
 		return DeploymentsCount{}, result.Error
 	}