Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

wip

goenningc0e7d5a1493c
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 000000000..6accc7c05
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,19 @@
+{
+ // See https://go.microsoft.com/fwlink/?LinkId=733558
+ // for the documentation about the tasks.json format
+ "version": "0.1.0",
+ "tasks": [
+ {
+ "taskName": "test",
+ "command": "make",
+ "args": ["test"],
+ "isShellCommand": true
+ },
+ {
+ "taskName": "build",
+ "command": "make",
+ "args": ["build"],
+ "isShellCommand": true
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/dbx/dbx.go b/app/dbx/dbx.go
new file mode 100644
index 000000000..88f152e83
--- /dev/null
+++ b/app/dbx/dbx.go
@@ -0,0 +1,67 @@
+package dbx
+
+import (
+ "database/sql"
+
+ "github.com/WeCanHearYou/wechy/app/toolbox/env"
+
+ //required
+ _ "github.com/lib/pq"
+)
+
+// New creates a new Database instance
+func New() (*Database, error) {
+ conn, err := sql.Open("postgres", env.MustGet("DATABASE_URL"))
+ if err != nil {
+ return nil, throw(err)
+ }
+ return &Database{conn}, nil
+}
+
+// Database represents a connection to a SQL database
+type Database struct {
+ conn *sql.DB
+}
+
+// Execute given SQL command
+func (db Database) Execute(command string, args ...interface{}) error {
+ _, err := db.conn.Exec(command, args...)
+ if err != nil {
+ return throw(err)
+ }
+ return nil
+}
+
+// Query the database with given SQL command
+func (db Database) Query(command string, args ...interface{}) (*sql.Rows, error) {
+ return db.conn.Query(command, args...)
+}
+
+// QueryRow the database with given SQL command and returns only one row
+func (db Database) QueryRow(command string, args ...interface{}) *sql.Row {
+ return db.conn.QueryRow(command, args...)
+}
+
+// Begin returns a new SQL transaction
+func (db Database) Begin() (*sql.Tx, error) {
+ return db.conn.Begin()
+}
+
+// Close connection to database
+func (db Database) Close() {
+ if env.IsTest() {
+ db.Execute("TRUNCATE TABLE users RESTART IDENTITY CASCADE")
+ db.Execute("TRUNCATE TABLE tenants RESTART IDENTITY CASCADE")
+ }
+
+ if db.conn != nil {
+ db.conn.Close()
+ }
+}
+
+func throw(err error) error {
+ if env.IsTest() {
+ panic(err)
+ }
+ return err
+}
diff --git a/app/identity/handler.go b/app/identity/handler.go
index 5ca0d714b..45fad9f11 100644
--- a/app/identity/handler.go
+++ b/app/identity/handler.go
@@ -7,7 +7,7 @@ import (
"time"
"github.com/WeCanHearYou/wechy/app"
- "github.com/labstack/echo"
+ "github.com/WeCanHearYou/wechy/app/infra"
)
type oauthUserProfile struct {
@@ -38,12 +38,12 @@ func (h OAuthHandlers) Callback(provider string) app.HandlerFunc {
if err != nil {
c.Logger().Errorf("Could not parse url %s", redirect)
- return c.Render(http.StatusInternalServerError, "500.html", echo.Map{})
+ return c.Failure(err)
}
tenant, err := h.tenantService.GetByDomain(stripPort(redirectURL.Host))
if err != nil {
- return err
+ return c.Failure(err)
}
//TODO: Check if code is empty (or other querystring parameter)
@@ -51,7 +51,7 @@ func (h OAuthHandlers) Callback(provider string) app.HandlerFunc {
oauthUser, err := h.oauthService.GetProfile(provider, code)
if err != nil {
c.Logger().Error(err)
- return c.Render(http.StatusInternalServerError, "500.html", echo.Map{})
+ return c.Failure(err)
}
user, err := h.userService.GetByEmail(oauthUser.Email)
@@ -71,10 +71,10 @@ func (h OAuthHandlers) Callback(provider string) app.HandlerFunc {
err = h.userService.Register(user)
if err != nil {
- return err
+ return c.Failure(err)
}
} else {
- return err
+ return c.Failure(err)
}
}
@@ -86,9 +86,9 @@ func (h OAuthHandlers) Callback(provider string) app.HandlerFunc {
}
var token string
- if token, err = Encode(claims); err != nil {
+ if token, err = infra.Encode(claims); err != nil {
c.Logger().Errorf("Encoding claims failed with %s", err)
- return c.Render(http.StatusInternalServerError, "500.html", echo.Map{})
+ return c.Failure(err)
}
var query = redirectURL.Query()
diff --git a/app/identity/handler_test.go b/app/identity/handler_test.go
index 1c7131fa3..e72a4a0ab 100644
--- a/app/identity/handler_test.go
+++ b/app/identity/handler_test.go
@@ -5,32 +5,36 @@ import (
"net/http"
+ "net/url"
+
"github.com/WeCanHearYou/wechy/app/identity"
"github.com/WeCanHearYou/wechy/app/mock"
. "github.com/onsi/gomega"
)
-//HTTPOAuthService implements real OAuth operations using Golang's oauth2 package
-type mockOAuthService struct{}
-
-//GetAuthURL returns authentication url for given provider
-func (p mockOAuthService) GetAuthURL(provider string, redirect string) string {
- return "http://myapp/oauth/token?provider=" + provider + "&redirect=" + redirect
+func handlers() identity.OAuthHandlers {
+ oauth := &mock.OAuthService{}
+ tenant := &mock.TenantService{}
+ user := &mock.UserService{}
+ return identity.OAuth(tenant, oauth, user)
}
-//GetProfile returns user profile based on provider and code
-func (p mockOAuthService) GetProfile(provider string, code string) (*identity.OAuthUserProfile, error) {
- return nil, nil
+func TestLoginHandler(t *testing.T) {
+ RegisterTestingT(t)
+
+ server := mock.NewServer()
+ code, response := server.ExecuteRaw(handlers().Login(identity.OAuthFacebookProvider))
+
+ Expect(code).To(Equal(http.StatusTemporaryRedirect))
+ Expect(response.Header.Get("Location")).To(Equal("http://orange.test.canherayou.com/oauth/token?provider=facebook&redirect="))
}
-func TestLoginHandlers(t *testing.T) {
+func TestCallbackHandler_InvalidState(t *testing.T) {
RegisterTestingT(t)
- oauth := &mockOAuthService{}
-
server := mock.NewServer()
- code, response := server.ExecuteRaw(identity.OAuth(nil, oauth, nil).Login(identity.OAuthFacebookProvider))
+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=abc")
+ code, _ := server.ExecuteRaw(handlers().Callback(identity.OAuthFacebookProvider))
- Expect(code).To(Equal(http.StatusTemporaryRedirect))
- Expect(response.Header.Get("Location")).To(Equal("http://myapp/oauth/token?provider=facebook&redirect="))
+ Expect(code).To(Equal(http.StatusInternalServerError))
}
diff --git a/app/identity/middleware.go b/app/identity/middleware.go
index c34c626c0..c826026c0 100644
--- a/app/identity/middleware.go
+++ b/app/identity/middleware.go
@@ -5,6 +5,7 @@ import (
"net/url"
"github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/infra"
)
// MultiTenant extract tenant information from hostname and inject it into current context
@@ -30,7 +31,7 @@ func JwtGetter() app.MiddlewareFunc {
return func(c app.Context) error {
if cookie, err := c.Cookie("auth"); err == nil {
- if claims, err := Decode(cookie.Value); err == nil {
+ if claims, err := infra.Decode(cookie.Value); err == nil {
c.SetClaims(claims)
} else {
c.Logger().Error(err)
diff --git a/app/identity/middleware_test.go b/app/identity/middleware_test.go
index 10cda8014..c119c16b8 100644
--- a/app/identity/middleware_test.go
+++ b/app/identity/middleware_test.go
@@ -7,6 +7,7 @@ import (
"github.com/WeCanHearYou/wechy/app"
"github.com/WeCanHearYou/wechy/app/identity"
+ "github.com/WeCanHearYou/wechy/app/infra"
"github.com/WeCanHearYou/wechy/app/mock"
"github.com/labstack/echo"
. "github.com/onsi/gomega"
@@ -110,7 +111,7 @@ func TestJwtGetter_NoCookie(t *testing.T) {
func TestJwtGetter_WithCookie(t *testing.T) {
RegisterTestingT(t)
- token, _ := identity.Encode(&app.WechyClaims{
+ token, _ := infra.Encode(&app.WechyClaims{
UserName: "Jon Snow",
})
@@ -152,7 +153,7 @@ func TestJwtSetter_WithoutJwt(t *testing.T) {
func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {
RegisterTestingT(t)
- token, _ := identity.Encode(&app.WechyClaims{
+ token, _ := infra.Encode(&app.WechyClaims{
UserName: "Jon Snow",
})
@@ -174,7 +175,7 @@ func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {
func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {
RegisterTestingT(t)
- token, _ := identity.Encode(&app.WechyClaims{
+ token, _ := infra.Encode(&app.WechyClaims{
UserName: "Jon Snow",
})
diff --git a/app/identity/jwt.go b/app/infra/jwt.go
similarity index 97%
rename from app/identity/jwt.go
rename to app/infra/jwt.go
index 3026d7d04..fdec07e98 100644
--- a/app/identity/jwt.go
+++ b/app/infra/jwt.go
@@ -1,4 +1,4 @@
-package identity
+package infra
import (
"github.com/WeCanHearYou/wechy/app"
diff --git a/app/identity/jwt_test.go b/app/infra/jwt_test.go
similarity index 80%
rename from app/identity/jwt_test.go
rename to app/infra/jwt_test.go
index 6b741101e..0a95656a6 100644
--- a/app/identity/jwt_test.go
+++ b/app/infra/jwt_test.go
@@ -1,10 +1,10 @@
-package identity_test
+package infra_test
import (
"testing"
"github.com/WeCanHearYou/wechy/app"
- "github.com/WeCanHearYou/wechy/app/identity"
+ "github.com/WeCanHearYou/wechy/app/infra"
. "github.com/onsi/gomega"
)
@@ -17,7 +17,7 @@ func TestJWT_Encode(t *testing.T) {
UserEmail: "[email protected]",
}
- token, err := identity.Encode(claims)
+ token, err := infra.Encode(claims)
Expect(token).NotTo(BeNil())
Expect(err).To(BeNil())
}
@@ -32,9 +32,9 @@ func TestJWT_Decode(t *testing.T) {
TenantID: 2,
}
- token, _ := identity.Encode(claims)
+ token, _ := infra.Encode(claims)
- decoded, err := identity.Decode(token)
+ decoded, err := infra.Decode(token)
Expect(err).To(BeNil())
Expect(decoded.UserID).To(Equal(claims.UserID))
Expect(decoded.UserName).To(Equal(claims.UserName))
diff --git a/app/mock/identity.go b/app/mock/identity.go
new file mode 100644
index 000000000..939bfeb88
--- /dev/null
+++ b/app/mock/identity.go
@@ -0,0 +1,57 @@
+package mock
+
+import (
+ "github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/identity"
+)
+
+// TenantService implements a mocked TenantService
+type TenantService struct {
+}
+
+// GetByDomain returns a tenant based on its domain
+func (svc TenantService) GetByDomain(domain string) (*app.Tenant, error) {
+ tenant := &app.Tenant{}
+
+ switch domain {
+ case "demo":
+ tenant.ID = 1
+ tenant.Name = "Demonstration"
+ tenant.Domain = "demo"
+ return tenant, nil
+ case "orange.test.canherayou.com":
+ tenant.ID = 2
+ tenant.Name = "Orange Inc."
+ tenant.Domain = "orange."
+ return tenant, nil
+ }
+ return nil, app.ErrNotFound
+}
+
+//OAuthService implements a mocked OAuthService
+type OAuthService struct{}
+
+//GetAuthURL returns authentication url for given provider
+func (p OAuthService) GetAuthURL(provider string, redirect string) string {
+ return "http://orange.test.canherayou.com/oauth/token?provider=" + provider + "&redirect=" + redirect
+}
+
+//GetProfile returns user profile based on provider and code
+func (p OAuthService) GetProfile(provider string, code string) (*identity.OAuthUserProfile, error) {
+ return nil, nil
+}
+
+// UserService implements a mocked UserService
+type UserService struct {
+}
+
+// GetByEmail returns a user based on given email
+func (svc UserService) GetByEmail(email string) (*app.User, error) {
+ user := &app.User{}
+ return user, nil
+}
+
+// Register creates a new user based on given information
+func (svc UserService) Register(user *app.User) error {
+ return nil
+}
diff --git a/app/postgres/feedback.go b/app/postgres/feedback.go
index 36d7f81c4..230044195 100644
--- a/app/postgres/feedback.go
+++ b/app/postgres/feedback.go
@@ -1,17 +1,16 @@
package postgres
import (
- "database/sql"
-
"time"
"github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/dbx"
"github.com/WeCanHearYou/wechy/app/feedback"
)
// IdeaService contains read and write operations for ideas
type IdeaService struct {
- DB *sql.DB
+ DB *dbx.Database
}
// GetAll returns all tenant ideas
diff --git a/app/postgres/feedback_test.go b/app/postgres/feedback_test.go
index a5bebe6aa..6dbe74acc 100644
--- a/app/postgres/feedback_test.go
+++ b/app/postgres/feedback_test.go
@@ -5,22 +5,23 @@ import (
"time"
"github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/dbx"
"github.com/WeCanHearYou/wechy/app/postgres"
. "github.com/onsi/gomega"
)
func TestIdeaService_GetAll(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
now := time.Now()
- execute(db, "INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
- execute(db, "INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
- execute(db, "INSERT INTO users (name, email, created_on) VALUES ('Arya Start','[email protected]', now())")
- execute(db, "INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #1','Description #1', $1, 1, 1)", now)
- execute(db, "INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #2','Description #2', $1, 1, 2)", now)
+ db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
+ db.Execute("INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
+ db.Execute("INSERT INTO users (name, email, created_on) VALUES ('Arya Start','[email protected]', now())")
+ db.Execute("INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #1','Description #1', $1, 1, 1)", now)
+ db.Execute("INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #2','Description #2', $1, 1, 2)", now)
svc := &postgres.IdeaService{DB: db}
ideas, err := svc.GetAll(1)
@@ -39,11 +40,11 @@ func TestIdeaService_GetAll(t *testing.T) {
func TestIdeaService_SaveAndGet(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
- execute(db, "INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
- execute(db, "INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
+ db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
+ db.Execute("INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
svc := &postgres.IdeaService{DB: db}
idea, err := svc.Save(1, 1, "My new idea", "with this description")
@@ -63,8 +64,8 @@ func TestIdeaService_SaveAndGet(t *testing.T) {
func TestIdeaService_GetInvalid(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
svc := &postgres.IdeaService{DB: db}
dbIdea, err := svc.GetByID(1, 1)
@@ -75,11 +76,11 @@ func TestIdeaService_GetInvalid(t *testing.T) {
func TestIdeaService_AddAndReturnComments(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
- execute(db, "INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
- execute(db, "INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
+ db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
+ db.Execute("INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
svc := &postgres.IdeaService{DB: db}
idea, _ := svc.Save(1, 1, "My new idea", "with this description")
diff --git a/app/postgres/identity.go b/app/postgres/identity.go
index 07c555970..2e31f1e13 100644
--- a/app/postgres/identity.go
+++ b/app/postgres/identity.go
@@ -1,17 +1,17 @@
package postgres
import (
- "database/sql"
"strings"
"time"
"github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/dbx"
"github.com/WeCanHearYou/wechy/app/toolbox/env"
)
// UserService is used for user operations using a Postgres database
type UserService struct {
- DB *sql.DB
+ DB *dbx.Database
}
// GetByEmail returns a user based on given email
@@ -52,7 +52,7 @@ func (svc UserService) Register(user *app.User) error {
// TenantService contains read and write operations for tenants
type TenantService struct {
- DB *sql.DB
+ DB *dbx.Database
}
// GetByDomain returns a tenant based on its domain
diff --git a/app/postgres/identity_test.go b/app/postgres/identity_test.go
index ee8b13e90..e12ae919b 100644
--- a/app/postgres/identity_test.go
+++ b/app/postgres/identity_test.go
@@ -4,6 +4,7 @@ import (
"testing"
"github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/dbx"
"github.com/WeCanHearYou/wechy/app/identity"
"github.com/WeCanHearYou/wechy/app/postgres"
. "github.com/onsi/gomega"
@@ -11,8 +12,8 @@ import (
func TestUserService_GetByEmail_Error(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
svc := &postgres.UserService{DB: db}
user, err := svc.GetByEmail("[email protected]")
@@ -23,10 +24,10 @@ func TestUserService_GetByEmail_Error(t *testing.T) {
func TestUserService_GetByEmail(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
- execute(db, "INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
+ db.Execute("INSERT INTO users (name, email, created_on) VALUES ('Jon Snow','[email protected]', now())")
svc := &postgres.UserService{DB: db}
user, err := svc.GetByEmail("[email protected]")
@@ -39,10 +40,10 @@ func TestUserService_GetByEmail(t *testing.T) {
func TestUserService_Register(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
- execute(db, "INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
+ db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
svc := &postgres.UserService{DB: db}
user := &app.User{
@@ -68,10 +69,10 @@ func TestUserService_Register(t *testing.T) {
func TestUserService_Register_MultipleProviders(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
- execute(db, "INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
+ db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
svc := &postgres.UserService{DB: db}
user := &app.User{
@@ -101,8 +102,8 @@ func TestUserService_Register_MultipleProviders(t *testing.T) {
func TestTenantService_GetByDomain_NotFound(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
svc := &postgres.TenantService{DB: db}
tenant, err := svc.GetByDomain("mydomain")
@@ -113,10 +114,10 @@ func TestTenantService_GetByDomain_NotFound(t *testing.T) {
func TestTenantService_GetByDomain_Subdomain(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
- execute(db, "INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
+ db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
svc := &postgres.TenantService{DB: db}
tenant, err := svc.GetByDomain("mydomain")
@@ -129,10 +130,10 @@ func TestTenantService_GetByDomain_Subdomain(t *testing.T) {
func TestTenantService_GetByDomain_FullDomain(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
- execute(db, "INSERT INTO tenants (name, subdomain, cname, created_on) VALUES ('My Domain Inc.','mydomain', 'mydomain.anydomain.com', now())")
+ db.Execute("INSERT INTO tenants (name, subdomain, cname, created_on) VALUES ('My Domain Inc.','mydomain', 'mydomain.anydomain.com', now())")
svc := &postgres.TenantService{DB: db}
tenant, err := svc.GetByDomain("mydomain.anydomain.com")
diff --git a/app/postgres/infra.go b/app/postgres/infra.go
index d2bbc4b32..38b367dfa 100644
--- a/app/postgres/infra.go
+++ b/app/postgres/infra.go
@@ -1,10 +1,10 @@
package postgres
-import "database/sql"
+import "github.com/WeCanHearYou/wechy/app/dbx"
// HealthCheckService is a simple general purpose health check service
type HealthCheckService struct {
- DB *sql.DB
+ DB *dbx.Database
}
// IsDatabaseOnline checks if database is online
diff --git a/app/postgres/infra_test.go b/app/postgres/infra_test.go
index fa0d8f12c..7dbbc953e 100644
--- a/app/postgres/infra_test.go
+++ b/app/postgres/infra_test.go
@@ -3,14 +3,15 @@ package postgres_test
import (
"testing"
+ "github.com/WeCanHearYou/wechy/app/dbx"
"github.com/WeCanHearYou/wechy/app/postgres"
. "github.com/onsi/gomega"
)
func TestHealthCheckService_IsDatabaseOnline_Success(t *testing.T) {
RegisterTestingT(t)
- db := setup()
- defer teardown(db)
+ db, _ := dbx.New()
+ defer db.Close()
svc := &postgres.HealthCheckService{DB: db}
diff --git a/app/postgres/setup_test.go b/app/postgres/setup_test.go
deleted file mode 100644
index c1a8c4d47..000000000
--- a/app/postgres/setup_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package postgres_test
-
-import (
- "database/sql"
-
- "github.com/WeCanHearYou/wechy/app/toolbox/env"
- _ "github.com/lib/pq"
-)
-
-func setup() *sql.DB {
- db, err := sql.Open("postgres", env.MustGet("DATABASE_URL"))
- if err != nil {
- panic(err)
- }
- return db
-}
-
-func teardown(db *sql.DB) {
- execute(db, "TRUNCATE TABLE users RESTART IDENTITY CASCADE")
- execute(db, "TRUNCATE TABLE tenants RESTART IDENTITY CASCADE")
-
- if db != nil {
- db.Close()
- }
-}
-
-func execute(db *sql.DB, command string, args ...interface{}) {
- _, err := db.Exec(command, args...)
- if err != nil {
- panic(err)
- }
-}
diff --git a/main.go b/main.go
index baf69029d..1d56910ed 100644
--- a/main.go
+++ b/main.go
@@ -1,13 +1,11 @@
package main
import (
- "database/sql"
-
+ "github.com/WeCanHearYou/wechy/app/dbx"
"github.com/WeCanHearYou/wechy/app/identity"
"github.com/WeCanHearYou/wechy/app/infra"
"github.com/WeCanHearYou/wechy/app/postgres"
"github.com/WeCanHearYou/wechy/app/toolbox/env"
- _ "github.com/lib/pq"
_ "github.com/mattes/migrate/driver/postgres"
mig "github.com/mattes/migrate/migrate"
@@ -38,7 +36,7 @@ func init() {
}
func main() {
- db, err := sql.Open("postgres", env.MustGet("DATABASE_URL"))
+ db, err := dbx.New()
if err != nil {
panic(err)
}