Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

inject tenant into storage and remove from GetAll

goenningc92400e56f04
diff --git a/app/handlers/feedback.go b/app/handlers/feedback.go
index 13eb345b9..7275fb76d 100644
--- a/app/handlers/feedback.go
+++ b/app/handlers/feedback.go
@@ -11,7 +11,7 @@ import (
// Index is the default home page
func Index() web.HandlerFunc {
return func(c web.Context) error {
- ideas, err := c.Services().Ideas.GetAll(c.Tenant().ID)
+ ideas, err := c.Services().Ideas.GetAll()
if err != nil {
return c.Failure(err)
}
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.go
index 3b0ff7750..be4c7f27b 100644
--- a/app/middlewares/setup.go
+++ b/app/middlewares/setup.go
@@ -19,10 +19,8 @@ func Setup(db *dbx.Database) web.MiddlewareFunc {
return err
}
+ c.SetActiveTransaction(tx)
c.SetServices(&app.Services{
- OAuth: &oauth.HTTPService{},
- Ideas: &postgres.IdeaStorage{Trx: tx},
- Users: &postgres.UserStorage{Trx: tx},
Tenants: &postgres.TenantStorage{Trx: tx},
})
@@ -38,6 +36,7 @@ func Setup(db *dbx.Database) web.MiddlewareFunc {
c.Error(err)
}
}()
+
err = next(c)
if err == nil {
return tx.Commit()
@@ -47,3 +46,20 @@ func Setup(db *dbx.Database) web.MiddlewareFunc {
}
}
}
+
+//AddServices adds services to current context
+func AddServices() web.MiddlewareFunc {
+ return func(next web.HandlerFunc) web.HandlerFunc {
+ return func(c web.Context) error {
+ tx := c.ActiveTransaction()
+ tenant := c.Tenant()
+ services := c.Services()
+ services.OAuth = &oauth.HTTPService{}
+ services.Ideas = &postgres.IdeaStorage{Trx: tx, Tenant: tenant}
+ services.Users = &postgres.UserStorage{Trx: tx}
+ services.Tenants = &postgres.TenantStorage{Trx: tx}
+
+ return next(c)
+ }
+ }
+}
diff --git a/app/pkg/web/context.go b/app/pkg/web/context.go
index a06421f06..50249fb73 100644
--- a/app/pkg/web/context.go
+++ b/app/pkg/web/context.go
@@ -6,6 +6,7 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/env"
"github.com/labstack/echo"
)
@@ -15,6 +16,7 @@ var (
tenantContextKey = preffixKey + "TENANT"
userContextKey = preffixKey + "USER"
authEndpointContextKey = preffixKey + "AUTH_ENDPOINT"
+ transactionContextKey = preffixKey + "TRANSACTION"
servicesContextKey = preffixKey + "SERVICES"
)
@@ -81,6 +83,16 @@ func (ctx *Context) SetServices(services *app.Services) {
ctx.Set(servicesContextKey, services)
}
+//SetActiveTransaction adds transaction to context
+func (ctx *Context) SetActiveTransaction(trx *dbx.Trx) {
+ ctx.Set(transactionContextKey, trx)
+}
+
+//ActiveTransaction returns current active Database transaction
+func (ctx *Context) ActiveTransaction() *dbx.Trx {
+ return ctx.Get(transactionContextKey).(*dbx.Trx)
+}
+
//BaseURL returns base URL as string
func (ctx *Context) BaseURL() string {
protocol := "http"
diff --git a/app/storage/feedback.go b/app/storage/feedback.go
index 0be34ffc8..0435418a2 100644
--- a/app/storage/feedback.go
+++ b/app/storage/feedback.go
@@ -7,7 +7,7 @@ type Idea interface {
GetByID(tenantID, ideaID int) (*models.Idea, error)
GetByNumber(tenantID, number int) (*models.Idea, error)
GetCommentsByIdeaID(tenantID, ideaID int) ([]*models.Comment, error)
- GetAll(tenantID int) ([]*models.Idea, error)
+ GetAll() ([]*models.Idea, error)
Save(tenantID, userID int, title, description string) (*models.Idea, error)
AddComment(userID, ideaID int, content string) (int, error)
AddSupporter(tenantID, userID, ideaID int) error
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index c71c7207f..75ceb99b9 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -67,7 +67,8 @@ func (c *dbComment) toModel() *models.Comment {
// IdeaStorage contains read and write operations for ideas
type IdeaStorage struct {
- Trx *dbx.Trx
+ Trx *dbx.Trx
+ Tenant *models.Tenant
}
var (
@@ -96,9 +97,9 @@ var (
)
// GetAll returns all tenant ideas
-func (s *IdeaStorage) GetAll(tenantID int) ([]*models.Idea, error) {
+func (s *IdeaStorage) GetAll() ([]*models.Idea, error) {
var ideas []*dbIdea
- err := s.Trx.Select(&ideas, sqlSelectIdeasWhere+" i.tenant_id = $1 ORDER BY i.created_on DESC", tenantID)
+ err := s.Trx.Select(&ideas, sqlSelectIdeasWhere+" i.tenant_id = $1 ORDER BY i.created_on DESC", s.Tenant.ID)
if err != nil {
return nil, err
}
diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.go
index 11d2cc7dd..729773ed8 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -11,6 +11,11 @@ import (
. "github.com/onsi/gomega"
)
+var demoTenant = &models.Tenant{
+ ID: 300,
+ Name: "Demonstration",
+}
+
func TestIdeaStorage_GetAll(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
@@ -25,8 +30,8 @@ func TestIdeaStorage_GetAll(t *testing.T) {
trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #1', 'idea-1', 1, 'Description #1', $1, 300, 300, 0, 1)", now)
trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #2', 'idea-2', 2, 'Description #2', $1, 300, 301, 5, 2)", now)
- ideas := &postgres.IdeaStorage{Trx: trx}
- dbIdeas, err := ideas.GetAll(300)
+ ideas := &postgres.IdeaStorage{Trx: trx, Tenant: demoTenant}
+ dbIdeas, err := ideas.GetAll()
Expect(err).To(BeNil())
Expect(dbIdeas).To(HaveLen(2))
diff --git a/router.go b/router.go
index 96736db31..4c53d86fb 100644
--- a/router.go
+++ b/router.go
@@ -34,6 +34,7 @@ func GetMainEngine(settings *models.AppSettings, db *dbx.Database) *web.Engine {
{
public.Use(middlewares.Setup(db))
public.Use(middlewares.Tenant())
+ public.Use(middlewares.AddServices())
public.Use(middlewares.JwtGetter())
public.Use(middlewares.JwtSetter())
@@ -48,6 +49,7 @@ func GetMainEngine(settings *models.AppSettings, db *dbx.Database) *web.Engine {
{
private.Use(middlewares.Setup(db))
private.Use(middlewares.Tenant())
+ private.Use(middlewares.AddServices())
private.Use(middlewares.JwtGetter())
private.Use(middlewares.JwtSetter())
private.Use(middlewares.IsAuthenticated())
@@ -63,6 +65,7 @@ func GetMainEngine(settings *models.AppSettings, db *dbx.Database) *web.Engine {
{
auth.Use(middlewares.Setup(db))
auth.Use(middlewares.Tenant())
+ auth.Use(middlewares.AddServices())
auth.Get("/facebook", handlers.Login(oauth.FacebookProvider))
auth.Get("/facebook/callback", handlers.OAuthCallback(oauth.FacebookProvider))
@@ -74,6 +77,7 @@ func GetMainEngine(settings *models.AppSettings, db *dbx.Database) *web.Engine {
{
admin.Use(middlewares.Setup(db))
admin.Use(middlewares.Tenant())
+ admin.Use(middlewares.AddServices())
admin.Use(middlewares.JwtGetter())
admin.Use(middlewares.JwtSetter())
admin.Use(middlewares.IsAuthenticated())