Open platform to collect and prioritize feedback
bugfix: nil err when status change from open to open (#220)
Guilherme Oenning980a60648e8e
diff --git a/app/actions/idea.go b/app/actions/idea.goindex b44d3455d..999cf9ec6 100644--- a/app/actions/idea.go+++ b/app/actions/idea.go@@ -138,12 +138,12 @@ func (input *SetResponse) IsAuthorized(user *models.User) bool {func (input *SetResponse) Validate(services *app.Services) *validate.Result {result := validate.Success()- if input.Model.Status < models.IdeaNew || input.Model.Status > models.IdeaPlanned {+ if input.Model.Status < models.IdeaOpen || input.Model.Status > models.IdeaPlanned {result.AddFieldFailure("status", "Status is invalid.")}- if input.Model.Text == "" {- result.AddFieldFailure("text", "Text is required.")+ if input.Model.Status != models.IdeaOpen && input.Model.Text == "" {+ result.AddFieldFailure("text", "Description is required.")}return resultdiff --git a/app/handlers/idea_test.go b/app/handlers/idea_test.goindex 3523625e9..6bec081f5 100644--- a/app/handlers/idea_test.go+++ b/app/handlers/idea_test.go@@ -280,5 +280,5 @@ func TestSetResponseHandler_Unauthorized(t *testing.T) {idea, _ = services.Ideas.GetByNumber(idea.Number)Expect(code).To(Equal(http.StatusForbidden))- Expect(idea.Status).To(Equal(models.IdeaNew))+ Expect(idea.Status).To(Equal(models.IdeaOpen))}diff --git a/app/models/feedback.go b/app/models/feedback.goindex 8908764ba..2b6390fc3 100644--- a/app/models/feedback.go+++ b/app/models/feedback.go@@ -90,8 +90,8 @@ type AssignUnassignTag struct {}var (- //IdeaNew is the default status- IdeaNew = 0+ //IdeaOpen is the default status+ IdeaOpen = 0//IdeaStarted is used when the idea has been accepted and work is in progressIdeaStarted = 1//IdeaCompleted is used when the idea has been accepted and already implementeddiff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.goindex 5d7ba95f3..438bd375b 100644--- a/app/storage/postgres/idea.go+++ b/app/storage/postgres/idea.go@@ -313,7 +313,7 @@ func (s *IdeaStorage) SetResponse(number int, text string, userID, status int) e}respondedOn := time.Now()- if idea.Status == status {+ if idea.Status == status && idea.Response != nil {respondedOn = idea.Response.RespondedOn}diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.goindex 8f560c7a8..4f15f11d3 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -60,7 +60,7 @@ func TestIdeaStorage_AddAndGet(t *testing.T) {Expect(dbIdeaById.ID).To(Equal(idea.ID))Expect(dbIdeaById.Number).To(Equal(1))Expect(dbIdeaById.TotalSupporters).To(Equal(0))- Expect(dbIdeaById.Status).To(Equal(models.IdeaNew))+ Expect(dbIdeaById.Status).To(Equal(models.IdeaOpen))Expect(dbIdeaById.Title).To(Equal("My new idea"))Expect(dbIdeaById.Description).To(Equal("with this description"))Expect(dbIdeaById.User.ID).To(Equal(1))@@ -73,7 +73,7 @@ func TestIdeaStorage_AddAndGet(t *testing.T) {Expect(dbIdeaBySlug.ID).To(Equal(idea.ID))Expect(dbIdeaBySlug.Number).To(Equal(1))Expect(dbIdeaBySlug.TotalSupporters).To(Equal(0))- Expect(dbIdeaBySlug.Status).To(Equal(models.IdeaNew))+ Expect(dbIdeaBySlug.Status).To(Equal(models.IdeaOpen))Expect(dbIdeaBySlug.Title).To(Equal("My new idea"))Expect(dbIdeaBySlug.Description).To(Equal("with this description"))Expect(dbIdeaBySlug.User.ID).To(Equal(1))@@ -266,6 +266,18 @@ func TestIdeaStorage_SetResponse(t *testing.T) {Expect(idea.Response.User.ID).To(Equal(1))}+func TestIdeaStorage_SetResponse_KeepOpen(t *testing.T) {+ SetupDatabaseTest(t)+ defer TeardownDatabaseTest()++ tenants := postgres.NewTenantStorage(trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))+ idea, _ := ideas.Add("My new idea", "with this description", 1)+ err := ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaOpen)+ Expect(err).To(BeNil())+}+func TestIdeaStorage_SetResponse_ChangeText(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()