Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

use dbx new binder'

goenning4334c2f2354d
diff --git a/app/models/identity.go b/app/models/identity.go
index 71450b6e0..e0769b372 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -4,18 +4,18 @@ import jwt "github.com/dgrijalva/jwt-go"
//Tenant represents a tenant
type Tenant struct {
- ID int `json:"id"`
- Name string `json:"name"`
- Subdomain string `json:"subdomain"`
+ ID int `json:"id" db:"id"`
+ Name string `json:"name" db:"name"`
+ Subdomain string `json:"subdomain" db:"subdomain"`
}
//User represents an user inside our application
type User struct {
- ID int `json:"id"`
- Name string `json:"name"`
- Email string `json:"email"`
- Tenant *Tenant `json:"tenant"`
- Role Role `json:"role"`
+ ID int `json:"id" db:"id"`
+ Name string `json:"name" db:"name"`
+ Email string `json:"email" db:"email"`
+ Tenant *Tenant `json:"tenant" db:"tenant"`
+ Role Role `json:"role" db:"role"`
Providers []*UserProvider `json:"providers"`
}
@@ -43,8 +43,8 @@ func (u *User) HasProvider(provider string) bool {
//UserProvider represents the relashionship between an User and an Authentication provide
type UserProvider struct {
- Name string `json:"name"`
- UID string `json:"uid"`
+ Name string `json:"name" db:"provider"`
+ UID string `json:"uid" db:"provider_uid"`
}
//WechyClaims represents what goes into JWT tokens
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 56be7636e..b34f48d98 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -108,7 +108,7 @@ func (db Database) Get(data interface{}, command string, args ...interface{}) er
if rows.Next() {
return scan(rows, data)
}
- return nil
+ return sql.ErrNoRows
}
//Select all matched rows bind to given data
@@ -121,12 +121,12 @@ func (db Database) Select(data interface{}, command string, args ...interface{})
sliceType := reflect.TypeOf(data).Elem()
items := reflect.New(sliceType).Elem()
for rows.Next() {
- item := reflect.New(sliceType.Elem())
+ item := reflect.New(sliceType.Elem().Elem())
err = scan(rows, item.Interface())
if err != nil {
return err
}
- items = reflect.Append(items, item.Elem())
+ items = reflect.Append(items, item)
}
reflect.Indirect(reflect.ValueOf(data)).Set(items)
diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.go
index 82c4379a0..26bd5ee8a 100644
--- a/app/pkg/dbx/dbx_test.go
+++ b/app/pkg/dbx/dbx_test.go
@@ -53,7 +53,7 @@ func TestBind_SimpleStruct_Multiple(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
- u := []user{}
+ u := []*user{}
err := db.Select(&u, "SELECT name FROM users WHERE tenant_id = 300")
Expect(err).To(BeNil())
@@ -89,7 +89,7 @@ func TestBind_NestedStruct_Multiple(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
- u := []userWithTenant{}
+ u := []*userWithTenant{}
err := db.Select(&u, `
SELECT u.id, u.name, t.id AS tenant_id, t.name AS tenant_name
diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.go
index 46cb78068..4d8d5b908 100644
--- a/app/storage/postgres/tenant.go
+++ b/app/storage/postgres/tenant.go
@@ -3,6 +3,8 @@ package postgres
import (
"strings"
+ "database/sql"
+
"github.com/WeCanHearYou/wechy/app"
"github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/dbx"
@@ -14,16 +16,15 @@ type TenantStorage struct {
}
// GetByDomain returns a tenant based on its domain
-func (svc *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
- tenant := &models.Tenant{}
+func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
+ tenant := models.Tenant{}
- row := svc.DB.QueryRow("SELECT id, name, subdomain FROM tenants WHERE subdomain = $1 OR cname = $2", extractSubdomain(domain), domain)
- err := row.Scan(&tenant.ID, &tenant.Name, &tenant.Subdomain)
- if err != nil {
+ err := s.DB.Get(&tenant, "SELECT id, name, subdomain FROM tenants WHERE subdomain = $1 OR cname = $2", extractSubdomain(domain), domain)
+ if err == sql.ErrNoRows {
return nil, app.ErrNotFound
}
- return tenant, nil
+ return &tenant, nil
}
func extractSubdomain(domain string) string {
diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.go
index 03c33d31d..3a6942822 100644
--- a/app/storage/postgres/user.go
+++ b/app/storage/postgres/user.go
@@ -50,34 +50,22 @@ func (s *UserStorage) Register(user *models.User) error {
// RegisterProvider adds given provider to userID
func (s *UserStorage) RegisterProvider(userID int, provider *models.UserProvider) error {
- now := time.Now()
- return s.DB.Execute("INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4)", userID, provider.Name, provider.UID, now)
+ cmd := "INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4)"
+ return s.DB.Execute(cmd, userID, provider.Name, provider.UID, time.Now())
}
// GetByID returns a user based on given id
func getUser(db *dbx.Database, filter string, args ...interface{}) (*models.User, error) {
- user := &models.User{}
- user.Tenant = &models.Tenant{}
- row := db.QueryRow("SELECT id, name, email, tenant_id, role FROM users WHERE "+filter, args...)
-
- if err := row.Scan(&user.ID, &user.Name, &user.Email, &user.Tenant.ID, &user.Role); err != nil {
- if err == sql.ErrNoRows {
- return nil, app.ErrNotFound
- }
- return nil, err
+ user := models.User{}
+ err := db.Get(&user, "SELECT id, name, email, tenant_id, role FROM users WHERE "+filter, args...)
+ if err == sql.ErrNoRows {
+ return nil, app.ErrNotFound
}
- rows, err := db.Query("SELECT provider_uid, provider FROM user_providers WHERE user_id = $1", user.ID)
+ err = db.Select(&user.Providers, "SELECT provider_uid, provider FROM user_providers WHERE user_id = $1", user.ID)
if err != nil {
return nil, err
}
- defer rows.Close()
- for rows.Next() {
- p := &models.UserProvider{}
- rows.Scan(&p.UID, &p.Name)
- user.Providers = append(user.Providers, p)
- }
-
- return user, nil
+ return &user, nil
}