Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

forgot one model

goenningf36c21d13634
diff --git a/app/infra/handler.go b/app/infra/handler.go
index dd8dc4d15..2ff3369cd 100644
--- a/app/infra/handler.go
+++ b/app/infra/handler.go
@@ -6,17 +6,18 @@ import (
"time"
"github.com/WeCanHearYou/wechy/app"
+ "github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/env"
"github.com/labstack/echo"
)
type statusHandler struct {
healthService HealthCheckService
- settings *WechySettings
+ settings *models.WechySettings
}
// Status creates a new Status HTTP handler
-func Status(healthService HealthCheckService, settings *WechySettings) app.HandlerFunc {
+func Status(healthService HealthCheckService, settings *models.WechySettings) app.HandlerFunc {
return statusHandler{healthService, settings}.get()
}
diff --git a/app/infra/handler_test.go b/app/infra/handler_test.go
index bdc91adce..429d7a2f4 100644
--- a/app/infra/handler_test.go
+++ b/app/infra/handler_test.go
@@ -5,6 +5,7 @@ import (
"github.com/WeCanHearYou/wechy/app/infra"
"github.com/WeCanHearYou/wechy/app/mock"
+ "github.com/WeCanHearYou/wechy/app/models"
. "github.com/onsi/gomega"
)
@@ -18,7 +19,7 @@ func TestStatusHandler(t *testing.T) {
RegisterTestingT(t)
service := &falsyHealthCheckService{}
- settings := &infra.WechySettings{
+ settings := &models.WechySettings{
BuildTime: "today",
}
diff --git a/app/infra/model.go b/app/infra/model.go
deleted file mode 100644
index 908fab33b..000000000
--- a/app/infra/model.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package infra
-
-// WechySettings is an application-wide settings
-type WechySettings struct {
- BuildTime string
- Version string
- AuthEndpoint string
-}
diff --git a/main.go b/main.go
index ab7c0bfa1..6811b8a06 100644
--- a/main.go
+++ b/main.go
@@ -1,9 +1,9 @@
package main
import (
- "github.com/WeCanHearYou/wechy/app/pkg/dbx"
"github.com/WeCanHearYou/wechy/app/identity"
- "github.com/WeCanHearYou/wechy/app/infra"
+ "github.com/WeCanHearYou/wechy/app/models"
+ "github.com/WeCanHearYou/wechy/app/pkg/dbx"
"github.com/WeCanHearYou/wechy/app/pkg/env"
"github.com/WeCanHearYou/wechy/app/postgres"
_ "github.com/mattes/migrate/driver/postgres"
@@ -47,7 +47,7 @@ func main() {
Idea: &postgres.IdeaService{DB: db},
User: &postgres.UserService{DB: db},
Tenant: &postgres.TenantService{DB: db},
- Settings: &infra.WechySettings{
+ Settings: &models.WechySettings{
BuildTime: buildtime,
Version: version,
AuthEndpoint: env.MustGet("AUTH_ENDPOINT"),
diff --git a/router.go b/router.go
index e2ab93084..c78692b8f 100644
--- a/router.go
+++ b/router.go
@@ -24,7 +24,7 @@ type WechyServices struct {
Tenant identity.TenantService
Idea feedback.IdeaService
Health infra.HealthCheckService
- Settings *infra.WechySettings
+ Settings *models.WechySettings
}
func errorHandler(e error, c echo.Context) {