Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

refactor parameters

goenning7e7c5cec83e2
diff --git a/app/handlers/feedback.go b/app/handlers/idea.go
similarity index 81%
rename from app/handlers/feedback.go
rename to app/handlers/idea.go
index 68c4bda93..8dcd68ddf 100644
--- a/app/handlers/feedback.go
+++ b/app/handlers/idea.go
@@ -4,6 +4,7 @@ import (
"strings"
"github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/web"
"github.com/labstack/echo"
)
@@ -42,12 +43,12 @@ func PostIdea() web.HandlerFunc {
}
ideas := c.Services().Ideas
- idea, err := ideas.Save(c.User().ID, input.Title, input.Description)
+ idea, err := ideas.Add(input.Title, input.Description, c.User().ID)
if err != nil {
return c.Failure(err)
}
- if err := ideas.AddSupporter(c.User().ID, idea.ID); err != nil {
+ if err := ideas.AddSupporter(idea.Number, c.User().ID); err != nil {
return c.Failure(err)
}
@@ -72,7 +73,7 @@ func IdeaDetails() web.HandlerFunc {
return c.Failure(err)
}
- comments, err := ideas.GetCommentsByIdeaID(idea.ID)
+ comments, err := ideas.GetCommentsByIdea(number)
if err != nil {
return c.Failure(err)
}
@@ -108,7 +109,7 @@ func PostComment() web.HandlerFunc {
}
ideas := c.Services().Ideas
- idea, err := ideas.GetByNumber(ideaNumber)
+ _, err = ideas.AddComment(ideaNumber, input.Content, c.User().ID)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
@@ -116,11 +117,6 @@ func PostComment() web.HandlerFunc {
return c.Failure(err)
}
- _, err = ideas.AddComment(c.User().ID, idea.ID, input.Content)
- if err != nil {
- return c.Failure(err)
- }
-
return c.JSON(200, echo.Map{})
}
}
@@ -138,13 +134,25 @@ func SetResponse() web.HandlerFunc {
return c.Failure(err)
}
+ if input.Status < models.IdeaNew || input.Status > models.IdeaDeclined {
+ return c.JSON(400, echo.Map{
+ "message": "Status is invalid.",
+ })
+ }
+
+ if strings.Trim(input.Text, " ") == "" {
+ return c.JSON(400, echo.Map{
+ "message": "Text is required.",
+ })
+ }
+
ideaNumber, err := c.ParamAsInt("number")
if err != nil {
return c.Failure(err)
}
ideas := c.Services().Ideas
- idea, err := ideas.GetByNumber(ideaNumber)
+ err = ideas.SetResponse(ideaNumber, input.Text, c.User().ID, input.Status)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
@@ -152,11 +160,6 @@ func SetResponse() web.HandlerFunc {
return c.Failure(err)
}
- err = ideas.SetResponse(idea.ID, input.Text, c.User().ID, input.Status)
- if err != nil {
- return c.Failure(err)
- }
-
return c.JSON(200, echo.Map{})
}
}
@@ -175,13 +178,13 @@ func RemoveSupporter() web.HandlerFunc {
}
}
-func addOrRemoveSupporter(c web.Context, addOrRemove func(userId, ideaId int) error) error {
+func addOrRemoveSupporter(c web.Context, addOrRemove func(number, userID int) error) error {
ideaNumber, err := c.ParamAsInt("number")
if err != nil {
return c.Failure(err)
}
- idea, err := c.Services().Ideas.GetByNumber(ideaNumber)
+ err = addOrRemove(ideaNumber, c.User().ID)
if err != nil {
if err == app.ErrNotFound {
return c.NotFound()
@@ -189,10 +192,5 @@ func addOrRemoveSupporter(c web.Context, addOrRemove func(userId, ideaId int) er
return c.Failure(err)
}
- err = addOrRemove(c.User().ID, idea.ID)
- if err != nil {
- return c.Failure(err)
- }
-
return c.JSON(200, echo.Map{})
}
diff --git a/app/handlers/feedback_test.go b/app/handlers/idea_test.go
similarity index 94%
rename from app/handlers/feedback_test.go
rename to app/handlers/idea_test.go
index 9f065dd01..96b3265a3 100644
--- a/app/handlers/feedback_test.go
+++ b/app/handlers/idea_test.go
@@ -31,7 +31,7 @@ func TestDetailsHandler(t *testing.T) {
RegisterTestingT(t)
ideas := &inmemory.IdeaStorage{}
- idea, _ := ideas.Save(1, "My Idea", "My Idea Description")
+ idea, _ := ideas.Add("My Idea", "My Idea Description", 1)
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, "Title", "Description")
+ ideas.Add("Title", "Description", 1)
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, "The Idea #1", "The Description #1")
- ideas.Save(1, "The Idea #2", "The Description #2")
+ ideas.Add("The Idea #1", "The Description #1", 1)
+ ideas.Add("The Idea #2", "The Description #2", 1)
server := mock.NewServer()
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
@@ -167,10 +167,10 @@ func TestRemoveSupporterHandler(t *testing.T) {
RegisterTestingT(t)
ideas := &inmemory.IdeaStorage{}
- ideas.Save(1, "The Idea #1", "The Description #1")
+ ideas.Add("The Idea #1", "The Description #1", 1)
ideas.AddSupporter(1, 1)
- ideas.AddSupporter(2, 1)
- ideas.AddSupporter(3, 1)
+ ideas.AddSupporter(1, 2)
+ ideas.AddSupporter(1, 3)
server := mock.NewServer()
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
diff --git a/app/storage/feedback.go b/app/storage/feedback.go
deleted file mode 100644
index 9cbc4c9ef..000000000
--- a/app/storage/feedback.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package storage
-
-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(number int) (*models.Idea, error)
- GetCommentsByIdeaID(ideaID int) ([]*models.Comment, error)
- GetAll() ([]*models.Idea, error)
- Save(userID int, title, description string) (*models.Idea, error)
- AddComment(userID, ideaID int, content string) (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/idea.go b/app/storage/idea.go
new file mode 100644
index 000000000..42bdca3e7
--- /dev/null
+++ b/app/storage/idea.go
@@ -0,0 +1,16 @@
+package storage
+
+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(number int) (*models.Idea, error)
+ GetCommentsByIdea(number int) ([]*models.Comment, error)
+ GetAll() ([]*models.Idea, error)
+ Add(title, description string, userID int) (*models.Idea, error)
+ AddComment(number int, content string, userID int) (int, error)
+ AddSupporter(number, userID int) error
+ RemoveSupporter(number, userID int) error
+ SetResponse(number int, text string, userID, status int) error
+}
diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.go
index 1e6ac2c1f..343541cfe 100644
--- a/app/storage/inmemory/idea.go
+++ b/app/storage/inmemory/idea.go
@@ -38,13 +38,13 @@ func (s *IdeaStorage) GetAll() ([]*models.Idea, error) {
return s.ideas, nil
}
-// GetCommentsByIdeaID returns all coments from given idea
-func (s *IdeaStorage) GetCommentsByIdeaID(ideaID int) ([]*models.Comment, error) {
+// GetCommentsByIdea returns all coments from given idea
+func (s *IdeaStorage) GetCommentsByIdea(number int) ([]*models.Comment, error) {
return make([]*models.Comment, 0), nil
}
-// Save a new idea in the database
-func (s *IdeaStorage) Save(userID int, title, description string) (*models.Idea, error) {
+// Add a new idea in the database
+func (s *IdeaStorage) Add(title, description string, userID int) (*models.Idea, error) {
s.lastID = s.lastID + 1
idea := &models.Idea{
ID: s.lastID,
@@ -57,34 +57,34 @@ func (s *IdeaStorage) Save(userID int, title, description string) (*models.Idea,
}
// AddComment places a new comment on an idea
-func (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error) {
+func (s *IdeaStorage) AddComment(number int, content string, userID int) (int, error) {
return 0, nil
}
// AddSupporter adds user to idea list of supporters
-func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
- for _, idea := range s.ideas {
- if idea.ID == ideaID {
- idea.TotalSupporters = idea.TotalSupporters + 1
- }
+func (s *IdeaStorage) AddSupporter(number, userID int) error {
+ idea, err := s.GetByNumber(number)
+ if err != nil {
+ return err
}
+ idea.TotalSupporters = idea.TotalSupporters + 1
return nil
}
// RemoveSupporter removes user from idea list of supporters
-func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
- for _, idea := range s.ideas {
- if idea.ID == ideaID {
- idea.TotalSupporters = idea.TotalSupporters - 1
- }
+func (s *IdeaStorage) RemoveSupporter(number, userID int) error {
+ idea, err := s.GetByNumber(number)
+ if err != nil {
+ return err
}
+ idea.TotalSupporters = idea.TotalSupporters - 1
return nil
}
// SetResponse changes current idea response
-func (s *IdeaStorage) SetResponse(ideaID int, text string, userID, status int) error {
+func (s *IdeaStorage) SetResponse(number int, text string, userID, status int) error {
for _, idea := range s.ideas {
- if idea.ID == ideaID {
+ if idea.Number == number {
idea.Response = &models.IdeaResponse{
Text: text,
User: &models.User{ID: userID},
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index 8d8cedc85..472f02202 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -139,8 +139,8 @@ func (s *IdeaStorage) GetByNumber(number int) (*models.Idea, error) {
return idea.toModel(), nil
}
-// GetCommentsByIdeaID returns all coments from given idea
-func (s *IdeaStorage) GetCommentsByIdeaID(ideaID int) ([]*models.Comment, error) {
+// GetCommentsByIdea returns all coments from given idea
+func (s *IdeaStorage) GetCommentsByIdea(number int) ([]*models.Comment, error) {
comments := []*dbComment{}
err := s.Trx.Select(&comments,
`SELECT c.id,
@@ -154,9 +154,9 @@ func (s *IdeaStorage) GetCommentsByIdeaID(ideaID int) ([]*models.Comment, error)
ON i.id = c.idea_id
INNER JOIN users u
ON u.id = c.user_id
- WHERE i.id = $1
+ WHERE i.number = $1
AND i.tenant_id = $2
- ORDER BY c.created_on DESC`, ideaID, s.Tenant.ID)
+ ORDER BY c.created_on DESC`, number, s.Tenant.ID)
if err != nil {
return nil, err
}
@@ -168,26 +168,28 @@ func (s *IdeaStorage) GetCommentsByIdeaID(ideaID int) ([]*models.Comment, error)
return result, nil
}
-// Save a new idea in the database
-func (s *IdeaStorage) Save(userID int, title, description string) (*models.Idea, error) {
- idea := new(models.Idea)
- idea.Title = title
- idea.Description = description
-
+// Add a new idea in the database
+func (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)
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())
- if err := row.Scan(&idea.ID); err != nil {
+ if err := row.Scan(&id); err != nil {
return nil, err
}
- return idea, nil
+ return s.GetByID(id)
}
// AddComment places a new comment on an idea
-func (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error) {
+func (s *IdeaStorage) AddComment(number int, content string, userID int) (int, error) {
+ idea, err := s.GetByNumber(number)
+ if err != nil {
+ return 0, err
+ }
+
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", ideaID, 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
}
@@ -195,8 +197,8 @@ func (s *IdeaStorage) AddComment(userID, ideaID int, content string) (int, error
}
// AddSupporter adds user to idea list of supporters
-func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
- idea, err := s.GetByID(ideaID)
+func (s *IdeaStorage) AddSupporter(number, userID int) error {
+ idea, err := s.GetByNumber(number)
if err != nil {
return err
}
@@ -204,7 +206,7 @@ func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
return nil
}
- alreadySupported, err := s.Trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, ideaID)
+ alreadySupported, err := s.Trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, idea.ID)
if err != nil {
return err
}
@@ -213,11 +215,11 @@ func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
return nil
}
- if err := s.Trx.Execute(`UPDATE ideas SET supporters = supporters + 1 WHERE id = $1`, ideaID); 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, ideaID, 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
}
@@ -225,8 +227,8 @@ func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
}
// RemoveSupporter removes user from idea list of supporters
-func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
- idea, err := s.GetByID(ideaID)
+func (s *IdeaStorage) RemoveSupporter(number, userID int) error {
+ idea, err := s.GetByNumber(number)
if err != nil {
return err
}
@@ -235,7 +237,7 @@ func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
return nil
}
- didSupport, err := s.Trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, ideaID)
+ didSupport, err := s.Trx.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, idea.ID)
if err != nil {
return err
}
@@ -244,11 +246,11 @@ func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
return nil
}
- if err := s.Trx.Execute(`UPDATE ideas SET supporters = supporters - 1 WHERE id = $1`, ideaID); 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, ideaID); 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
}
@@ -256,8 +258,17 @@ func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
}
// SetResponse changes current idea response
-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 {
+func (s *IdeaStorage) SetResponse(number int, text string, userID, status int) error {
+ idea, err := s.GetByNumber(number)
+ if err != nil {
+ return err
+ }
+
+ 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
+ `, idea.ID, 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 34f3b6ff5..95223b81d 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -58,7 +58,7 @@ func TestIdeaStorage_GetAll(t *testing.T) {
Expect(dbIdeas[1].Status).To(Equal(models.IdeaCompleted))
}
-func TestIdeaStorage_SaveAndGet(t *testing.T) {
+func TestIdeaStorage_AddAndGet(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
db.Seed()
@@ -68,7 +68,7 @@ func TestIdeaStorage_SaveAndGet(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, err := ideas.Save(300, "My new idea", "with this description")
+ idea, err := ideas.Add("My new idea", "with this description", 300)
Expect(err).To(BeNil())
Expect(idea.ID).To(Equal(1))
@@ -112,13 +112,13 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, err := ideas.Save(300, "My new idea", "with this description")
+ idea, err := ideas.Add("My new idea", "with this description", 300)
Expect(err).To(BeNil())
- ideas.AddComment(300, idea.ID, "Comment #1")
- ideas.AddComment(300, idea.ID, "Comment #2")
+ ideas.AddComment(idea.Number, "Comment #1", 300)
+ ideas.AddComment(idea.Number, "Comment #2", 300)
- comments, err := ideas.GetCommentsByIdeaID(idea.ID)
+ comments, err := ideas.GetCommentsByIdea(idea.Number)
Expect(err).To(BeNil())
Expect(len(comments)).To(Equal(2))
@@ -126,7 +126,7 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {
Expect(comments[1].Content).To(Equal("Comment #1"))
}
-func TestIdeaStorage_SaveAndGet_DifferentTenants(t *testing.T) {
+func TestIdeaStorage_AddAndGet_DifferentTenants(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
db.Seed()
@@ -136,10 +136,10 @@ func TestIdeaStorage_SaveAndGet_DifferentTenants(t *testing.T) {
defer trx.Rollback()
demoIdeas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- demoIdeas.Save(300, "My new idea", "with this description")
+ demoIdeas.Add("My new idea", "with this description", 300)
orangeIdeas := &postgres.IdeaStorage{Trx: trx, Tenant: orangeTenant}
- orangeIdeas.Save(400, "My other idea", "with other description")
+ orangeIdeas.Add("My other idea", "with other description", 400)
dbIdea, err := demoIdeas.GetByNumber(1)
@@ -169,12 +169,12 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, "My new idea", "with this description")
+ idea, _ := ideas.Add("My new idea", "with this description", 300)
- err := ideas.AddSupporter(300, idea.ID)
+ err := ideas.AddSupporter(idea.Number, 300)
Expect(err).To(BeNil())
- err = ideas.AddSupporter(301, idea.ID)
+ err = ideas.AddSupporter(idea.Number, 301)
Expect(err).To(BeNil())
dbIdea, err := ideas.GetByNumber(1)
@@ -192,12 +192,12 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, "My new idea", "with this description")
+ idea, _ := ideas.Add("My new idea", "with this description", 300)
- err := ideas.AddSupporter(300, idea.ID)
+ err := ideas.AddSupporter(idea.Number, 300)
Expect(err).To(BeNil())
- err = ideas.AddSupporter(300, idea.ID)
+ err = ideas.AddSupporter(idea.Number, 300)
Expect(err).To(BeNil())
dbIdea, err := ideas.GetByNumber(1)
@@ -215,12 +215,12 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, "My new idea", "with this description")
+ idea, _ := ideas.Add("My new idea", "with this description", 300)
- err := ideas.AddSupporter(300, idea.ID)
+ err := ideas.AddSupporter(idea.Number, 300)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, idea.ID)
+ err = ideas.RemoveSupporter(idea.Number, 300)
Expect(err).To(BeNil())
dbIdea, err := ideas.GetByNumber(1)
@@ -238,15 +238,15 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, "My new idea", "with this description")
+ idea, _ := ideas.Add("My new idea", "with this description", 300)
- err := ideas.AddSupporter(300, idea.ID)
+ err := ideas.AddSupporter(idea.Number, 300)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, idea.ID)
+ err = ideas.RemoveSupporter(idea.Number, 300)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, idea.ID)
+ err = ideas.RemoveSupporter(idea.Number, 300)
Expect(err).To(BeNil())
dbIdea, err := ideas.GetByNumber(1)
@@ -264,8 +264,8 @@ func TestIdeaStorage_SetResponse(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- idea, _ := ideas.Save(300, "My new idea", "with this description")
- err := ideas.SetResponse(idea.ID, "We liked this idea", 300, models.IdeaStarted)
+ idea, _ := ideas.Add("My new idea", "with this description", 300)
+ err := ideas.SetResponse(idea.Number, "We liked this idea", 300, models.IdeaStarted)
Expect(err).To(BeNil())
@@ -285,9 +285,9 @@ func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- 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)
+ 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)
dbIdea, err := ideas.GetByNumber(1)
Expect(err).To(BeNil())
@@ -304,10 +304,10 @@ func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {
defer trx.Rollback()
ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
- 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)
+ 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)
+ ideas.RemoveSupporter(idea.Number, 300)
dbIdea, err := ideas.GetByNumber(1)
Expect(err).To(BeNil())
diff --git a/public/shared/RespondForm.tsx b/public/shared/ResponseForm.tsx
similarity index 87%
rename from public/shared/RespondForm.tsx
rename to public/shared/ResponseForm.tsx
index af4db6ac5..0b37635c3 100644
--- a/public/shared/RespondForm.tsx
+++ b/public/shared/ResponseForm.tsx
@@ -2,21 +2,23 @@ import axios from "axios";
import * as React from "react";
import * as storage from "../storage";
import { User, Comment, Idea } from "../models";
+import { DisplayError } from "./Common";
-interface RespondFormProps {
+interface ResponseFormProps {
idea: Idea;
}
-interface RespondFormState {
+interface ResponseFormState {
active: boolean;
+ error?: Error;
}
-export class RespondForm extends React.Component<RespondFormProps, RespondFormState> {
+export class ResponseForm extends React.Component<ResponseFormProps, ResponseFormState> {
private user: User;
private text: HTMLTextAreaElement;
private status: HTMLSelectElement;
- constructor(props: RespondFormProps) {
+ constructor(props: ResponseFormProps) {
super(props);
this.user = storage.getCurrentUser();
@@ -33,7 +35,9 @@ export class RespondForm extends React.Component<RespondFormProps, RespondFormSt
});
location.reload();
} catch (ex) {
- // TODO: handle this
+ this.setState({
+ error: ex.response.data
+ });
}
}
@@ -51,6 +55,7 @@ export class RespondForm extends React.Component<RespondFormProps, RespondFormSt
<i className="icon announcement"></i>Respond
</div>;
const form = <form className="ui reply form">
+ <DisplayError error={this.state.error} />
<div className="two fields">
<div className="field">
<label>Status</label>
diff --git a/public/site/ShowIdeaPage.tsx b/public/site/ShowIdeaPage.tsx
index 065b45794..359a78639 100644
--- a/public/site/ShowIdeaPage.tsx
+++ b/public/site/ShowIdeaPage.tsx
@@ -7,7 +7,7 @@ import { CommentInput } from "../shared/CommentInput";
import { Gravatar, MultiLineText, ShowIdeaResponse } from "../shared/Common";
import { SocialSignInButton } from "../shared/SocialSignInButton";
import { SupportCounter } from "../shared/SupportCounter";
-import { RespondForm } from "../shared/RespondForm";
+import { ResponseForm } from "../shared/ResponseForm";
import { Footer } from "../shared/Footer";
import { Header } from "../shared/Header";
@@ -73,7 +73,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
<ShowIdeaResponse status={ this.idea.status } response={ this.idea.response } />
<div className="ui hidden divider"></div>
- <RespondForm idea={ this.idea } />
+ <ResponseForm idea={ this.idea } />
<div className="ui comments">
<h3 className="ui dividing header">Comments</h3>