Open platform to collect and prioritize feedback
implements sequencial idea number. fixes #32
goenningdd9290fbf59d
diff --git a/app/feedback/handler.go b/app/feedback/handler.goindex 36ba7ceb6..01a6eb9d6 100644--- a/app/feedback/handler.go+++ b/app/feedback/handler.go@@ -66,12 +66,12 @@ func (h AllHandlers) Details() app.HandlerFunc {return func(c app.Context) error {tenant := c.Tenant()- ideaID, err := c.ParamAsInt("id")+ number, err := c.ParamAsInt("number")if err != nil {return c.Failure(err)}- idea, err := h.ideaService.GetByID(tenant.ID, ideaID)+ idea, err := h.ideaService.GetByNumber(tenant.ID, number)if err != nil {if err == app.ErrNotFound {return c.NotFound()diff --git a/app/feedback/handler_test.go b/app/feedback/handler_test.goindex 6f33a61cc..159741b2c 100644--- a/app/feedback/handler_test.go+++ b/app/feedback/handler_test.go@@ -16,8 +16,8 @@ type mockIdeaService struct {func NewMockIdeaService() *mockIdeaService {return &mockIdeaService{ideas: []*feedback.Idea{- &feedback.Idea{ID: 1, Title: "Idea #1"},- &feedback.Idea{ID: 2, Title: "Idea #2"},+ &feedback.Idea{ID: 1, Number: 1, Title: "Idea #1"},+ &feedback.Idea{ID: 2, Number: 2, Title: "Idea #2"},},}}@@ -31,6 +31,15 @@ func (svc mockIdeaService) GetByID(tenantID, ideaID int) (*feedback.Idea, error)return nil, app.ErrNotFound}+func (svc mockIdeaService) GetByNumber(tenantID, number int) (*feedback.Idea, error) {+ for _, idea := range svc.ideas {+ if idea.Number == number {+ return idea, nil+ }+ }+ return nil, app.ErrNotFound+}+func (svc mockIdeaService) GetAll(tenantID int) ([]*feedback.Idea, error) {return svc.ideas, nil}@@ -62,7 +71,7 @@ func TestDetailsHandler(t *testing.T) {server := mock.NewServer()server.Context.Set("__CTX_TENANT", &app.Tenant{ID: 2, Name: "Any Tenant"})- server.Context.SetParamNames("id")+ server.Context.SetParamNames("number")server.Context.SetParamValues("1")code, _ := server.Execute(feedback.Handlers(NewMockIdeaService()).Details())@@ -75,7 +84,7 @@ func TestDetailsHandler_NotFound(t *testing.T) {server := mock.NewServer()server.Context.Set("__CTX_TENANT", &app.Tenant{ID: 2, Name: "Any Tenant"})- server.Context.SetParamNames("id")+ server.Context.SetParamNames("number")server.Context.SetParamValues("99")code, _ := server.Execute(feedback.Handlers(NewMockIdeaService()).Details())diff --git a/app/feedback/model.go b/app/feedback/model.goindex 5fb818996..1ec99932d 100644--- a/app/feedback/model.go+++ b/app/feedback/model.go@@ -9,6 +9,7 @@ import (//Idea represents an idea on a tenant boardtype Idea struct {ID int `json:"id"`+ Number int `json:"number"`Title string `json:"title"`Description string `json:"description"`CreatedOn time.Time `json:"createdOn"`diff --git a/app/feedback/service.go b/app/feedback/service.goindex ccde16457..2593a9bf2 100644--- a/app/feedback/service.go+++ b/app/feedback/service.go@@ -3,6 +3,7 @@ package feedback// IdeaService contains read and write operations for ideastype IdeaService interface {GetByID(tenantID, ideaID int) (*Idea, error)+ GetByNumber(tenantID, number int) (*Idea, error)GetCommentsByIdeaID(tenantID, ideaID int) ([]*Comment, error)GetAll(tenantID int) ([]*Idea, error)Save(tenantID, userID int, title, description string) (*Idea, error)diff --git a/app/postgres/feedback.go b/app/postgres/feedback.goindex 12202ca7b..35c4c0664 100644--- a/app/postgres/feedback.go+++ b/app/postgres/feedback.go@@ -15,12 +15,12 @@ type IdeaService struct {// GetAll returns all tenant ideasfunc (svc IdeaService) GetAll(tenantID int) ([]*feedback.Idea, error) {- rows, err := svc.DB.Query(`SELECT i.id, i.title, i.description, i.created_on, u.id, u.name, u.email- FROM ideas i- INNER JOIN users u- ON u.id = i.user_id- WHERE i.tenant_id = $1- ORDER BY i.created_on DESC`, tenantID)+ rows, err := svc.DB.Query(`SELECT i.id, i.number, i.title, i.description, i.created_on, u.id, u.name, u.email+ FROM ideas i+ INNER JOIN users u+ ON u.id = i.user_id+ WHERE i.tenant_id = $1+ ORDER BY i.created_on DESC`, tenantID)if err != nil {return nil, err}@@ -29,7 +29,7 @@ func (svc IdeaService) GetAll(tenantID int) ([]*feedback.Idea, error) {var ideas []*feedback.Ideafor rows.Next() {idea := &feedback.Idea{}- rows.Scan(&idea.ID, &idea.Title, &idea.Description, &idea.CreatedOn, &idea.User.ID, &idea.User.Name, &idea.User.Email)+ rows.Scan(&idea.ID, &idea.Number, &idea.Title, &idea.Description, &idea.CreatedOn, &idea.User.ID, &idea.User.Name, &idea.User.Email)ideas = append(ideas, idea)}@@ -38,13 +38,13 @@ func (svc IdeaService) GetAll(tenantID int) ([]*feedback.Idea, error) {// GetByID returns idea by given idfunc (svc IdeaService) GetByID(tenantID, ideaID int) (*feedback.Idea, error) {- rows, err := svc.DB.Query(`SELECT i.id, i.title, i.description, i.created_on, u.id, u.name, u.email- FROM ideas i- INNER JOIN users u- ON u.id = i.user_id- WHERE i.tenant_id = $1- AND i.id = $2- ORDER BY i.created_on DESC`, tenantID, ideaID)+ rows, err := svc.DB.Query(`SELECT i.id, i.number, i.title, i.description, i.created_on, u.id, u.name, u.email+ FROM ideas i+ INNER JOIN users u+ ON u.id = i.user_id+ WHERE i.tenant_id = $1+ AND i.id = $2+ ORDER BY i.created_on DESC`, tenantID, ideaID)if err != nil {return nil, err}@@ -52,7 +52,29 @@ func (svc IdeaService) GetByID(tenantID, ideaID int) (*feedback.Idea, error) {defer rows.Close()if rows.Next() {idea := &feedback.Idea{}- rows.Scan(&idea.ID, &idea.Title, &idea.Description, &idea.CreatedOn, &idea.User.ID, &idea.User.Name, &idea.User.Email)+ rows.Scan(&idea.ID, &idea.Number, &idea.Title, &idea.Description, &idea.CreatedOn, &idea.User.ID, &idea.User.Name, &idea.User.Email)+ return idea, nil+ }+ return nil, app.ErrNotFound+}++// GetByNumber returns idea by tenant and number+func (svc IdeaService) GetByNumber(tenantID, number int) (*feedback.Idea, error) {+ rows, err := svc.DB.Query(`SELECT i.id, i.number, i.title, i.description, i.created_on, u.id, u.name, u.email+ FROM ideas i+ INNER JOIN users u+ ON u.id = i.user_id+ WHERE i.tenant_id = $1+ AND i.number = $2+ ORDER BY i.created_on DESC`, tenantID, number)+ if err != nil {+ return nil, err+ }++ defer rows.Close()+ if rows.Next() {+ idea := &feedback.Idea{}+ rows.Scan(&idea.ID, &idea.Number, &idea.Title, &idea.Description, &idea.CreatedOn, &idea.User.ID, &idea.User.Name, &idea.User.Email)return idea, nil}return nil, app.ErrNotFound@@ -61,14 +83,14 @@ func (svc IdeaService) GetByID(tenantID, ideaID int) (*feedback.Idea, error) {// GetCommentsByIdeaID returns all coments from given ideafunc (svc IdeaService) GetCommentsByIdeaID(tenantID, ideaID int) ([]*feedback.Comment, error) {rows, err := svc.DB.Query(`SELECT c.id, c.content, c.created_on, u.id, u.name, u.email- FROM comments c- INNER JOIN ideas i- ON i.id = c.idea_id- INNER JOIN users u- ON u.id = c.user_id- WHERE i.id = $1- AND i.tenant_id = $2- ORDER BY c.created_on DESC`, ideaID, tenantID)+ FROM comments c+ INNER JOIN ideas i+ ON i.id = c.idea_id+ INNER JOIN users u+ ON u.id = c.user_id+ WHERE i.id = $1+ AND i.tenant_id = $2+ ORDER BY c.created_on DESC`, ideaID, tenantID)if err != nil {return nil, err}@@ -95,7 +117,10 @@ func (svc IdeaService) Save(tenantID, userID int, title, description string) (*fidea.Title = titleidea.Description = description- if err = tx.QueryRow("INSERT INTO ideas (title, description, tenant_id, user_id, created_on) VALUES ($1, $2, $3, $4, $5) RETURNING id", title, description, tenantID, userID, time.Now()).Scan(&idea.ID); err != nil {+ row := tx.QueryRow(`INSERT INTO ideas (title, number, description, tenant_id, user_id, created_on)+ VALUES ($1, (SELECT COALESCE(MAX(number), 0) + 1 FROM ideas i WHERE i.tenant_id = $3), $2, $3, $4, $5)+ RETURNING id`, title, description, tenantID, userID, time.Now())+ if err = row.Scan(&idea.ID); err != nil {tx.Rollback()return nil, err}diff --git a/app/postgres/feedback_test.go b/app/postgres/feedback_test.goindex 425d0000c..5b32ead17 100644--- a/app/postgres/feedback_test.go+++ b/app/postgres/feedback_test.go@@ -17,8 +17,8 @@ func TestIdeaService_GetAll(t *testing.T) {now := time.Now()- db.Execute("INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #1','Description #1', $1, 300, 300)", now)- db.Execute("INSERT INTO ideas (title, description, created_on, tenant_id, user_id) VALUES ('Idea #2','Description #2', $1, 300, 301)", now)+ db.Execute("INSERT INTO ideas (title, number, description, created_on, tenant_id, user_id) VALUES ('Idea #1', 1, 'Description #1', $1, 300, 300)", now)+ db.Execute("INSERT INTO ideas (title, number, description, created_on, tenant_id, user_id) VALUES ('Idea #2', 2, 'Description #2', $1, 300, 301)", now)svc := &postgres.IdeaService{DB: db}ideas, err := svc.GetAll(300)@@ -27,10 +27,12 @@ func TestIdeaService_GetAll(t *testing.T) {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[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"))}@@ -52,6 +54,7 @@ func TestIdeaService_SaveAndGet(t *testing.T) {Expect(err).To(BeNil())Expect(dbIdea.ID).To(Equal(1))+ Expect(dbIdea.Number).To(Equal(1))Expect(dbIdea.Title).To(Equal("My new idea"))Expect(dbIdea.Description).To(Equal("with this description"))Expect(dbIdea.User.ID).To(Equal(1))@@ -91,3 +94,27 @@ func TestIdeaService_AddAndReturnComments(t *testing.T) {Expect(comments[0].Content).To(Equal("Comment #2"))Expect(comments[1].Content).To(Equal("Comment #1"))}++func TestIdeaService_SaveAndGet_DifferentTenants(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ svc := &postgres.IdeaService{DB: db}+ svc.Save(300, 300, "My new idea", "with this description")+ svc.Save(400, 400, "My other idea", "with other description")++ dbIdea, err := svc.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)++ Expect(err).To(BeNil())+ Expect(dbIdea.ID).To(Equal(2))+ Expect(dbIdea.Number).To(Equal(1))+ Expect(dbIdea.Title).To(Equal("My other idea"))+}diff --git a/migrations/201704101854_add_ideas_number.up.sql b/migrations/201704101854_add_ideas_number.up.sqlnew file mode 100644index 000000000..88e253ee6--- /dev/null+++ b/migrations/201704101854_add_ideas_number.up.sql@@ -0,0 +1,8 @@+ALTER TABLE ideas ADD NUMBER INT;++UPDATE ideas i+SET NUMBER = i2.seqnum+FROM (SELECT i2.*, row_number() OVER (PARTITION BY tenant_id ORDER BY created_on) AS seqnum FROM ideas i2) i2+WHERE i2.id = i.id;++ALTER TABLE ideas ALTER COLUMN NUMBER SET NOT NULL;\ No newline at end of filediff --git a/package.json b/package.jsonindex ff65d50b0..c43783df1 100644--- a/package.json+++ b/package.json@@ -7,8 +7,7 @@"scripts": {"build": "rm -rf dist && webpack -p","build:watch": "rm -rf dist && webpack --watch",- "lint": "tslint public/**/**.tsx public/**/**.ts",- "heroku-postbuild": "npm run build"+ "lint": "tslint public/**/**.tsx public/**/**.ts"},"dependencies": {"axios": "^0.16.0",diff --git a/public/components/root.tsx b/public/components/root.tsxindex cfa12de11..d5c33414d 100644--- a/public/components/root.tsx+++ b/public/components/root.tsx@@ -15,15 +15,15 @@ export class Root extends React.Component<{}, {}> {const ideasList = ideas.map((x) =><div className="item" key={x.id}><div className="content">- <a href={`/ideas/${x.id}`} className="header">- <i className="idea icon"></i>{ x.title }+ <a href={`/ideas/${x.number}`} className="header">+ <i className="idea icon"></i> { x.title }</a><div className="description"><MultiLineText text={ x.description } /></div><div className="extra">- <Gravatar email={x.user.email}/> <u>{x.user.name}</u>- shared <u title={x.createdOn}>{ moment(x.createdOn).fromNow() }</u>+ #{ x.number } shared by <Gravatar email={x.user.email}/> <u>{x.user.name}</u>+ <span title={x.createdOn}>{ moment(x.createdOn).fromNow() }</span></div></div></div>);diff --git a/public/components/show_idea_root.tsx b/public/components/show_idea_root.tsxindex 5e6306e5d..90642c4d4 100644--- a/public/components/show_idea_root.tsx+++ b/public/components/show_idea_root.tsx@@ -42,8 +42,9 @@ export class ShowIdeaRoot extends React.Component<{}, {}> {<p>{ idea.description }</p><p>- <Gravatar email={idea.user.email}/> <u>{idea.user.name}</u>- shared <u title={idea.createdOn}>{ moment(idea.createdOn).fromNow() }</u>+ #{ idea.number } shared by + <Gravatar email={idea.user.email}/> <u>{idea.user.name}</u> + <span title={idea.createdOn}>{ moment(idea.createdOn).fromNow() }</span></p><div className="ui comments">diff --git a/public/models.ts b/public/models.tsindex 8bca4e27f..34a96d7e5 100644--- a/public/models.ts+++ b/public/models.ts@@ -12,6 +12,7 @@ export interface User {export interface Idea {id: number;+ number: number;title: string;description: string;createdOn: string;diff --git a/router.go b/router.goindex 57d938fcc..9a9c67dd3 100644--- a/router.go+++ b/router.go@@ -114,7 +114,7 @@ func GetMainEngine(ctx *WechyServices) *echo.Echo {use(appGroup, infra.JwtSetter())get(appGroup, "/", feedback.Handlers(ctx.Idea).List())- get(appGroup, "/ideas/:id", feedback.Handlers(ctx.Idea).Details())+ get(appGroup, "/ideas/:number", feedback.Handlers(ctx.Idea).Details())get(appGroup, "/logout", oauthHandlers.Logout())get(appGroup, "/api/status", infra.Status(ctx.Health, ctx.Settings))}