Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

disallow add/remove supported from completed/declined ideas

goenning9dfdb77c8541
diff --git a/app/handlers/feedback.go b/app/handlers/feedback.go
index 609b006c9..bf3ea5ba3 100644
--- a/app/handlers/feedback.go
+++ b/app/handlers/feedback.go
@@ -57,7 +57,7 @@ func (h AllHandlers) PostIdea() web.HandlerFunc {
return c.Failure(err)
}
- if err := h.ideas.AddSupporter(c.User().ID, idea.ID); err != nil {
+ if err := h.ideas.AddSupporter(c.Tenant().ID, c.User().ID, idea.ID); err != nil {
return c.Failure(err)
}
@@ -149,7 +149,7 @@ func (h AllHandlers) RemoveSupporter() web.HandlerFunc {
}
}
-func addOrRemoveSupporter(c web.Context, h AllHandlers, addOrRemove func(userId, ideaId int) error) error {
+func addOrRemoveSupporter(c web.Context, h AllHandlers, addOrRemove func(tenantId, userId, ideaId int) error) error {
ideaNumber, err := c.ParamAsInt("number")
if err != nil {
return c.Failure(err)
@@ -163,7 +163,7 @@ func addOrRemoveSupporter(c web.Context, h AllHandlers, addOrRemove func(userId,
return c.Failure(err)
}
- err = addOrRemove(c.User().ID, idea.ID)
+ err = addOrRemove(c.Tenant().ID, c.User().ID, idea.ID)
if err != nil {
return c.Failure(err)
}
diff --git a/app/handlers/feedback_test.go b/app/handlers/feedback_test.go
index 260e16d2b..45b6c4b3e 100644
--- a/app/handlers/feedback_test.go
+++ b/app/handlers/feedback_test.go
@@ -160,9 +160,9 @@ func TestRemoveSupporterHandler(t *testing.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)
+ ideas.AddSupporter(1, 1, 1)
+ ideas.AddSupporter(1, 2, 1)
+ ideas.AddSupporter(1, 3, 1)
server := mock.NewServer()
server.Context.SetTenant(&models.Tenant{ID: 1, Name: "Any Tenant"})
server.Context.SetUser(&models.User{ID: 2, Name: "Arya"})
diff --git a/app/storage/feedback.go b/app/storage/feedback.go
index de2f227d1..0be34ffc8 100644
--- a/app/storage/feedback.go
+++ b/app/storage/feedback.go
@@ -10,6 +10,7 @@ type Idea interface {
GetAll(tenantID int) ([]*models.Idea, error)
Save(tenantID, 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
+ AddSupporter(tenantID, userID, ideaID int) error
+ RemoveSupporter(tenantID, userID, ideaID int) error
+ SetResponse(tenantID, ideaID int, text string, userID, status int) error
}
diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.go
index 3e5d3c2cf..4c749d32a 100644
--- a/app/storage/inmemory/idea.go
+++ b/app/storage/inmemory/idea.go
@@ -1,6 +1,8 @@
package inmemory
import (
+ "time"
+
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/models"
)
@@ -60,7 +62,7 @@ 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 {
+func (s *IdeaStorage) AddSupporter(tenantID, userID, ideaID int) error {
for _, idea := range s.ideas {
if idea.ID == ideaID {
idea.TotalSupporters = idea.TotalSupporters + 1
@@ -70,7 +72,7 @@ func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
}
// RemoveSupporter removes user from idea list of supporters
-func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
+func (s *IdeaStorage) RemoveSupporter(tenantID, userID, ideaID int) error {
for _, idea := range s.ideas {
if idea.ID == ideaID {
idea.TotalSupporters = idea.TotalSupporters - 1
@@ -78,3 +80,17 @@ func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
}
return nil
}
+
+// SetResponse changes current idea response
+func (s *IdeaStorage) SetResponse(tenantID, ideaID int, text string, userID, status int) error {
+ for _, idea := range s.ideas {
+ if idea.ID == ideaID {
+ idea.Response = &models.IdeaResponse{
+ Text: text,
+ User: &models.User{ID: userID},
+ CreatedOn: time.Now(),
+ }
+ }
+ }
+ return nil
+}
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index 944021fc3..456a30bfb 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -206,7 +206,15 @@ 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 {
+func (s *IdeaStorage) AddSupporter(tenantID, userID, ideaID int) error {
+ idea, err := s.GetByID(tenantID, ideaID)
+ if err != nil {
+ return err
+ }
+ if idea.Status >= models.IdeaCompleted {
+ return nil
+ }
+
alreadySupported, err := s.DB.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, ideaID)
if err != nil {
return err
@@ -235,7 +243,16 @@ func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
}
// RemoveSupporter removes user from idea list of supporters
-func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
+func (s *IdeaStorage) RemoveSupporter(tenantID, userID, ideaID int) error {
+ idea, err := s.GetByID(tenantID, ideaID)
+ if err != nil {
+ return err
+ }
+
+ if idea.Status >= models.IdeaCompleted {
+ return nil
+ }
+
didSupport, err := s.DB.Exists("SELECT 1 FROM idea_supporters WHERE user_id = $1 AND idea_id = $2", userID, ideaID)
if err != nil {
return err
@@ -262,3 +279,11 @@ func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
return tx.Commit()
}
+
+// SetResponse changes current idea response
+func (s *IdeaStorage) SetResponse(tenantID, ideaID int, text string, userID, status int) error {
+ if err := s.DB.Execute(`UPDATE ideas SET response = $3, response_date = $4, response_user_id = $5, status = $6 WHERE id = $1 and tenant_id = $2`, ideaID, tenantID, 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 24d294dcd..90ca48cd1 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -145,10 +145,10 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {
ideas := &postgres.IdeaStorage{DB: db}
idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
- err := ideas.AddSupporter(300, idea.ID)
+ err := ideas.AddSupporter(300, 300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.AddSupporter(301, idea.ID)
+ err = ideas.AddSupporter(300, 301, idea.ID)
Expect(err).To(BeNil())
dbIdea, err := ideas.GetByNumber(300, 1)
@@ -165,10 +165,10 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {
ideas := &postgres.IdeaStorage{DB: db}
idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
- err := ideas.AddSupporter(300, idea.ID)
+ err := ideas.AddSupporter(300, 300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.AddSupporter(300, idea.ID)
+ err = ideas.AddSupporter(300, 300, idea.ID)
Expect(err).To(BeNil())
dbIdea, err := ideas.GetByNumber(300, 1)
@@ -185,10 +185,10 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {
ideas := &postgres.IdeaStorage{DB: db}
idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
- err := ideas.AddSupporter(300, idea.ID)
+ err := ideas.AddSupporter(300, 300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, idea.ID)
+ err = ideas.RemoveSupporter(300, 300, idea.ID)
Expect(err).To(BeNil())
dbIdea, err := ideas.GetByNumber(300, 1)
@@ -205,16 +205,67 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {
ideas := &postgres.IdeaStorage{DB: db}
idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
- err := ideas.AddSupporter(300, idea.ID)
+ err := ideas.AddSupporter(300, 300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, idea.ID)
+ err = ideas.RemoveSupporter(300, 300, idea.ID)
Expect(err).To(BeNil())
- err = ideas.RemoveSupporter(300, idea.ID)
+ err = ideas.RemoveSupporter(300, 300, idea.ID)
Expect(err).To(BeNil())
dbIdea, err := ideas.GetByNumber(300, 1)
Expect(err).To(BeNil())
Expect(dbIdea.TotalSupporters).To(Equal(0))
}
+
+func TestIdeaStorage_SetResponse(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ db.Seed()
+ defer db.Close()
+
+ ideas := &postgres.IdeaStorage{DB: db}
+ idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+ err := ideas.SetResponse(300, idea.ID, "We liked this idea", 300, models.IdeaStarted)
+
+ Expect(err).To(BeNil())
+
+ idea, _ = ideas.GetByID(300, idea.ID)
+ Expect(idea.Response.Text).To(Equal("We liked this idea"))
+ Expect(idea.Status).To(Equal(models.IdeaStarted))
+ Expect(idea.Response.User.ID).To(Equal(300))
+}
+
+func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ db.Seed()
+ defer db.Close()
+
+ ideas := &postgres.IdeaStorage{DB: db}
+ idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+ ideas.SetResponse(300, idea.ID, "We liked this idea", 300, models.IdeaCompleted)
+ ideas.AddSupporter(300, 300, idea.ID)
+
+ dbIdea, err := ideas.GetByNumber(300, 1)
+ Expect(err).To(BeNil())
+ Expect(dbIdea.TotalSupporters).To(Equal(0))
+}
+
+func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ db.Seed()
+ defer db.Close()
+
+ ideas := &postgres.IdeaStorage{DB: db}
+ idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+ ideas.AddSupporter(300, 300, idea.ID)
+ ideas.SetResponse(300, idea.ID, "We liked this idea", 300, models.IdeaCompleted)
+ ideas.RemoveSupporter(300, 300, idea.ID)
+
+ dbIdea, err := ideas.GetByNumber(300, 1)
+ Expect(err).To(BeNil())
+ Expect(dbIdea.TotalSupporters).To(Equal(1))
+}
diff --git a/public/models.ts b/public/models.ts
index 35a1bb1c8..b8e298de4 100644
--- a/public/models.ts
+++ b/public/models.ts
@@ -25,6 +25,42 @@ export interface Idea {
totalSupporters: number;
}
+export const IdeaNew = 0;
+export const IdeaStarted = 1;
+export const IdeaCompleted = 2;
+export const IdeaDeclined = 3;
+
+
+export const IdeaStatusMetadata: { [key: number]: any} = { };
+
+IdeaStatusMetadata[IdeaNew] = {
+ title: "New",
+ showStatus: false,
+ closed: false,
+ color: "black",
+};
+
+IdeaStatusMetadata[IdeaStarted] = {
+ title: "Started",
+ showStatus: true,
+ closed: false,
+ color: "blue",
+};
+
+IdeaStatusMetadata[IdeaCompleted] = {
+ title: "Completed",
+ showStatus: true,
+ closed: true,
+ color: "green",
+};
+
+IdeaStatusMetadata[IdeaDeclined] = {
+ title: "Declined",
+ showStatus: true,
+ closed: true,
+ color: "red",
+};
+
export interface IdeaResponse {
user: User;
text: string;
diff --git a/public/shared/Common.tsx b/public/shared/Common.tsx
index 7512a6157..de9453299 100644
--- a/public/shared/Common.tsx
+++ b/public/shared/Common.tsx
@@ -3,7 +3,7 @@ import * as moment from "moment";
import md5 = require("md5");
import { AxiosError, AxiosResponse } from "axios";
import { get, getCurrentUser } from "../storage";
-import { User, IdeaResponse } from "../models";
+import { User, IdeaResponse, IdeaStatusMetadata } from "../models";
export const Gravatar = (props: {email?: string}) => {
const hash = props.email ? md5(props.email) : "";
@@ -47,14 +47,8 @@ export const EnvironmentInfo = () => {
};
export const IdeaStatusRibbon = (props: { status: number }) => {
- const statusText = props.status === 1 ? "Started" :
- props.status === 2 ? "Completed" :
- props.status === 3 ? "Declined" : "Unknown";
- const color = props.status === 1 ? "blue" :
- props.status === 2 ? "green" :
- props.status === 3 ? "red" : "black";
-
- return <span className={`ui ribbon label ${color}`}>{ statusText }</span>;
+ const metadata = IdeaStatusMetadata[props.status];
+ return <span className={`ui ribbon label ${metadata.color}`}>{ metadata.title }</span>;
};
interface IdeaResponseProps {
diff --git a/public/shared/SupportCounter.tsx b/public/shared/SupportCounter.tsx
index 4be8f4886..49e45805d 100644
--- a/public/shared/SupportCounter.tsx
+++ b/public/shared/SupportCounter.tsx
@@ -1,6 +1,6 @@
import axios from "axios";
import * as React from "react";
-import { Idea, User } from "../models";
+import { Idea, User, IdeaStatusMetadata } from "../models";
import * as storage from "../storage";
import { SocialSignInList } from "./SocialSignInList";
@@ -61,6 +61,8 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support
}
public render() {
+ const metadata = IdeaStatusMetadata[this.props.idea.status];
+
const support = <div className="ui mini violet inverted animated button"
onClick={async () => await this.supportOrUndo()}>
<div className="visible content">Want</div>
@@ -72,9 +74,11 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support
const undo = <div className="ui mini violet animated button"
onClick={async () => await this.supportOrUndo()}>
<div className="visible content"><i className="heart icon"></i></div>
- <div className="hidden content">
- Undo
- </div>
+ <div className="hidden content">Undo</div>
+ </div>;
+
+ const disabled = <div className="ui disabled mini animated button">
+ <div className="visible content">~</div>
</div>;
return <div>
@@ -83,7 +87,7 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support
<div className="value">
{ this.state.total }
</div>
- { this.state.supported ? undo : support }
+ { metadata.closed ? disabled : this.state.supported ? undo : support }
</div>
</div>
<div ref={(e) => { this.list = e; } } className="ui popup transition hidden">