Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

sort by trending ideas (like hackernews) (#223)

Guilherme Oenningd0701a8d04e3
diff --git a/app/models/feedback.go b/app/models/feedback.go
index a43f3871f..8f2fcd447 100644
--- a/app/models/feedback.go
+++ b/app/models/feedback.go
@@ -19,6 +19,7 @@ type Idea struct {
Status int `json:"status"`
Response *IdeaResponse `json:"response"`
Tags []int64 `json:"tags"`
+ Ranking float64 `json:"ranking"`
}
// CanBeSupported returns true if this idea can be Supported/UnSupported
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index 1e6664201..4e91b0144 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -2,6 +2,7 @@ package postgres
import (
"fmt"
+ "math"
"time"
"database/sql"
@@ -13,24 +14,31 @@ import (
)
type dbIdea struct {
- ID int `db:"id"`
- Number int `db:"number"`
- Title string `db:"title"`
- Slug string `db:"slug"`
- Description string `db:"description"`
- CreatedOn time.Time `db:"created_on"`
- User *dbUser `db:"user"`
- ViewerSupported bool `db:"viewer_supported"`
- TotalSupporters int `db:"supporters"`
- TotalComments int `db:"comments"`
- Status int `db:"status"`
- Response sql.NullString `db:"response"`
- RespondedOn dbx.NullTime `db:"response_date"`
- ResponseUser *dbUser `db:"response_user"`
- Tags []int64 `db:"tags"`
+ ID int `db:"id"`
+ Number int `db:"number"`
+ Title string `db:"title"`
+ Slug string `db:"slug"`
+ Description string `db:"description"`
+ CreatedOn time.Time `db:"created_on"`
+ User *dbUser `db:"user"`
+ ViewerSupported bool `db:"viewer_supported"`
+ TotalSupporters int `db:"supporters"`
+ TotalComments int `db:"comments"`
+ RecentSupporters int `db:"recent_supporters"`
+ RecentComments int `db:"recent_comments"`
+ Status int `db:"status"`
+ Response sql.NullString `db:"response"`
+ RespondedOn dbx.NullTime `db:"response_date"`
+ ResponseUser *dbUser `db:"response_user"`
+ Tags []int64 `db:"tags"`
}
func (i *dbIdea) toModel() *models.Idea {
+ ranking := float64((i.RecentSupporters*5)+(i.RecentComments*3)-1) / math.Pow((time.Since(i.CreatedOn).Hours()+2), 0.8)
+ if math.IsNaN(ranking) {
+ ranking = 0
+ }
+
idea := &models.Idea{
ID: i.ID,
Number: i.Number,
@@ -44,6 +52,7 @@ func (i *dbIdea) toModel() *models.Idea {
Status: i.Status,
User: i.User.toModel(),
Tags: i.Tags,
+ Ranking: ranking,
}
if i.Response.Valid {
@@ -104,7 +113,9 @@ var (
i.description,
i.created_on,
i.supporters,
- (SELECT COUNT(*) FROM comments c WHERE c.idea_id = i.id) as comments,
+ (SELECT COUNT(*) FROM comments WHERE idea_id = i.id) as comments,
+ (SELECT COUNT(*) FROM idea_supporters WHERE idea_id = i.id AND created_on > CURRENT_DATE - INTERVAL '30 days') AS recent_supporters,
+ (SELECT COUNT(*) FROM comments WHERE idea_id = i.id AND created_on > CURRENT_DATE - INTERVAL '30 days') AS recent_comments,
i.status,
u.id AS user_id,
u.name AS user_name,
@@ -129,12 +140,10 @@ var (
ON t.id = it.tag_id
%s
WHERE %s
- GROUP BY i.id, u.id, r.id
- ORDER BY %s`
+ GROUP BY i.id, u.id, r.id`
)
-// GetAll returns all tenant ideas
-func (s *IdeaStorage) getIdeaQuery(filter, order string) string {
+func (s *IdeaStorage) getIdeaQuery(filter string) string {
viewerSupportedSubQuery := "null"
if s.user != nil {
viewerSupportedSubQuery = fmt.Sprintf("(SELECT true FROM idea_supporters WHERE idea_id = i.id AND user_id = %d)", s.user.ID)
@@ -143,10 +152,9 @@ func (s *IdeaStorage) getIdeaQuery(filter, order string) string {
if s.user != nil && s.user.IsCollaborator() {
tagCondition = ``
}
- return fmt.Sprintf(sqlSelectIdeasWhere, viewerSupportedSubQuery, tagCondition, filter, order)
+ return fmt.Sprintf(sqlSelectIdeasWhere, viewerSupportedSubQuery, tagCondition, filter)
}
-// GetAll returns all tenant ideas
func (s *IdeaStorage) getSingle(query string, args ...interface{}) (*models.Idea, error) {
idea := dbIdea{}
@@ -162,23 +170,23 @@ func (s *IdeaStorage) getSingle(query string, args ...interface{}) (*models.Idea
// GetByID returns idea by given id
func (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {
- return s.getSingle(s.getIdeaQuery("i.tenant_id = $1 AND i.id = $2", "i.created_on DESC"), s.tenant.ID, ideaID)
+ return s.getSingle(s.getIdeaQuery("i.tenant_id = $1 AND i.id = $2"), s.tenant.ID, ideaID)
}
// GetBySlug returns idea by tenant and slug
func (s *IdeaStorage) GetBySlug(slug string) (*models.Idea, error) {
- return s.getSingle(s.getIdeaQuery("i.tenant_id = $1 AND i.slug = $2", "i.created_on DESC"), s.tenant.ID, slug)
+ return s.getSingle(s.getIdeaQuery("i.tenant_id = $1 AND i.slug = $2"), s.tenant.ID, slug)
}
// GetByNumber returns idea by tenant and number
func (s *IdeaStorage) GetByNumber(number int) (*models.Idea, error) {
- return s.getSingle(s.getIdeaQuery("i.tenant_id = $1 AND i.number = $2", "i.created_on DESC"), s.tenant.ID, number)
+ return s.getSingle(s.getIdeaQuery("i.tenant_id = $1 AND i.number = $2"), s.tenant.ID, number)
}
// GetAll returns all tenant ideas
func (s *IdeaStorage) GetAll() ([]*models.Idea, error) {
var ideas []*dbIdea
- err := s.trx.Select(&ideas, s.getIdeaQuery("i.tenant_id = $1", "i.created_on DESC"), s.tenant.ID)
+ err := s.trx.Select(&ideas, s.getIdeaQuery("i.tenant_id = $1"), s.tenant.ID)
if err != nil {
return nil, err
}
diff --git a/public/models/idea.ts b/public/models/idea.ts
index 632b8df54..51d270729 100644
--- a/public/models/idea.ts
+++ b/public/models/idea.ts
@@ -14,6 +14,7 @@ export interface Idea {
totalSupporters: number;
totalComments: number;
tags: number[];
+ ranking: number;
}
export class IdeaStatus {
diff --git a/public/pages/site/HomePage/IdeaFilter.tsx b/public/pages/site/HomePage/IdeaFilter.tsx
index 70226acbd..9fb185924 100644
--- a/public/pages/site/HomePage/IdeaFilter.tsx
+++ b/public/pages/site/HomePage/IdeaFilter.tsx
@@ -10,9 +10,10 @@ interface IdeaFilterProps {
}
const filterers: {[key: string]: (idea: Idea) => boolean} = {
- 'recent': (idea: Idea) => idea.status !== IdeaStatus.Completed.value && idea.status !== IdeaStatus.Declined.value,
- 'most-wanted': (idea: Idea) => idea.status !== IdeaStatus.Completed.value && idea.status !== IdeaStatus.Declined.value,
- 'most-discussed': (idea: Idea) => idea.status !== IdeaStatus.Completed.value && idea.status !== IdeaStatus.Declined.value,
+ 'trending': (idea: Idea) => IdeaStatus.Get(idea.status).closed === false,
+ 'recent': (idea: Idea) => IdeaStatus.Get(idea.status).closed === false,
+ 'most-wanted': (idea: Idea) => IdeaStatus.Get(idea.status).closed === false,
+ 'most-discussed': (idea: Idea) => IdeaStatus.Get(idea.status).closed === false,
'planned': (idea: Idea) => idea.status === IdeaStatus.Planned.value,
'started': (idea: Idea) => idea.status === IdeaStatus.Started.value,
'completed': (idea: Idea) => idea.status === IdeaStatus.Completed.value,
@@ -20,6 +21,7 @@ const filterers: {[key: string]: (idea: Idea) => boolean} = {
};
const names: {[key: string]: string} = {
+ 'trending': 'trending',
'recent': 'recent',
'most-wanted': 'most wanted',
'most-discussed': 'most discussed',
@@ -30,6 +32,7 @@ const names: {[key: string]: string} = {
};
const sorterers: {[key: string]: (left: Idea, right: Idea) => number} = {
+ 'trending': (left: Idea, right: Idea) => right.ranking !== left.ranking ? right.ranking - left.ranking : new Date(right.createdOn).getTime() - new Date(left.createdOn).getTime(),
'recent': (left: Idea, right: Idea) => new Date(right.createdOn).getTime() - new Date(left.createdOn).getTime(),
'most-wanted': (left: Idea, right: Idea) => right.totalSupporters - left.totalSupporters,
'most-discussed': (left: Idea, right: Idea) => right.totalComments - left.totalComments,
@@ -48,7 +51,7 @@ export class IdeaFilter extends React.Component<IdeaFilterProps, {}> {
public static getFilter(value: string): IdeaFilterFunction {
if (!filterers[value]) {
- value = 'recent';
+ value = 'trending';
}
return (ideas: Idea[]) => ideas.filter(filterers[value]).sort(sorterers[value]);
@@ -65,7 +68,7 @@ export class IdeaFilter extends React.Component<IdeaFilterProps, {}> {
public render() {
let activeFilter = this.props.activeFilter;
if (!(this.props.activeFilter in names)) {
- activeFilter = 'recent';
+ activeFilter = 'trending';
}
const grouped = this.props.ideas.reduce<{ [status: number]: number }>((group, idea) => {
@@ -89,6 +92,7 @@ export class IdeaFilter extends React.Component<IdeaFilterProps, {}> {
<i className="dropdown icon" />
<div className="menu">
<div className="header">What do you want to see?</div>
+ <div className={`item ${activeFilter === 'trending' && 'active'}`} data-value="trending" data-text="trending">Trending</div>
<div className={`item ${activeFilter === 'recent' && 'active'}`} data-value="recent" data-text="recent">Recent</div>
<div className={`item ${activeFilter === 'most-wanted' && 'active'}`} data-value="most-wanted" data-text="most wanted">Most Wanted</div>
<div className={`item ${activeFilter === 'most-discussed' && 'active'}`} data-value="most-discussed" data-text="most discussed">Most Discussed</div>