Open platform to collect and prioritize feedback
refactoring on storage
goenningaa7b315b143d
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.goindex be4c7f27b..5a529c803 100644--- a/app/middlewares/setup.go+++ b/app/middlewares/setup.go@@ -14,14 +14,14 @@ import (func Setup(db *dbx.Database) web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {- tx, err := db.Begin()+ trx, err := db.Begin()if err != nil {return err}- c.SetActiveTransaction(tx)+ c.SetActiveTransaction(trx)c.SetServices(&app.Services{- Tenants: &postgres.TenantStorage{Trx: tx},+ Tenants: postgres.NewTenantStorage(trx),})defer func() {@@ -38,11 +38,11 @@ func Setup(db *dbx.Database) web.MiddlewareFunc {}()err = next(c)- if err == nil {- return tx.Commit()+ if err != nil {+ trx.Rollback()+ return err}- tx.Rollback()- return err+ return trx.Commit()}}}@@ -51,14 +51,12 @@ func Setup(db *dbx.Database) web.MiddlewareFunc {func AddServices() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {- tx := c.ActiveTransaction()+ trx := c.ActiveTransaction()tenant := c.Tenant()services := c.Services()services.OAuth = &oauth.HTTPService{}- services.Ideas = &postgres.IdeaStorage{Trx: tx, Tenant: tenant}- services.Users = &postgres.UserStorage{Trx: tx}- services.Tenants = &postgres.TenantStorage{Trx: tx}-+ services.Ideas = postgres.NewIdeaStorage(tenant, trx)+ services.Users = postgres.NewUserStorage(trx)return next(c)}}diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.goindex 34ba46915..e2ad72868 100644--- a/app/storage/postgres/idea.go+++ b/app/storage/postgres/idea.go@@ -67,8 +67,16 @@ func (c *dbComment) toModel() *models.Comment {// IdeaStorage contains read and write operations for ideastype IdeaStorage struct {- Trx *dbx.Trx- Tenant *models.Tenant+ trx *dbx.Trx+ tenant *models.Tenant+}++// NewIdeaStorage creates a new IdeaStorage+func NewIdeaStorage(tenant *models.Tenant, trx *dbx.Trx) *IdeaStorage {+ return &IdeaStorage{+ trx: trx,+ tenant: tenant,+ }}var (@@ -99,7 +107,7 @@ var (// GetAll returns all tenant ideasfunc (s *IdeaStorage) GetAll() ([]*models.Idea, error) {var ideas []*dbIdea- err := s.Trx.Select(&ideas, sqlSelectIdeasWhere+" i.tenant_id = $1 ORDER BY i.created_on DESC", s.Tenant.ID)+ err := s.trx.Select(&ideas, sqlSelectIdeasWhere+" i.tenant_id = $1 ORDER BY i.created_on DESC", s.tenant.ID)if err != nil {return nil, err}@@ -115,7 +123,7 @@ func (s *IdeaStorage) GetAll() ([]*models.Idea, error) {func (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {idea := dbIdea{}- err := s.Trx.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.id = $2 ORDER BY i.created_on DESC", s.Tenant.ID, ideaID)+ err := s.trx.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.id = $2 ORDER BY i.created_on DESC", s.tenant.ID, ideaID)if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {@@ -129,7 +137,7 @@ func (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {func (s *IdeaStorage) GetByNumber(number int) (*models.Idea, error) {idea := dbIdea{}- err := s.Trx.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.number = $2 ORDER BY i.created_on DESC", s.Tenant.ID, number)+ err := s.trx.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.number = $2 ORDER BY i.created_on DESC", s.tenant.ID, number)if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {@@ -142,7 +150,7 @@ func (s *IdeaStorage) GetByNumber(number int) (*models.Idea, error) {// GetCommentsByIdea returns all coments from given ideafunc (s *IdeaStorage) GetCommentsByIdea(number int) ([]*models.Comment, error) {comments := []*dbComment{}- err := s.Trx.Select(&comments,+ err := s.trx.Select(&comments,`SELECT c.id,c.content,c.created_on,@@ -156,7 +164,7 @@ func (s *IdeaStorage) GetCommentsByIdea(number int) ([]*models.Comment, error) {ON u.id = c.user_idWHERE i.number = $1AND i.tenant_id = $2- ORDER BY c.created_on DESC`, number, s.Tenant.ID)+ ORDER BY c.created_on DESC`, number, s.tenant.ID)if err != nil {return nil, err}@@ -171,9 +179,9 @@ func (s *IdeaStorage) GetCommentsByIdea(number int) ([]*models.Comment, error) {// Add a new idea in the databasefunc (s *IdeaStorage) Add(title, description string, userID int) (*models.Idea, error) {var id int- row := s.Trx.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, s.Tenant.ID, userID, time.Now())+ RETURNING id`, title, slug.Make(title), description, s.tenant.ID, userID, time.Now())if err := row.Scan(&id); err != nil {return nil, err}@@ -189,7 +197,7 @@ func (s *IdeaStorage) AddComment(number int, content string, userID int) (int, e}var id int- if err := s.Trx.QueryRow("INSERT INTO comments (idea_id, content, user_id, created_on) VALUES ($1, $2, $3, $4) RETURNING id", idea.ID, content, userID, time.Now()).Scan(&id); err != nil {+ if err := s.trx.QueryRow("INSERT INTO comments (idea_id, content, user_id, created_on) VALUES ($1, $2, $3, $4) RETURNING id", idea.ID, content, userID, time.Now()).Scan(&id); err != nil {return 0, err}@@ -206,7 +214,7 @@ func (s *IdeaStorage) AddSupporter(number, userID int) error {return nil}- alreadySupported, err := s.Trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, idea.ID)+ alreadySupported, err := s.trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, idea.ID)if err != nil {return err}@@ -215,11 +223,11 @@ func (s *IdeaStorage) AddSupporter(number, userID int) error {return nil}- if err := s.Trx.Execute(`UPDATE ideas SET supporters = supporters + 1 WHERE id = $1`, idea.ID); err != nil {+ if err := s.trx.Execute(`UPDATE ideas SET supporters = supporters + 1 WHERE id = $1`, idea.ID); err != nil {return err}- if err := s.Trx.Execute(`INSERT INTO idea_supporters (user_id, idea_id, created_on) VALUES ($1, $2, $3)`, userID, idea.ID, time.Now()); err != nil {+ if err := s.trx.Execute(`INSERT INTO idea_supporters (user_id, idea_id, created_on) VALUES ($1, $2, $3)`, userID, idea.ID, time.Now()); err != nil {return err}@@ -237,7 +245,7 @@ func (s *IdeaStorage) RemoveSupporter(number, userID int) error {return nil}- didSupport, err := s.Trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, idea.ID)+ didSupport, err := s.trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, idea.ID)if err != nil {return err}@@ -246,11 +254,11 @@ func (s *IdeaStorage) RemoveSupporter(number, userID int) error {return nil}- if err := s.Trx.Execute(`UPDATE ideas SET supporters = supporters - 1 WHERE id = $1`, idea.ID); err != nil {+ if err := s.trx.Execute(`UPDATE ideas SET supporters = supporters - 1 WHERE id = $1`, idea.ID); err != nil {return err}- if err := s.Trx.Execute(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2`, userID, idea.ID); err != nil {+ if err := s.trx.Execute(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2`, userID, idea.ID); err != nil {return err}@@ -264,11 +272,11 @@ func (s *IdeaStorage) SetResponse(number int, text string, userID, status int) ereturn err}- if err := s.Trx.Execute(`+ if err := s.trx.Execute(`UPDATE ideasSET response = $3, response_date = $4, response_user_id = $5, status = $6WHERE id = $1 and tenant_id = $2- `, idea.ID, s.Tenant.ID, text, time.Now(), userID, status); err != nil {+ `, idea.ID, s.tenant.ID, 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 95223b81d..b48036525 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -35,7 +35,7 @@ func TestIdeaStorage_GetAll(t *testing.T) {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{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)dbIdeas, err := ideas.GetAll()Expect(err).To(BeNil())@@ -67,7 +67,7 @@ func TestIdeaStorage_AddAndGet(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, err := ideas.Add("My new idea", "with this description", 300)Expect(err).To(BeNil())Expect(idea.ID).To(Equal(1))@@ -95,7 +95,7 @@ func TestIdeaStorage_GetInvalid(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)dbIdea, err := ideas.GetByID(1)Expect(err).To(Equal(app.ErrNotFound))@@ -111,7 +111,7 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, err := ideas.Add("My new idea", "with this description", 300)Expect(err).To(BeNil())@@ -135,10 +135,10 @@ func TestIdeaStorage_AddAndGet_DifferentTenants(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- demoIdeas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ demoIdeas := postgres.NewIdeaStorage(demoTenant, trx)demoIdeas.Add("My new idea", "with this description", 300)- orangeIdeas := &postgres.IdeaStorage{Trx: trx, Tenant: orangeTenant}+ orangeIdeas := postgres.NewIdeaStorage(orangeTenant, trx)orangeIdeas.Add("My other idea", "with other description", 400)dbIdea, err := demoIdeas.GetByNumber(1)@@ -168,7 +168,7 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, _ := ideas.Add("My new idea", "with this description", 300)err := ideas.AddSupporter(idea.Number, 300)@@ -191,7 +191,7 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, _ := ideas.Add("My new idea", "with this description", 300)err := ideas.AddSupporter(idea.Number, 300)@@ -214,7 +214,7 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, _ := ideas.Add("My new idea", "with this description", 300)err := ideas.AddSupporter(idea.Number, 300)@@ -237,7 +237,7 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, _ := ideas.Add("My new idea", "with this description", 300)err := ideas.AddSupporter(idea.Number, 300)@@ -263,7 +263,7 @@ func TestIdeaStorage_SetResponse(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, _ := ideas.Add("My new idea", "with this description", 300)err := ideas.SetResponse(idea.Number, "We liked this idea", 300, models.IdeaStarted)@@ -284,7 +284,7 @@ func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, _ := ideas.Add("My new idea", "with this description", 300)ideas.SetResponse(idea.Number, "We liked this idea", 300, models.IdeaCompleted)ideas.AddSupporter(idea.Number, 300)@@ -303,7 +303,7 @@ func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}+ ideas := postgres.NewIdeaStorage(demoTenant, trx)idea, _ := ideas.Add("My new idea", "with this description", 300)ideas.AddSupporter(idea.Number, 300)ideas.SetResponse(idea.Number, "We liked this idea", 300, models.IdeaCompleted)diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 2eab5c55a..bd53ab7ae 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -13,7 +13,12 @@ import (// TenantStorage contains read and write operations for tenantstype TenantStorage struct {- Trx *dbx.Trx+ trx *dbx.Trx+}++// NewTenantStorage creates a new TenantStorage+func NewTenantStorage(trx *dbx.Trx) *TenantStorage {+ return &TenantStorage{trx: trx}}type dbTenant struct {@@ -34,7 +39,7 @@ func (t *dbTenant) toModel() *models.Tenant {// Add given tenant to tenant listfunc (s *TenantStorage) Add(tenant *models.Tenant) error {- row := s.Trx.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 +53,7 @@ func (s *TenantStorage) Add(tenant *models.Tenant) error {func (s *TenantStorage) First() (*models.Tenant, error) {tenant := dbTenant{}- err := s.Trx.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 +67,7 @@ func (s *TenantStorage) First() (*models.Tenant, error) {func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {tenant := dbTenant{}- err := s.Trx.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 6277149ff..baa372904 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -19,7 +19,7 @@ func TestTenantStorage_First(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- tenants := &postgres.TenantStorage{Trx: trx}+ tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.First()Expect(err).To(BeNil())@@ -37,7 +37,7 @@ func TestTenantStorage_Empty_First(t *testing.T) {trx.Execute("TRUNCATE tenants CASCADE")- tenants := &postgres.TenantStorage{Trx: trx}+ tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.First()Expect(err).To(Equal(app.ErrNotFound))@@ -53,7 +53,7 @@ func TestTenantStorage_GetByDomain_NotFound(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- tenants := &postgres.TenantStorage{Trx: trx}+ tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.GetByDomain("mydomain")Expect(tenant).To(BeNil())@@ -69,7 +69,7 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- tenants := &postgres.TenantStorage{Trx: trx}+ tenants := postgres.NewTenantStorage(trx)tenants.Add(&models.Tenant{Name: "My Domain Inc.",Subdomain: "mydomain",@@ -93,7 +93,7 @@ func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- tenants := &postgres.TenantStorage{Trx: trx}+ tenants := postgres.NewTenantStorage(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 eba37dcbc..e38d0278b 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -48,28 +48,33 @@ func (u *dbUser) toModel() *models.User {// UserStorage is used for user operations using a Postgres databasetype UserStorage struct {- Trx *dbx.Trx+ trx *dbx.Trx+}++// NewUserStorage creates a new UserStorage+func NewUserStorage(trx *dbx.Trx) *UserStorage {+ return &UserStorage{trx: trx}}// GetByID returns a user based on given idfunc (s *UserStorage) GetByID(userID int) (*models.User, error) {- return getUser(s.Trx, "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.Trx, "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 {now := time.Now()- 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 {+ 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 := 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 {+ 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}}@@ -80,7 +85,7 @@ func (s *UserStorage) Register(user *models.User) error {// 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.Trx.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 iddiff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex 61b5ccace..83dd27c4b 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -19,7 +19,7 @@ func TestUserStorage_GetByID(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- users := &postgres.UserStorage{Trx: trx}+ users := postgres.NewUserStorage(trx)user, err := users.GetByID(300)Expect(err).To(BeNil())@@ -41,7 +41,7 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- users := &postgres.UserStorage{Trx: trx}+ users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(300, "[email protected]")Expect(user).To(BeNil())@@ -57,7 +57,7 @@ func TestUserStorage_GetByEmail(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- users := &postgres.UserStorage{Trx: trx}+ users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(300, "[email protected]")Expect(err).To(BeNil())@@ -79,7 +79,7 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- users := &postgres.UserStorage{Trx: trx}+ users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(400, "[email protected]")Expect(user).To(BeNil())@@ -95,7 +95,7 @@ func TestUserStorage_Register(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- users := &postgres.UserStorage{Trx: trx}+ users := postgres.NewUserStorage(trx)user := &models.User{Name: "Rob Stark",Email: "[email protected]",@@ -132,7 +132,7 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {trx.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")- users := &postgres.UserStorage{Trx: trx}+ users := postgres.NewUserStorage(trx)user := &models.User{Name: "Jon Snow",Email: "[email protected]",@@ -168,7 +168,7 @@ func TestUserStorage_RegisterProvider(t *testing.T) {trx, _ := db.Begin()defer trx.Rollback()- users := &postgres.UserStorage{Trx: trx}+ users := postgres.NewUserStorage(trx)users.RegisterProvider(300, &models.UserProvider{UID: "GO1234",Name: "google",