Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

remove tenantID from parameters

goenning8152b79ac37d
diff --git a/app/handlers/feedback.go b/app/handlers/feedback.go
index 7275fb76d..68c4bda93 100644
--- a/app/handlers/feedback.go
+++ b/app/handlers/feedback.go
@@ -42,12 +42,12 @@ func PostIdea() web.HandlerFunc {
}
ideas := c.Services().Ideas
- idea, err := ideas.Save(c.Tenant().ID, c.User().ID, input.Title, input.Description)
+ idea, err := ideas.Save(c.User().ID, input.Title, input.Description)
if err != nil {
return c.Failure(err)
}
- if err := ideas.AddSupporter(c.Tenant().ID, c.User().ID, idea.ID); err != nil {
+ if err := ideas.AddSupporter(c.User().ID, idea.ID); err != nil {
return c.Failure(err)
}
@@ -58,15 +58,13 @@ func PostIdea() web.HandlerFunc {
// IdeaDetails shows details of given Idea by id
func IdeaDetails() web.HandlerFunc {
return func(c web.Context) error {
- tenant := c.Tenant()
-
number, err := c.ParamAsInt("number")
if err != nil {
return c.Failure(err)
}
ideas := c.Services().Ideas
- idea, err := ideas.GetByNumber(tenant.ID, number)
+ idea, err := ideas.GetByNumber(number)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
@@ -74,7 +72,7 @@ func IdeaDetails() web.HandlerFunc {
return c.Failure(err)
}
- comments, err := ideas.GetCommentsByIdeaID(tenant.ID, idea.ID)
+ comments, err := ideas.GetCommentsByIdeaID(idea.ID)
if err != nil {
return c.Failure(err)
}
@@ -110,7 +108,7 @@ func PostComment() web.HandlerFunc {
}
ideas := c.Services().Ideas
- idea, err := ideas.GetByNumber(c.Tenant().ID, ideaNumber)
+ idea, err := ideas.GetByNumber(ideaNumber)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
@@ -146,7 +144,7 @@ func SetResponse() web.HandlerFunc {
}
ideas := c.Services().Ideas
- idea, err := ideas.GetByNumber(c.Tenant().ID, ideaNumber)
+ idea, err := ideas.GetByNumber(ideaNumber)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
@@ -154,7 +152,7 @@ func SetResponse() web.HandlerFunc {
return c.Failure(err)
}
- err = ideas.SetResponse(c.Tenant().ID, idea.ID, input.Text, c.User().ID, input.Status)
+ err = ideas.SetResponse(idea.ID, input.Text, c.User().ID, input.Status)
if err != nil {
return c.Failure(err)
}
@@ -177,13 +175,13 @@ func RemoveSupporter() web.HandlerFunc {
}
}
-func addOrRemoveSupporter(c web.Context, addOrRemove func(tenantId, userId, ideaId int) error) error {
+func addOrRemoveSupporter(c web.Context, addOrRemove func(userId, ideaId int) error) error {
ideaNumber, err := c.ParamAsInt("number")
if err != nil {
return c.Failure(err)
}
- idea, err := c.Services().Ideas.GetByNumber(c.Tenant().ID, ideaNumber)
+ idea, err := c.Services().Ideas.GetByNumber(ideaNumber)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
@@ -191,7 +189,7 @@ func addOrRemoveSupporter(c web.Context, addOrRemove func(tenantId, userId, idea
return c.Failure(err)
}
- err = addOrRemove(c.Tenant().ID, c.User().ID, idea.ID)
+ err = addOrRemove(c.User().ID, idea.ID)
if err != nil {
return c.Failure(err)
}
diff --git a/app/handlers/feedback_test.go b/app/handlers/feedback_test.go
index 68fbd3fb5..9f065dd01 100644
--- a/app/handlers/feedback_test.go
+++ b/app/handlers/feedback_test.go
@@ -31,7 +31,7 @@ func TestDetailsHandler(t *testing.T) {
RegisterTestingT(t)
ideas := &inmemory.IdeaStorage{}
- idea, _ := ideas.Save(1, 1, "My Idea", "My Idea Description")
+ idea, _ := ideas.Save(1, "My Idea", "My Idea Description")
server := mock.NewServer()
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
@@ -96,7 +96,7 @@ func TestPostCommentHandler(t *testing.T) {
RegisterTestingT(t)
ideas := &inmemory.IdeaStorage{}
- ideas.Save(1, 1, "Title", "Description")
+ ideas.Save(1, "Title", "Description")
server := mock.NewServer()
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
@@ -129,8 +129,8 @@ func TestAddSupporterHandler(t *testing.T) {
RegisterTestingT(t)
ideas := &inmemory.IdeaStorage{}
- ideas.Save(1, 1, "The Idea #1", "The Description #1")
- ideas.Save(1, 1, "The Idea #2", "The Description #2")
+ ideas.Save(1, "The Idea #1", "The Description #1")
+ ideas.Save(1, "The Idea #2", "The Description #2")
server := mock.NewServer()
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
@@ -139,8 +139,8 @@ func TestAddSupporterHandler(t *testing.T) {
server.Context.SetParamValues("2")
code, _ := server.Execute(handlers.AddSupporter())
- first, _ := ideas.GetByNumber(1, 1)
- second, _ := ideas.GetByNumber(1, 2)
+ first, _ := ideas.GetByNumber(1)
+ second, _ := ideas.GetByNumber(2)
Expect(code).To(Equal(200))
Expect(first.TotalSupporters).To(Equal(0))
@@ -167,10 +167,10 @@ func TestRemoveSupporterHandler(t *testing.T) {
RegisterTestingT(t)
ideas := &inmemory.IdeaStorage{}
- ideas.Save(1, 1, "The Idea #1", "The Description #1")
- ideas.AddSupporter(1, 1, 1)
- ideas.AddSupporter(1, 2, 1)
- ideas.AddSupporter(1, 3, 1)
+ ideas.Save(1, "The Idea #1", "The Description #1")
+ ideas.AddSupporter(1, 1)
+ ideas.AddSupporter(2, 1)
+ ideas.AddSupporter(3, 1)
server := mock.NewServer()
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
@@ -179,7 +179,7 @@ func TestRemoveSupporterHandler(t *testing.T) {
server.Context.SetParamValues("1")
code, _ := server.Execute(handlers.RemoveSupporter())
- idea, _ := ideas.GetByNumber(1, 1)
+ idea, _ := ideas.GetByNumber(1)
Expect(code).To(Equal(200))
Expect(idea.TotalSupporters).To(Equal(2))
diff --git a/app/storage/feedback.go b/app/storage/feedback.go
index e19d0f052..9cbc4c9ef 100644
--- a/app/storage/feedback.go
+++ b/app/storage/feedback.go
@@ -5,12 +5,12 @@ import "github.com/getfider/fider/app/models"
// Idea contains read and write operations for ideas
type Idea interface {
GetByID(ideaID int) (*models.Idea, error)
- GetByNumber(tenantID, number int) (*models.Idea, error)
- GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comment, error)
+ GetByNumber(number int) (*models.Idea, error)
+ GetCommentsByIdeaID(ideaID int) ([]*models.Comment, error)
GetAll() ([]*models.Idea, error)
- Save(tenantID, userID int, title, description string) (*models.Idea, error)
+ Save(userID int, title, description string) (*models.Idea, error)
AddComment(userID, ideaID int, content string) (int, error)
- AddSupporter(tenantID, userID, ideaID int) error
- RemoveSupporter(tenantID, userID, ideaID int) error
- SetResponse(tenantID, ideaID int, text string, userID, status int) error
+ AddSupporter(userID, ideaID int) error
+ RemoveSupporter(userID, ideaID int) error
+ SetResponse(ideaID int, text string, userID, status int) error
}
diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.go
index f8b955caf..1e6ac2c1f 100644
--- a/app/storage/inmemory/idea.go
+++ b/app/storage/inmemory/idea.go
@@ -24,7 +24,7 @@ func (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {
}
// GetByNumber returns idea by tenant and number
-func (s *IdeaStorage) GetByNumber(tenantID, number int) (*models.Idea, error) {
+func (s *IdeaStorage) GetByNumber(number int) (*models.Idea, error) {
for _, idea := range s.ideas {
if idea.Number == number {
return idea, nil
@@ -39,12 +39,12 @@ func (s *IdeaStorage) GetAll() ([]*models.Idea, error) {
}
// GetCommentsByIdeaID returns all coments from given idea
-func (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comment, error) {
+func (s *IdeaStorage) GetCommentsByIdeaID(ideaID int) ([]*models.Comment, error) {
return make([]*models.Comment, 0), nil
}
// Save a new idea in the database
-func (s *IdeaStorage) Save(tenantID, userID int, title, description string) (*models.Idea, error) {
+func (s *IdeaStorage) Save(userID int, title, description string) (*models.Idea, error) {
s.lastID = s.lastID + 1
idea := &models.Idea{
ID: s.lastID,
@@ -62,7 +62,7 @@ func (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error
}
// AddSupporter adds user to idea list of supporters
-func (s *IdeaStorage) AddSupporter(tenantID, userID, ideaID int) error {
+func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
for _, idea := range s.ideas {
if idea.ID == ideaID {
idea.TotalSupporters = idea.TotalSupporters + 1
@@ -72,7 +72,7 @@ func (s *IdeaStorage) AddSupporter(tenantID, userID, ideaID int) error {
}
// RemoveSupporter removes user from idea list of supporters
-func (s *IdeaStorage) RemoveSupporter(tenantID, userID, ideaID int) error {
+func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
for _, idea := range s.ideas {
if idea.ID == ideaID {
idea.TotalSupporters = idea.TotalSupporters - 1
@@ -82,7 +82,7 @@ func (s *IdeaStorage) RemoveSupporter(tenantID, userID, ideaID int) error {
}
// SetResponse changes current idea response
-func (s *IdeaStorage) SetResponse(tenantID, ideaID int, text string, userID, status int) error {
+func (s *IdeaStorage) SetResponse(ideaID int, text string, userID, status int) error {
for _, idea := range s.ideas {
if idea.ID == ideaID {
idea.Response = &models.IdeaResponse{
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index b718f7159..8d8cedc85 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -126,10 +126,10 @@ func (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {
}
// GetByNumber returns idea by tenant and number
-func (s *IdeaStorage) GetByNumber(tenantID, number 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", tenantID, 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 {
@@ -140,7 +140,7 @@ func (s *IdeaStorage) GetByNumber(tenantID, number int) (*models.Idea, error) {
}
// GetCommentsByIdeaID returns all coments from given idea
-func (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comment, error) {
+func (s *IdeaStorage) GetCommentsByIdeaID(ideaID int) ([]*models.Comment, error) {
comments := []*dbComment{}
err := s.Trx.Select(&comments,
`SELECT c.id,
@@ -156,7 +156,7 @@ func (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comme
ON u.id = c.user_id
WHERE i.id = $1
AND i.tenant_id = $2
- ORDER BY c.created_on DESC`, ideaID, tenantID)
+ ORDER BY c.created_on DESC`, ideaID, s.Tenant.ID)
if err != nil {
return nil, err
}
@@ -169,14 +169,14 @@ func (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comme
}
// Save a new idea in the database
-func (s *IdeaStorage) Save(tenantID, userID int, title, description string) (*models.Idea, error) {
+func (s *IdeaStorage) Save(userID int, title, description string) (*models.Idea, error) {
idea := new(models.Idea)
idea.Title = title
idea.Description = description
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())
+ RETURNING id`, title, slug.Make(title), description, s.Tenant.ID, userID, time.Now())
if err := row.Scan(&idea.ID); err != nil {
return nil, err
}
@@ -195,7 +195,7 @@ func (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error
}
// AddSupporter adds user to idea list of supporters
-func (s *IdeaStorage) AddSupporter(tenantID, userID, ideaID int) error {
+func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
idea, err := s.GetByID(ideaID)
if err != nil {
return err
@@ -225,7 +225,7 @@ func (s *IdeaStorage) AddSupporter(tenantID, userID, ideaID int) error {
}
// RemoveSupporter removes user from idea list of supporters
-func (s *IdeaStorage) RemoveSupporter(tenantID, userID, ideaID int) error {
+func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
idea, err := s.GetByID(ideaID)
if err != nil {
return err
@@ -256,8 +256,8 @@ func (s *IdeaStorage) RemoveSupporter(tenantID, userID, ideaID int) error {
}
// SetResponse changes current idea response
-func (s *IdeaStorage) SetResponse(tenantID, ideaID int, text string, userID, status int) error {
- 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 {
+func (s *IdeaStorage) SetResponse(ideaID int, text string, userID, status int) error {
+ 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, s.Tenant.ID, text, time.Now(), userID, status); err != nil {
return err
}
return nil
diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.go
index ca3906c38..34f3b6ff5 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -16,6 +16,11 @@ var demoTenant = &models.Tenant{
Name: "Demonstration",
}
+var orangeTenant = &models.Tenant{
+ ID: 400,
+ Name: "Orange Inc.",
+}
+
func TestIdeaStorage_GetAll(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
@@ -63,7 +68,7 @@ func TestIdeaStorage_SaveAndGet(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, err := ideas.Save(300, 300, "My new idea", "with this description")
+ idea, err := ideas.Save(300, "My new idea", "with this description")
Expect(err).To(BeNil())
Expect(idea.ID).To(Equal(1))
@@ -106,15 +111,14 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {
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{Trx: trx, Tenant: demoTenant}
+ idea, err := ideas.Save(300, "My new idea", "with this description")
+ Expect(err).To(BeNil())
- 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")
+ ideas.AddComment(300, idea.ID, "Comment #1")
+ ideas.AddComment(300, idea.ID, "Comment #2")
- comments, err := ideas.GetCommentsByIdeaID(1, idea.ID)
+ comments, err := ideas.GetCommentsByIdeaID(idea.ID)
Expect(err).To(BeNil())
Expect(len(comments)).To(Equal(2))
@@ -131,11 +135,13 @@ func TestIdeaStorage_SaveAndGet_DifferentTenants(t *testing.T) {
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")
+ demoIdeas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
+ demoIdeas.Save(300, "My new idea", "with this description")
+
+ orangeIdeas := &postgres.IdeaStorage{Trx: trx, Tenant: orangeTenant}
+ orangeIdeas.Save(400, "My other idea", "with other description")
- dbIdea, err := ideas.GetByNumber(300, 1)
+ dbIdea, err := demoIdeas.GetByNumber(1)
Expect(err).To(BeNil())
Expect(dbIdea.ID).To(Equal(1))
@@ -143,7 +149,7 @@ func TestIdeaStorage_SaveAndGet_DifferentTenants(t *testing.T) {
Expect(dbIdea.Title).To(Equal("My new idea"))
Expect(dbIdea.Slug).To(Equal("my-new-idea"))
- dbIdea, err = ideas.GetByNumber(400, 1)
+ dbIdea, err = orangeIdeas.GetByNumber(1)
Expect(err).To(BeNil())
Expect(dbIdea.ID).To(Equal(2))
@@ -163,15 +169,15 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+ idea, _ := ideas.Save(300, "My new idea", "with this description")
- err := ideas.AddSupporter(300, 300, idea.ID)
+ err := ideas.AddSupporter(300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.AddSupporter(300, 301, idea.ID)
+ err = ideas.AddSupporter(301, idea.ID)
Expect(err).To(BeNil())
- dbIdea, err := ideas.GetByNumber(300, 1)
+ dbIdea, err := ideas.GetByNumber(1)
Expect(err).To(BeNil())
Expect(dbIdea.TotalSupporters).To(Equal(2))
}
@@ -186,15 +192,15 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+ idea, _ := ideas.Save(300, "My new idea", "with this description")
- err := ideas.AddSupporter(300, 300, idea.ID)
+ err := ideas.AddSupporter(300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.AddSupporter(300, 300, idea.ID)
+ err = ideas.AddSupporter(300, idea.ID)
Expect(err).To(BeNil())
- dbIdea, err := ideas.GetByNumber(300, 1)
+ dbIdea, err := ideas.GetByNumber(1)
Expect(err).To(BeNil())
Expect(dbIdea.TotalSupporters).To(Equal(1))
}
@@ -209,15 +215,15 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+ idea, _ := ideas.Save(300, "My new idea", "with this description")
- err := ideas.AddSupporter(300, 300, idea.ID)
+ err := ideas.AddSupporter(300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, 300, idea.ID)
+ err = ideas.RemoveSupporter(300, idea.ID)
Expect(err).To(BeNil())
- dbIdea, err := ideas.GetByNumber(300, 1)
+ dbIdea, err := ideas.GetByNumber(1)
Expect(err).To(BeNil())
Expect(dbIdea.TotalSupporters).To(Equal(0))
}
@@ -232,18 +238,18 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+ idea, _ := ideas.Save(300, "My new idea", "with this description")
- err := ideas.AddSupporter(300, 300, idea.ID)
+ err := ideas.AddSupporter(300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, 300, idea.ID)
+ err = ideas.RemoveSupporter(300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, 300, idea.ID)
+ err = ideas.RemoveSupporter(300, idea.ID)
Expect(err).To(BeNil())
- dbIdea, err := ideas.GetByNumber(300, 1)
+ dbIdea, err := ideas.GetByNumber(1)
Expect(err).To(BeNil())
Expect(dbIdea.TotalSupporters).To(Equal(0))
}
@@ -258,8 +264,8 @@ func TestIdeaStorage_SetResponse(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
- err := ideas.SetResponse(300, idea.ID, "We liked this idea", 300, models.IdeaStarted)
+ idea, _ := ideas.Save(300, "My new idea", "with this description")
+ err := ideas.SetResponse(idea.ID, "We liked this idea", 300, models.IdeaStarted)
Expect(err).To(BeNil())
@@ -279,11 +285,11 @@ func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- 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)
+ idea, _ := ideas.Save(300, "My new idea", "with this description")
+ ideas.SetResponse(idea.ID, "We liked this idea", 300, models.IdeaCompleted)
+ ideas.AddSupporter(300, idea.ID)
- dbIdea, err := ideas.GetByNumber(300, 1)
+ dbIdea, err := ideas.GetByNumber(1)
Expect(err).To(BeNil())
Expect(dbIdea.TotalSupporters).To(Equal(0))
}
@@ -298,12 +304,12 @@ func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- 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)
- ideas.RemoveSupporter(300, 300, idea.ID)
+ idea, _ := ideas.Save(300, "My new idea", "with this description")
+ ideas.AddSupporter(300, idea.ID)
+ ideas.SetResponse(idea.ID, "We liked this idea", 300, models.IdeaCompleted)
+ ideas.RemoveSupporter(300, idea.ID)
- dbIdea, err := ideas.GetByNumber(300, 1)
+ dbIdea, err := ideas.GetByNumber(1)
Expect(err).To(BeNil())
Expect(dbIdea.TotalSupporters).To(Equal(1))
}