Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

bug fixes and safe guards for want/undo

goenning0a76edd99ab3
diff --git a/app/handlers/feedback.go b/app/handlers/feedback.go
index 40a3e42bc..5d2f37e76 100644
--- a/app/handlers/feedback.go
+++ b/app/handlers/feedback.go
@@ -27,17 +27,8 @@ func (h AllHandlers) List() web.HandlerFunc {
return c.Failure(err)
}
- var supported []int
- if c.IsAuthenticated() {
- supported, err = h.ideas.GetSupportedIdeas(c.User().ID)
- if err != nil {
- return c.Failure(err)
- }
- }
-
return c.Page(echo.Map{
- "ideas": ideas,
- "supported": supported,
+ "ideas": ideas,
})
}
}
diff --git a/app/models/identity.go b/app/models/identity.go
index e0769b372..d7a7b1a5b 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -11,12 +11,13 @@ type Tenant struct {
//User represents an user inside our application
type User struct {
- ID int `json:"id" db:"id"`
- Name string `json:"name" db:"name"`
- Email string `json:"email" db:"email"`
- Tenant *Tenant `json:"tenant" db:"tenant"`
- Role Role `json:"role" db:"role"`
- Providers []*UserProvider `json:"providers"`
+ ID int `json:"id" db:"id"`
+ Name string `json:"name" db:"name"`
+ Email string `json:"email" db:"email"`
+ Tenant *Tenant `json:"tenant" db:"tenant"`
+ Role Role `json:"role" db:"role"`
+ Providers []*UserProvider `json:"providers"`
+ SupportedIdeas []int `json:"supportedIdeas"`
}
//Role represents what the user can do inside its tenant
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index cd800ddec..40ce51b7a 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -53,12 +53,12 @@ func (db Database) QueryInt(command string, args ...interface{}) (int, error) {
// QueryIntArray executes given SQL command and return first column as int
func (db Database) QueryIntArray(command string, args ...interface{}) ([]int, error) {
- var values []int
+ values := make([]int, 0)
var value int
rows, err := db.conn.Query(command, args...)
if err != nil {
- return make([]int, 0), err
+ return nil, err
}
if rows != nil {
@@ -66,11 +66,12 @@ func (db Database) QueryIntArray(command string, args ...interface{}) ([]int, er
for rows.Next() {
err := rows.Scan(&value)
if err != nil {
- return make([]int, 0), err
+ return nil, err
}
values = append(values, value)
}
}
+
return values, nil
}
diff --git a/app/storage/feedback.go b/app/storage/feedback.go
index 05314a7a0..6510d54a7 100644
--- a/app/storage/feedback.go
+++ b/app/storage/feedback.go
@@ -12,5 +12,4 @@ type Idea interface {
AddComment(userID, ideaID int, content string) (int, error)
AddSupporter(userID, ideaID int) error
RemoveSupporter(userID, ideaID int) error
- GetSupportedIdeas(userID int) ([]int, error)
}
diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.go
index dddc3ff7b..bc95a5f7d 100644
--- a/app/storage/inmemory/idea.go
+++ b/app/storage/inmemory/idea.go
@@ -78,8 +78,3 @@ func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
}
return nil
}
-
-// GetSupportedIdeas returns all ideas supported by given user
-func (s *IdeaStorage) GetSupportedIdeas(userID int) ([]int, error) {
- return make([]int, 0), nil
-}
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index f74e14734..3a863cf95 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -135,6 +135,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 {
+ 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
+ }
+
+ if alreadySupported {
+ return nil
+ }
+
tx, err := s.DB.Begin()
if err != nil {
return err
@@ -155,6 +164,15 @@ func (s *IdeaStorage) AddSupporter(userID, ideaID int) error {
// RemoveSupporter removes user from idea list of supporters
func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
+ 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
+ }
+
+ if !didSupport {
+ return nil
+ }
+
tx, err := s.DB.Begin()
if err != nil {
return err
@@ -172,8 +190,3 @@ func (s *IdeaStorage) RemoveSupporter(userID, ideaID int) error {
return tx.Commit()
}
-
-// GetSupportedIdeas returns all ideas supported by given user
-func (s *IdeaStorage) GetSupportedIdeas(userID int) ([]int, error) {
- return s.DB.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1", userID)
-}
diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.go
index a613c0bee..1e8aef8ad 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -141,6 +141,25 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {
Expect(dbIdea.TotalSupporters).To(Equal(2))
}
+func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ ideas := &postgres.IdeaStorage{DB: db}
+ idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+
+ err := ideas.AddSupporter(300, idea.ID)
+ Expect(err).To(BeNil())
+
+ err = ideas.AddSupporter(300, idea.ID)
+ Expect(err).To(BeNil())
+
+ dbIdea, err := ideas.GetByNumber(300, 1)
+ Expect(err).To(BeNil())
+ Expect(dbIdea.TotalSupporters).To(Equal(1))
+}
+
func TestIdeaStorage_RemoveSupporter(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
@@ -159,3 +178,25 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {
Expect(err).To(BeNil())
Expect(dbIdea.TotalSupporters).To(Equal(0))
}
+
+func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ defer db.Close()
+
+ ideas := &postgres.IdeaStorage{DB: db}
+ idea, _ := ideas.Save(300, 300, "My new idea", "with this description")
+
+ err := ideas.AddSupporter(300, idea.ID)
+ Expect(err).To(BeNil())
+
+ err = ideas.RemoveSupporter(300, idea.ID)
+ Expect(err).To(BeNil())
+
+ err = ideas.RemoveSupporter(300, idea.ID)
+ Expect(err).To(BeNil())
+
+ dbIdea, err := ideas.GetByNumber(300, 1)
+ Expect(err).To(BeNil())
+ Expect(dbIdea.TotalSupporters).To(Equal(0))
+}
diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.go
index f641890e2..fb6b31274 100644
--- a/app/storage/postgres/user.go
+++ b/app/storage/postgres/user.go
@@ -69,5 +69,10 @@ func getUser(db *dbx.Database, filter string, args ...interface{}) (*models.User
return nil, err
}
+ user.SupportedIdeas, err = db.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1", user.ID)
+ if err != nil {
+ return nil, err
+ }
+
return &user, nil
}
diff --git a/public/components/SupportCounter.tsx b/public/components/SupportCounter.tsx
index 4905f3db0..b6bc55163 100644
--- a/public/components/SupportCounter.tsx
+++ b/public/components/SupportCounter.tsx
@@ -2,54 +2,57 @@ import axios from "axios";
import * as React from "react";
import { Idea, User } from "../models";
import * as storage from "../storage";
+import { SocialSignInButton } from "./social_signin_button";
interface SupportCounterProps {
+ user: User;
idea: Idea;
}
interface SupportCounterState {
supported: boolean;
total: number;
- user: User;
}
export class SupportCounter extends React.Component<SupportCounterProps, SupportCounterState> {
+ private elem: HTMLElement;
+ private list: HTMLElement;
+
constructor(props: SupportCounterProps) {
super(props);
- const supported = storage.get<number[]>("supported") || [];
this.state = {
- supported: supported.indexOf(props.idea.id) >= 0,
- total: props.idea.totalSupporters,
- user: storage.getCurrentUser()
+ supported: props.user && props.user.supportedIdeas.indexOf(props.idea.id) >= 0,
+ total: props.idea.totalSupporters
};
}
- public async undo() {
- if (!this.state.supported || !this.state.user) { return; }
-
- try {
- await axios.post(`/api/ideas/${this.props.idea.number}/unsupport`);
-
- this.setState({
- supported: false,
- total: this.state.total - 1
+ public componentDidMount() {
+ if (!this.props.user) {
+ $(this.elem).popup({
+ inline: true,
+ hoverable: true,
+ popup: this.list,
+ on: "click",
+ position : "bottom left"
});
- } catch (ex) {
- // TODO: handle this
+ return;
}
-
}
- public async support() {
- if (this.state.supported || !this.state.user) { return; }
+ public async supportOrUndo() {
+ if (!this.props.user) {
+ return;
+ }
+
+ const action = this.state.supported ? "unsupport" : "support";
try {
- await axios.post(`/api/ideas/${this.props.idea.number}/support`);
+ await axios.post(`/api/ideas/${this.props.idea.number}/${action}`);
this.setState({
- supported: true,
- total: this.state.total + 1
+ supported: !this.state.supported,
+ total: this.state.total + (this.state.supported ? -1 : 1)
});
} catch (ex) {
// TODO: handle this
@@ -58,28 +61,35 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support
}
public render() {
-
const support = <div className="support-button ui mini violet inverted animated button"
- onClick={async () => await this.support()}>
+ onClick={async () => await this.supportOrUndo()}>
<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={async () => await this.undo()}>
+ onClick={async () => await this.supportOrUndo()}>
<div className="visible content"><i className="heart icon"></i></div>
<div className="hidden content">
Undo
</div>
</div>;
- return <div className="ui small statistics">
- <div className="statistic">
- <div className="value">
- { this.state.total }
+ return <div>
+ <div className="ui small statistics">
+ <div ref={(e) => { this.elem = e; } } className="statistic">
+ <div className="value">
+ { this.state.total }
+ </div>
+ { this.state.supported ? undo : support }
</div>
- { this.state.supported ? undo : support }
+ </div>
+ <div ref={(e) => { this.list = e; } } className="ui popup transition hidden">
+ <p className="header">Please log in to support an idea</p>
+ <SocialSignInButton provider="facebook" small={true} />
+ <SocialSignInButton provider="google" small={true} />
</div>
</div>;
}
diff --git a/public/components/header.tsx b/public/components/header.tsx
index 6309fcdc7..46cabe4a9 100644
--- a/public/components/header.tsx
+++ b/public/components/header.tsx
@@ -8,7 +8,7 @@ export class Header extends React.Component<{}, {}> {
private dropdown: HTMLElement;
private list: HTMLElement;
- public componentDidMount() {
+ public componentDidMount() {
$(this.dropdown).popup({
inline: true,
hoverable: true,
@@ -53,7 +53,7 @@ export class Header extends React.Component<{}, {}> {
</a>
</div>
</div>
- <div ref={(e) => { this.list = e; } } className="ui popup top left transition hidden">
+ <div ref={(e) => { this.list = e; } } className="ui popup transition hidden">
{ items }
</div>
</div>;
diff --git a/public/components/root.tsx b/public/components/root.tsx
index 9780f8ab1..fbc750404 100644
--- a/public/components/root.tsx
+++ b/public/components/root.tsx
@@ -11,11 +11,12 @@ import { IdeaInput } from "./idea_input";
export class Root extends React.Component<{}, {}> {
public render() {
+ const user = storage.getCurrentUser();
const ideas = storage.get<Idea[]>("ideas") || [];
const ideasList = ideas.map((x) =>
<div className="item" key={x.id}>
- <SupportCounter idea={x} />
+ <SupportCounter user={user} idea={x} />
<div className="content">
<a href={`/ideas/${x.number}`} className="header">
<i className="idea icon"></i> { x.title }
diff --git a/public/components/show_idea_root.tsx b/public/components/show_idea_root.tsx
index f70cd573a..b5df5ecf4 100644
--- a/public/components/show_idea_root.tsx
+++ b/public/components/show_idea_root.tsx
@@ -41,7 +41,7 @@ export class ShowIdeaRoot extends React.Component<{}, {}> {
<div className="ui items unstackable">
<div className="item">
- <SupportCounter idea={idea} />
+ <SupportCounter user={user} idea={idea} />
<div className="idea-header">
<h1 className="ui header">{ idea.title }</h1>
diff --git a/public/models.ts b/public/models.ts
index 75f51b331..efd006b39 100644
--- a/public/models.ts
+++ b/public/models.ts
@@ -8,6 +8,7 @@ export interface User {
id: number;
name: string;
email: string;
+ supportedIdeas: number[];
}
export interface Idea {