Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

introduce dbModels and show correct response user

goenning562cc8a5d214
diff --git a/.vscode/settings.json b/.vscode/settings.json
index da52c0117..db5a8bac1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -27,8 +27,6 @@
"vendor": true
},
"vsicons.presets.angular": true,
- "go.coverageOptions": "showBothCoveredAndUncoveredCode",
- "go.coverOnSave": true,
"go.testEnvVars": {
"GO_ENV": "test",
"HOST_MODE": "multi",
diff --git a/app/middlewares/auth.go b/app/middlewares/auth.go
index 115a6d9f6..abec399ea 100644
--- a/app/middlewares/auth.go
+++ b/app/middlewares/auth.go
@@ -3,7 +3,6 @@ package middlewares
import (
"net/http"
- "github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/web"
)
@@ -20,7 +19,7 @@ func IsAuthenticated() web.MiddlewareFunc {
}
// IsAuthorized blocks non-authorized requests
-func IsAuthorized(roles ...models.Role) web.MiddlewareFunc {
+func IsAuthorized(roles ...int) web.MiddlewareFunc {
return func(next web.HandlerFunc) web.HandlerFunc {
return func(c web.Context) error {
user := c.User()
diff --git a/app/models/feedback.go b/app/models/feedback.go
index 089dbca26..267e0311b 100644
--- a/app/models/feedback.go
+++ b/app/models/feedback.go
@@ -1,67 +1,43 @@
package models
-import (
- "encoding/json"
- "time"
-
- "github.com/getfider/fider/app/pkg/dbx"
-)
+import "time"
//Idea represents an idea on a tenant board
type Idea struct {
- ID int `json:"id" db:"id"`
- Number int `json:"number" db:"number"`
- Title string `json:"title" db:"title"`
- Slug string `json:"slug" db:"slug"`
- 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"`
- Status IdeaStatus `json:"status" db:"status"`
- Response *IdeaResponse `json:"response" db:"response"`
+ ID int `json:"id"`
+ Number int `json:"number"`
+ Title string `json:"title"`
+ Slug string `json:"slug"`
+ Description string `json:"description"`
+ CreatedOn time.Time `json:"createdOn"`
+ User *User `json:"user"`
+ TotalSupporters int `json:"totalSupporters"`
+ Status int `json:"status"`
+ Response *IdeaResponse `json:"response"`
}
//IdeaResponse is a staff response to a given idea
type IdeaResponse struct {
- Text dbx.NullString `db:"text"`
- CreatedOn dbx.NullTime `db:"date"`
- UserID dbx.NullInt `db:"user_id"`
+ Text string `json:"text"`
+ CreatedOn time.Time `json:"createdOn"` //TODO: Rename??
+ User *User `json:"user"`
}
-// MarshalJSON interface redefinition
-func (r IdeaResponse) MarshalJSON() ([]byte, error) {
- if r.Text.Valid || r.CreatedOn.Valid || r.UserID.Valid {
- return json.Marshal(struct {
- Text dbx.NullString `json:"text"`
- CreatedOn dbx.NullTime `json:"createdOn"`
- UserID dbx.NullInt `json:"userId"`
- }{
- Text: r.Text,
- CreatedOn: r.CreatedOn,
- UserID: r.UserID,
- })
- }
- return json.Marshal(nil)
+//Comment represents an user comment on an idea
+type Comment struct {
+ ID int `json:"id"`
+ Content string `json:"content"`
+ CreatedOn time.Time `json:"createdOn"`
+ User *User `json:"user"`
}
-//IdeaStatus represents the status of an idea
-type IdeaStatus int
-
var (
//IdeaNew is the default status
- IdeaNew = IdeaStatus(0)
+ IdeaNew = 0
//IdeaStarted is used when the idea has been accepted and work is in progress
- IdeaStarted = IdeaStatus(1)
+ IdeaStarted = 1
//IdeaCompleted is used when the idea has been accepted and already implemented
- IdeaCompleted = IdeaStatus(2)
+ IdeaCompleted = 2
//IdeaDeclined is used when organizers decide to decline an idea
- IdeaDeclined = IdeaStatus(3)
+ IdeaDeclined = 3
)
-
-//Comment represents an user comment on an idea
-type Comment struct {
- ID int `json:"id" db:"id"`
- Content string `json:"content" db:"content"`
- CreatedOn time.Time `json:"createdOn" db:"created_on"`
- User *User `json:"user" db:"user"`
-}
diff --git a/app/models/identity.go b/app/models/identity.go
index 27229a38c..c9704e604 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -1,37 +1,33 @@
package models
import jwt "github.com/dgrijalva/jwt-go"
-import "database/sql"
//Tenant represents a tenant
type Tenant struct {
- ID int `json:"id" db:"id"`
- Name string `json:"name" db:"name"`
- Subdomain string `json:"subdomain" db:"subdomain"`
- CNAME sql.NullString `json:"cname" db:"cname"`
+ ID int `json:"id"`
+ Name string `json:"name"`
+ Subdomain string `json:"subdomain"`
+ CNAME string `json:"cname"`
}
//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"`
+ ID int `json:"id"`
+ Name string `json:"name"`
+ Email string `json:"email"`
+ Tenant *Tenant `json:"tenant"`
+ Role int `json:"role"`
Providers []*UserProvider `json:"providers"`
SupportedIdeas []int `json:"supportedIdeas"`
}
-//Role represents what the user can do inside its tenant
-type Role int
-
var (
//RoleVisitor is the basic role for every user
- RoleVisitor = Role(1)
+ RoleVisitor = 1
//RoleMember has limited access to administrative console
- RoleMember = Role(2)
+ RoleMember = 2
//RoleAdministrator has full access to administrative console
- RoleAdministrator = Role(3)
+ RoleAdministrator = 3
)
//HasProvider returns true if current user has given provider registered
@@ -46,8 +42,8 @@ func (u *User) HasProvider(provider string) bool {
//UserProvider represents the relashionship between an User and an Authentication provide
type UserProvider struct {
- Name string `json:"name" db:"provider"`
- UID string `json:"uid" db:"provider_uid"`
+ Name string `json:"name"`
+ UID string `json:"uid"`
}
//FiderClaims represents what goes into JWT tokens
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index f9cad4053..944021fc3 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -11,6 +11,60 @@ import (
"github.com/gosimple/slug"
)
+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"`
+ TotalSupporters int `db:"supporters"`
+ Status int `db:"status"`
+ Response sql.NullString `db:"response"`
+ RespondedOn dbx.NullTime `db:"response_date"`
+ ResponseUser *dbUser `db:"response_user"`
+}
+
+func (i *dbIdea) toModel() *models.Idea {
+ idea := &models.Idea{
+ ID: i.ID,
+ Number: i.Number,
+ Title: i.Title,
+ Slug: i.Slug,
+ Description: i.Description,
+ CreatedOn: i.CreatedOn,
+ TotalSupporters: i.TotalSupporters,
+ Status: i.Status,
+ User: i.User.toModel(),
+ }
+
+ if i.Response.Valid {
+ idea.Response = &models.IdeaResponse{
+ Text: i.Response.String,
+ CreatedOn: i.RespondedOn.Time,
+ User: i.ResponseUser.toModel(),
+ }
+ }
+ return idea
+}
+
+type dbComment struct {
+ ID int `db:"id"`
+ Content string `db:"content"`
+ CreatedOn time.Time `db:"created_on"`
+ User *dbUser `db:"user"`
+}
+
+func (c *dbComment) toModel() *models.Comment {
+ return &models.Comment{
+ ID: c.ID,
+ Content: c.Content,
+ CreatedOn: c.CreatedOn,
+ User: c.User.toModel(),
+ }
+}
+
// IdeaStorage contains read and write operations for ideas
type IdeaStorage struct {
DB *dbx.Database
@@ -18,39 +72,47 @@ type IdeaStorage struct {
var (
sqlSelectIdeasWhere = `SELECT i.id,
- i.number,
- i.title,
- i.slug,
- i.description,
- i.created_on,
- i.supporters,
- i.status,
- u.id AS user_id,
- u.name AS user_name,
- u.email AS user_email,
- i.response AS response_text,
- i.response_date,
- i.response_user_id
- FROM ideas i
- INNER JOIN users u
- ON u.id = i.user_id
- WHERE`
+ i.number,
+ i.title,
+ i.slug,
+ i.description,
+ i.created_on,
+ i.supporters,
+ i.status,
+ u.id AS user_id,
+ u.name AS user_name,
+ u.email AS user_email,
+ i.response,
+ i.response_date,
+ r.id AS response_user_id,
+ r.name AS response_user_name,
+ r.email AS response_user_email
+ FROM ideas i
+ INNER JOIN users u
+ ON u.id = i.user_id
+ LEFT JOIN users r
+ ON r.id = i.response_user_id
+ WHERE`
)
// GetAll returns all tenant ideas
func (s *IdeaStorage) GetAll(tenantID int) ([]*models.Idea, error) {
- var ideas []*models.Idea
+ var ideas []*dbIdea
err := s.DB.Select(&ideas, sqlSelectIdeasWhere+" i.tenant_id = $1 ORDER BY i.created_on DESC", tenantID)
if err != nil {
return nil, err
}
- return ideas, nil
+ var result = make([]*models.Idea, len(ideas))
+ for i, idea := range ideas {
+ result[i] = idea.toModel()
+ }
+ return result, nil
}
// GetByID returns idea by given id
func (s *IdeaStorage) GetByID(tenantID, ideaID int) (*models.Idea, error) {
- idea := models.Idea{}
+ idea := dbIdea{}
err := s.DB.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.id = $2 ORDER BY i.created_on DESC", tenantID, ideaID)
if err == sql.ErrNoRows {
@@ -59,12 +121,12 @@ func (s *IdeaStorage) GetByID(tenantID, ideaID int) (*models.Idea, error) {
return nil, err
}
- return &idea, nil
+ return idea.toModel(), nil
}
// GetByNumber returns idea by tenant and number
func (s *IdeaStorage) GetByNumber(tenantID, number int) (*models.Idea, error) {
- idea := models.Idea{}
+ idea := dbIdea{}
err := s.DB.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.number = $2 ORDER BY i.created_on DESC", tenantID, number)
if err == sql.ErrNoRows {
@@ -73,12 +135,12 @@ func (s *IdeaStorage) GetByNumber(tenantID, number int) (*models.Idea, error) {
return nil, err
}
- return &idea, nil
+ return idea.toModel(), nil
}
// GetCommentsByIdeaID returns all coments from given idea
func (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comment, error) {
- comments := []*models.Comment{}
+ comments := []*dbComment{}
err := s.DB.Select(&comments,
`SELECT c.id,
c.content,
@@ -98,7 +160,11 @@ func (s *IdeaStorage) GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comme
return nil, err
}
- return comments, nil
+ var result = make([]*models.Comment, len(comments))
+ for i, comment := range comments {
+ result[i] = comment.toModel()
+ }
+ return result, nil
}
// Save a new idea in the database
diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.go
index 090a080ec..38b70a548 100644
--- a/app/storage/postgres/tenant.go
+++ b/app/storage/postgres/tenant.go
@@ -16,6 +16,22 @@ type TenantStorage struct {
DB *dbx.Database
}
+type dbTenant struct {
+ ID int `db:"id"`
+ Name string `db:"name"`
+ Subdomain string `db:"subdomain"`
+ CNAME sql.NullString `db:"cname"`
+}
+
+func (t *dbTenant) toModel() *models.Tenant {
+ return &models.Tenant{
+ ID: t.ID,
+ Name: t.Name,
+ Subdomain: t.Subdomain,
+ CNAME: t.CNAME.String,
+ }
+}
+
// Add given tenant to tenant list
func (s *TenantStorage) Add(tenant *models.Tenant) error {
row := s.DB.QueryRow(`INSERT INTO tenants (name, subdomain, cname, created_on)
@@ -30,7 +46,7 @@ func (s *TenantStorage) Add(tenant *models.Tenant) error {
// First returns first tenant
func (s *TenantStorage) First() (*models.Tenant, error) {
- tenant := models.Tenant{}
+ tenant := dbTenant{}
err := s.DB.Get(&tenant, "SELECT id, name, subdomain, cname FROM tenants LIMIT 1")
if err == sql.ErrNoRows {
@@ -39,12 +55,12 @@ func (s *TenantStorage) First() (*models.Tenant, error) {
return nil, err
}
- return &tenant, nil
+ return tenant.toModel(), nil
}
// GetByDomain returns a tenant based on its domain
func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
- tenant := models.Tenant{}
+ tenant := dbTenant{}
err := s.DB.Get(&tenant, "SELECT id, name, subdomain, cname FROM tenants WHERE subdomain = $1 OR cname = $2", extractSubdomain(domain), domain)
if err == sql.ErrNoRows {
@@ -53,7 +69,7 @@ func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
return nil, err
}
- return &tenant, nil
+ return tenant.toModel(), nil
}
func extractSubdomain(domain string) string {
diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.go
index 3ea9c7139..735f766e2 100644
--- a/app/storage/postgres/tenant_test.go
+++ b/app/storage/postgres/tenant_test.go
@@ -3,8 +3,6 @@ package postgres_test
import (
"testing"
- "database/sql"
-
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/dbx"
@@ -70,7 +68,7 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {
Expect(tenant.ID).To(Equal(int(1)))
Expect(tenant.Name).To(Equal("My Domain Inc."))
Expect(tenant.Subdomain).To(Equal("mydomain"))
- Expect(tenant.CNAME.Valid).To(BeFalse())
+ Expect(tenant.CNAME).To(Equal(""))
Expect(err).To(BeNil())
}
@@ -84,7 +82,7 @@ func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {
tenants.Add(&models.Tenant{
Name: "My Domain Inc.",
Subdomain: "mydomain",
- CNAME: sql.NullString{String: "mydomain.anydomain.com", Valid: true},
+ CNAME: "mydomain.anydomain.com",
})
tenant, err := tenants.GetByDomain("mydomain.anydomain.com")
@@ -92,7 +90,6 @@ func TestTenantStorage_GetByDomain_FullDomain(t *testing.T) {
Expect(tenant.ID).To(Equal(int(1)))
Expect(tenant.Name).To(Equal("My Domain Inc."))
Expect(tenant.Subdomain).To(Equal("mydomain"))
- Expect(tenant.CNAME.String).To(Equal("mydomain.anydomain.com"))
- Expect(tenant.CNAME.Valid).To(BeTrue())
+ Expect(tenant.CNAME).To(Equal("mydomain.anydomain.com"))
Expect(err).To(BeNil())
}
diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.go
index f83488f99..a8ca99a49 100644
--- a/app/storage/postgres/user.go
+++ b/app/storage/postgres/user.go
@@ -10,6 +10,42 @@ import (
"github.com/getfider/fider/app/pkg/dbx"
)
+type dbUser struct {
+ ID sql.NullInt64 `db:"id"`
+ Name sql.NullString `db:"name"`
+ Email sql.NullString `db:"email"`
+ Tenant *dbTenant `db:"tenant"`
+ Role sql.NullInt64 `db:"role"`
+ Providers []*dbUserProvider
+ SupportedIdeas []int
+}
+
+type dbUserProvider struct {
+ Name sql.NullString `db:"provider"`
+ UID sql.NullString `db:"provider_uid"`
+}
+
+func (u *dbUser) toModel() *models.User {
+ user := &models.User{
+ ID: int(u.ID.Int64),
+ Name: u.Name.String,
+ Email: u.Email.String,
+ Tenant: u.Tenant.toModel(),
+ SupportedIdeas: u.SupportedIdeas,
+ Role: int(u.Role.Int64),
+ Providers: make([]*models.UserProvider, len(u.Providers)),
+ }
+
+ for i, p := range u.Providers {
+ user.Providers[i] = &models.UserProvider{
+ Name: p.Name.String,
+ UID: p.UID.String,
+ }
+ }
+
+ return user
+}
+
// UserStorage is used for user operations using a Postgres database
type UserStorage struct {
DB *dbx.Database
@@ -56,7 +92,7 @@ func (s *UserStorage) RegisterProvider(userID int, provider *models.UserProvider
// GetByID returns a user based on given id
func getUser(db *dbx.Database, filter string, args ...interface{}) (*models.User, error) {
- user := models.User{}
+ user := dbUser{}
err := db.Get(&user, "SELECT id, name, email, tenant_id, role FROM users WHERE "+filter, args...)
if err == sql.ErrNoRows {
return nil, app.ErrNotFound
@@ -74,5 +110,5 @@ func getUser(db *dbx.Database, filter string, args ...interface{}) (*models.User
return nil, err
}
- return &user, nil
+ return user.toModel(), nil
}
diff --git a/public/models.ts b/public/models.ts
index 1ca892b97..35a1bb1c8 100644
--- a/public/models.ts
+++ b/public/models.ts
@@ -26,7 +26,7 @@ export interface Idea {
}
export interface IdeaResponse {
- userId: number;
+ user: User;
text: string;
createdOn: Date;
}
diff --git a/public/shared/Common.tsx b/public/shared/Common.tsx
index ae6050f9b..7512a6157 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 } from "../models";
+import { User, IdeaResponse } from "../models";
export const Gravatar = (props: {email?: string}) => {
const hash = props.email ? md5(props.email) : "";
@@ -59,21 +59,19 @@ export const IdeaStatusRibbon = (props: { status: number }) => {
interface IdeaResponseProps {
status: number;
- user: User;
- response?: string;
- createdOn?: Date;
+ response: IdeaResponse;
}
-export const IdeaResponse = (props: IdeaResponseProps): JSX.Element => {
- if (props.createdOn) {
+export const ShowIdeaResponse = (props: IdeaResponseProps): JSX.Element => {
+ if (props.response) {
return <div className="fdr-response item ui raised segment">
<IdeaStatusRibbon status={props.status} />
<div className="info">
- <Gravatar email={props.user.email}/> <u>{props.user.name}</u>
- <span title={props.createdOn.toString()}>{ moment(props.createdOn).fromNow() }</span>
+ <Gravatar email={props.response.user.email}/> <u>{props.response.user.name}</u>
+ <span title={props.response.createdOn.toString()}>{ moment(props.response.createdOn).fromNow() }</span>
</div>
<div className="content">
- <MultiLineText text={ props.response } />
+ <MultiLineText text={ props.response.text } />
</div>
</div>;
}
diff --git a/public/site/HomePage.tsx b/public/site/HomePage.tsx
index 9bc8253bc..e7bc4b991 100644
--- a/public/site/HomePage.tsx
+++ b/public/site/HomePage.tsx
@@ -2,7 +2,7 @@ import * as moment from "moment";
import * as React from "react";
import { Idea, User } from "../models";
import * as storage from "../storage";
-import { Gravatar, MultiLineText, IdeaResponse } from "../shared/Common";
+import { Gravatar, MultiLineText, ShowIdeaResponse } from "../shared/Common";
import { SupportCounter } from "../shared/SupportCounter";
import { Footer } from "../shared/Footer";
@@ -34,10 +34,7 @@ export class HomePage extends React.Component<{}, {}> {
#{ x.number } shared by <Gravatar email={x.user.email}/> <u>{x.user.name}</u>
<span title={x.createdOn}>{ moment(x.createdOn).fromNow() }</span>
</div>
- <IdeaResponse status={x.status}
- response={x.response ? x.response.text : undefined }
- createdOn={x.response ? x.response.createdOn : undefined }
- user={x.user} />
+ <ShowIdeaResponse status={ x.status } response={ x.response } />
</div>
</div>);
diff --git a/public/site/ShowIdeaPage.tsx b/public/site/ShowIdeaPage.tsx
index 8f97162c9..94bb226cd 100644
--- a/public/site/ShowIdeaPage.tsx
+++ b/public/site/ShowIdeaPage.tsx
@@ -4,7 +4,7 @@ import * as storage from "../storage";
import { User, Comment, Idea } from "../models";
import { CommentInput } from "../shared/CommentInput";
-import { Gravatar, MultiLineText, IdeaResponse } from "../shared/Common";
+import { Gravatar, MultiLineText, ShowIdeaResponse } from "../shared/Common";
import { SocialSignInButton } from "../shared/SocialSignInButton";
import { SupportCounter } from "../shared/SupportCounter";
@@ -66,10 +66,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
<MultiLineText text={ this.idea.description } />
- <IdeaResponse status={this.idea.status}
- response={this.idea.response ? this.idea.response.text : undefined }
- createdOn={this.idea.response ? this.idea.response.createdOn : undefined }
- user={this.idea.user} />
+ <ShowIdeaResponse status={ this.idea.status } response={ this.idea.response } />
<div className="ui comments">
<h3 className="ui dividing header">Comments</h3>