Open platform to collect and prioritize feedback
refactor: add new column and FKs (#294)
Guilherme Oenning0dcde074a19d
diff --git a/app/actions/actions_test.go b/app/actions/actions_test.goindex 6a881c4f6..450beed09 100644--- a/app/actions/actions_test.go+++ b/app/actions/actions_test.go@@ -17,9 +17,11 @@ var jonSnowToken, _ = jwt.Encode(&models.OAuthClaims{})var services = &app.Services{- Tenants: &inmemory.TenantStorage{},- Users: &inmemory.UserStorage{},- Ideas: inmemory.NewIdeaStorage(),+ Tenants: &inmemory.TenantStorage{},+ Users: &inmemory.UserStorage{},+ Ideas: inmemory.NewIdeaStorage(),+ Tags: inmemory.NewTagStorage(),+ Notifications: inmemory.NewNotificationStorage(),}func ExpectFailed(result *validate.Result, fields ...string) {diff --git a/app/actions/user.go b/app/actions/user.goindex 7f8113557..df6ec1816 100644--- a/app/actions/user.go+++ b/app/actions/user.go@@ -89,7 +89,7 @@ func (input *ChangeUserEmail) Validate(user *models.User, services *app.Servicesreturn result}- existing, err := services.Users.GetByEmail(user.Tenant.ID, input.Model.Email)+ existing, err := services.Users.GetByEmail(input.Model.Email)if err != nil && err != app.ErrNotFound {return validate.Error(err)}diff --git a/app/actions/user_test.go b/app/actions/user_test.goindex b4be0dd97..b5891bb21 100644--- a/app/actions/user_test.go+++ b/app/actions/user_test.go@@ -32,13 +32,16 @@ func TestChangeUserRole_Authorized(t *testing.T) {func TestChangeUserRole_InvalidRole(t *testing.T) {RegisterTestingT(t)+ tenant := &models.Tenant{ID: 1}+ services.SetCurrentTenant(tenant)+targetUser := &models.User{- Tenant: &models.Tenant{ID: 1},+ Tenant: tenant,}services.Users.Register(targetUser)currentUser := &models.User{- Tenant: &models.Tenant{ID: 1},+ Tenant: tenant,Role: models.RoleAdministrator,}services.Users.Register(currentUser)diff --git a/app/handlers/settings.go b/app/handlers/settings.goindex c84286a74..a366a53b6 100644--- a/app/handlers/settings.go+++ b/app/handlers/settings.go@@ -76,7 +76,7 @@ func UpdateUserSettings() web.HandlerFunc {return c.HandleValidation(result)}- err := c.Services().Users.Update(c.User().ID, input.Model)+ err := c.Services().Users.Update(input.Model)if err != nil {return c.Failure(err)}diff --git a/app/handlers/settings_test.go b/app/handlers/settings_test.goindex 7739ea459..7b7b32f74 100644--- a/app/handlers/settings_test.go+++ b/app/handlers/settings_test.go@@ -45,7 +45,7 @@ func TestUpdateUserSettingsHandler_ValidName(t *testing.T) {AsUser(mock.JonSnow).ExecutePost(handlers.UpdateUserSettings(), `{ "name": "Jon Stark" }`)- user, _ := services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")+ user, _ := services.Users.GetByEmail("[email protected]")Expect(code).To(Equal(http.StatusOK))Expect(user.Name).To(Equal("Jon Stark"))@@ -67,7 +67,7 @@ func TestUpdateUserSettingsHandler_NewSettings(t *testing.T) {}}`)- user, _ := services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")+ user, _ := services.Users.GetByEmail("[email protected]")Expect(code).To(Equal(http.StatusOK))Expect(user.Name).To(Equal("Jon Stark"))@@ -148,7 +148,7 @@ func TestVerifyChangeEmailKeyHandler_Success(t *testing.T) {Execute(handlers.VerifyChangeEmailKey())Expect(code).To(Equal(http.StatusTemporaryRedirect))- user, err := services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.ID).To(Equal(mock.JonSnow.ID))Expect(user.Name).To(Equal(mock.JonSnow.Name))@@ -176,11 +176,11 @@ func TestVerifyChangeEmailKeyHandler_DifferentUser(t *testing.T) {Expect(code).To(Equal(http.StatusTemporaryRedirect))- _, err := services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")+ _, err := services.Users.GetByEmail("[email protected]")Expect(err).To(BeNil())- _, err = services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")+ _, err = services.Users.GetByEmail("[email protected]")Expect(err).To(BeNil())- _, err = services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")+ _, err = services.Users.GetByEmail("[email protected]")Expect(err).To(Equal(app.ErrNotFound))}diff --git a/app/handlers/signin.go b/app/handlers/signin.goindex 364ff7d18..15a26645d 100644--- a/app/handlers/signin.go+++ b/app/handlers/signin.go@@ -59,11 +59,12 @@ func OAuthCallback(provider string) web.HandlerFunc {return c.Failure(err)}+ c.Services().SetCurrentTenant(tenant)users := c.Services().Users- user, err := users.GetByProvider(tenant.ID, provider, oauthUser.ID.String())+ user, err := users.GetByProvider(provider, oauthUser.ID.String())if err == app.ErrNotFound && oauthUser.Email != "" {- user, err = users.GetByEmail(tenant.ID, oauthUser.Email)+ user, err = users.GetByEmail(oauthUser.Email)}if err != nil {if err == app.ErrNotFound {@@ -175,7 +176,7 @@ func VerifySignInKey(kind models.EmailVerificationKind) web.HandlerFunc {return c.Failure(err)}} else if kind == models.EmailVerificationKindSignIn {- user, err = c.Services().Users.GetByEmail(c.Tenant().ID, result.Email)+ user, err = c.Services().Users.GetByEmail(result.Email)if err != nil {if err == app.ErrNotFound {// This will render a page for /signin/verify URL using same variables as home page@@ -209,7 +210,7 @@ func CompleteSignInProfile() web.HandlerFunc {return c.HandleValidation(result)}- _, err := c.Services().Users.GetByEmail(c.Tenant().ID, input.Model.Email)+ _, err := c.Services().Users.GetByEmail(input.Model.Email)if err != app.ErrNotFound {return c.Ok(web.Map{})}diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.goindex de9cba650..ca4edcf30 100644--- a/app/handlers/signin_test.go+++ b/app/handlers/signin_test.go@@ -96,7 +96,7 @@ func TestCallbackHandler_NewUser(t *testing.T) {WithURL("http://login.test.fider.io/oauth/callback?state=http://avengers.test.fider.io&code=456").Execute(handlers.OAuthCallback(oauth.FacebookProvider))- user, err := services.Users.GetByEmail(mock.AvengersTenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.Name).To(Equal("Some Facebook Guy"))@@ -167,7 +167,7 @@ func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {WithURL("http://login.test.fider.io/oauth/callback?state=http://demo.test.fider.io&code=123").Execute(handlers.OAuthCallback(oauth.GoogleProvider))- user, err := services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(len(user.Providers)).To(Equal(2))@@ -350,7 +350,7 @@ func TestCompleteSignInProfileHandler_CorrectKey(t *testing.T) {ExecutePost(handlers.CompleteSignInProfile(), `{ "name": "Hot Pie", "key": "1234567890" }`)Expect(code).To(Equal(http.StatusOK))- user, err := services.Users.GetByEmail(mock.DemoTenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.Name).To(Equal("Hot Pie"))Expect(user.Email).To(Equal("[email protected]"))diff --git a/app/handlers/signup.go b/app/handlers/signup.goindex 1bf1af26a..fdbc50d58 100644--- a/app/handlers/signup.go+++ b/app/handlers/signup.go@@ -51,7 +51,7 @@ func CreateTenant() web.HandlerFunc {return c.Failure(err)}- c.Services().Tenants.SetCurrentTenant(tenant)+ c.SetTenant(tenant)user := &models.User{Tenant: tenant,diff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.goindex f30127ff0..e13002909 100644--- a/app/handlers/signup_test.go+++ b/app/handlers/signup_test.go@@ -105,7 +105,8 @@ func TestCreateTenantHandler_WithSocialAccount(t *testing.T) {Expect(tenant.Subdomain).To(Equal("mycompany"))Expect(tenant.Status).To(Equal(models.TenantActive))- user, err := services.Users.GetByEmail(tenant.ID, "[email protected]")+ services.SetCurrentTenant(tenant)+ user, err := services.Users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.Name).To(Equal("Jon Snow"))Expect(user.Email).To(Equal("[email protected]"))@@ -133,7 +134,7 @@ func TestCreateTenantHandler_WithEmailAndName(t *testing.T) {Expect(tenant.Subdomain).To(Equal("mycompany"))Expect(tenant.Status).To(Equal(models.TenantInactive))- user, err := services.Users.GetByEmail(tenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail("[email protected]")Expect(err).To(Equal(app.ErrNotFound))Expect(user).To(BeNil())}diff --git a/app/pkg/dbx/setup.sql b/app/pkg/dbx/setup.sqlindex 34a19c4e4..a614947ac 100644--- a/app/pkg/dbx/setup.sql+++ b/app/pkg/dbx/setup.sql@@ -3,17 +3,17 @@ TRUNCATE TABLE tenants RESTART IDENTITY CASCADE;INSERT INTO tenants (name, subdomain, created_on, cname, invitation, welcome_message, status) VALUES ('Demonstration', 'demo', now(), '', '', '', 1);INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Jon Snow', '[email protected]', 1, now(), 3);-INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (1, 'facebook', 'FB1234', now());+INSERT INTO user_providers (user_id, tenant_id, provider, provider_uid, created_on) VALUES (1, 1, 'facebook', 'FB1234', now());INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Arya Stark', '[email protected]', 1, now(), 1);-INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (2, 'google', 'GO5678', now());+INSERT INTO user_providers (user_id, tenant_id, provider, provider_uid, created_on) VALUES (2, 1, 'google', 'GO5678', now());INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Sansa Stark', '[email protected]', 1, now(), 1);INSERT INTO tenants (name, subdomain, created_on, cname, invitation, welcome_message, status) VALUES ('Avengers', 'avengers', now(), 'feedback.avengers.com', '', '', 1);INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Tony Stark', '[email protected]', 2, now(), 3);-INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (4, 'facebook', 'FB2222', now());+INSERT INTO user_providers (user_id, tenant_id, provider, provider_uid, created_on) VALUES (4, 2, 'facebook', 'FB2222', now());INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('The Hulk', '[email protected]', 2, now(), 1);-INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (5, 'google', 'GO1111', now());+INSERT INTO user_providers (user_id, tenant_id, provider, provider_uid, created_on) VALUES (5, 2, 'google', 'GO1111', now());diff --git a/app/storage/inmemory/user.go b/app/storage/inmemory/user.goindex 10b7d667a..9ac25bfa2 100644--- a/app/storage/inmemory/user.go+++ b/app/storage/inmemory/user.go@@ -37,9 +37,9 @@ func (s *UserStorage) SetCurrentUser(user *models.User) {}// GetByEmail returns a user based on given email-func (s *UserStorage) GetByEmail(tenantID int, email string) (*models.User, error) {+func (s *UserStorage) GetByEmail(email string) (*models.User, error) {for _, user := range s.users {- if user.Email == email && user.Tenant.ID == tenantID {+ if user.Email == email && user.Tenant.ID == s.tenant.ID {return user, nil}}@@ -47,7 +47,7 @@ func (s *UserStorage) GetByEmail(tenantID int, email string) (*models.User, erro}// GetByProvider returns a user based on provider details-func (s *UserStorage) GetByProvider(tenantID int, provider string, uid string) (*models.User, error) {+func (s *UserStorage) GetByProvider(provider string, uid string) (*models.User, error) {for _, user := range s.users {for _, item := range user.Providers {if item.Name == provider && item.UID == uid {@@ -64,7 +64,7 @@ func (s *UserStorage) Register(user *models.User) error {s.lastID = s.lastID + 1user.ID = s.lastID}- _, err := s.GetByEmail(user.Tenant.ID, user.Email)+ _, err := s.GetByEmail(user.Email)if err == app.ErrNotFound || user.Email == "" {s.users = append(s.users, user)return nil@@ -82,8 +82,8 @@ func (s *UserStorage) RegisterProvider(userID int, provider *models.UserProvider}// Update user settings-func (s *UserStorage) Update(userID int, settings *models.UpdateUserSettings) error {- user, err := s.GetByID(userID)+func (s *UserStorage) Update(settings *models.UpdateUserSettings) error {+ user, err := s.GetByID(s.user.ID)if err == nil {user.Name = settings.Name}diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.goindex 16a732a05..778e20f5a 100644--- a/app/storage/postgres/idea.go+++ b/app/storage/postgres/idea.go@@ -126,6 +126,7 @@ var (FROM commentsINNER JOIN ideasON ideas.id = comments.idea_id+ AND ideas.tenant_id = comments.tenant_idWHERE ideas.tenant_id = $1GROUP BY idea_id),@@ -136,6 +137,7 @@ var (FROM idea_supportersINNER JOIN ideasON ideas.id = idea_supporters.idea_id+ AND ideas.tenant_id = idea_supporters.tenant_idWHERE ideas.tenant_id = $1AND idea_supporters.created_on > CURRENT_DATE - INTERVAL '30 days'GROUP BY idea_id@@ -287,7 +289,7 @@ func (s *IdeaStorage) Search(query, filter string, tags []string) ([]*models.Idereturn result, nil}-// GetCommentsByIdea returns all coments from given idea+// GetCommentsByIdea returns all comments from given ideafunc (s *IdeaStorage) GetCommentsByIdea(number int) ([]*models.Comment, error) {comments := []*dbComment{}err := s.trx.Select(&comments,@@ -301,8 +303,10 @@ func (s *IdeaStorage) GetCommentsByIdea(number int) ([]*models.Comment, error) {FROM comments cINNER JOIN ideas iON i.id = c.idea_id+ AND i.tenant_id = c.tenant_idINNER JOIN users uON u.id = c.user_id+ AND u.tenant_id = c.tenant_idWHERE i.number = $1AND i.tenant_id = $2ORDER BY c.created_on ASC`, number, s.tenant.ID)@@ -360,8 +364,8 @@ func (s *IdeaStorage) AddComment(number int, content string, userID int) (int, evar id intif err := s.trx.Get(&id,- "INSERT INTO comments (idea_id, content, user_id, created_on) VALUES ($1, $2, $3, $4) RETURNING id",- idea.ID, content, userID, time.Now()); err != nil {+ "INSERT INTO comments (tenant_id, idea_id, content, user_id, created_on) VALUES ($1, $2, $3, $4, $5) RETURNING id",+ s.tenant.ID, idea.ID, content, userID, time.Now()); err != nil {return 0, err}@@ -383,7 +387,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 AND tenant_id = $3", userID, idea.ID, s.tenant.ID)if err != nil {return err}@@ -392,13 +396,13 @@ 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 AND tenant_id = $2`, idea.ID, s.tenant.ID); err != nil {return err}if err := s.trx.Execute(- `INSERT INTO idea_supporters (user_id, idea_id, created_on) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING`,- userID, idea.ID, time.Now()); err != nil {+ `INSERT INTO idea_supporters (tenant_id, user_id, idea_id, created_on) VALUES ($1, $2, $3, $4) ON CONFLICT DO NOTHING`,+ s.tenant.ID, userID, idea.ID, time.Now()); err != nil {return err}@@ -416,7 +420,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 AND tenant_id = $3", userID, idea.ID, s.tenant.ID)if err != nil {return err}@@ -425,11 +429,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 AND tenant_id = $2`, idea.ID, s.tenant.ID); err != nil {return err}- return s.trx.Execute(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2`, userID, idea.ID)+ return s.trx.Execute(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2 AND tenant_id = $3`, userID, idea.ID, s.tenant.ID)}// AddSubscriber adds user to the idea list of subscribers@@ -445,13 +449,13 @@ func (s *IdeaStorage) internalAddSubscriber(number, userID int, force bool) erroconflict := " DO NOTHING"if force {- conflict = "(user_id, idea_id) DO UPDATE SET status = $4, updated_on = $3"+ conflict = "(user_id, idea_id) DO UPDATE SET status = $5, updated_on = $4"}return s.trx.Execute(fmt.Sprintf(`- INSERT INTO idea_subscribers (user_id, idea_id, created_on, updated_on, status)- VALUES ($1, $2, $3, $3, $4) ON CONFLICT %s`, conflict),- userID, idea.ID, time.Now(), models.SubscriberActive,+ INSERT INTO idea_subscribers (tenant_id, user_id, idea_id, created_on, updated_on, status)+ VALUES ($1, $2, $3, $4, $4, $5) ON CONFLICT %s`, conflict),+ s.tenant.ID, userID, idea.ID, time.Now(), models.SubscriberActive,)}@@ -463,10 +467,10 @@ func (s *IdeaStorage) RemoveSubscriber(number, userID int) error {}return s.trx.Execute(`- INSERT INTO idea_subscribers (user_id, idea_id, created_on, updated_on, status)- VALUES ($1, $2, $3, $3, 0) ON CONFLICT (user_id, idea_id)- DO UPDATE SET status = 0, updated_on = $3`,- userID, idea.ID, time.Now(),+ INSERT INTO idea_subscribers (tenant_id, user_id, idea_id, created_on, updated_on, status)+ VALUES ($1, $2, $3, $4, $4, 0) ON CONFLICT (user_id, idea_id)+ DO UPDATE SET status = 0, updated_on = $4`,+ s.tenant.ID, userID, idea.ID, time.Now(),)}@@ -481,10 +485,11 @@ func (s *IdeaStorage) GetActiveSubscribers(number int, channel models.Notificatiif len(event.RequiresSubscripionUserRoles) == 0 {err = s.trx.Select(&users, `- SELECT u.id, u.name, u.email, u.tenant_id, u.role+ SELECT DISTINCT u.id, u.name, u.email, u.tenant_id, u.roleFROM users uLEFT JOIN user_settings setON set.user_id = u.id+ AND set.tenant_id = u.tenant_idAND set.key = $1WHERE u.tenant_id = $2AND (@@ -498,14 +503,16 @@ func (s *IdeaStorage) GetActiveSubscribers(number int, channel models.Notificati)} else {err = s.trx.Select(&users, `- SELECT u.id, u.name, u.email, u.tenant_id, u.role+ SELECT DISTINCT u.id, u.name, u.email, u.tenant_id, u.roleFROM users uLEFT JOIN idea_subscribers subON sub.user_id = u.idAND sub.idea_id = $1+ AND sub.tenant_id = u.tenant_idLEFT JOIN user_settings setON set.user_id = u.idAND set.key = $3+ AND set.tenant_id = u.tenant_idWHERE u.tenant_id = $4AND ( sub.status = $2 OR (sub.status IS NULL AND NOT u.role = ANY($7)) )AND (@@ -571,7 +578,7 @@ func (s *IdeaStorage) MarkAsDuplicate(number, originalNumber, userID int) errorrespondedOn = idea.Response.RespondedOn}- users, err := s.trx.QueryIntArray("SELECT user_id FROM idea_supporters WHERE idea_id = $1", idea.ID)+ users, err := s.trx.QueryIntArray("SELECT user_id FROM idea_supporters WHERE idea_id = $1 AND tenant_id = $2", idea.ID, s.tenant.ID)if err != nil {return err}@@ -591,5 +598,5 @@ func (s *IdeaStorage) MarkAsDuplicate(number, originalNumber, userID int) error// SupportedBy returns a list of Idea ID supported by given userfunc (s *IdeaStorage) SupportedBy(userID int) ([]int, error) {- return s.trx.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1", userID)+ return s.trx.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1 AND tenant_id = $2", userID, s.tenant.ID)}diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.goindex 451a11df9..387912208 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -119,10 +119,12 @@ func TestIdeaStorage_AddAndGet_DifferentTenants(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- demoIdea, _ := ideas.Add("My new idea", "with this description", 1)+ demoIdea, err := ideas.Add("My new idea", "with this description", jonSnow.ID)+ Expect(err).To(BeNil())ideas.SetCurrentTenant(avengersTenant)- avengersIdea, _ := ideas.Add("My other idea", "with other description", 3)+ avengersIdea, err := ideas.Add("My other idea", "with other description", tonyStark.ID)+ Expect(err).To(BeNil())ideas.SetCurrentTenant(demoTenant)dbIdea, err := ideas.GetByNumber(1)@@ -149,7 +151,7 @@ func TestIdeaStorage_Update(t *testing.T) {ideas.SetCurrentTenant(demoTenant)- idea, err := ideas.Add("My new idea", "with this description", 1)+ idea, err := ideas.Add("My new idea", "with this description", jonSnow.ID)Expect(err).To(BeNil())idea, err = ideas.Update(idea.Number, "The new comment", "With the new description")@@ -167,7 +169,7 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {ideas.SetCurrentTenant(demoTenant)ideas.SetCurrentUser(jonSnow)- idea, err := ideas.Add("My new idea", "with this description", 1)+ idea, err := ideas.Add("My new idea", "with this description", jonSnow.ID)Expect(err).To(BeNil())err = ideas.AddSupporter(idea.Number, aryaStark.ID)@@ -191,7 +193,7 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)err := ideas.AddSupporter(idea.Number, 1)Expect(err).To(BeNil())@@ -209,7 +211,7 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)err := ideas.AddSupporter(idea.Number, 1)Expect(err).To(BeNil())@@ -227,7 +229,7 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)err := ideas.AddSupporter(idea.Number, 1)Expect(err).To(BeNil())@@ -248,8 +250,8 @@ func TestIdeaStorage_SetResponse(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)- err := ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaStarted)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)+ err := ideas.SetResponse(idea.Number, "We liked this idea", jonSnow.ID, models.IdeaStarted)Expect(err).To(BeNil())@@ -264,8 +266,8 @@ func TestIdeaStorage_SetResponse_KeepOpen(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)- err := ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaOpen)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)+ err := ideas.SetResponse(idea.Number, "We liked this idea", jonSnow.ID, models.IdeaOpen)Expect(err).To(BeNil())}@@ -274,16 +276,16 @@ func TestIdeaStorage_SetResponse_ChangeText(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)- ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaStarted)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)+ ideas.SetResponse(idea.Number, "We liked this idea", jonSnow.ID, models.IdeaStarted)idea, _ = ideas.GetByID(idea.ID)respondedOn := idea.Response.RespondedOn- ideas.SetResponse(idea.Number, "We liked this idea and we'll work on it", 1, models.IdeaStarted)+ ideas.SetResponse(idea.Number, "We liked this idea and we'll work on it", jonSnow.ID, models.IdeaStarted)idea, _ = ideas.GetByID(idea.ID)Expect(idea.Response.RespondedOn).To(Equal(respondedOn))- ideas.SetResponse(idea.Number, "We finished it", 1, models.IdeaCompleted)+ ideas.SetResponse(idea.Number, "We finished it", jonSnow.ID, models.IdeaCompleted)idea, _ = ideas.GetByID(idea.ID)Expect(idea.Response.RespondedOn).Should(BeTemporally(">", respondedOn))}@@ -293,12 +295,12 @@ func TestIdeaStorage_SetResponse_AsDuplicate(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea1, _ := ideas.Add("My new idea", "with this description", 1)- ideas.AddSupporter(idea1.Number, 1)- idea2, _ := ideas.Add("My other idea", "with similar description", 2)- ideas.AddSupporter(idea2.Number, 2)+ idea1, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)+ ideas.AddSupporter(idea1.Number, jonSnow.ID)+ idea2, _ := ideas.Add("My other idea", "with similar description", aryaStark.ID)+ ideas.AddSupporter(idea2.Number, aryaStark.ID)- ideas.MarkAsDuplicate(idea2.Number, idea1.Number, 1)+ ideas.MarkAsDuplicate(idea2.Number, idea1.Number, jonSnow.ID)idea1, _ = ideas.GetByID(idea1.ID)Expect(idea1.TotalSupporters).To(Equal(2))@@ -322,8 +324,8 @@ func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)- ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaCompleted)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)+ ideas.SetResponse(idea.Number, "We liked this idea", jonSnow.ID, models.IdeaCompleted)ideas.AddSupporter(idea.Number, 1)dbIdea, err := ideas.GetByNumber(1)@@ -336,10 +338,10 @@ func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)- ideas.AddSupporter(idea.Number, 1)- ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaCompleted)- ideas.RemoveSupporter(idea.Number, 1)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)+ ideas.AddSupporter(idea.Number, jonSnow.ID)+ ideas.SetResponse(idea.Number, "We liked this idea", jonSnow.ID, models.IdeaCompleted)+ ideas.RemoveSupporter(idea.Number, jonSnow.ID)dbIdea, err := ideas.GetByNumber(1)Expect(err).To(BeNil())@@ -351,10 +353,10 @@ func TestIdeaStorage_ListSupportedIdeas(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)- idea1, _ := ideas.Add("My new idea", "with this description", 1)- idea2, _ := ideas.Add("My other idea", "with better description", 1)- ideas.AddSupporter(idea1.Number, 2)- ideas.AddSupporter(idea2.Number, 2)+ idea1, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)+ idea2, _ := ideas.Add("My other idea", "with better description", jonSnow.ID)+ ideas.AddSupporter(idea1.Number, aryaStark.ID)+ ideas.AddSupporter(idea2.Number, aryaStark.ID)Expect(ideas.SupportedBy(1)).To(Equal([]int{}))Expect(ideas.SupportedBy(2)).To(Equal([]int{idea1.ID, idea2.ID}))@@ -367,12 +369,12 @@ func TestIdeaStorage_WithTags(t *testing.T) {ideas.SetCurrentTenant(demoTenant)tags.SetCurrentTenant(demoTenant)- idea, _ := ideas.Add("My new idea", "with this description", 1)+ idea, _ := ideas.Add("My new idea", "with this description", jonSnow.ID)bug, _ := tags.Add("Bug", "FF0000", true)featureRequest, _ := tags.Add("Feature Request", "00FF00", false)- tags.AssignTag(bug.ID, idea.ID, 1)- tags.AssignTag(featureRequest.ID, idea.ID, 1)+ tags.AssignTag(bug.ID, idea.ID, jonSnow.ID)+ tags.AssignTag(featureRequest.ID, idea.ID, jonSnow.ID)idea, _ = ideas.GetByID(idea.ID)Expect(len(idea.Tags)).To(Equal(1))diff --git a/app/storage/postgres/setup_test.go b/app/storage/postgres/setup_test.goindex b1d1ef957..7579ee994 100644--- a/app/storage/postgres/setup_test.go+++ b/app/storage/postgres/setup_test.go@@ -25,6 +25,7 @@ var gotTenant *models.Tenantvar jonSnow *models.Uservar aryaStark *models.Uservar sansaStark *models.User+var tonyStark *models.Userfunc SetupDatabaseTest(t *testing.T) {RegisterTestingT(t)@@ -38,9 +39,14 @@ func SetupDatabaseTest(t *testing.T) {demoTenant, _ = tenants.GetByDomain("demo")avengersTenant, _ = tenants.GetByDomain("avengers")++ users.SetCurrentTenant(demoTenant)jonSnow, _ = users.GetByID(1)aryaStark, _ = users.GetByID(2)sansaStark, _ = users.GetByID(3)++ users.SetCurrentTenant(avengersTenant)+ tonyStark, _ = users.GetByID(4)}func TeardownDatabaseTest() {diff --git a/app/storage/postgres/subscription_test.go b/app/storage/postgres/subscription_test.goindex 4ab5171d7..92d5c3337 100644--- a/app/storage/postgres/subscription_test.go+++ b/app/storage/postgres/subscription_test.go@@ -143,6 +143,7 @@ func TestSubscription_DisabledEmail(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)+ users.SetCurrentTenant(demoTenant)users.SetCurrentUser(aryaStark)err := users.UpdateSettings(map[string]string{models.NotificationEventNewComment.UserSettingsKeyName: strconv.Itoa(int(models.NotificationChannelWeb)),@@ -183,6 +184,7 @@ func TestSubscription_VisitorEnabledNewIdea(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)+ users.SetCurrentTenant(demoTenant)users.SetCurrentUser(aryaStark)err := users.UpdateSettings(map[string]string{models.NotificationEventNewIdea.UserSettingsKeyName: strconv.Itoa(int(models.NotificationChannelEmail | models.NotificationChannelWeb)),@@ -209,6 +211,7 @@ func TestSubscription_DisabledEverything(t *testing.T) {defer TeardownDatabaseTest()ideas.SetCurrentTenant(demoTenant)+ users.SetCurrentTenant(demoTenant)disableAll := map[string]string{models.NotificationEventNewIdea.UserSettingsKeyName: "0",models.NotificationEventNewComment.UserSettingsKeyName: "0",diff --git a/app/storage/postgres/tag.go b/app/storage/postgres/tag.goindex 08cbb95d8..ff164cab8 100644--- a/app/storage/postgres/tag.go+++ b/app/storage/postgres/tag.go@@ -94,16 +94,16 @@ func (s *TagStorage) Update(tagID int, name, color string, isPublic bool) (*mode// Delete a tag by its idfunc (s *TagStorage) Delete(tagID int) error {- err := s.trx.Execute(`DELETE FROM idea_tags WHERE tag_id = $1`, tagID)+ err := s.trx.Execute(`DELETE FROM idea_tags WHERE tag_id = $1 AND tenant_id = $2`, tagID, s.tenant.ID)if err != nil {return err}- return s.trx.Execute(`DELETE FROM tags WHERE id = $1 AND tenant_id = $2;`, tagID, s.tenant.ID)+ return s.trx.Execute(`DELETE FROM tags WHERE id = $1 AND tenant_id = $2`, tagID, s.tenant.ID)}// AssignTag adds a tag to an ideafunc (s *TagStorage) AssignTag(tagID, ideaID, userID int) error {- alreadyAssigned, err := s.trx.Exists("SELECT 1 FROM idea_tags WHERE idea_id = $1 AND tag_id = $2", ideaID, tagID)+ alreadyAssigned, err := s.trx.Exists("SELECT 1 FROM idea_tags WHERE idea_id = $1 AND tag_id = $2 AND tenant_id = $3", ideaID, tagID, s.tenant.ID)if err != nil {return err}@@ -113,16 +113,16 @@ func (s *TagStorage) AssignTag(tagID, ideaID, userID int) error {}return s.trx.Execute(- `INSERT INTO idea_tags (tag_id, idea_id, created_on, created_by_id) VALUES ($1, $2, $3, $4)`,- tagID, ideaID, time.Now(), userID,+ `INSERT INTO idea_tags (tag_id, idea_id, created_on, created_by_id, tenant_id) VALUES ($1, $2, $3, $4, $5)`,+ tagID, ideaID, time.Now(), userID, s.tenant.ID,)}// UnassignTag removes a tag from an ideafunc (s *TagStorage) UnassignTag(tagID, ideaID int) error {return s.trx.Execute(- `DELETE FROM idea_tags WHERE tag_id = $1 AND idea_id = $2`,- tagID, ideaID,+ `DELETE FROM idea_tags WHERE tag_id = $1 AND idea_id = $2 AND tenant_id = $3`,+ tagID, ideaID, s.tenant.ID,)}@@ -133,6 +133,7 @@ func (s *TagStorage) GetAssigned(ideaID int) ([]*models.Tag, error) {FROM tags tINNER JOIN idea_tags itON it.tag_id = t.id+ AND it.tenant_id = t.tenant_idWHERE it.idea_id = $1 AND t.tenant_id = $2`, ideaID, s.tenant.ID)}diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex e15f3d2be..3cb3a423f 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -82,15 +82,23 @@ func (s *UserStorage) GetByID(userID int) (*models.User, error) {}// GetByEmail returns a user based on given email-func (s *UserStorage) GetByEmail(tenantID int, email string) (*models.User, error) {- return getUser(s.trx, "email = $1 AND tenant_id = $2", email, tenantID)+func (s *UserStorage) GetByEmail(email string) (*models.User, error) {+ return getUser(s.trx, "email = $1 AND tenant_id = $2", email, s.tenant.ID)}// GetByProvider returns a user based on provider details-func (s *UserStorage) GetByProvider(tenantID int, provider string, uid string) (*models.User, error) {+func (s *UserStorage) GetByProvider(provider string, uid string) (*models.User, error) {var userID int- query := "SELECT user_id FROM user_providers up INNER JOIN users u ON u.id = up.user_id WHERE up.provider = $1 AND up.provider_uid = $2 AND u.tenant_id = $3"- if err := s.trx.Scalar(&userID, query, provider, uid, tenantID); err != nil {+ query := `+ SELECT user_id+ FROM user_providers up+ INNER JOIN users u+ ON u.id = up.user_id+ AND u.tenant_id = up.tenant_id+ WHERE up.provider = $1+ AND up.provider_uid = $2+ AND u.tenant_id = $3`+ if err := s.trx.Scalar(&userID, query, provider, uid, s.tenant.ID); err != nil {return nil, err}return s.GetByID(userID)@@ -102,12 +110,12 @@ func (s *UserStorage) Register(user *models.User) error {user.Email = strings.TrimSpace(user.Email)if err := s.trx.Get(&user.ID,"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); err != nil {+ user.Name, user.Email, now, s.tenant.ID, user.Role); 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 (tenant_id, user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4, $5)", s.tenant.ID, user.ID, provider.Name, provider.UID, now); err != nil {return err}}@@ -117,26 +125,26 @@ 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())+ cmd := "INSERT INTO user_providers (tenant_id, user_id, provider, provider_uid, created_on) VALUES ($1, $2, $3, $4, $5)"+ return s.trx.Execute(cmd, s.tenant.ID, userID, provider.Name, provider.UID, time.Now())}// Update user profile-func (s *UserStorage) Update(userID int, settings *models.UpdateUserSettings) error {- cmd := "UPDATE users SET name = $2 WHERE id = $1"- return s.trx.Execute(cmd, userID, settings.Name)+func (s *UserStorage) Update(settings *models.UpdateUserSettings) error {+ cmd := "UPDATE users SET name = $2 WHERE id = $1 AND tenant_id = $3"+ return s.trx.Execute(cmd, s.user.ID, settings.Name, s.tenant.ID)}// UpdateSettings of given userfunc (s *UserStorage) UpdateSettings(settings map[string]string) error {if s.user != nil && settings != nil && len(settings) > 0 {query := `- INSERT INTO user_settings (user_id, key, value)- VALUES ($1, $2, $3) ON CONFLICT (user_id, key) DO UPDATE SET value = $3+ INSERT INTO user_settings (tenant_id, user_id, key, value)+ VALUES ($1, $2, $3, $4) ON CONFLICT (user_id, key) DO UPDATE SET value = $4`for key, value := range settings {- err := s.trx.Execute(query, s.user.ID, key, value)+ err := s.trx.Execute(query, s.tenant.ID, s.user.ID, key, value)if err != nil {return err}@@ -153,7 +161,7 @@ func (s *UserStorage) GetUserSettings() (map[string]string, error) {}var settings []*dbUserSetting- err := s.trx.Select(&settings, "SELECT key, value FROM user_settings WHERE user_id = $1", s.user.ID)+ err := s.trx.Select(&settings, "SELECT key, value FROM user_settings WHERE user_id = $1 AND tenant_id = $2", s.user.ID, s.tenant.ID)if err != nil {return nil, err}diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex 79c953b96..68b8858d2 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -28,7 +28,8 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- user, err := users.GetByEmail(1, "[email protected]")+ users.SetCurrentTenant(demoTenant)+ user, err := users.GetByEmail("[email protected]")Expect(user).To(BeNil())Expect(err).NotTo(BeNil())}@@ -37,7 +38,8 @@ func TestUserStorage_GetByEmail(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- user, err := users.GetByEmail(1, "[email protected]")+ users.SetCurrentTenant(demoTenant)+ user, err := users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.ID).To(Equal(int(1)))Expect(user.Tenant.ID).To(Equal(1))@@ -52,7 +54,8 @@ func TestUserStorage_GetByProvider(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- user, err := users.GetByProvider(1, "facebook", "FB1234")+ users.SetCurrentTenant(demoTenant)+ user, err := users.GetByProvider("facebook", "FB1234")Expect(err).To(BeNil())Expect(user.ID).To(Equal(int(1)))Expect(user.Tenant.ID).To(Equal(1))@@ -67,7 +70,8 @@ func TestUserStorage_GetByProvider_WrongTenant(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- user, err := users.GetByProvider(2, "facebook", "FB1234")+ users.SetCurrentTenant(avengersTenant)+ user, err := users.GetByProvider("facebook", "FB1234")Expect(user).To(BeNil())Expect(err).To(Equal(app.ErrNotFound))}@@ -76,7 +80,8 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- user, err := users.GetByEmail(2, "[email protected]")+ users.SetCurrentTenant(avengersTenant)+ user, err := users.GetByEmail("[email protected]")Expect(user).To(BeNil())Expect(err).NotTo(BeNil())}@@ -85,13 +90,11 @@ func TestUserStorage_Register(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()+ users.SetCurrentTenant(demoTenant)user := &models.User{Name: "Rob Stark",Email: "[email protected]",- Tenant: &models.Tenant{- ID: 1,- },- Role: models.RoleCollaborator,+ Role: models.RoleCollaborator,Providers: []*models.UserProvider{{UID: "123123123",@@ -102,7 +105,7 @@ func TestUserStorage_Register(t *testing.T) {err := users.Register(user)Expect(err).To(BeNil())- user, err = users.GetByEmail(1, "[email protected]")+ user, err = users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.ID).To(Equal(int(6)))Expect(user.Role).To(Equal(models.RoleCollaborator))@@ -114,13 +117,11 @@ func TestUserStorage_Register_WhiteSpaceEmail(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()+ users.SetCurrentTenant(demoTenant)user := &models.User{Name: "Rob Stark",Email: " ",- Tenant: &models.Tenant{- ID: 1,- },- Role: models.RoleCollaborator,+ Role: models.RoleCollaborator,}err := users.Register(user)Expect(err).To(BeNil())@@ -142,14 +143,14 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {VALUES ('My Domain Inc.','mydomain', now(), 1)RETURNING id`)+ users.SetCurrentTenant(&models.Tenant{+ ID: tenantID,+ })user := &models.User{Name: "Jon Snow",Email: "[email protected]",- Tenant: &models.Tenant{- ID: tenantID,- },- Role: models.RoleCollaborator,+ Role: models.RoleCollaborator,Providers: []*models.UserProvider{{UID: "123123123",@@ -173,6 +174,7 @@ func TestUserStorage_RegisterProvider(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()+ users.SetCurrentTenant(demoTenant)users.RegisterProvider(1, &models.UserProvider{UID: "GO1234",Name: "google",@@ -196,10 +198,12 @@ func TestUserStorage_UpdateSettings(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- err := users.Update(1, &models.UpdateUserSettings{Name: "Jon Stark"})+ users.SetCurrentTenant(demoTenant)+ users.SetCurrentUser(jonSnow)+ err := users.Update(&models.UpdateUserSettings{Name: "Jon Stark"})Expect(err).To(BeNil())- user, err := users.GetByEmail(1, "[email protected]")+ user, err := users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.Name).To(Equal("Jon Stark"))}@@ -212,7 +216,7 @@ func TestUserStorage_ChangeRole(t *testing.T) {err := users.ChangeRole(jonSnow.ID, models.RoleVisitor)Expect(err).To(BeNil())- user, err := users.GetByEmail(jonSnow.Tenant.ID, "[email protected]")+ user, err := users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.Role).To(Equal(models.RoleVisitor))}@@ -225,11 +229,11 @@ func TestUserStorage_ChangeEmail(t *testing.T) {err := users.ChangeEmail(jonSnow.ID, "[email protected]")Expect(err).To(BeNil())- user, err := users.GetByEmail(jonSnow.Tenant.ID, "[email protected]")+ user, err := users.GetByEmail("[email protected]")Expect(err).To(BeNil())Expect(user.Email).To(Equal("[email protected]"))- user, err = users.GetByEmail(jonSnow.Tenant.ID, "[email protected]")+ user, err = users.GetByEmail("[email protected]")Expect(err).To(Equal(app.ErrNotFound))Expect(user).To(BeNil())}@@ -272,6 +276,7 @@ func TestUserStorage_SaveGetUserSettings(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()+ users.SetCurrentTenant(demoTenant)users.SetCurrentUser(aryaStark)disableAll := map[string]string{models.NotificationEventNewIdea.UserSettingsKeyName: "0",diff --git a/app/storage/storage.go b/app/storage/storage.goindex 19cf569cd..bfe2c1b97 100644--- a/app/storage/storage.go+++ b/app/storage/storage.go@@ -39,11 +39,11 @@ type Idea interface {type User interface {BaseGetByID(userID int) (*models.User, error)- GetByEmail(tenantID int, email string) (*models.User, error)- GetByProvider(tenantID int, provider string, uid string) (*models.User, error)+ GetByEmail(email string) (*models.User, error)+ GetByProvider(provider string, uid string) (*models.User, error)Register(user *models.User) errorRegisterProvider(userID int, provider *models.UserProvider) error- Update(userID int, settings *models.UpdateUserSettings) error+ Update(settings *models.UpdateUserSettings) errorChangeEmail(userID int, email string) errorChangeRole(userID int, role models.Role) errorGetAll() ([]*models.User, error)diff --git a/migrations/201803011831_add_tenant_id_everywhere.up.sql b/migrations/201803011831_add_tenant_id_everywhere.up.sqlnew file mode 100644index 000000000..1dda62429--- /dev/null+++ b/migrations/201803011831_add_tenant_id_everywhere.up.sql@@ -0,0 +1,226 @@+CREATE UNIQUE INDEX idea_id_tenant_id_key ON ideas (tenant_id, id);+CREATE UNIQUE INDEX user_id_tenant_id_key ON users (tenant_id, id);+CREATE UNIQUE INDEX tag_id_tenant_id_key ON tags (tenant_id, id);++++---- TABLE: comments++-- add tenant_id+ALTER TABLE comments ADD tenant_id INT NULL;+UPDATE comments SET tenant_id = (SELECT tenant_id FROM ideas WHERE ideas.id = comments.idea_id);+ALTER TABLE comments ALTER COLUMN tenant_id SET NOT NULL;++ALTER TABLE comments+ ADD CONSTRAINT comments_tenant_id_fkey+ FOREIGN KEY (tenant_id)+ REFERENCES tenants(id);++-- comments <-> ideas+ALTER TABLE comments+ DROP CONSTRAINT comments_idea_id_fkey RESTRICT;++ALTER TABLE comments+ ADD CONSTRAINT comments_idea_id_fkey+ FOREIGN KEY (idea_id, tenant_id)+ REFERENCES ideas(id, tenant_id);++-- comments <-> users+ALTER TABLE comments+ DROP CONSTRAINT comments_user_id_fkey RESTRICT;++ALTER TABLE comments+ ADD CONSTRAINT comments_user_id_fkey+ FOREIGN KEY (user_id, tenant_id)+ REFERENCES users(id, tenant_id);++++---- TABLE: email_verifications++-- email_verifications <-> users+ALTER TABLE email_verifications+ DROP CONSTRAINT email_verifications_user_id_fkey RESTRICT;++ALTER TABLE email_verifications+ ADD CONSTRAINT email_verifications_user_id_fkey+ FOREIGN KEY (user_id, tenant_id)+ REFERENCES users(id, tenant_id);++++---- TABLE: user_providers++-- add tenant_id+ALTER TABLE user_providers ADD tenant_id INT NULL;+UPDATE user_providers SET tenant_id = (SELECT tenant_id FROM users WHERE users.id = user_providers.user_id);+ALTER TABLE user_providers ALTER COLUMN tenant_id SET NOT NULL;++ALTER TABLE user_providers+ ADD CONSTRAINT user_providers_tenant_id_fkey+ FOREIGN KEY (tenant_id)+ REFERENCES tenants(id);++-- user_providers <-> users+ALTER TABLE user_providers+ DROP CONSTRAINT user_providers_user_id_fkey RESTRICT;++ALTER TABLE user_providers+ ADD CONSTRAINT user_providers_user_id_fkey+ FOREIGN KEY (user_id, tenant_id)+ REFERENCES users(id, tenant_id);++++---- TABLE: user_settings++-- add tenant_id+ALTER TABLE user_settings ADD tenant_id INT NULL;+UPDATE user_settings SET tenant_id = (SELECT tenant_id FROM users WHERE users.id = user_settings.user_id);+ALTER TABLE user_settings ALTER COLUMN tenant_id SET NOT NULL;++ALTER TABLE user_settings+ ADD CONSTRAINT user_settings_tenant_id_fkey+ FOREIGN KEY (tenant_id)+ REFERENCES tenants(id);++-- user_settings <-> users+ALTER TABLE user_settings+ DROP CONSTRAINT user_settings_user_id_fkey RESTRICT;++ALTER TABLE user_settings+ ADD CONSTRAINT user_settings_user_id_fkey+ FOREIGN KEY (user_id, tenant_id)+ REFERENCES users(id, tenant_id);++++---- TABLE: idea_subscribers++-- add tenant_id+ALTER TABLE idea_subscribers ADD tenant_id INT NULL;+UPDATE idea_subscribers SET tenant_id = (SELECT tenant_id FROM users WHERE users.id = idea_subscribers.user_id);+ALTER TABLE idea_subscribers ALTER COLUMN tenant_id SET NOT NULL;++ALTER TABLE idea_subscribers+ ADD CONSTRAINT idea_subscribers_tenant_id_fkey+ FOREIGN KEY (tenant_id)+ REFERENCES tenants(id);++-- idea_subscribers <-> ideas+ALTER TABLE idea_subscribers+ DROP CONSTRAINT idea_subscribers_idea_id_fkey RESTRICT;++ALTER TABLE idea_subscribers+ ADD CONSTRAINT idea_subscribers_idea_id_fkey+ FOREIGN KEY (idea_id, tenant_id)+ REFERENCES ideas(id, tenant_id);++-- idea_subscribers <-> users+ALTER TABLE idea_subscribers+ DROP CONSTRAINT idea_subscribers_user_id_fkey RESTRICT;++ALTER TABLE idea_subscribers+ ADD CONSTRAINT idea_subscribers_user_id_fkey+ FOREIGN KEY (user_id, tenant_id)+ REFERENCES users(id, tenant_id);++++---- TABLE: idea_supporters++-- add tenant_id+ALTER TABLE idea_supporters ADD tenant_id INT NULL;+UPDATE idea_supporters SET tenant_id = (SELECT tenant_id FROM users WHERE users.id = idea_supporters.user_id);+ALTER TABLE idea_supporters ALTER COLUMN tenant_id SET NOT NULL;++ALTER TABLE idea_supporters+ ADD CONSTRAINT idea_supporters_tenant_id_fkey+ FOREIGN KEY (tenant_id)+ REFERENCES tenants(id);++-- idea_supporters <-> ideas+ALTER TABLE idea_supporters+ DROP CONSTRAINT idea_supporters_idea_id_fkey RESTRICT;++ALTER TABLE idea_supporters+ ADD CONSTRAINT idea_supporters_idea_id_fkey+ FOREIGN KEY (idea_id, tenant_id)+ REFERENCES ideas(id, tenant_id);++-- idea_supporters <-> users+ALTER TABLE idea_supporters+ DROP CONSTRAINT idea_supporters_user_id_fkey RESTRICT;++ALTER TABLE idea_supporters+ ADD CONSTRAINT idea_supporters_user_id_fkey+ FOREIGN KEY (user_id, tenant_id)+ REFERENCES users(id, tenant_id);++---- TABLE: idea_tags++-- add tenant_id+ALTER TABLE idea_tags ADD tenant_id INT NULL;+UPDATE idea_tags SET tenant_id = (SELECT tenant_id FROM tags WHERE tags.id = idea_tags.tag_id);+ALTER TABLE idea_tags ALTER COLUMN tenant_id SET NOT NULL;++ALTER TABLE idea_tags+ ADD CONSTRAINT idea_tags_tenant_id_fkey+ FOREIGN KEY (tenant_id)+ REFERENCES tenants(id);++-- idea_tags <-> ideas+ALTER TABLE idea_tags+ DROP CONSTRAINT idea_tags_idea_id_fkey RESTRICT;++ALTER TABLE idea_tags+ ADD CONSTRAINT idea_tags_idea_id_fkey+ FOREIGN KEY (idea_id, tenant_id)+ REFERENCES ideas(id, tenant_id);++-- idea_tags <-> users+ALTER TABLE idea_tags+ DROP CONSTRAINT idea_tags_created_by_id_fkey RESTRICT;++ALTER TABLE idea_tags+ ADD CONSTRAINT idea_tags_created_by_id_fkey+ FOREIGN KEY (created_by_id, tenant_id)+ REFERENCES users(id, tenant_id);++-- idea_tags <-> tags+ALTER TABLE idea_tags+ DROP CONSTRAINT idea_tags_tag_id_fkey RESTRICT;++ALTER TABLE idea_tags+ ADD CONSTRAINT idea_tags_tag_id_fkey+ FOREIGN KEY (tag_id, tenant_id)+ REFERENCES tags(id, tenant_id);++---- TABLE: notifications++-- notifications <-> ideas+ALTER TABLE notifications+ DROP CONSTRAINT notifications_idea_id_fkey RESTRICT;++ALTER TABLE notifications+ ADD CONSTRAINT notifications_idea_id_fkey+ FOREIGN KEY (idea_id, tenant_id)+ REFERENCES ideas(id, tenant_id);++-- notifications <-> users+ALTER TABLE notifications+ DROP CONSTRAINT notifications_user_id_fkey RESTRICT;++ALTER TABLE notifications+ ADD CONSTRAINT notifications_user_id_fkey+ FOREIGN KEY (user_id, tenant_id)+ REFERENCES users(id, tenant_id);++-- notifications <-> users (author)+ALTER TABLE notifications+ DROP CONSTRAINT notifications_author_id_fkey RESTRICT;++ALTER TABLE notifications+ ADD CONSTRAINT notifications_author_id_fkey+ FOREIGN KEY (author_id, tenant_id)+ REFERENCES users(id, tenant_id);\ No newline at end of file