Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

add storage functions to add/remove supporters

goenninge43903214e9d
diff --git a/app/storage/feedback.go b/app/storage/feedback.go
index 6cc18137e..bd70dc544 100644
--- a/app/storage/feedback.go
+++ b/app/storage/feedback.go
@@ -10,4 +10,6 @@ type Idea interface {
GetAll(tenantID int) ([]*models.Idea, error)
Save(tenantID, userID int, title, description string) (*models.Idea, error)
AddComment(userID, ideaID int, content string) (int, error)
+ AddSupport(userID, ideaID int) error
+ RemoveSupport(userID, ideaID int) error
}
diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.go
index 5b2d37e20..ebc92f899 100644
--- a/app/storage/inmemory/idea.go
+++ b/app/storage/inmemory/idea.go
@@ -58,3 +58,13 @@ func (s *IdeaStorage) Save(tenantID, userID int, title, description string) (*mo
func (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error) {
return 0, nil
}
+
+// AddSupport adds user to idea list of supporters
+func (s *IdeaStorage) AddSupport(userID, ideaID int) error {
+ return nil
+}
+
+// RemoveSupport removes user from idea list of supporters
+func (s *IdeaStorage) RemoveSupport(userID, ideaID int) error {
+ return nil
+}
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index 22cde4348..e48838b23 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -132,3 +132,43 @@ func (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error
return id, tx.Commit()
}
+
+// AddSupport adds user to idea list of supporters
+func (s *IdeaStorage) AddSupport(userID, ideaID int) error {
+ 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()
+ 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()
+ return err
+ }
+
+ return tx.Commit()
+}
+
+// RemoveSupport removes user from idea list of supporters
+func (s *IdeaStorage) RemoveSupport(userID, ideaID int) error {
+ 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()
+ 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()
+}
diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.go
index e62b28285..76bb3266b 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -20,23 +20,23 @@ func TestIdeaStorage_GetAll(t *testing.T) {
db.Execute("INSERT INTO ideas (title, number, description, created_on, tenant_id, user_id, supporters) VALUES ('Idea #1', 1, 'Description #1', $1, 300, 300, 0)", now)
db.Execute("INSERT INTO ideas (title, number, description, created_on, tenant_id, user_id, supporters) VALUES ('Idea #2', 2, 'Description #2', $1, 300, 301, 5)", now)
- svc := &postgres.IdeaStorage{DB: db}
- ideas, err := svc.GetAll(300)
+ ideas := &postgres.IdeaStorage{DB: db}
+ dbIdeas, err := ideas.GetAll(300)
Expect(err).To(BeNil())
- Expect(ideas).To(HaveLen(2))
-
- Expect(ideas[0].Title).To(Equal("Idea #1"))
- Expect(ideas[0].Number).To(Equal(1))
- Expect(ideas[0].Description).To(Equal("Description #1"))
- Expect(ideas[0].User.Name).To(Equal("Jon Snow"))
- Expect(ideas[0].TotalSupporters).To(Equal(0))
-
- Expect(ideas[1].Title).To(Equal("Idea #2"))
- Expect(ideas[1].Number).To(Equal(2))
- Expect(ideas[1].Description).To(Equal("Description #2"))
- Expect(ideas[1].User.Name).To(Equal("Arya Stark"))
- Expect(ideas[1].TotalSupporters).To(Equal(5))
+ Expect(dbIdeas).To(HaveLen(2))
+
+ Expect(dbIdeas[0].Title).To(Equal("Idea #1"))
+ Expect(dbIdeas[0].Number).To(Equal(1))
+ Expect(dbIdeas[0].Description).To(Equal("Description #1"))
+ Expect(dbIdeas[0].User.Name).To(Equal("Jon Snow"))
+ Expect(dbIdeas[0].TotalSupporters).To(Equal(0))
+
+ Expect(dbIdeas[1].Title).To(Equal("Idea #2"))
+ Expect(dbIdeas[1].Number).To(Equal(2))
+ Expect(dbIdeas[1].Description).To(Equal("Description #2"))
+ Expect(dbIdeas[1].User.Name).To(Equal("Arya Stark"))
+ Expect(dbIdeas[1].TotalSupporters).To(Equal(5))
}
func TestIdeaStorage_SaveAndGet(t *testing.T) {
@@ -47,12 +47,12 @@ func TestIdeaStorage_SaveAndGet(t *testing.T) {
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)")
- svc := &postgres.IdeaStorage{DB: db}
- idea, err := svc.Save(1, 1, "My new idea", "with this description")
+ ideas := &postgres.IdeaStorage{DB: db}
+ idea, err := ideas.Save(1, 1, "My new idea", "with this description")
Expect(err).To(BeNil())
Expect(idea.ID).To(Equal(1))
- dbIdea, err := svc.GetByID(1, 1)
+ dbIdea, err := ideas.GetByID(1, 1)
Expect(err).To(BeNil())
Expect(dbIdea.ID).To(Equal(1))
@@ -70,8 +70,8 @@ func TestIdeaStorage_GetInvalid(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- svc := &postgres.IdeaStorage{DB: db}
- dbIdea, err := svc.GetByID(1, 1)
+ ideas := &postgres.IdeaStorage{DB: db}
+ dbIdea, err := ideas.GetByID(1, 1)
Expect(err).To(Equal(app.ErrNotFound))
Expect(dbIdea).To(BeNil())
@@ -85,12 +85,12 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {
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)")
- svc := &postgres.IdeaStorage{DB: db}
- idea, _ := svc.Save(1, 1, "My new idea", "with this description")
- svc.AddComment(1, idea.ID, "Comment #1")
- svc.AddComment(1, idea.ID, "Comment #2")
+ ideas := &postgres.IdeaStorage{DB: db}
+ 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")
- comments, err := svc.GetCommentsByIdeaID(1, idea.ID)
+ comments, err := ideas.GetCommentsByIdeaID(1, idea.ID)
Expect(err).To(BeNil())
Expect(len(comments)).To(Equal(2))
@@ -103,21 +103,59 @@ func TestIdeaStorage_SaveAndGet_DifferentTenants(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- svc := &postgres.IdeaStorage{DB: db}
- svc.Save(300, 300, "My new idea", "with this description")
- svc.Save(400, 400, "My other idea", "with other description")
+ ideas := &postgres.IdeaStorage{DB: db}
+ ideas.Save(300, 300, "My new idea", "with this description")
+ ideas.Save(400, 400, "My other idea", "with other description")
- dbIdea, err := svc.GetByNumber(300, 1)
+ dbIdea, err := ideas.GetByNumber(300, 1)
Expect(err).To(BeNil())
Expect(dbIdea.ID).To(Equal(1))
Expect(dbIdea.Number).To(Equal(1))
Expect(dbIdea.Title).To(Equal("My new idea"))
- dbIdea, err = svc.GetByNumber(400, 1)
+ dbIdea, err = ideas.GetByNumber(400, 1)
Expect(err).To(BeNil())
Expect(dbIdea.ID).To(Equal(2))
Expect(dbIdea.Number).To(Equal(1))
Expect(dbIdea.Title).To(Equal("My other idea"))
}
+
+func TestIdeaStorage_AddSupporter(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ ideas := &postgres.IdeaStorage{DB: db}
+ idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+
+ err := ideas.AddSupport(300, idea.ID)
+ Expect(err).To(BeNil())
+
+ err = ideas.AddSupport(301, idea.ID)
+ Expect(err).To(BeNil())
+
+ dbIdea, err := ideas.GetByNumber(300, 1)
+ Expect(err).To(BeNil())
+ Expect(dbIdea.TotalSupporters).To(Equal(2))
+}
+
+func TestIdeaStorage_RemoveSupporter(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ ideas := &postgres.IdeaStorage{DB: db}
+ idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+
+ err := ideas.AddSupport(300, idea.ID)
+ Expect(err).To(BeNil())
+
+ err = ideas.RemoveSupport(300, idea.ID)
+ Expect(err).To(BeNil())
+
+ dbIdea, err := ideas.GetByNumber(300, 1)
+ Expect(err).To(BeNil())
+ Expect(dbIdea.TotalSupporters).To(Equal(0))
+}
diff --git a/app/storage/postgres/identity_test.go b/app/storage/postgres/identity_test.go
index 0d7d8cc4d..a8f5fb3a0 100644
--- a/app/storage/postgres/identity_test.go
+++ b/app/storage/postgres/identity_test.go
@@ -13,8 +13,8 @@ func TestTenantStorage_GetByDomain_NotFound(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- svc := &postgres.TenantStorage{DB: db}
- tenant, err := svc.GetByDomain("mydomain")
+ tenants := &postgres.TenantStorage{DB: db}
+ tenant, err := tenants.GetByDomain("mydomain")
Expect(tenant).To(BeNil())
Expect(err).NotTo(BeNil())
@@ -27,8 +27,8 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {
db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
- svc := &postgres.TenantStorage{DB: db}
- tenant, err := svc.GetByDomain("mydomain")
+ tenants := &postgres.TenantStorage{DB: db}
+ tenant, err := tenants.GetByDomain("mydomain")
Expect(tenant.ID).To(Equal(int(1)))
Expect(tenant.Name).To(Equal("My Domain Inc."))
@@ -43,8 +43,8 @@ func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {
db.Execute("INSERT INTO tenants (name, subdomain, cname, created_on) VALUES ('My Domain Inc.','mydomain', 'mydomain.anydomain.com', now())")
- svc := &postgres.TenantStorage{DB: db}
- tenant, err := svc.GetByDomain("mydomain.anydomain.com")
+ tenants := &postgres.TenantStorage{DB: db}
+ tenant, err := tenants.GetByDomain("mydomain.anydomain.com")
Expect(tenant.ID).To(Equal(int(1)))
Expect(tenant.Name).To(Equal("My Domain Inc."))
diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.go
index 5951bf980..5aa938d53 100644
--- a/app/storage/postgres/user_test.go
+++ b/app/storage/postgres/user_test.go
@@ -15,8 +15,8 @@ func TestUserStorage_GetByID(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- svc := &postgres.UserStorage{DB: db}
- user, err := svc.GetByID(300)
+ users := &postgres.UserStorage{DB: db}
+ user, err := users.GetByID(300)
Expect(err).To(BeNil())
Expect(user.ID).To(Equal(int(300)))
@@ -33,8 +33,8 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- svc := &postgres.UserStorage{DB: db}
- user, err := svc.GetByEmail(300, "[email protected]")
+ users := &postgres.UserStorage{DB: db}
+ user, err := users.GetByEmail(300, "[email protected]")
Expect(user).To(BeNil())
Expect(err).NotTo(BeNil())
@@ -45,8 +45,8 @@ func TestUserStorage_GetByEmail(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- svc := &postgres.UserStorage{DB: db}
- user, err := svc.GetByEmail(300, "[email protected]")
+ users := &postgres.UserStorage{DB: db}
+ user, err := users.GetByEmail(300, "[email protected]")
Expect(err).To(BeNil())
Expect(user.ID).To(Equal(int(300)))
@@ -63,8 +63,8 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- svc := &postgres.UserStorage{DB: db}
- user, err := svc.GetByEmail(400, "[email protected]")
+ users := &postgres.UserStorage{DB: db}
+ user, err := users.GetByEmail(400, "[email protected]")
Expect(user).To(BeNil())
Expect(err).NotTo(BeNil())
@@ -75,7 +75,7 @@ func TestUserStorage_Register(t *testing.T) {
db, _ := dbx.New()
defer db.Close()
- svc := &postgres.UserStorage{DB: db}
+ users := &postgres.UserStorage{DB: db}
user := &models.User{
Name: "Rob Stark",
@@ -90,10 +90,10 @@ func TestUserStorage_Register(t *testing.T) {
},
},
}
- err := svc.Register(user)
+ err := users.Register(user)
Expect(err).To(BeNil())
- user, err = svc.GetByEmail(300, "[email protected]")
+ user, err = users.GetByEmail(300, "[email protected]")
Expect(err).To(BeNil())
Expect(user.ID).To(Equal(int(1)))
Expect(user.Role).To(Equal(models.RoleMember))
@@ -108,7 +108,7 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {
db.Execute("INSERT INTO tenants (name, subdomain, created_on) VALUES ('My Domain Inc.','mydomain', now())")
- svc := &postgres.UserStorage{DB: db}
+ users := &postgres.UserStorage{DB: db}
user := &models.User{
Name: "Jon Snow",
@@ -127,7 +127,7 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {
},
},
}
- err := svc.Register(user)
+ err := users.Register(user)
Expect(err).To(BeNil())
Expect(user.ID).To(Equal(int(1)))