Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

adding API to edit an idea (#68)

Guilherme Oenningaea2c8010ec0
diff --git a/app/handlers/idea.go b/app/handlers/idea.go
index 4e6049539..a675d2095 100644
--- a/app/handlers/idea.go
+++ b/app/handlers/idea.go
@@ -6,6 +6,7 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/web"
+ "github.com/getfider/fider/app/validate"
)
// Index is the default home page
@@ -22,7 +23,7 @@ func Index() web.HandlerFunc {
}
}
-type newIdeaInput struct {
+type ideaInput struct {
Title string `json:"title"`
Description string `json:"description"`
}
@@ -30,20 +31,19 @@ type newIdeaInput struct {
// PostIdea creates a new idea on current tenant
func PostIdea() web.HandlerFunc {
return func(c web.Context) error {
- input := new(newIdeaInput)
+ input := new(ideaInput)
if err := c.Bind(input); err != nil {
return c.Failure(err)
}
- if strings.Trim(input.Title, " ") == "" {
- return c.JSON(400, web.Map{
- "message": "Title is required.",
- })
+ ok, messages, err := validate.Idea(input.Title, input.Description)
+ if err != nil {
+ return c.Failure(err)
}
- if len(input.Title) < 10 || len(strings.Split(input.Title, " ")) < 3 {
- return c.JSON(400, web.Map{
- "message": "Title needs to be more descriptive.",
+ if !ok {
+ return c.BadRequest(web.Map{
+ "message": strings.Join(messages, ","),
})
}
@@ -57,7 +57,45 @@ func PostIdea() web.HandlerFunc {
return c.Failure(err)
}
- return c.JSON(200, idea)
+ return c.Ok(idea)
+ }
+}
+
+// UpdateIdea updates an existing ideaof current tenant
+func UpdateIdea() web.HandlerFunc {
+ return func(c web.Context) error {
+ number, err := c.ParamAsInt("number")
+ if err != nil {
+ return c.Failure(err)
+ }
+
+ input := new(ideaInput)
+ if err := c.Bind(input); err != nil {
+ return c.Failure(err)
+ }
+
+ ok, messages, err := validate.Idea(input.Title, input.Description)
+ if err != nil {
+ return c.Failure(err)
+ }
+
+ if !ok {
+ return c.BadRequest(web.Map{
+ "message": strings.Join(messages, ","),
+ })
+ }
+
+ idea, err := c.Services().Ideas.GetByNumber(number)
+ if idea.CanBeChangedBy(c.User()) {
+ idea, err = c.Services().Ideas.Update(number, input.Title, input.Description)
+ if err != nil {
+ return c.Failure(err)
+ }
+ } else {
+ return c.Unauthorized()
+ }
+
+ return c.Ok(idea)
}
}
@@ -103,7 +141,7 @@ func PostComment() web.HandlerFunc {
}
if strings.Trim(input.Content, " ") == "" {
- return c.JSON(400, web.Map{
+ return c.BadRequest(web.Map{
"message": "Comment is required.",
})
}
@@ -122,7 +160,7 @@ func PostComment() web.HandlerFunc {
return c.Failure(err)
}
- return c.JSON(200, web.Map{})
+ return c.Ok(web.Map{})
}
}
@@ -140,13 +178,13 @@ func SetResponse() web.HandlerFunc {
}
if input.Status < models.IdeaNew || input.Status > models.IdeaDeclined {
- return c.JSON(400, web.Map{
+ return c.BadRequest(web.Map{
"message": "Status is invalid.",
})
}
if strings.Trim(input.Text, " ") == "" {
- return c.JSON(400, web.Map{
+ return c.BadRequest(web.Map{
"message": "Text is required.",
})
}
@@ -165,7 +203,7 @@ func SetResponse() web.HandlerFunc {
return c.Failure(err)
}
- return c.JSON(200, web.Map{})
+ return c.Ok(web.Map{})
}
}
@@ -197,5 +235,5 @@ func addOrRemoveSupporter(c web.Context, addOrRemove func(number, userID int) er
return c.Failure(err)
}
- return c.JSON(200, web.Map{})
+ return c.Ok(web.Map{})
}
diff --git a/app/handlers/idea_test.go b/app/handlers/idea_test.go
index 96b3265a3..795de27a1 100644
--- a/app/handlers/idea_test.go
+++ b/app/handlers/idea_test.go
@@ -3,12 +3,11 @@ package handlers_test
import (
"testing"
- "strconv"
-
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/handlers"
- "github.com/getfider/fider/app/mock"
"github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/mock"
+ "github.com/getfider/fider/app/pkg/web"
"github.com/getfider/fider/app/storage/inmemory"
. "github.com/onsi/gomega"
)
@@ -36,8 +35,7 @@ func TestDetailsHandler(t *testing.T) {
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParamNames("number")
- server.Context.SetParamValues(strconv.Itoa(idea.Number))
+ server.Context.SetParams(web.Map{"number": idea.Number})
code, _ := server.Execute(handlers.IdeaDetails())
@@ -52,8 +50,7 @@ func TestDetailsHandler_NotFound(t *testing.T) {
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParamNames("number")
- server.Context.SetParamValues("99")
+ server.Context.SetParams(web.Map{"number": "99"})
code, _ := server.Execute(handlers.IdeaDetails())
@@ -92,17 +89,67 @@ func TestPostIdeaHandler_WithoutTitle(t *testing.T) {
Expect(err).NotTo(BeNil())
}
+func TestUpdateIdeaHandler_IdeaOwner(t *testing.T) {
+ RegisterTestingT(t)
+
+ ideas := &inmemory.IdeaStorage{}
+ idea, _ := ideas.Add("My First Idea", "With a description", 1)
+ server := mock.NewServer()
+ server.Context.SetServices(&app.Services{Ideas: ideas})
+ server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
+ server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
+ server.Context.SetParams(web.Map{"number": idea.Number})
+ code, _ := server.ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
+
+ idea, _ = ideas.GetByNumber(idea.Number)
+ Expect(code).To(Equal(200))
+ Expect(idea.Title).To(Equal("the new title"))
+ Expect(idea.Description).To(Equal("new description"))
+}
+
+func TestUpdateIdeaHandler_TenantStaff(t *testing.T) {
+ RegisterTestingT(t)
+
+ ideas := &inmemory.IdeaStorage{}
+ idea, _ := ideas.Add("My First Idea", "With a description", 1)
+ server := mock.NewServer()
+ server.Context.SetServices(&app.Services{Ideas: ideas})
+ server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
+ server.Context.SetUser(&models.User{ID: 2, Name: "Jon", Role: models.RoleAdministrator})
+ server.Context.SetParams(web.Map{"number": idea.Number})
+ code, _ := server.ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
+
+ idea, _ = ideas.GetByNumber(idea.Number)
+ Expect(code).To(Equal(200))
+ Expect(idea.Title).To(Equal("the new title"))
+ Expect(idea.Description).To(Equal("new description"))
+}
+
+func TestUpdateIdeaHandler_NonAuthorized(t *testing.T) {
+ RegisterTestingT(t)
+
+ ideas := &inmemory.IdeaStorage{}
+ idea, _ := ideas.Add("My First Idea", "With a description", 1)
+ server := mock.NewServer()
+ server.Context.SetServices(&app.Services{Ideas: ideas})
+ server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
+ server.Context.SetUser(&models.User{ID: 2, Name: "Jon"})
+ server.Context.SetParams(web.Map{"number": idea.Number})
+ code, _ := server.ExecutePost(handlers.UpdateIdea(), `{ "title": "the new title", "description": "new description" }`)
+
+ Expect(code).To(Equal(401))
+}
+
func TestPostCommentHandler(t *testing.T) {
RegisterTestingT(t)
ideas := &inmemory.IdeaStorage{}
- ideas.Add("Title", "Description", 1)
+ idea, _ := ideas.Add("My First Idea", "With a description", 1)
server := mock.NewServer()
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParamNames("number")
- server.Context.SetParamValues("1")
+ server.Context.SetParams(web.Map{"number": idea.Number})
handler := handlers.PostComment()
code, _ := server.ExecutePost(handler, `{ "content": "This is a comment!" }`)
@@ -117,8 +164,7 @@ func TestPostCommentHandler_WithoutContent(t *testing.T) {
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParamNames("number")
- server.Context.SetParamValues("1")
+ server.Context.SetParams(web.Map{"number": "1"})
handler := handlers.PostComment()
code, _ := server.ExecutePost(handler, `{ "content": "" }`)
@@ -135,8 +181,7 @@ func TestAddSupporterHandler(t *testing.T) {
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetUser(&models.User{ID: 2, Name: "Arya"})
- server.Context.SetParamNames("number")
- server.Context.SetParamValues("2")
+ server.Context.SetParams(web.Map{"number": "2"})
code, _ := server.Execute(handlers.AddSupporter())
first, _ := ideas.GetByNumber(1)
@@ -155,8 +200,7 @@ func TestAddSupporterHandler_InvalidIdea(t *testing.T) {
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})
- server.Context.SetParamNames("number")
- server.Context.SetParamValues("1")
+ server.Context.SetParams(web.Map{"number": "1"})
code, _ := server.Execute(handlers.AddSupporter())
@@ -167,7 +211,7 @@ func TestRemoveSupporterHandler(t *testing.T) {
RegisterTestingT(t)
ideas := &inmemory.IdeaStorage{}
- ideas.Add("The Idea #1", "The Description #1", 1)
+ idea, _ := ideas.Add("The Idea #1", "The Description #1", 1)
ideas.AddSupporter(1, 1)
ideas.AddSupporter(1, 2)
ideas.AddSupporter(1, 3)
@@ -175,11 +219,10 @@ func TestRemoveSupporterHandler(t *testing.T) {
server.Context.SetServices(&app.Services{Ideas: ideas})
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetUser(&models.User{ID: 2, Name: "Arya"})
- server.Context.SetParamNames("number")
- server.Context.SetParamValues("1")
+ server.Context.SetParams(web.Map{"number": idea.Number})
code, _ := server.Execute(handlers.RemoveSupporter())
- idea, _ := ideas.GetByNumber(1)
+ idea, _ = ideas.GetByNumber(idea.Number)
Expect(code).To(Equal(200))
Expect(idea.TotalSupporters).To(Equal(2))
diff --git a/app/handlers/oauth_test.go b/app/handlers/oauth_test.go
index a41742052..af3b89064 100644
--- a/app/handlers/oauth_test.go
+++ b/app/handlers/oauth_test.go
@@ -9,7 +9,7 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/handlers"
- "github.com/getfider/fider/app/mock"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/oauth"
"github.com/getfider/fider/app/storage/inmemory"
diff --git a/app/handlers/signup_test.go b/app/handlers/signup_test.go
index 8bfbf3e6b..3b155e921 100644
--- a/app/handlers/signup_test.go
+++ b/app/handlers/signup_test.go
@@ -7,9 +7,10 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/handlers"
- "github.com/getfider/fider/app/mock"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/jwt"
+ "github.com/getfider/fider/app/pkg/web"
"github.com/getfider/fider/app/storage/inmemory"
. "github.com/onsi/gomega"
)
@@ -69,8 +70,7 @@ func TestCheckAvailabilityHandler_UnavailableSubdomain(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
- server.Context.SetParamNames("subdomain")
- server.Context.SetParamValues("got")
+ server.Context.SetParams(web.Map{"subdomain": "got"})
tenants := &inmemory.TenantStorage{}
tenants.Add("Game of Thrones", "got")
server.Context.SetServices(&app.Services{
@@ -86,8 +86,7 @@ func TestCheckAvailabilityHandler_ValidSubdomain(t *testing.T) {
RegisterTestingT(t)
server := mock.NewServer()
- server.Context.SetParamNames("subdomain")
- server.Context.SetParamValues("mycompany")
+ server.Context.SetParams(web.Map{"subdomain": "mycompany"})
tenants := &inmemory.TenantStorage{}
tenants.Add("Game of Thrones", "got")
server.Context.SetServices(&app.Services{
diff --git a/app/handlers/status.go b/app/handlers/status.go
index 66620012a..088cc8288 100644
--- a/app/handlers/status.go
+++ b/app/handlers/status.go
@@ -1,7 +1,6 @@
package handlers
import (
- "net/http"
"time"
"github.com/getfider/fider/app/models"
@@ -11,7 +10,7 @@ import (
//Status returns some useful information
func Status(settings *models.AppSettings) web.HandlerFunc {
return func(c web.Context) error {
- return c.JSON(http.StatusOK, web.Map{
+ return c.Ok(web.Map{
"build": settings.BuildTime,
"version": settings.Version,
"env": settings.Environment,
diff --git a/app/handlers/status_test.go b/app/handlers/status_test.go
index 54187c1d0..4e7bcbb22 100644
--- a/app/handlers/status_test.go
+++ b/app/handlers/status_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/getfider/fider/app/handlers"
- "github.com/getfider/fider/app/mock"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/models"
. "github.com/onsi/gomega"
)
diff --git a/app/middlewares/auth_test.go b/app/middlewares/auth_test.go
index 461f6030a..c6b9ba30f 100644
--- a/app/middlewares/auth_test.go
+++ b/app/middlewares/auth_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/getfider/fider/app/middlewares"
- "github.com/getfider/fider/app/mock"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/web"
. "github.com/onsi/gomega"
diff --git a/app/middlewares/cache_test.go b/app/middlewares/cache_test.go
index 2d485ed10..3b77a1349 100644
--- a/app/middlewares/cache_test.go
+++ b/app/middlewares/cache_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/getfider/fider/app/middlewares"
- "github.com/getfider/fider/app/mock"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/pkg/web"
. "github.com/onsi/gomega"
)
diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.go
index 0e13896e0..3ef9ffdde 100644
--- a/app/middlewares/domain_test.go
+++ b/app/middlewares/domain_test.go
@@ -6,7 +6,7 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/middlewares"
- "github.com/getfider/fider/app/mock"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/pkg/web"
"github.com/getfider/fider/app/storage/inmemory"
. "github.com/onsi/gomega"
diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.go
index 534c4e26c..9e21d0a03 100644
--- a/app/middlewares/jwt_test.go
+++ b/app/middlewares/jwt_test.go
@@ -8,7 +8,7 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/middlewares"
- "github.com/getfider/fider/app/mock"
+ "github.com/getfider/fider/app/pkg/mock"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/jwt"
"github.com/getfider/fider/app/pkg/web"
diff --git a/app/models/feedback.go b/app/models/feedback.go
index 339510306..be5ab5c67 100644
--- a/app/models/feedback.go
+++ b/app/models/feedback.go
@@ -16,6 +16,11 @@ type Idea struct {
Response *IdeaResponse `json:"response"`
}
+//CanBeChangedBy returns true if given user can change this idea
+func (i *Idea) CanBeChangedBy(user *User) bool {
+ return user.IsStaff() || i.User.ID == user.ID
+}
+
//IdeaResponse is a staff response to a given idea
type IdeaResponse struct {
Text string `json:"text"`
diff --git a/app/models/identity.go b/app/models/identity.go
index 3b03fa4b3..aec4d4303 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -30,7 +30,7 @@ var (
RoleAdministrator = 3
)
-//HasProvider returns true if current user has given provider registered
+//HasProvider returns true if current user has registered with given provider
func (u *User) HasProvider(provider string) bool {
for _, p := range u.Providers {
if p.Name == provider {
@@ -40,6 +40,11 @@ func (u *User) HasProvider(provider string) bool {
return false
}
+//IsStaff returns true if user has special permissions
+func (u *User) IsStaff() bool {
+ return u.Role >= RoleMember
+}
+
//UserProvider represents the relashionship between an User and an Authentication provide
type UserProvider struct {
Name string
diff --git a/app/mock/server.go b/app/pkg/mock/server.go
similarity index 100%
rename from app/mock/server.go
rename to app/pkg/mock/server.go
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index 3059accc8..c7f7f0b80 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -1,6 +1,7 @@
package web
import (
+ "fmt"
"net/http"
"strconv"
@@ -65,9 +66,14 @@ func (ctx *Context) Failure(err error) error {
return echo.NewHTTPError(http.StatusInternalServerError, err)
}
+//Unauthorized returns a 401 response
+func (ctx *Context) Unauthorized() error {
+ return ctx.JSON(http.StatusUnauthorized, Map{})
+}
+
//Ok returns 200 OK with JSON result
-func (ctx *Context) Ok(dict Map) error {
- return ctx.JSON(http.StatusOK, dict)
+func (ctx *Context) Ok(data interface{}) error {
+ return ctx.JSON(http.StatusOK, data)
}
//BadRequest returns 400 BadRequest with JSON result
@@ -80,6 +86,19 @@ func (ctx *Context) Page(dict Map) error {
return ctx.Render(http.StatusOK, "index.html", dict)
}
+//SetParams sets path parameter names and values.
+func (ctx *Context) SetParams(dict Map) {
+ names := make([]string, len(dict))
+ values := make([]string, len(dict))
+
+ for name, value := range dict {
+ names = append(names, name)
+ values = append(values, fmt.Sprint(value))
+ }
+ ctx.SetParamNames(names...)
+ ctx.SetParamValues(values...)
+}
+
//User returns authenticated user
func (ctx *Context) User() *models.User {
user, ok := ctx.Get(userContextKey).(*models.User)
diff --git a/app/storage/idea.go b/app/storage/idea.go
index c68f08d15..647e23ce5 100644
--- a/app/storage/idea.go
+++ b/app/storage/idea.go
@@ -9,6 +9,7 @@ type Idea interface {
GetCommentsByIdea(number int) ([]*models.Comment, error)
GetAll() ([]*models.Idea, error)
Add(title, description string, userID int) (*models.Idea, error)
+ Update(number int, title, description string) (*models.Idea, error)
AddComment(number int, content string, userID int) (int, error)
AddSupporter(number, userID int) error
RemoveSupporter(number, userID int) error
diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.go
index a4830982c..79b43f0de 100644
--- a/app/storage/inmemory/idea.go
+++ b/app/storage/inmemory/idea.go
@@ -23,6 +23,17 @@ func (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {
return nil, app.ErrNotFound
}
+// Update given idea
+func (s *IdeaStorage) Update(number int, title, description string) (*models.Idea, error) {
+ idea, err := s.GetByNumber(number)
+ if err != nil {
+ return nil, err
+ }
+ idea.Title = title
+ idea.Description = description
+ return idea, err
+}
+
// GetByNumber returns idea by tenant and number
func (s *IdeaStorage) GetByNumber(number int) (*models.Idea, error) {
for _, idea := range s.ideas {
@@ -51,6 +62,9 @@ func (s *IdeaStorage) Add(title, description string, userID int) (*models.Idea,
Number: s.lastID,
Title: title,
Description: description,
+ User: &models.User{
+ ID: userID,
+ },
}
s.ideas = append(s.ideas, idea)
return idea, nil
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index be3f99803..b5704743d 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -176,6 +176,17 @@ func (s *IdeaStorage) GetCommentsByIdea(number int) ([]*models.Comment, error) {
return result, nil
}
+// Update given idea
+func (s *IdeaStorage) Update(number int, title, description string) (*models.Idea, error) {
+ err := s.trx.Execute(`UPDATE ideas SET title = $1, slug = $2, description = $3
+ WHERE number = $4 AND tenant_id = $5`, title, slug.Make(title), description, number, s.tenant.ID)
+ if err != nil {
+ return nil, err
+ }
+
+ return s.GetByNumber(number)
+}
+
// Add a new idea in the database
func (s *IdeaStorage) Add(title, description string, userID int) (*models.Idea, error) {
var id int
diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.go
index 38280ace0..34293c54a 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -156,7 +156,27 @@ func TestIdeaStorage_AddAndGet_DifferentTenants(t *testing.T) {
Expect(dbIdea.Number).To(Equal(1))
Expect(dbIdea.Title).To(Equal("My other idea"))
Expect(dbIdea.Slug).To(Equal("my-other-idea"))
+}
+
+func TestIdeaStorage_Update(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ db.Seed()
+ defer db.Close()
+
+ trx, _ := db.Begin()
+ defer trx.Rollback()
+
+ ideas := postgres.NewIdeaStorage(demoTenant, trx)
+ idea, err := ideas.Add("My new idea", "with this description", 300)
+ Expect(err).To(BeNil())
+
+ idea, err = ideas.Update(idea.Number, "The new comment", "With the new description")
+ Expect(err).To(BeNil())
+ Expect(idea.Title).To(Equal("The new comment"))
+ Expect(idea.Description).To(Equal("With the new description"))
+ Expect(idea.Slug).To(Equal("the-new-comment"))
}
func TestIdeaStorage_AddSupporter(t *testing.T) {
diff --git a/app/validate/idea.go b/app/validate/idea.go
new file mode 100644
index 000000000..e5309f17f
--- /dev/null
+++ b/app/validate/idea.go
@@ -0,0 +1,19 @@
+package validate
+
+import (
+ "strings"
+)
+
+//Idea validates given idea
+func Idea(title string, description string) (bool, []string, error) {
+
+ if strings.Trim(title, " ") == "" {
+ return false, []string{"Title is required."}, nil
+ }
+
+ if len(title) < 10 || len(strings.Split(title, " ")) < 3 {
+ return false, []string{"Title needs to be more descriptive."}, nil
+ }
+
+ return true, make([]string, 0), nil
+}
diff --git a/app/validate/idea_test.go b/app/validate/idea_test.go
new file mode 100644
index 000000000..95a1386d6
--- /dev/null
+++ b/app/validate/idea_test.go
@@ -0,0 +1,43 @@
+package validate_test
+
+import (
+ "testing"
+
+ "github.com/getfider/fider/app/validate"
+ . "github.com/onsi/gomega"
+)
+
+func TestInvalidIdeaTitles(t *testing.T) {
+ RegisterTestingT(t)
+
+ for _, title := range []string{
+ "me",
+ "",
+ " ",
+ "signup",
+ "my company",
+ "my@company",
+ "my.company",
+ "my+company",
+ "1234567890123456789012345678901234567890ABC",
+ } {
+ ok, messages, err := validate.Idea(title, "")
+ Expect(ok).To(BeFalse())
+ Expect(len(messages) > 0).To(BeTrue())
+ Expect(err).To(BeNil())
+ }
+}
+
+func TestValidIdeaTitles(t *testing.T) {
+ RegisterTestingT(t)
+
+ for _, title := range []string{
+ "this is my new idea",
+ "this idea is very descriptive",
+ } {
+ ok, messages, err := validate.Idea(title, "")
+ Expect(ok).To(BeTrue())
+ Expect(len(messages)).To(Equal(0))
+ Expect(err).To(BeNil())
+ }
+}
diff --git a/router.go b/router.go
index dd465cd79..660a4d72b 100644
--- a/router.go
+++ b/router.go
@@ -79,6 +79,7 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {
private.Use(middlewares.IsAuthenticated())
private.Post("/api/ideas", handlers.PostIdea())
+ private.Post("/api/ideas/:number", handlers.UpdateIdea())
private.Post("/api/ideas/:number/comments", handlers.PostComment())
private.Post("/api/ideas/:number/status", handlers.SetResponse())
private.Post("/api/ideas/:number/support", handlers.AddSupporter())