Skip to content
Snippets Groups Projects
Commit 2c642d14 authored by Bayu Samudra's avatar Bayu Samudra
Browse files

fix: move app not in util folder

parent 9ce5411b
Branches
Tags
2 merge requests!16Refactoring,!15Refactor Folder
Pipeline #52088 passed with stage
in 2 minutes and 28 seconds
File moved
package app
import "github.com/google/wire"
var AppSet = wire.NewSet(
// app
New,
wire.Bind(new(Server), new(*HttpServer)),
)
File moved
File moved
File moved
File moved
File moved
......@@ -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
......
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 {
......
......@@ -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
......
......@@ -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(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment