diff --git a/utils/app/app.go b/app/app.go similarity index 100% rename from utils/app/app.go rename to app/app.go diff --git a/app/di.go b/app/di.go new file mode 100644 index 0000000000000000000000000000000000000000..30599e242f16527236fb6e4ee212a3a6818f0e22 --- /dev/null +++ b/app/di.go @@ -0,0 +1,9 @@ +package app + +import "github.com/google/wire" + +var AppSet = wire.NewSet( + // app + New, + wire.Bind(new(Server), new(*HttpServer)), +) diff --git a/utils/app/list.go b/app/list.go similarity index 100% rename from utils/app/list.go rename to app/list.go diff --git a/utils/app/server.go b/app/server.go similarity index 100% rename from utils/app/server.go rename to app/server.go diff --git a/utils/app/start.go b/app/start.go similarity index 100% rename from utils/app/start.go rename to app/start.go diff --git a/utils/app/type.go b/app/type.go similarity index 100% rename from utils/app/type.go rename to app/type.go diff --git a/utils/app/version.go b/app/version.go similarity index 100% rename from utils/app/version.go rename to app/version.go diff --git a/di.go b/di.go index 66bbf655c71fb48a23bc81ddca3513bcfec22cc9..c563acb4b31c641fb0c9894e97c435504155ac7f 100644 --- a/di.go +++ b/di.go @@ -6,6 +6,7 @@ package main import ( "github.com/google/wire" + "gitlab.informatika.org/ocw/ocw-backend/app" "gitlab.informatika.org/ocw/ocw-backend/handler" "gitlab.informatika.org/ocw/ocw-backend/middleware" "gitlab.informatika.org/ocw/ocw-backend/provider" @@ -13,8 +14,6 @@ import ( "gitlab.informatika.org/ocw/ocw-backend/routes" "gitlab.informatika.org/ocw/ocw-backend/service" "gitlab.informatika.org/ocw/ocw-backend/utils" - - "gitlab.informatika.org/ocw/ocw-backend/utils/app" ) func CreateServer() (app.Server, error) { @@ -26,6 +25,7 @@ func CreateServer() (app.Server, error) { routes.RoutesSet, service.ServiceSet, provider.ProviderSet, + app.AppSet, ) return nil, nil diff --git a/test/api.go b/test/api.go index b67503d1f08ec5f0a09053ad8741a638a9a226bb..8baee7fe44bd603228bef4bdeb157a2fc1bd0e2c 100644 --- a/test/api.go +++ b/test/api.go @@ -1,8 +1,8 @@ package test import ( + "gitlab.informatika.org/ocw/ocw-backend/app" "gitlab.informatika.org/ocw/ocw-backend/test/db" - "gitlab.informatika.org/ocw/ocw-backend/utils/app" ) type ApiTestPack struct { diff --git a/test/di.go b/test/di.go index 5c7b2522627ea697541b958a9004a854237f4a4e..9ce05c76ea2a7f5f97645eb7bde26d66fdb121f0 100644 --- a/test/di.go +++ b/test/di.go @@ -6,6 +6,7 @@ package test import ( "github.com/google/wire" + "gitlab.informatika.org/ocw/ocw-backend/app" "gitlab.informatika.org/ocw/ocw-backend/handler" "gitlab.informatika.org/ocw/ocw-backend/middleware" "gitlab.informatika.org/ocw/ocw-backend/provider" @@ -31,6 +32,7 @@ func CreateServer(logger logger.Logger, envTest *env.Environment) (*ApiTestPack, service.ServiceTestSet, db.DbTestSet, provider.ProviderTestSet, + app.AppSet, ) return nil, nil diff --git a/utils/di.go b/utils/di.go index e0379b9b91db793088068635c1c9f2b29017a231..d6b65b8b8f725bf8c3da03f3ab776ef8aca15e90 100644 --- a/utils/di.go +++ b/utils/di.go @@ -2,7 +2,6 @@ package utils import ( "github.com/google/wire" - "gitlab.informatika.org/ocw/ocw-backend/utils/app" "gitlab.informatika.org/ocw/ocw-backend/utils/base64" "gitlab.informatika.org/ocw/ocw-backend/utils/env" "gitlab.informatika.org/ocw/ocw-backend/utils/httputil" @@ -41,10 +40,6 @@ var UtilSetTest = wire.NewSet( // Token utility wire.Struct(new(token.TokenUtilImpl), "*"), wire.Bind(new(token.TokenUtil), new(*token.TokenUtilImpl)), - - // app - app.New, - wire.Bind(new(app.Server), new(*app.HttpServer)), ) var UtilSet = wire.NewSet(