Refactoring and add container

Author: Hasan Demir

Makefile

@@ -1,4 +1,2 @@
 schema:
-	go generate ./ent
-migrate: 
-	go run ./cobra/cobra.go migrate
+	go generate ./ent && go run ./cobra/cobra.go migrate

app/app.go

@@ -2,23 +2,27 @@ package app
 
 import (
 	"context"
-	"log"
 
 	"github.com/hsndmr/go-sanctum/pkg/config"
 	"github.com/hsndmr/go-sanctum/pkg/connection"
 )
 
-func Init(ctx context.Context) {
-	config.App.Init()
-	connection.Connect()
 
-	if config.App.Env == "local" {
-		CreateSchema()
-	}
+type Container struct {
+	Config *config.Config
+	DBClient *connection.DBClient
 }
 
-func CreateSchema() {
-	if err := connection.Client.Schema.Create(context.Background()); err != nil {
-		log.Fatalf("Database Migration Error: %v", err)
-	}
+var C *Container
+
+// Init initializes the configuration and database connection
+func Init() {
+	C = CreateContainer(context.Background())
+}
+
+func CreateContainer(ctx context.Context) *Container {
+	container := &Container{}
+	container.Config, _ = config.Init()
+	container.DBClient, _ = connection.CreateClient(container.Config)
+	return container
 }

cobra/cmd/migrate.go

@@ -5,10 +5,7 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"context"
-
 	"github.com/hsndmr/go-sanctum/app"
-	"github.com/hsndmr/go-sanctum/pkg/connection"
 	"github.com/spf13/cobra"
 )
 
@@ -23,8 +20,8 @@ var migrateCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(migrateCmd)
 
-	app.Init(context.Background())
-	defer connection.Client.Close()
+	app.Init()
+	defer app.C.DBClient.Close()
 
 	// Here you will define your flags and configuration settings.