Open platform to collect and prioritize feedback
remove WeCHY references
goenningfb7b09ab8b7d
diff --git a/app/handlers/status.go b/app/handlers/status.goindex 9a6be3076..31690d46a 100644--- a/app/handlers/status.go+++ b/app/handlers/status.go@@ -10,11 +10,11 @@ import ()type statusHandler struct {- settings *models.WeCHYSettings+ settings *models.AppSettings}// Status creates a new Status HTTP handler-func Status(settings *models.WeCHYSettings) web.HandlerFunc {+func Status(settings *models.AppSettings) web.HandlerFunc {return statusHandler{settings}.get()}diff --git a/app/handlers/status_test.go b/app/handlers/status_test.goindex 727d0dbca..8a3d01ae3 100644--- a/app/handlers/status_test.go+++ b/app/handlers/status_test.go@@ -12,7 +12,7 @@ import (func TestStatusHandler(t *testing.T) {RegisterTestingT(t)- settings := &models.WeCHYSettings{+ settings := &models.AppSettings{BuildTime: "today",}diff --git a/app/mock/server.go b/app/mock/server.goindex cd97ce6fc..f33c27668 100644--- a/app/mock/server.go+++ b/app/mock/server.go@@ -26,7 +26,7 @@ type Server struct {// NewServer creates a new test serverfunc NewServer() *Server {engine := echo.New()- engine.Renderer = web.NewHTMLRenderer(&models.WeCHYSettings{}, engine.Logger)+ engine.Renderer = web.NewHTMLRenderer(&models.AppSettings{}, engine.Logger)engine.HTTPErrorHandler = func(e error, c echo.Context) {fmt.Println(e)c.NoContent(e.(*echo.HTTPError).Code)diff --git a/app/models/infra.go b/app/models/infra.goindex f608e6d45..e795806b8 100644--- a/app/models/infra.go+++ b/app/models/infra.go@@ -1,7 +1,7 @@package models-// WeCHYSettings is an application-wide settings-type WeCHYSettings struct {+// AppSettings is an application-wide settings+type AppSettings struct {BuildTime stringVersion stringAuthEndpoint stringdiff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex 4aa165c52..4f4fb2428 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -16,7 +16,7 @@ var (authEndpointContextKey = preffixKey + "AUTH_ENDPOINT")-//Context wraps echo.context to provide userful WeCHY information+//Context wraps echo.context to provide userful informationtype Context struct {echo.Context}diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.goindex 4794f09cc..799a3db04 100644--- a/app/pkg/web/engine.go+++ b/app/pkg/web/engine.go@@ -19,7 +19,7 @@ type Engine struct {}//New creates a new Engine-func New(settings *models.WeCHYSettings) *Engine {+func New(settings *models.AppSettings) *Engine {router := echo.New()router.Use(middleware.Gzip())router.Static("/favicon.ico", "favicon.ico")diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 54d0ff6f7..1ce0afcc3 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -16,11 +16,11 @@ import (type HTMLRenderer struct {templates map[string]*template.Templatelogger echo.Logger- settings *models.WeCHYSettings+ settings *models.AppSettings}// NewHTMLRenderer creates a new HTMLRenderer-func NewHTMLRenderer(settings *models.WeCHYSettings, logger echo.Logger) *HTMLRenderer {+func NewHTMLRenderer(settings *models.AppSettings, logger echo.Logger) *HTMLRenderer {renderer := &HTMLRenderer{nil, logger, settings}renderer.templates = make(map[string]*template.Template)diff --git a/main.go b/main.goindex d3ca05365..70d7cbbda 100644--- a/main.go+++ b/main.go@@ -43,12 +43,12 @@ func main() {panic(err)}- ctx := &WeCHYServices{+ ctx := &AppServices{OAuth: &oauth.HTTPService{},Idea: &postgres.IdeaStorage{DB: db},User: &postgres.UserStorage{DB: db},Tenant: &postgres.TenantStorage{DB: db},- Settings: &models.WeCHYSettings{+ Settings: &models.AppSettings{BuildTime: buildtime,Version: version,Compiler: runtime.Version(),diff --git a/router.go b/router.goindex 77bfb0593..3771b8e0f 100644--- a/router.go+++ b/router.go@@ -11,17 +11,17 @@ import ("github.com/WeCanHearYou/wechy/app/storage")-// WeCHYServices holds reference to all Wechy services-type WeCHYServices struct {+// AppServices holds reference to all Wechy services+type AppServices struct {OAuth oauth.ServiceUser storage.UserTenant storage.TenantIdea storage.Idea- Settings *models.WeCHYSettings+ Settings *models.AppSettings}// GetMainEngine returns main HTTP engine-func GetMainEngine(ctx *WeCHYServices) *web.Engine {+func GetMainEngine(ctx *AppServices) *web.Engine {r := web.New(ctx.Settings)assets := r.Group("/assets")diff --git a/router_test.go b/router_test.goindex 0818e5eaa..dbf6701d5 100644--- a/router_test.go+++ b/router_test.go@@ -9,6 +9,6 @@ import (func TestGetMainEngine(t *testing.T) {RegisterTestingT(t)- r := GetMainEngine(&WeCHYServices{})+ r := GetMainEngine(&AppServices{})Expect(r).ToNot(BeNil())}