From 2c642d14ec3ebd05902e79332cec696cda08a5ec Mon Sep 17 00:00:00 2001
From: bayusamudra5502 <bayusamudra.55.02.com@gmail.com>
Date: Thu, 23 Feb 2023 16:34:48 +0700
Subject: [PATCH] fix: move app not in util folder

---
 {utils/app => app}/app.go     | 0
 app/di.go                     | 9 +++++++++
 {utils/app => app}/list.go    | 0
 {utils/app => app}/server.go  | 0
 {utils/app => app}/start.go   | 0
 {utils/app => app}/type.go    | 0
 {utils/app => app}/version.go | 0
 di.go                         | 4 ++--
 test/api.go                   | 2 +-
 test/di.go                    | 2 ++
 utils/di.go                   | 5 -----
 11 files changed, 14 insertions(+), 8 deletions(-)
 rename {utils/app => app}/app.go (100%)
 create mode 100644 app/di.go
 rename {utils/app => app}/list.go (100%)
 rename {utils/app => app}/server.go (100%)
 rename {utils/app => app}/start.go (100%)
 rename {utils/app => app}/type.go (100%)
 rename {utils/app => app}/version.go (100%)

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 0000000..30599e2
--- /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 66bbf65..c563acb 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 b67503d..8baee7f 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 5c7b252..9ce05c7 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 e0379b9..d6b65b8 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(
-- 
GitLab