Open platform to collect and prioritize feedback
client-side ajax
goenningbad96c3485a2
diff --git a/app/handlers/feedback.go b/app/handlers/feedback.goindex 59cc021f3..5d2f37e76 100644--- a/app/handlers/feedback.go+++ b/app/handlers/feedback.go@@ -134,3 +134,39 @@ func (h AllHandlers) PostComment() web.HandlerFunc {return c.JSON(200, echo.Map{})}}++// AddSupporter adds current user to given idea list of supporters+func (h AllHandlers) AddSupporter() web.HandlerFunc {+ return func(c web.Context) error {+ return addOrRemoveSupporter(c, h, h.ideas.AddSupporter)+ }+}++// RemoveSupporter removes current user from given idea list of supporters+func (h AllHandlers) RemoveSupporter() web.HandlerFunc {+ return func(c web.Context) error {+ return addOrRemoveSupporter(c, h, h.ideas.RemoveSupporter)+ }+}++func addOrRemoveSupporter(c web.Context, h AllHandlers, addOrRemove func(userId, ideaId int) error) error {+ ideaNumber, err := c.ParamAsInt("number")+ if err != nil {+ return c.Failure(err)+ }++ idea, err := h.ideas.GetByNumber(c.Tenant().ID, ideaNumber)+ if err != nil {+ if err == app.ErrNotFound {+ return c.NotFound()+ }+ 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/feedback_test.goindex 573c413c9..d71ec9ec0 100644--- a/app/handlers/feedback_test.go+++ b/app/handlers/feedback_test.go@@ -116,7 +116,6 @@ func TestPostCommentHandler_WithoutContent(t *testing.T) {Expect(code).To(Equal(400))}-/*func TestAddSupporterHandler(t *testing.T) {RegisterTestingT(t)@@ -125,11 +124,51 @@ func TestAddSupporterHandler(t *testing.T) {ideas.Save(1, 1, "The Idea #2", "The Description #2")server := mock.NewServer()server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})- server.Context.SetUser(&models.User{ID: 1, Name: "Jon"})+ server.Context.SetUser(&models.User{ID: 2, Name: "Arya"})server.Context.SetParamNames("number")server.Context.SetParamValues("2")+code, _ := server.Execute(handlers.Handlers(ideas).AddSupporter())+ first, _ := ideas.GetByNumber(1, 1)+ second, _ := ideas.GetByNumber(1, 2)++ Expect(code).To(Equal(200))+ Expect(first.TotalSupporters).To(Equal(0))+ Expect(second.TotalSupporters).To(Equal(1))+}++func TestAddSupporterHandler_InvalidIdea(t *testing.T) {+ RegisterTestingT(t)++ ideas := &inmemory.IdeaStorage{}+ server := mock.NewServer()+ 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")++ code, _ := server.Execute(handlers.Handlers(ideas).AddSupporter())++ Expect(code).To(Equal(404))+}++func TestRemoveSupporterHandler(t *testing.T) {+ RegisterTestingT(t)++ ideas := &inmemory.IdeaStorage{}+ ideas.Save(1, 1, "The Idea #1", "The Description #1")+ ideas.AddSupporter(1, 1)+ ideas.AddSupporter(2, 1)+ ideas.AddSupporter(3, 1)+ server := mock.NewServer()+ 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")++ code, _ := server.Execute(handlers.Handlers(ideas).RemoveSupporter())+ idea, _ := ideas.GetByNumber(1, 1)Expect(code).To(Equal(200))+ Expect(idea.TotalSupporters).To(Equal(2))}-*/diff --git a/app/models/feedback.go b/app/models/feedback.goindex 44e80a0f8..12723026a 100644--- a/app/models/feedback.go+++ b/app/models/feedback.go@@ -6,13 +6,14 @@ import (//Idea represents an idea on a tenant boardtype Idea struct {- ID int `json:"id" db:"id"`- Number int `json:"number" db:"number"`- Title string `json:"title" db:"title"`- Description string `json:"description" db:"description"`- CreatedOn time.Time `json:"createdOn" db:"created_on"`- User *User `json:"user" db:"user"`- TotalSupporters int `json:"totalSupporters" db:"supporters"`+ ID int `json:"id" db:"id"`+ Number int `json:"number" db:"number"`+ Title string `json:"title" db:"title"`+ Description string `json:"description" db:"description"`+ CreatedOn time.Time `json:"createdOn" db:"created_on"`+ User *User `json:"user" db:"user"`+ //Supported bool `json:"supported" db:"supported"`+ TotalSupporters int `json:"totalSupporters" db:"supporters"`}//Comment represents an user comment on an ideadiff --git a/public/components/SupportCounter.tsx b/public/components/SupportCounter.tsxindex 662025e57..a9561cc87 100644--- a/public/components/SupportCounter.tsx+++ b/public/components/SupportCounter.tsx@@ -1,3 +1,4 @@+import axios from "axios";import * as React from "react";import { Idea } from "../models";@@ -19,34 +20,48 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support};}- public undo() {+ public async undo() {if (!this.state.supported) { return; }- this.setState({- supported: false,- total: this.state.total - 1- });+ try {+ await axios.post(`/api/ideas/${this.props.idea.number}/unsupport`);++ this.setState({+ supported: false,+ total: this.state.total - 1+ });+ } catch (ex) {+ // TODO: handle this+ }+}- public support() {+ public async support() {if (this.state.supported) { return; }- this.setState({- supported: true,- total: this.state.total + 1- });+ try {+ await axios.post(`/api/ideas/${this.props.idea.number}/support`);++ this.setState({+ supported: true,+ total: this.state.total + 1+ });+ } catch (ex) {+ // TODO: handle this+ }+}public render() {const support = <div className="support-button ui mini violet inverted animated button"- onClick={() => this.support()}>+ onClick={async () => await this.support()}><div className="visible content">Want</div><div className="hidden content"><i className="heart icon"></i></div></div>;const undo = <div className="support-button ui mini violet animated button"- onClick={() => this.undo()}>+ onClick={async () => await this.undo()}><div className="visible content"><i className="heart icon"></i></div><div className="hidden content">Undodiff --git a/router.go b/router.goindex 7e67cd7f1..aaf9ac67c 100644--- a/router.go+++ b/router.go@@ -52,6 +52,8 @@ func GetMainEngine(ctx *WeCHYServices) *web.Engine {private.Post("/api/ideas", handlers.Handlers(ctx.Idea).PostIdea())private.Post("/api/ideas/:number/comments", handlers.Handlers(ctx.Idea).PostComment())+ private.Post("/api/ideas/:number/support", handlers.Handlers(ctx.Idea).AddSupporter())+ private.Post("/api/ideas/:number/unsupport", handlers.Handlers(ctx.Idea).RemoveSupporter())}auth := r.Group("/oauth")