Merge pull request #33 from threefoldtech/development-add-stellar-address-to-farms

add stellar address to farms

Author: Eslam-Nawara

node-registrar/docs/docs.go

@@ -914,6 +914,9 @@ const docTemplate = `{
                         "$ref": "#/definitions/db.Node"
                     }
                 },
+                "stellar_address": {
+                    "type": "string"
+                },
                 "twin_id": {
                     "description": "Farmer account reference",
                     "type": "integer"
@@ -1130,14 +1133,14 @@ const docTemplate = `{
         },
         "server.UpdateFarmRequest": {
             "type": "object",
-            "required": [
-                "farm_name"
-            ],
             "properties": {
                 "farm_name": {
                     "type": "string",
-                    "maxLength": 40,
-                    "minLength": 1
+                    "maxLength": 40
+                },
+                "stellar_address": {
+                    "type": "string",
+                    "maxLength": 56
                 }
             }
         },

node-registrar/docs/swagger.json

@@ -903,6 +903,9 @@
                         "$ref": "#/definitions/db.Node"
                     }
                 },
+                "stellar_address": {
+                    "type": "string"
+                },
                 "twin_id": {
                     "description": "Farmer account reference",
                     "type": "integer"
@@ -1119,14 +1122,14 @@
         },
         "server.UpdateFarmRequest": {
             "type": "object",
-            "required": [
-                "farm_name"
-            ],
             "properties": {
                 "farm_name": {
                     "type": "string",
-                    "maxLength": 40,
-                    "minLength": 1
+                    "maxLength": 40
+                },
+                "stellar_address": {
+                    "type": "string",
+                    "maxLength": 56
                 }
             }
         },

node-registrar/docs/swagger.yaml

@@ -43,6 +43,8 @@ definitions:
         items:
           $ref: '#/definitions/db.Node'
         type: array
+      stellar_address:
+        type: string
       twin_id:
         description: Farmer account reference
         type: integer
@@ -194,10 +196,10 @@ definitions:
     properties:
       farm_name:
         maxLength: 40
-        minLength: 1
         type: string
-    required:
-    - farm_name
+      stellar_address:
+        maxLength: 56
+        type: string
     type: object
   server.UpdateNodeRequest:
     properties:

node-registrar/pkg/db/farms.go

@@ -49,10 +49,17 @@ func (db *Database) CreateFarm(farm Farm) (uint64, error) {
 	return farm.FarmID, nil
 }
 
-func (db *Database) UpdateFarm(farmID uint64, name string) (err error) {
-	result := db.gormDB.Model(&Farm{}).Where("farm_id = ?", farmID).Updates(map[string]interface{}{
-		"farm_name": name,
-	})
+func (db *Database) UpdateFarm(farmID uint64, name string, stellarAddr string) (err error) {
+	update := map[string]interface{}{}
+
+	if len(name) != 0 {
+		update["farm_name"] = name
+	}
+	if len(stellarAddr) != 0 {
+		update["stellar_address"] = stellarAddr
+	}
+
+	result := db.gormDB.Model(&Farm{}).Where("farm_id = ?", farmID).Updates(update)
 	if result.Error != nil {
 		return result.Error
 	}

node-registrar/pkg/db/models.go

@@ -21,12 +21,13 @@ type Account struct {
 }
 
 type Farm struct {
-	FarmID    uint64    `gorm:"primaryKey;autoIncrement" json:"farm_id"`
-	FarmName  string    `gorm:"size:40;not null;unique;check:farm_name <> ''" json:"farm_name"`
-	TwinID    uint64    `json:"twin_id" gorm:"not null;check:twin_id > 0"` // Farmer account reference
-	Dedicated bool      `json:"dedicated"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
+	FarmID         uint64    `gorm:"primaryKey;autoIncrement" json:"farm_id"`
+	FarmName       string    `gorm:"size:40;not null;unique;check:farm_name <> ''" json:"farm_name" binding:"alphanum,required"`
+	TwinID         uint64    `json:"twin_id" gorm:"not null;check:twin_id > 0"` // Farmer account reference
+	StellarAddress string    `json:"stellar_address" binding:"max=56,startswith=G,len=56,alphanum,uppercase"`
+	Dedicated      bool      `json:"dedicated"`
+	CreatedAt      time.Time `json:"created_at"`
+	UpdatedAt      time.Time `json:"updated_at"`
 	// @swagger:ignore
 	Nodes []Node `gorm:"foreignKey:FarmID;references:FarmID;constraint:OnDelete:RESTRICT" json:"nodes"`
 }

node-registrar/pkg/server/handlers.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -130,7 +131,8 @@ func (s Server) createFarmHandler(c *gin.Context) {
 }
 
 type UpdateFarmRequest struct {
-	FarmName string `json:"farm_name" binding:"required,min=1,max=40"`
+	FarmName       string `json:"farm_name" binding:"max=40"`
+	StellarAddress string `json:"stellar_address" binding:"max=56,startswith=G,len=56,alphanum,uppercase"`
 }
 
 // @Summary Update farm
@@ -176,9 +178,13 @@ func (s Server) updateFarmsHandler(c *gin.Context) {
 		return
 	}
 
+	req.FarmName = strings.TrimSpace(req.FarmName)
+	req.StellarAddress = strings.TrimSpace(req.StellarAddress)
+
 	// No need to hit DB if new farm name is same as the old one
-	if existingFarm.FarmName != req.FarmName {
-		err = s.db.UpdateFarm(id, req.FarmName)
+	if (len(req.FarmName) != 0 && existingFarm.FarmName != req.FarmName) ||
+		(len(req.StellarAddress) != 0 && existingFarm.StellarAddress != req.StellarAddress) {
+		err = s.db.UpdateFarm(id, req.FarmName, req.StellarAddress)
 		if err != nil {
 			status := http.StatusBadRequest