Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

better err handling

goenningceba18ac884e
diff --git a/handlers/tenant.go b/handlers/tenant.go
index 2b713aa46..559a6e5dd 100644
--- a/handlers/tenant.go
+++ b/handlers/tenant.go
@@ -2,6 +2,7 @@ package handlers
import (
"github.com/WeCanHearYou/wchy-api/context"
+ "github.com/WeCanHearYou/wchy-api/services"
"github.com/gin-gonic/gin"
)
@@ -16,8 +17,8 @@ func TenantByDomain(ctx context.WchyContext) gin.HandlerFunc {
func (h tenantHandlers) byDomain() gin.HandlerFunc {
return func(c *gin.Context) {
- tenant := h.ctx.Tenant.GetByDomain(c.Param("domain"))
- if tenant == nil {
+ tenant, err := h.ctx.Tenant.GetByDomain(c.Param("domain"))
+ if err == services.ErrNotFound {
c.Status(404)
} else {
c.JSON(200, tenant)
diff --git a/services/errors.go b/services/errors.go
new file mode 100644
index 000000000..1b0acfc8c
--- /dev/null
+++ b/services/errors.go
@@ -0,0 +1,8 @@
+package services
+
+import (
+ "errors"
+)
+
+// ErrNotFound represents an object not found error
+var ErrNotFound = errors.New("Object not found")
diff --git a/services/tenant.go b/services/tenant.go
index cee03d248..fedc04c46 100644
--- a/services/tenant.go
+++ b/services/tenant.go
@@ -4,5 +4,5 @@ import "github.com/WeCanHearYou/wchy-api/models"
// TenantService contains read and write operations for tenants
type TenantService interface {
- GetByDomain(domain string) *models.Tenant
+ GetByDomain(domain string) (*models.Tenant, error)
}
diff --git a/services/tenant_inmemory.go b/services/tenant_inmemory.go
index 6e05fd054..3013b8e6e 100644
--- a/services/tenant_inmemory.go
+++ b/services/tenant_inmemory.go
@@ -13,11 +13,11 @@ func NewInMemoryTenantService(tenants []*models.Tenant) *InMemoryTenantService {
}
// GetByDomain returns a tenant based on its domain
-func (svc InMemoryTenantService) GetByDomain(domain string) *models.Tenant {
+func (svc InMemoryTenantService) GetByDomain(domain string) (*models.Tenant, error) {
for _, tenant := range svc.tenants {
if tenant.Domain == domain {
- return tenant
+ return tenant, nil
}
}
- return nil
+ return nil, ErrNotFound
}
diff --git a/services/tenant_postgres.go b/services/tenant_postgres.go
index 5baac46c5..5f10f78b8 100644
--- a/services/tenant_postgres.go
+++ b/services/tenant_postgres.go
@@ -17,15 +17,14 @@ func NewPostgresTenantService(db *sql.DB) *PostgresTenantService {
}
// GetByDomain returns a tenant based on its domain
-func (svc PostgresTenantService) GetByDomain(domain string) *models.Tenant {
+func (svc PostgresTenantService) GetByDomain(domain string) (*models.Tenant, error) {
tenant := &models.Tenant{}
row := svc.db.QueryRow("SELECT id, name, domain FROM tenants WHERE domain = $1", domain)
err := row.Scan(&tenant.ID, &tenant.Name, &tenant.Domain)
- if err != nil {
- //TODO: return nil or error
- return nil
+ if err == sql.ErrNoRows {
+ return nil, ErrNotFound
}
- return tenant
+ return tenant, nil
}
diff --git a/services/tenant_postgres_test.go b/services/tenant_postgres_test.go
index 337aa7de7..689b9e256 100644
--- a/services/tenant_postgres_test.go
+++ b/services/tenant_postgres_test.go
@@ -3,6 +3,8 @@ package services
import (
"testing"
+ "database/sql"
+
"github.com/stretchr/testify/assert"
sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1"
)
@@ -11,13 +13,13 @@ func TestTenantByDomain_WhenDomainIsUnknown_ShouldReturnError(t *testing.T) {
db, mock, _ := sqlmock.New()
defer db.Close()
- rows := sqlmock.NewRows([]string{})
- mock.ExpectQuery("SELECT id, name, domain FROM tenants WHERE domain = $1").WithArgs("mydomain").WillReturnRows(rows)
+ mock.ExpectQuery("SELECT id, name, domain FROM tenants WHERE domain = \\$1").WithArgs("mydomain").WillReturnError(sql.ErrNoRows)
svc := NewPostgresTenantService(db)
- tenant := svc.GetByDomain("mydomain")
+ tenant, err := svc.GetByDomain("mydomain")
assert.Nil(t, tenant)
+ assert.Error(t, err)
}
func TestTenantByDomain_WhenDomainIsKnown_ShouldReturnTenantInformation(t *testing.T) {
@@ -28,9 +30,10 @@ func TestTenantByDomain_WhenDomainIsKnown_ShouldReturnTenantInformation(t *testi
mock.ExpectQuery("SELECT id, name, domain FROM tenants WHERE domain = \\$1").WithArgs("mydomain").WillReturnRows(rows)
svc := NewPostgresTenantService(db)
- tenant := svc.GetByDomain("mydomain")
+ tenant, err := svc.GetByDomain("mydomain")
assert.Equal(t, tenant.ID, 234)
assert.Equal(t, tenant.Name, "My Domain Inc.")
assert.Equal(t, tenant.Domain, "mydomain")
+ assert.Nil(t, err)
}