Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Moved more entities to dbEntities

Matt Robertscff09114b47a
diff --git a/app/services/sqlstore/dbEntities/billing.go b/app/services/sqlstore/dbEntities/billing.go
index 8e6941482..6619bfa8a 100644
--- a/app/services/sqlstore/dbEntities/billing.go
+++ b/app/services/sqlstore/dbEntities/billing.go
@@ -8,7 +8,7 @@ import (
"github.com/getfider/fider/app/pkg/dbx"
)
-type billingState struct {
+type BillingState struct {
Status int `db:"status"`
PlanID string `db:"paddle_plan_id"`
SubscriptionID string `db:"paddle_subscription_id"`
@@ -16,7 +16,7 @@ type billingState struct {
SubscriptionEndsAt dbx.NullTime `db:"subscription_ends_at"`
}
-func (s *billingState) toModel(ctx context.Context) *entity.BillingState {
+func (s *BillingState) ToModel(ctx context.Context) *entity.BillingState {
model := &entity.BillingState{
Status: enum.BillingStatus(s.Status),
PlanID: s.PlanID,
diff --git a/app/services/sqlstore/dbEntities/oauth.go b/app/services/sqlstore/dbEntities/oauth.go
index c703f4fdb..32c973af1 100644
--- a/app/services/sqlstore/dbEntities/oauth.go
+++ b/app/services/sqlstore/dbEntities/oauth.go
@@ -4,7 +4,7 @@ import (
"github.com/getfider/fider/app/models/entity"
)
-type oauthConfig struct {
+type OAuthConfig struct {
ID int `db:"id"`
Provider string `db:"provider"`
DisplayName string `db:"display_name"`
@@ -22,7 +22,7 @@ type oauthConfig struct {
JSONUserEmailPath string `db:"json_user_email_path"`
}
-func (m *oauthConfig) toModel() *entity.OAuthConfig {
+func (m *OAuthConfig) ToModel() *entity.OAuthConfig {
return &entity.OAuthConfig{
ID: m.ID,
Provider: m.Provider,
diff --git a/app/services/sqlstore/dbEntities/tag.go b/app/services/sqlstore/dbEntities/tag.go
index db85d3ae4..ca13660cd 100644
--- a/app/services/sqlstore/dbEntities/tag.go
+++ b/app/services/sqlstore/dbEntities/tag.go
@@ -4,7 +4,7 @@ import (
"github.com/getfider/fider/app/models/entity"
)
-type tag struct {
+type Tag struct {
ID int `db:"id"`
Name string `db:"name"`
Slug string `db:"slug"`
@@ -12,7 +12,7 @@ type tag struct {
IsPublic bool `db:"is_public"`
}
-func (t *tag) toModel() *entity.Tag {
+func (t *Tag) ToModel() *entity.Tag {
return &entity.Tag{
ID: t.ID,
Name: t.Name,
diff --git a/app/services/sqlstore/dbEntities/user.go b/app/services/sqlstore/dbEntities/user.go
index c08fb2614..e4ae80cb2 100644
--- a/app/services/sqlstore/dbEntities/user.go
+++ b/app/services/sqlstore/dbEntities/user.go
@@ -30,7 +30,7 @@ type UserProvider struct {
UID sql.NullString `db:"provider_uid"`
}
-type userSetting struct {
+type UserSetting struct {
Key string `db:"key"`
Value string `db:"value"`
}
diff --git a/app/services/sqlstore/dbEntities/vote.go b/app/services/sqlstore/dbEntities/vote.go
index 82946df53..6c1d12df9 100644
--- a/app/services/sqlstore/dbEntities/vote.go
+++ b/app/services/sqlstore/dbEntities/vote.go
@@ -8,7 +8,7 @@ import (
"github.com/getfider/fider/app/models/enum"
)
-type vote struct {
+type Vote struct {
User *struct {
ID int `db:"id"`
Name string `db:"name"`
@@ -19,7 +19,7 @@ type vote struct {
CreatedAt time.Time `db:"created_at"`
}
-func (v *vote) toModel(ctx context.Context) *entity.Vote {
+func (v *Vote) ToModel(ctx context.Context) *entity.Vote {
vote := &entity.Vote{
CreatedAt: v.CreatedAt,
User: &entity.VoteUser{
diff --git a/app/services/sqlstore/postgres/billing.go b/app/services/sqlstore/postgres/billing.go
index 4b830e612..cfb88c13d 100644
--- a/app/services/sqlstore/postgres/billing.go
+++ b/app/services/sqlstore/postgres/billing.go
@@ -10,40 +10,15 @@ import (
"github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/services/sqlstore/dbEntities"
"github.com/lib/pq"
)
-type dbBillingState struct {
- Status int `db:"status"`
- PlanID string `db:"paddle_plan_id"`
- SubscriptionID string `db:"paddle_subscription_id"`
- TrialEndsAt dbx.NullTime `db:"trial_ends_at"`
- SubscriptionEndsAt dbx.NullTime `db:"subscription_ends_at"`
-}
-
-func (s *dbBillingState) toModel(ctx context.Context) *entity.BillingState {
- model := &entity.BillingState{
- Status: enum.BillingStatus(s.Status),
- PlanID: s.PlanID,
- SubscriptionID: s.SubscriptionID,
- }
-
- if s.TrialEndsAt.Valid {
- model.TrialEndsAt = &s.TrialEndsAt.Time
- }
-
- if s.SubscriptionEndsAt.Valid {
- model.SubscriptionEndsAt = &s.SubscriptionEndsAt.Time
- }
-
- return model
-}
-
func getBillingState(ctx context.Context, q *query.GetBillingState) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
q.Result = nil
- state := dbBillingState{}
+ state := dbEntities.BillingState{}
err := trx.Get(&state,
`SELECT
trial_ends_at,
@@ -58,7 +33,7 @@ func getBillingState(ctx context.Context, q *query.GetBillingState) error {
return err
}
- q.Result = state.toModel(ctx)
+ q.Result = state.ToModel(ctx)
return nil
})
}
@@ -149,7 +124,7 @@ func lockExpiredTenants(ctx context.Context, c *cmd.LockExpiredTenants) error {
func getTrialingTenantContacts(ctx context.Context, q *query.GetTrialingTenantContacts) error {
return using(ctx, func(trx *dbx.Trx, _ *entity.Tenant, _ *entity.User) error {
- var users []*dbUser
+ var users []*dbEntities.User
err := trx.Select(&users, `
SELECT
u.name,
@@ -171,7 +146,7 @@ func getTrialingTenantContacts(ctx context.Context, q *query.GetTrialingTenantCo
q.Contacts = make([]*entity.User, len(users))
for i, user := range users {
- q.Contacts[i] = user.toModel(ctx)
+ q.Contacts[i] = user.ToModel(ctx)
}
return nil
})
diff --git a/app/services/sqlstore/postgres/comment.go b/app/services/sqlstore/postgres/comment.go
index 2b30a987e..1a2e6d256 100644
--- a/app/services/sqlstore/postgres/comment.go
+++ b/app/services/sqlstore/postgres/comment.go
@@ -2,7 +2,6 @@ package postgres
import (
"context"
- "encoding/json"
"fmt"
"time"
diff --git a/app/services/sqlstore/postgres/notification.go b/app/services/sqlstore/postgres/notification.go
index f5f724b10..af80a7e5c 100644
--- a/app/services/sqlstore/postgres/notification.go
+++ b/app/services/sqlstore/postgres/notification.go
@@ -12,6 +12,7 @@ import (
"github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/services/sqlstore/dbEntities"
"github.com/lib/pq"
)
@@ -177,7 +178,7 @@ func getActiveSubscribers(ctx context.Context, q *query.GetActiveSubscribers) er
q.Result = make([]*entity.User, 0)
var (
- users []*dbUser
+ users []*dbEntities.User
err error
)
@@ -249,7 +250,7 @@ func getActiveSubscribers(ctx context.Context, q *query.GetActiveSubscribers) er
q.Result = make([]*entity.User, len(users))
for i, user := range users {
- q.Result[i] = user.toModel(ctx)
+ q.Result[i] = user.ToModel(ctx)
}
return nil
})
diff --git a/app/services/sqlstore/postgres/oauth.go b/app/services/sqlstore/postgres/oauth.go
index 55b9b91d7..16bca0964 100644
--- a/app/services/sqlstore/postgres/oauth.go
+++ b/app/services/sqlstore/postgres/oauth.go
@@ -10,53 +10,16 @@ import (
"github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/services/sqlstore/dbEntities"
)
-type dbOAuthConfig struct {
- ID int `db:"id"`
- Provider string `db:"provider"`
- DisplayName string `db:"display_name"`
- LogoBlobKey string `db:"logo_bkey"`
- Status int `db:"status"`
- IsTrusted bool `db:"is_trusted"`
- ClientID string `db:"client_id"`
- ClientSecret string `db:"client_secret"`
- AuthorizeURL string `db:"authorize_url"`
- TokenURL string `db:"token_url"`
- Scope string `db:"scope"`
- ProfileURL string `db:"profile_url"`
- JSONUserIDPath string `db:"json_user_id_path"`
- JSONUserNamePath string `db:"json_user_name_path"`
- JSONUserEmailPath string `db:"json_user_email_path"`
-}
-
-func (m *dbOAuthConfig) toModel() *entity.OAuthConfig {
- return &entity.OAuthConfig{
- ID: m.ID,
- Provider: m.Provider,
- DisplayName: m.DisplayName,
- Status: m.Status,
- IsTrusted: m.IsTrusted,
- LogoBlobKey: m.LogoBlobKey,
- ClientID: m.ClientID,
- ClientSecret: m.ClientSecret,
- AuthorizeURL: m.AuthorizeURL,
- TokenURL: m.TokenURL,
- ProfileURL: m.ProfileURL,
- Scope: m.Scope,
- JSONUserIDPath: m.JSONUserIDPath,
- JSONUserNamePath: m.JSONUserNamePath,
- JSONUserEmailPath: m.JSONUserEmailPath,
- }
-}
-
func getCustomOAuthConfigByProvider(ctx context.Context, q *query.GetCustomOAuthConfigByProvider) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
if tenant == nil {
return app.ErrNotFound
}
- config := &dbOAuthConfig{}
+ config := &dbEntities.OAuthConfig{}
err := trx.Get(config, `
SELECT id, provider, display_name, status, is_trusted, logo_bkey,
client_id, client_secret, authorize_url,
@@ -69,7 +32,7 @@ func getCustomOAuthConfigByProvider(ctx context.Context, q *query.GetCustomOAuth
return err
}
- q.Result = config.toModel()
+ q.Result = config.ToModel()
return nil
})
}
@@ -80,7 +43,7 @@ func listCustomOAuthConfig(ctx context.Context, q *query.ListCustomOAuthConfig)
return nil
}
- configs := []*dbOAuthConfig{}
+ configs := []*dbEntities.OAuthConfig{}
if tenant != nil {
err := trx.Select(&configs, `
SELECT id, provider, display_name, status, is_trusted, logo_bkey,
@@ -97,7 +60,7 @@ func listCustomOAuthConfig(ctx context.Context, q *query.ListCustomOAuthConfig)
q.Result = make([]*entity.OAuthConfig, len(configs))
for i, config := range configs {
- q.Result[i] = config.toModel()
+ q.Result[i] = config.ToModel()
}
return nil
})
diff --git a/app/services/sqlstore/postgres/post.go b/app/services/sqlstore/postgres/post.go
index fe6cd7701..5a50d9b5d 100644
--- a/app/services/sqlstore/postgres/post.go
+++ b/app/services/sqlstore/postgres/post.go
@@ -2,7 +2,6 @@ package postgres
import (
"context"
- "database/sql"
"fmt"
"strconv"
"strings"
@@ -20,68 +19,9 @@ import (
"github.com/getfider/fider/app/models/cmd"
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/services/sqlstore/dbEntities"
)
-type dbPost struct {
- ID int `db:"id"`
- Number int `db:"number"`
- Title string `db:"title"`
- Slug string `db:"slug"`
- Description string `db:"description"`
- CreatedAt time.Time `db:"created_at"`
- User *dbUser `db:"user"`
- HasVoted bool `db:"has_voted"`
- VotesCount int `db:"votes_count"`
- CommentsCount int `db:"comments_count"`
- RecentVotes int `db:"recent_votes_count"`
- RecentComments int `db:"recent_comments_count"`
- Status int `db:"status"`
- Response sql.NullString `db:"response"`
- RespondedAt dbx.NullTime `db:"response_date"`
- ResponseUser *dbUser `db:"response_user"`
- OriginalNumber sql.NullInt64 `db:"original_number"`
- OriginalTitle sql.NullString `db:"original_title"`
- OriginalSlug sql.NullString `db:"original_slug"`
- OriginalStatus sql.NullInt64 `db:"original_status"`
- Tags []string `db:"tags"`
- IsApproved bool `db:"is_approved"`
-}
-
-func (i *dbPost) toModel(ctx context.Context) *entity.Post {
- post := &entity.Post{
- ID: i.ID,
- Number: i.Number,
- Title: i.Title,
- Slug: i.Slug,
- Description: i.Description,
- CreatedAt: i.CreatedAt,
- HasVoted: i.HasVoted,
- VotesCount: i.VotesCount,
- CommentsCount: i.CommentsCount,
- Status: enum.PostStatus(i.Status),
- User: i.User.toModel(ctx),
- Tags: i.Tags,
- IsApproved: i.IsApproved,
- }
-
- if i.Response.Valid {
- post.Response = &entity.PostResponse{
- Text: i.Response.String,
- RespondedAt: i.RespondedAt.Time,
- User: i.ResponseUser.toModel(ctx),
- }
- if post.Status == enum.PostDuplicate && i.OriginalNumber.Valid {
- post.Response.Original = &entity.OriginalPost{
- Number: int(i.OriginalNumber.Int64),
- Slug: i.OriginalSlug.String,
- Title: i.OriginalTitle.String,
- Status: enum.PostStatus(i.OriginalStatus.Int64),
- }
- }
- }
- return post
-}
-
var (
sqlSelectPostsWhere = ` WITH
agg_tags AS (
@@ -231,14 +171,14 @@ func markPostAsDuplicate(ctx context.Context, c *cmd.MarkPostAsDuplicate) error
respondedAt = c.Post.Response.RespondedAt
}
- var users []*dbUser
+ var users []*dbEntities.User
err := trx.Select(&users, "SELECT user_id AS id FROM post_votes WHERE post_id = $1 AND tenant_id = $2", c.Post.ID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get votes of post with id '%d'", c.Post.ID)
}
for _, u := range users {
- err := bus.Dispatch(ctx, &cmd.AddVote{Post: c.Original, User: u.toModel(ctx)})
+ err := bus.Dispatch(ctx, &cmd.AddVote{Post: c.Original, User: u.ToModel(ctx)})
if err != nil {
return err
}
@@ -397,7 +337,7 @@ func findSimilarPosts(ctx context.Context, q *query.FindSimilarPosts) error {
filteredQuery := preprocessSearchQuery(q.Query)
var (
- posts []*dbPost
+ posts []*dbEntities.Post
err error
)
@@ -425,7 +365,7 @@ func findSimilarPosts(ctx context.Context, q *query.FindSimilarPosts) error {
q.Result = make([]*entity.Post, len(posts))
for i, post := range posts {
- q.Result[i] = post.toModel(ctx)
+ q.Result[i] = post.ToModel(ctx)
}
return nil
})
@@ -450,7 +390,7 @@ func searchPosts(ctx context.Context, q *query.SearchPosts) error {
}
var (
- posts []*dbPost
+ posts []*dbEntities.Post
err error
)
if q.Query != "" {
@@ -489,7 +429,7 @@ func searchPosts(ctx context.Context, q *query.SearchPosts) error {
q.Result = make([]*entity.Post, len(posts))
for i, post := range posts {
- q.Result[i] = post.toModel(ctx)
+ q.Result[i] = post.ToModel(ctx)
}
return nil
})
@@ -507,13 +447,13 @@ func getAllPosts(ctx context.Context, q *query.GetAllPosts) error {
}
func querySinglePost(ctx context.Context, trx *dbx.Trx, query string, args ...any) (*entity.Post, error) {
- post := dbPost{}
+ post := dbEntities.Post{}
if err := trx.Get(&post, query, args...); err != nil {
return nil, err
}
- return post.toModel(ctx), nil
+ return post.ToModel(ctx), nil
}
func buildPostQuery(user *entity.User, filter string) string {
diff --git a/app/services/sqlstore/postgres/tag.go b/app/services/sqlstore/postgres/tag.go
index aaab85c7b..0d57cf174 100644
--- a/app/services/sqlstore/postgres/tag.go
+++ b/app/services/sqlstore/postgres/tag.go
@@ -10,27 +10,10 @@ import (
"github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/services/sqlstore/dbEntities"
"github.com/gosimple/slug"
)
-type dbTag struct {
- ID int `db:"id"`
- Name string `db:"name"`
- Slug string `db:"slug"`
- Color string `db:"color"`
- IsPublic bool `db:"is_public"`
-}
-
-func (t *dbTag) toModel() *entity.Tag {
- return &entity.Tag{
- ID: t.ID,
- Name: t.Name,
- Slug: t.Slug,
- Color: t.Color,
- IsPublic: t.IsPublic,
- }
-}
-
func getTagBySlug(ctx context.Context, q *query.GetTagBySlug) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
tag, err := queryTagBySlug(trx, tenant, q.Slug)
@@ -176,18 +159,18 @@ func unassignTag(ctx context.Context, c *cmd.UnassignTag) error {
}
func queryTagBySlug(trx *dbx.Trx, tenant *entity.Tenant, slug string) (*entity.Tag, error) {
- tag := dbTag{}
+ tag := dbEntities.Tag{}
err := trx.Get(&tag, "SELECT id, name, slug, color, is_public FROM tags WHERE tenant_id = $1 AND slug = $2", tenant.ID, slug)
if err != nil {
return nil, errors.Wrap(err, "failed to get tag with slug '%s'", slug)
}
- return tag.toModel(), nil
+ return tag.ToModel(), nil
}
func queryTags(trx *dbx.Trx, query string, args ...any) ([]*entity.Tag, error) {
- tags := []*dbTag{}
+ tags := []*dbEntities.Tag{}
err := trx.Select(&tags, query, args...)
if err != nil {
return nil, err
@@ -195,7 +178,7 @@ func queryTags(trx *dbx.Trx, query string, args ...any) ([]*entity.Tag, error) {
var result = make([]*entity.Tag, len(tags))
for i, tag := range tags {
- result[i] = tag.toModel()
+ result[i] = tag.ToModel()
}
return result, nil
}
diff --git a/app/services/sqlstore/postgres/user.go b/app/services/sqlstore/postgres/user.go
index a8517f651..8263bb3c7 100644
--- a/app/services/sqlstore/postgres/user.go
+++ b/app/services/sqlstore/postgres/user.go
@@ -2,7 +2,6 @@ package postgres
import (
"context"
- "database/sql"
"fmt"
"strings"
"time"
@@ -19,64 +18,6 @@ import (
"github.com/lib/pq"
)
-type dbUser struct {
- ID sql.NullInt64 `db:"id"`
- Name sql.NullString `db:"name"`
- Email sql.NullString `db:"email"`
- Tenant *dbEntities.Tenant `db:"tenant"`
- Role sql.NullInt64 `db:"role"`
- Status sql.NullInt64 `db:"status"`
- AvatarType sql.NullInt64 `db:"avatar_type"`
- AvatarBlobKey sql.NullString `db:"avatar_bkey"`
- IsVerified sql.NullBool `db:"is_verified"`
- Providers []*dbUserProvider
-}
-
-type dbUserProvider struct {
- Name sql.NullString `db:"provider"`
- UID sql.NullString `db:"provider_uid"`
-}
-
-func (u *dbUser) toModel(ctx context.Context) *entity.User {
- if u == nil {
- return nil
- }
-
- avatarURL := ""
- avatarType := enum.AvatarType(u.AvatarType.Int64)
- if u.AvatarType.Valid {
- avatarURL = buildAvatarURL(ctx, avatarType, int(u.ID.Int64), u.Name.String, u.AvatarBlobKey.String)
- }
-
- user := &entity.User{
- ID: int(u.ID.Int64),
- Name: u.Name.String,
- Email: u.Email.String,
- Tenant: u.Tenant.ToModel(),
- Role: enum.Role(u.Role.Int64),
- Providers: make([]*entity.UserProvider, len(u.Providers)),
- Status: enum.UserStatus(u.Status.Int64),
- AvatarType: avatarType,
- AvatarBlobKey: u.AvatarBlobKey.String,
- AvatarURL: avatarURL,
- IsVerified: u.IsVerified.Bool,
- }
-
- for i, p := range u.Providers {
- user.Providers[i] = &entity.UserProvider{
- Name: p.Name.String,
- UID: p.UID.String,
- }
- }
-
- return user
-}
-
-type dbUserSetting struct {
- Key string `db:"key"`
- Value string `db:"value"`
-}
-
func countUsers(ctx context.Context, q *query.CountUsers) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
var count int
@@ -269,7 +210,7 @@ func getCurrentUserSettings(ctx context.Context, q *query.GetCurrentUserSettings
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
q.Result = make(map[string]string)
- var settings []*dbUserSetting
+ var settings []*dbEntities.UserSetting
err := trx.Select(&settings, "SELECT key, value FROM user_settings WHERE user_id = $1 AND tenant_id = $2", user.ID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get user settings")
@@ -385,7 +326,7 @@ func getUserByProvider(ctx context.Context, q *query.GetUserByProvider) error {
func getAllUsers(ctx context.Context, q *query.GetAllUsers) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
- var users []*dbUser
+ var users []*dbEntities.User
err := trx.Select(&users, `
SELECT id, name, email, tenant_id, role, status, avatar_type, avatar_bkey
FROM users
@@ -398,7 +339,7 @@ func getAllUsers(ctx context.Context, q *query.GetAllUsers) error {
q.Result = make([]*entity.User, len(users))
for i, user := range users {
- q.Result[i] = user.toModel(ctx)
+ q.Result[i] = user.ToModel(ctx)
}
return nil
})
@@ -406,7 +347,7 @@ func getAllUsers(ctx context.Context, q *query.GetAllUsers) error {
func getAllUsersNames(ctx context.Context, q *query.GetAllUsersNames) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
- var users []*dbUser
+ var users []*dbEntities.User
err := trx.Select(&users, `
SELECT name
FROM users
@@ -428,7 +369,7 @@ func getAllUsersNames(ctx context.Context, q *query.GetAllUsersNames) error {
}
func queryUser(ctx context.Context, trx *dbx.Trx, filter string, args ...any) (*entity.User, error) {
- user := dbUser{}
+ user := dbEntities.User{}
sql := fmt.Sprintf("SELECT id, name, email, tenant_id, role, status, avatar_type, avatar_bkey, is_verified FROM users WHERE status != %d AND ", enum.UserDeleted)
err := trx.Get(&user, sql+filter, args...)
if err != nil {
@@ -440,7 +381,7 @@ func queryUser(ctx context.Context, trx *dbx.Trx, filter string, args ...any) (*
return nil, err
}
- return user.toModel(ctx), nil
+ return user.ToModel(ctx), nil
}
func searchUsers(ctx context.Context, q *query.SearchUsers) error {
@@ -532,7 +473,7 @@ func searchUsers(ctx context.Context, q *query.SearchUsers) error {
offset := (q.Page - 1) * q.Limit
baseQuery += fmt.Sprintf(" LIMIT %d OFFSET %d", q.Limit, offset)
- var users []*dbUser
+ var users []*dbEntities.User
err = trx.Select(&users, baseQuery, args...)
if err != nil {
return errors.Wrap(err, "failed to search users")
@@ -540,7 +481,7 @@ func searchUsers(ctx context.Context, q *query.SearchUsers) error {
q.Result = make([]*entity.User, len(users))
for i, user := range users {
- q.Result[i] = user.toModel(ctx)
+ q.Result[i] = user.ToModel(ctx)
}
return nil
})
diff --git a/app/services/sqlstore/postgres/vote.go b/app/services/sqlstore/postgres/vote.go
index 2faa698a6..05baafff4 100644
--- a/app/services/sqlstore/postgres/vote.go
+++ b/app/services/sqlstore/postgres/vote.go
@@ -7,36 +7,12 @@ import (
"github.com/getfider/fider/app/models/cmd"
"github.com/getfider/fider/app/models/entity"
- "github.com/getfider/fider/app/models/enum"
"github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/services/sqlstore/dbEntities"
)
-type dbVote struct {
- User *struct {
- ID int `db:"id"`
- Name string `db:"name"`
- Email string `db:"email"`
- AvatarType int64 `db:"avatar_type"`
- AvatarBlobKey string `db:"avatar_bkey"`
- } `db:"user"`
- CreatedAt time.Time `db:"created_at"`
-}
-
-func (v *dbVote) toModel(ctx context.Context) *entity.Vote {
- vote := &entity.Vote{
- CreatedAt: v.CreatedAt,
- User: &entity.VoteUser{
- ID: v.User.ID,
- Name: v.User.Name,
- Email: v.User.Email,
- AvatarURL: buildAvatarURL(ctx, enum.AvatarType(v.User.AvatarType), v.User.ID, v.User.Name, v.User.AvatarBlobKey),
- },
- }
- return vote
-}
-
func addVote(ctx context.Context, c *cmd.AddVote) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
if !c.Post.CanBeVoted() {
@@ -84,7 +60,7 @@ func listPostVotes(ctx context.Context, q *query.ListPostVotes) error {
emailColumn = "u.email"
}
- votes := []*dbVote{}
+ votes := []*dbEntities.Vote{}
err := trx.Select(&votes, `
SELECT
pv.created_at,
@@ -107,7 +83,7 @@ func listPostVotes(ctx context.Context, q *query.ListPostVotes) error {
q.Result = make([]*entity.Vote, len(votes))
for i, vote := range votes {
- q.Result[i] = vote.toModel(ctx)
+ q.Result[i] = vote.ToModel(ctx)
}
return nil