Open platform to collect and prioritize feedback
update storage to use Trx
goenning14fa2f7bf3f6
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.goindex 661192766..3b0ff7750 100644--- a/app/middlewares/setup.go+++ b/app/middlewares/setup.go@@ -21,9 +21,9 @@ func Setup(db *dbx.Database) web.MiddlewareFunc {c.SetServices(&app.Services{OAuth: &oauth.HTTPService{},- Ideas: &postgres.IdeaStorage{DB: db},- Users: &postgres.UserStorage{DB: db},- Tenants: &postgres.TenantStorage{DB: db},+ Ideas: &postgres.IdeaStorage{Trx: tx},+ Users: &postgres.UserStorage{Trx: tx},+ Tenants: &postgres.TenantStorage{Trx: tx},})defer func() {diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.goindex d614c8785..848155a71 100644--- a/app/pkg/dbx/dbx.go+++ b/app/pkg/dbx/dbx.go@@ -31,111 +31,17 @@ 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 err- }- return nil-}--// QueryIntArray executes given SQL command and return first column as int-func (db Database) QueryIntArray(command string, args ...interface{}) ([]int, error) {- values := make([]int, 0)- var value int-- rows, err := db.conn.Query(command, args...)- if err != nil {- return nil, err- }-- if rows != nil {- defer rows.Close()- for rows.Next() {- err := rows.Scan(&value)- if err != nil {- return nil, err- }- values = append(values, value)- }- }-- return values, 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...)-}--// Exists returns true if at least one record is found-func (db Database) Exists(command string, args ...interface{}) (bool, error) {- rows, err := db.conn.Query(command, args...)- if rows != nil {- defer rows.Close()- return rows.Next(), nil- }- return false, err-}--// Count returns number of rows-func (db Database) Count(command string, args ...interface{}) (int, error) {- rows, err := db.conn.Query(command, args...)- defer rows.Close()- count := 0- for rows != nil && rows.Next() {- count++- }- return count, err-}-// Begin returns a new SQL transaction-func (db Database) Begin() (*sql.Tx, error) {- return db.conn.Begin()-}--// Get first row and bind to given data-func (db Database) Get(data interface{}, command string, args ...interface{}) error {- rows, err := db.Query(command, args...)- if err != nil {- return err- }- defer rows.Close()-- if rows.Next() {- return fill(rows, data)- }-- return sql.ErrNoRows+func (db Database) Begin() (*Trx, error) {+ tx, err := db.conn.Begin()+ return &Trx{tx: tx}, err}-//Select all matched rows bind to given data-func (db Database) Select(data interface{}, command string, args ...interface{}) error {- rows, err := db.Query(command, args...)- if err != nil {- return err- }- defer rows.Close()-- sliceType := reflect.TypeOf(data).Elem()- items := reflect.New(sliceType).Elem()- itemType := sliceType.Elem().Elem()- for rows.Next() {- item := reflect.New(itemType)- err = fill(rows, item.Interface())- if err != nil {- return err- }- items = reflect.Append(items, item)+// Close connection to database+func (db Database) Close() error {+ if db.conn != nil {+ return db.conn.Close()}-- reflect.Indirect(reflect.ValueOf(data)).Set(items)return nil}@@ -191,21 +97,13 @@ func fill(rows *sql.Rows, data interface{}) error {return nil}-// Close connection to database-func (db Database) Close() error {- if db.conn != nil {- return db.conn.Close()- }- return nil-}-func (db Database) load(path string) {content, err := ioutil.ReadFile(env.Path(path))if err != nil {panic(err)}- err = db.Execute(string(content))+ _, err = db.conn.Exec(string(content))if err != nil {panic(err)}@@ -239,3 +137,121 @@ func (db Database) Migrate() {fmt.Printf("Migrations finished with success.\n")}}++//Trx represents a Database transaction+type Trx struct {+ tx *sql.Tx+}++// Query the database with given SQL command+func (trx Trx) Query(command string, args ...interface{}) (*sql.Rows, error) {+ return trx.tx.Query(command, args...)+}++// Get first row and bind to given data+func (trx Trx) Get(data interface{}, command string, args ...interface{}) error {+ rows, err := trx.Query(command, args...)+ if err != nil {+ return err+ }+ defer rows.Close()++ if rows.Next() {+ return fill(rows, data)+ }++ return sql.ErrNoRows+}++// Execute given SQL command+func (trx Trx) Execute(command string, args ...interface{}) error {+ _, err := trx.tx.Exec(command, args...)+ if err != nil {+ return err+ }+ return nil+}++// QueryIntArray executes given SQL command and return first column as int+func (trx Trx) QueryIntArray(command string, args ...interface{}) ([]int, error) {+ values := make([]int, 0)+ var value int++ rows, err := trx.tx.Query(command, args...)+ if err != nil {+ return nil, err+ }++ if rows != nil {+ defer rows.Close()+ for rows.Next() {+ err := rows.Scan(&value)+ if err != nil {+ return nil, err+ }+ values = append(values, value)+ }+ }++ return values, nil+}++// QueryRow the database with given SQL command and returns only one row+func (trx Trx) QueryRow(command string, args ...interface{}) *sql.Row {+ return trx.tx.QueryRow(command, args...)+}++// Exists returns true if at least one record is found+func (trx Trx) Exists(command string, args ...interface{}) (bool, error) {+ rows, err := trx.tx.Query(command, args...)+ if rows != nil {+ defer rows.Close()+ return rows.Next(), nil+ }+ return false, err+}++// Count returns number of rows+func (trx Trx) Count(command string, args ...interface{}) (int, error) {+ rows, err := trx.tx.Query(command, args...)+ defer rows.Close()+ count := 0+ for rows != nil && rows.Next() {+ count+++ }+ return count, err+}++//Select all matched rows bind to given data+func (trx Trx) Select(data interface{}, command string, args ...interface{}) error {+ rows, err := trx.tx.Query(command, args...)+ if err != nil {+ return err+ }+ defer rows.Close()++ sliceType := reflect.TypeOf(data).Elem()+ items := reflect.New(sliceType).Elem()+ itemType := sliceType.Elem().Elem()+ for rows.Next() {+ item := reflect.New(itemType)+ err = fill(rows, item.Interface())+ if err != nil {+ return err+ }+ items = reflect.Append(items, item)+ }++ reflect.Indirect(reflect.ValueOf(data)).Set(items)+ return nil+}++// Commit current transaction+func (trx Trx) Commit() error {+ return trx.tx.Commit()+}++// Rollback current transaction+func (trx Trx) Rollback() error {+ return trx.tx.Rollback()+}diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.goindex e477adc80..1dc16bccd 100644--- a/app/pkg/dbx/dbx_test.go+++ b/app/pkg/dbx/dbx_test.go@@ -45,9 +45,11 @@ func TestBind_SimpleStruct(t *testing.T) {db, _ := dbx.New()defer db.Close()+ trx, _ := db.Begin()+ defer trx.Rollback()u := user{}- err := db.Get(&u, "SELECT id, name FROM users LIMIT 1")+ err := trx.Get(&u, "SELECT id, name FROM users LIMIT 1")Expect(err).To(BeNil())Expect(u.ID).To(Equal(300))Expect(u.Name).To(Equal("Jon Snow"))@@ -59,9 +61,11 @@ func TestBind_DeepNestedStruct(t *testing.T) {db, _ := dbx.New()defer db.Close()+ trx, _ := db.Begin()+ defer trx.Rollback()u := userProvider{}- err := db.Get(&u, `SELECT up.provider,+ err := trx.Get(&u, `SELECT up.provider,up.user_id,u.tenant_id AS user_tenant_idFROM user_providers up@@ -72,7 +76,6 @@ func TestBind_DeepNestedStruct(t *testing.T) {Expect(u.Provider).To(Equal("facebook"))Expect(u.User.ID).To(Equal(400))Expect(u.User.Tenant.ID).To(Equal(400))-}func TestBind_SimpleStruct_SingleField(t *testing.T) {@@ -80,9 +83,11 @@ func TestBind_SimpleStruct_SingleField(t *testing.T) {db, _ := dbx.New()defer db.Close()+ trx, _ := db.Begin()+ defer trx.Rollback()u := user{}- err := db.Get(&u, "SELECT name FROM users LIMIT 1")+ err := trx.Get(&u, "SELECT name FROM users LIMIT 1")Expect(err).To(BeNil())Expect(u.ID).To(Equal(0))Expect(u.Name).To(Equal("Jon Snow"))@@ -93,9 +98,11 @@ func TestBind_SimpleStruct_Multiple(t *testing.T) {db, _ := dbx.New()defer db.Close()+ trx, _ := db.Begin()+ defer trx.Rollback()u := []*user{}- err := db.Select(&u, "SELECT name FROM users WHERE tenant_id = 300")+ err := trx.Select(&u, "SELECT name FROM users WHERE tenant_id = 300")Expect(err).To(BeNil())Expect(len(u)).To(Equal(2))@@ -108,9 +115,12 @@ func TestBind_NestedStruct(t *testing.T) {db, _ := dbx.New()defer db.Close()+ trx, _ := db.Begin()+ defer trx.Rollback()+u := userWithTenant{}- err := db.Get(&u, `+ err := trx.Get(&u, `SELECT u.id, u.name, t.id AS tenant_id, t.name AS tenant_nameFROM users uINNER JOIN tenants t@@ -131,9 +141,12 @@ func TestBind_NestedStruct_Multiple(t *testing.T) {db, _ := dbx.New()defer db.Close()+ trx, _ := db.Begin()+ defer trx.Rollback()+u := []*userWithTenant{}- err := db.Select(&u, `+ err := trx.Select(&u, `SELECT u.id, u.name, t.id AS tenant_id, t.name AS tenant_nameFROM users uINNER JOIN tenants t@@ -146,6 +159,7 @@ func TestBind_NestedStruct_Multiple(t *testing.T) {Expect(*u[0].Tenant.Name).To(Equal("Demonstration"))Expect(u[1].Name).To(Equal("Arya Stark"))Expect(*u[1].Tenant.Name).To(Equal("Demonstration"))+}func TestExists_True(t *testing.T) {@@ -153,7 +167,10 @@ func TestExists_True(t *testing.T) {db, _ := dbx.New()defer db.Close()- exists, err := db.Exists("SELECT 1 FROM users WHERE id = 300")+ trx, _ := db.Begin()+ defer trx.Rollback()++ exists, err := trx.Exists("SELECT 1 FROM users WHERE id = 300")Expect(err).To(BeNil())Expect(exists).To(BeTrue())}@@ -163,7 +180,10 @@ func TestExists_False(t *testing.T) {db, _ := dbx.New()defer db.Close()- exists, err := db.Exists("SELECT 1 FROM users WHERE id = 0")+ trx, _ := db.Begin()+ defer trx.Rollback()++ exists, err := trx.Exists("SELECT 1 FROM users WHERE id = 0")Expect(err).To(BeNil())Expect(exists).To(BeFalse())}@@ -173,7 +193,10 @@ func TestCount(t *testing.T) {db, _ := dbx.New()defer db.Close()- count, err := db.Count("SELECT 1 FROM users WHERE id = 300")+ trx, _ := db.Begin()+ defer trx.Rollback()++ count, err := trx.Count("SELECT 1 FROM users WHERE id = 300")Expect(err).To(BeNil())Expect(count).To(Equal(1))}@@ -183,7 +206,10 @@ func TestCount_Empty(t *testing.T) {db, _ := dbx.New()defer db.Close()- count, err := db.Count("SELECT 1 FROM users WHERE id = 0")+ trx, _ := db.Begin()+ defer trx.Rollback()++ count, err := trx.Count("SELECT 1 FROM users WHERE id = 0")Expect(err).To(BeNil())Expect(count).To(Equal(0))}diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.goindex 456a30bfb..c71c7207f 100644--- a/app/storage/postgres/idea.go+++ b/app/storage/postgres/idea.go@@ -67,7 +67,7 @@ func (c *dbComment) toModel() *models.Comment {// IdeaStorage contains read and write operations for ideastype IdeaStorage struct {- DB *dbx.Database+ Trx *dbx.Trx}var (@@ -98,7 +98,7 @@ var (// GetAll returns all tenant ideasfunc (s *IdeaStorage) GetAll(tenantID int) ([]*models.Idea, error) {var ideas []*dbIdea- err := s.DB.Select(&ideas, sqlSelectIdeasWhere+" i.tenant_id = $1 ORDER BY i.created_on DESC", tenantID)+ err := s.Trx.Select(&ideas, sqlSelectIdeasWhere+" i.tenant_id = $1 ORDER BY i.created_on DESC", tenantID)if err != nil {return nil, err}@@ -114,7 +114,7 @@ func (s *IdeaStorage) GetAll(tenantID int) ([]*models.Idea, error) {func (s *IdeaStorage) GetByID(tenantID, ideaID int) (*models.Idea, error) {idea := dbIdea{}- err := s.DB.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.id = $2 ORDER BY i.created_on DESC", tenantID, ideaID)+ err := s.Trx.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.id = $2 ORDER BY i.created_on DESC", tenantID, ideaID)if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {@@ -128,7 +128,7 @@ func (s *IdeaStorage) GetByID(tenantID, ideaID int) (*models.Idea, error) {func (s *IdeaStorage) GetByNumber(tenantID, number int) (*models.Idea, error) {idea := dbIdea{}- err := s.DB.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.number = $2 ORDER BY i.created_on DESC", tenantID, number)+ err := s.Trx.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.number = $2 ORDER BY i.created_on DESC", tenantID, number)if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {@@ -141,7 +141,7 @@ func (s *IdeaStorage) GetByNumber(tenantID, number int) (*models.Idea, error) {// GetCommentsByIdeaID returns all coments from given ideafunc (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comment, error) {comments := []*dbComment{}- err := s.DB.Select(&comments,+ err := s.Trx.Select(&comments,`SELECT c.id,c.content,c.created_on,@@ -169,40 +169,28 @@ func (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comme// Save a new idea in the databasefunc (s *IdeaStorage) Save(tenantID, userID int, title, description string) (*models.Idea, error) {- tx, err := s.DB.Begin()- if err != nil {- return nil, err- }-idea := new(models.Idea)idea.Title = titleidea.Description = description- row := tx.QueryRow(`INSERT INTO ideas (title, slug, number, description, tenant_id, user_id, created_on, supporters, status)+ row := s.Trx.QueryRow(`INSERT INTO ideas (title, slug, number, description, tenant_id, user_id, created_on, supporters, status)VALUES ($1, $2, (SELECT COALESCE(MAX(number), 0) + 1 FROM ideas i WHERE i.tenant_id = $4), $3, $4, $5, $6, 0, 0)RETURNING id`, title, slug.Make(title), description, tenantID, userID, time.Now())- if err = row.Scan(&idea.ID); err != nil {- tx.Rollback()+ if err := row.Scan(&idea.ID); err != nil {return nil, err}- return idea, tx.Commit()+ return idea, nil}// AddComment places a new comment on an ideafunc (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error) {- tx, err := s.DB.Begin()- if err != nil {- return 0, err- }-var id int- if err = tx.QueryRow("INSERT INTO comments (idea_id, content, user_id, created_on) VALUES ($1, $2, $3, $4) RETURNING id", ideaID, content, userID, time.Now()).Scan(&id); err != nil {- tx.Rollback()+ if err := s.Trx.QueryRow("INSERT INTO comments (idea_id, content, user_id, created_on) VALUES ($1, $2, $3, $4) RETURNING id", ideaID, content, userID, time.Now()).Scan(&id); err != nil {return 0, err}- return id, tx.Commit()+ return id, nil}// AddSupporter adds user to idea list of supporters@@ -215,7 +203,7 @@ func (s *IdeaStorage) AddSupporter(tenantID, userID, ideaID int) error {return nil}- alreadySupported, err := s.DB.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, ideaID)+ alreadySupported, err := s.Trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, ideaID)if err != nil {return err}@@ -224,22 +212,15 @@ func (s *IdeaStorage) AddSupporter(tenantID, userID, ideaID int) error {return nil}- tx, err := s.DB.Begin()- if err != nil {- return err- }-- if _, err := tx.Exec(`UPDATE ideas SET supporters = supporters + 1 WHERE id = $1`, ideaID); err != nil {- tx.Rollback()+ if err := s.Trx.Execute(`UPDATE ideas SET supporters = supporters + 1 WHERE id = $1`, ideaID); err != nil {return err}- if _, err := tx.Exec(`INSERT INTO idea_supporters (user_id, idea_id, created_on) VALUES ($1, $2, $3)`, userID, ideaID, time.Now()); err != nil {- tx.Rollback()+ if err := s.Trx.Execute(`INSERT INTO idea_supporters (user_id, idea_id, created_on) VALUES ($1, $2, $3)`, userID, ideaID, time.Now()); err != nil {return err}- return tx.Commit()+ return nil}// RemoveSupporter removes user from idea list of supporters@@ -253,7 +234,7 @@ func (s *IdeaStorage) RemoveSupporter(tenantID, userID, ideaID int) error {return nil}- didSupport, err := s.DB.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, ideaID)+ didSupport, err := s.Trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, ideaID)if err != nil {return err}@@ -262,27 +243,20 @@ func (s *IdeaStorage) RemoveSupporter(tenantID, userID, ideaID int) error {return nil}- tx, err := s.DB.Begin()- if err != nil {+ if err := s.Trx.Execute(`UPDATE ideas SET supporters = supporters - 1 WHERE id = $1`, ideaID); err != nil {return err}- if _, err := tx.Exec(`UPDATE ideas SET supporters = supporters - 1 WHERE id = $1`, ideaID); err != nil {- tx.Rollback()+ if err := s.Trx.Execute(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2`, userID, ideaID); err != nil {return err}- if _, err := tx.Exec(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2`, userID, ideaID); err != nil {- tx.Rollback()- return err- }-- return tx.Commit()+ return nil}// SetResponse changes current idea responsefunc (s *IdeaStorage) SetResponse(tenantID, ideaID int, text string, userID, status int) error {- if err := s.DB.Execute(`UPDATE ideas SET response = $3, response_date = $4, response_user_id = $5, status = $6 WHERE id = $1 and tenant_id = $2`, ideaID, tenantID, text, time.Now(), userID, status); err != nil {+ if err := s.Trx.Execute(`UPDATE ideas SET response = $3, response_date = $4, response_user_id = $5, status = $6 WHERE id = $1 and tenant_id = $2`, ideaID, tenantID, text, time.Now(), userID, status); err != nil {return err}return nildiff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.goindex 90ca48cd1..11d2cc7dd 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -17,12 +17,15 @@ func TestIdeaStorage_GetAll(t *testing.T) {db.Seed()defer db.Close()+ trx, _ := db.Begin()+ defer trx.Rollback()+now := time.Now()- db.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #1', 'idea-1', 1, 'Description #1', $1, 300, 300, 0, 1)", now)- db.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #2', 'idea-2', 2, 'Description #2', $1, 300, 301, 5, 2)", now)+ trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #1', 'idea-1', 1, 'Description #1', $1, 300, 300, 0, 1)", now)+ trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #2', 'idea-2', 2, 'Description #2', $1, 300, 301, 5, 2)", now)- ideas := &postgres.IdeaStorage{DB: db}+ ideas := &postgres.IdeaStorage{Trx: trx}dbIdeas, err := ideas.GetAll(300)Expect(err).To(BeNil())@@ -51,10 +54,13 @@ func TestIdeaStorage_SaveAndGet(t *testing.T) {db.Seed()defer db.Close()- db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")- db.Execute("INSERT INTO users (name, email, created_on, role) VALUES ('Jon Snow','[email protected]', now(), 2)")+ trx, _ := db.Begin()+ defer trx.Rollback()++ trx.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")+ trx.Execute("INSERT INTO users (name, email, created_on, role) VALUES ('Jon Snow','[email protected]', now(), 2)")- ideas := &postgres.IdeaStorage{DB: db}+ ideas := &postgres.IdeaStorage{Trx: trx}idea, err := ideas.Save(1, 1, "My new idea", "with this description")Expect(err).To(BeNil())Expect(idea.ID).To(Equal(1))@@ -79,7 +85,10 @@ func TestIdeaStorage_GetInvalid(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}dbIdea, err := ideas.GetByID(1, 1)Expect(err).To(Equal(app.ErrNotFound))@@ -92,10 +101,13 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {db.Seed()defer db.Close()- db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")- db.Execute("INSERT INTO users (name, email, created_on, role) VALUES ('Jon Snow','[email protected]', now(), 2)")+ trx, _ := db.Begin()+ defer trx.Rollback()- ideas := &postgres.IdeaStorage{DB: db}+ trx.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")+ trx.Execute("INSERT INTO users (name, email, created_on, role) VALUES ('Jon Snow','[email protected]', now(), 2)")++ ideas := &postgres.IdeaStorage{Trx: trx}idea, _ := ideas.Save(1, 1, "My new idea", "with this description")ideas.AddComment(1, idea.ID, "Comment #1")ideas.AddComment(1, idea.ID, "Comment #2")@@ -114,7 +126,10 @@ func TestIdeaStorage_SaveAndGet_DifferentTenants(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}ideas.Save(300, 300, "My new idea", "with this description")ideas.Save(400, 400, "My other idea", "with other description")@@ -142,7 +157,10 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}idea, _ := ideas.Save(300, 300, "My new idea", "with this description")err := ideas.AddSupporter(300, 300, idea.ID)@@ -162,7 +180,10 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}idea, _ := ideas.Save(300, 300, "My new idea", "with this description")err := ideas.AddSupporter(300, 300, idea.ID)@@ -182,7 +203,10 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}idea, _ := ideas.Save(300, 300, "My new idea", "with this description")err := ideas.AddSupporter(300, 300, idea.ID)@@ -202,7 +226,10 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}idea, _ := ideas.Save(300, 300, "My new idea", "with this description")err := ideas.AddSupporter(300, 300, idea.ID)@@ -225,7 +252,10 @@ func TestIdeaStorage_SetResponse(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}idea, _ := ideas.Save(300, 300, "My new idea", "with this description")err := ideas.SetResponse(300, idea.ID, "We liked this idea", 300, models.IdeaStarted)@@ -243,7 +273,10 @@ func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}idea, _ := ideas.Save(300, 300, "My new idea", "with this description")ideas.SetResponse(300, idea.ID, "We liked this idea", 300, models.IdeaCompleted)ideas.AddSupporter(300, 300, idea.ID)@@ -259,7 +292,10 @@ func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {db.Seed()defer db.Close()- ideas := &postgres.IdeaStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ ideas := &postgres.IdeaStorage{Trx: trx}idea, _ := ideas.Save(300, 300, "My new idea", "with this description")ideas.AddSupporter(300, 300, idea.ID)ideas.SetResponse(300, idea.ID, "We liked this idea", 300, models.IdeaCompleted)diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 38b70a548..2eab5c55a 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -13,7 +13,7 @@ import (// TenantStorage contains read and write operations for tenantstype TenantStorage struct {- DB *dbx.Database+ Trx *dbx.Trx}type dbTenant struct {@@ -34,7 +34,7 @@ func (t *dbTenant) toModel() *models.Tenant {// Add given tenant to tenant listfunc (s *TenantStorage) Add(tenant *models.Tenant) error {- row := s.DB.QueryRow(`INSERT INTO tenants (name, subdomain, cname, created_on)+ row := s.Trx.QueryRow(`INSERT INTO tenants (name, subdomain, cname, created_on)VALUES ($1, $2, $3, $4)RETURNING id`, tenant.Name, tenant.Subdomain, tenant.CNAME, time.Now())if err := row.Scan(&tenant.ID); err != nil {@@ -48,7 +48,7 @@ func (s *TenantStorage) Add(tenant *models.Tenant) error {func (s *TenantStorage) First() (*models.Tenant, error) {tenant := dbTenant{}- err := s.DB.Get(&tenant, "SELECT id, name, subdomain, cname FROM tenants LIMIT 1")+ err := s.Trx.Get(&tenant, "SELECT id, name, subdomain, cname FROM tenants LIMIT 1")if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {@@ -62,7 +62,7 @@ func (s *TenantStorage) First() (*models.Tenant, error) {func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {tenant := dbTenant{}- err := s.DB.Get(&tenant, "SELECT id, name, subdomain, cname FROM tenants WHERE subdomain = $1 OR cname = $2", extractSubdomain(domain), domain)+ err := s.Trx.Get(&tenant, "SELECT id, name, subdomain, cname FROM tenants WHERE subdomain = $1 OR cname = $2", extractSubdomain(domain), domain)if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex 735f766e2..6277149ff 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -16,7 +16,10 @@ func TestTenantStorage_First(t *testing.T) {db.Seed()defer db.Close()- tenants := &postgres.TenantStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ tenants := &postgres.TenantStorage{Trx: trx}tenant, err := tenants.First()Expect(err).To(BeNil())@@ -29,9 +32,12 @@ func TestTenantStorage_Empty_First(t *testing.T) {db.Seed()defer db.Close()- db.Execute("TRUNCATE tenants CASCADE")+ trx, _ := db.Begin()+ defer trx.Rollback()++ trx.Execute("TRUNCATE tenants CASCADE")- tenants := &postgres.TenantStorage{DB: db}+ tenants := &postgres.TenantStorage{Trx: trx}tenant, err := tenants.First()Expect(err).To(Equal(app.ErrNotFound))@@ -44,7 +50,10 @@ func TestTenantStorage_GetByDomain_NotFound(t *testing.T) {db.Seed()defer db.Close()- tenants := &postgres.TenantStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ tenants := &postgres.TenantStorage{Trx: trx}tenant, err := tenants.GetByDomain("mydomain")Expect(tenant).To(BeNil())@@ -57,7 +66,10 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {db.Seed()defer db.Close()- tenants := &postgres.TenantStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ tenants := &postgres.TenantStorage{Trx: trx}tenants.Add(&models.Tenant{Name: "My Domain Inc.",Subdomain: "mydomain",@@ -78,7 +90,10 @@ func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {db.Seed()defer db.Close()- tenants := &postgres.TenantStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ tenants := &postgres.TenantStorage{Trx: trx}tenants.Add(&models.Tenant{Name: "My Domain Inc.",Subdomain: "mydomain",diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex a8ca99a49..eba37dcbc 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -48,64 +48,57 @@ func (u *dbUser) toModel() *models.User {// UserStorage is used for user operations using a Postgres databasetype UserStorage struct {- DB *dbx.Database+ Trx *dbx.Trx}// GetByID returns a user based on given idfunc (s *UserStorage) GetByID(userID int) (*models.User, error) {- return getUser(s.DB, "id = $1", userID)+ return getUser(s.Trx, "id = $1", userID)}// GetByEmail returns a user based on given emailfunc (s *UserStorage) GetByEmail(tenantID int, email string) (*models.User, error) {- return getUser(s.DB, "email = $1 AND tenant_id = $2", email, tenantID)+ return getUser(s.Trx, "email = $1 AND tenant_id = $2", email, tenantID)}// Register creates a new user based on given informationfunc (s *UserStorage) Register(user *models.User) error {- tx, err := s.DB.Begin()- if err != nil {- return err- }-now := time.Now()- if err = tx.QueryRow("INSERT INTO users (name, email, created_on, tenant_id, role) VALUES ($1, $2, $3, $4, $5) RETURNING id", user.Name, user.Email, now, user.Tenant.ID, user.Role).Scan(&user.ID); err != nil {- tx.Rollback()+ if err := s.Trx.QueryRow("INSERT INTO users (name, email, created_on, tenant_id, role) VALUES ($1, $2, $3, $4, $5) RETURNING id", user.Name, user.Email, now, user.Tenant.ID, user.Role).Scan(&user.ID); err != nil {return err}for _, provider := range user.Providers {- if _, err = tx.Exec("INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4)", user.ID, provider.Name, provider.UID, now); err != nil {- tx.Rollback()+ if err := s.Trx.Execute("INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4)", user.ID, provider.Name, provider.UID, now); err != nil {return err}}- return tx.Commit()+ return nil}// RegisterProvider adds given provider to userIDfunc (s *UserStorage) RegisterProvider(userID int, provider *models.UserProvider) error {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())+ return s.Trx.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) {+func getUser(trx *dbx.Trx, filter string, args ...interface{}) (*models.User, error) {user := dbUser{}- err := db.Get(&user, "SELECT id, name, email, tenant_id, role FROM users WHERE "+filter, args...)+ err := trx.Get(&user, "SELECT id, name, email, tenant_id, role FROM users WHERE "+filter, args...)if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {return nil, err}- err = db.Select(&user.Providers, "SELECT provider_uid, provider FROM user_providers WHERE user_id = $1", user.ID)+ err = trx.Select(&user.Providers, "SELECT provider_uid, provider FROM user_providers WHERE user_id = $1", user.ID)if err != nil {return nil, err}- user.SupportedIdeas, err = db.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1", user.ID)+ user.SupportedIdeas, err = trx.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1", user.ID)if err != nil {return nil, err}diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex 459dcbfe5..61b5ccace 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -16,7 +16,10 @@ func TestUserStorage_GetByID(t *testing.T) {db.Seed()defer db.Close()- users := &postgres.UserStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ users := &postgres.UserStorage{Trx: trx}user, err := users.GetByID(300)Expect(err).To(BeNil())@@ -35,7 +38,10 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {db.Seed()defer db.Close()- users := &postgres.UserStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ users := &postgres.UserStorage{Trx: trx}user, err := users.GetByEmail(300, "[email protected]")Expect(user).To(BeNil())@@ -48,7 +54,10 @@ func TestUserStorage_GetByEmail(t *testing.T) {db.Seed()defer db.Close()- users := &postgres.UserStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ users := &postgres.UserStorage{Trx: trx}user, err := users.GetByEmail(300, "[email protected]")Expect(err).To(BeNil())@@ -67,7 +76,10 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {db.Seed()defer db.Close()- users := &postgres.UserStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ users := &postgres.UserStorage{Trx: trx}user, err := users.GetByEmail(400, "[email protected]")Expect(user).To(BeNil())@@ -80,7 +92,10 @@ func TestUserStorage_Register(t *testing.T) {db.Seed()defer db.Close()- users := &postgres.UserStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ users := &postgres.UserStorage{Trx: trx}user := &models.User{Name: "Rob Stark",Email: "[email protected]",@@ -112,9 +127,12 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {db.Seed()defer db.Close()- db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")+ trx, _ := db.Begin()+ defer trx.Rollback()++ trx.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")- users := &postgres.UserStorage{DB: db}+ users := &postgres.UserStorage{Trx: trx}user := &models.User{Name: "Jon Snow",Email: "[email protected]",@@ -147,7 +165,10 @@ func TestUserStorage_RegisterProvider(t *testing.T) {db.Seed()defer db.Close()- users := &postgres.UserStorage{DB: db}+ trx, _ := db.Begin()+ defer trx.Rollback()++ users := &postgres.UserStorage{Trx: trx}users.RegisterProvider(300, &models.UserProvider{UID: "GO1234",Name: "google",