Merge pull request #34 from threefoldtech/development-fix-farm-name-conflict

Eslam-Nawara · web-flow · commit 44106af08589 · 2025-04-06T12:53:05.000+02:00
fix server not detecting conflicts on duplicated names
diff --git a/node-registrar/pkg/db/farms.go b/node-registrar/pkg/db/farms.go
@@ -1,6 +1,8 @@
 package db
 
 import (
+	"strings"
+
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
 )
@@ -41,9 +43,10 @@ func (db *Database) GetFarm(farmID uint64) (farm Farm, err error) {
 
 func (db *Database) CreateFarm(farm Farm) (uint64, error) {
 	if err := db.gormDB.Create(&farm).Error; err != nil {
-		if errors.Is(err, gorm.ErrDuplicatedKey) {
+		if errors.Is(err, gorm.ErrDuplicatedKey) || strings.Contains(err.Error(), "23505") {
 			return 0, ErrRecordAlreadyExists
 		}
+		return 0, err
 	}
 
 	return farm.FarmID, nil

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package db`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "strings"`
	`5`	`+`
`4`	`6`	`"github.com/pkg/errors"`
`5`	`7`	`"gorm.io/gorm"`
`6`	`8`	`)`
`@@ -41,9 +43,10 @@ func (db *Database) GetFarm(farmID uint64) (farm Farm, err error) {`
`41`	`43`
`42`	`44`	`func (db *Database) CreateFarm(farm Farm) (uint64, error) {`
`43`	`45`	`if err := db.gormDB.Create(&farm).Error; err != nil {`
`44`		`- if errors.Is(err, gorm.ErrDuplicatedKey) {`
	`46`	`+ if errors.Is(err, gorm.ErrDuplicatedKey) \|\| strings.Contains(err.Error(), "23505") {`
`45`	`47`	`return 0, ErrRecordAlreadyExists`
`46`	`48`	`}`
	`49`	`+ return 0, err`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`return farm.FarmID, nil`