Split Implementation and Framework (#28)

* split framework

* fix split

* fix split

* fix unregister

* fix unregister

* fix unregister

* fixing

Co-authored-by: Muhamad Surya Iksanudin <[email protected]>

Author: surya4crowde

.gitignore

@@ -1,3 +1,4 @@
 .env
 !generated/.gitignore
 generated/*
+swaggers/apidocs-swagger.json

cmds/app/main.go

@@ -3,46 +3,47 @@ package main
 import (
 	"fmt"
 
-	configs "github.com/crowdeco/skeleton/configs"
+	configs "github.com/crowdeco/bima/configs"
 	dic "github.com/crowdeco/skeleton/generated/dic"
+	"github.com/joho/godotenv"
 	"github.com/sirupsen/logrus"
 )
 
 func main() {
+	godotenv.Load()
 	container, _ := dic.NewContainer()
-	parser := container.GetCoreConfigParser()
 
 	var servers []configs.Server
-	for _, c := range parser.ParseModules() {
+	for _, c := range container.GetBimaConfigParserModule().Parse() {
 		servers = append(servers, container.Get(fmt.Sprintf("%s:server", c)).(configs.Server))
 	}
 
 	var listeners []configs.Listener
-	for _, c := range parser.ParseListeners() {
+	for _, c := range container.GetBimaConfigParserListener().Parse() {
 		listeners = append(listeners, container.Get(c).(configs.Listener))
 	}
 
 	var middlewares []configs.Middleware
-	for _, c := range parser.ParseMiddlewares() {
+	for _, c := range container.GetBimaConfigParserMiddleware().Parse() {
 		middlewares = append(middlewares, container.Get(c).(configs.Middleware))
 	}
 
 	var extensions []logrus.Hook
-	for _, c := range parser.ParseLoggers() {
+	for _, c := range container.GetBimaConfigParserLogger().Parse() {
 		extensions = append(extensions, container.Get(c).(logrus.Hook))
 	}
 
 	var routes []configs.Route
-	for _, c := range parser.ParseRoutes() {
+	for _, c := range container.GetBimaConfigParserRoute().Parse() {
 		routes = append(routes, container.Get(c).(configs.Route))
 	}
 
-	container.GetCoreRouterMux().Register(routes)
-	container.GetCoreLoggerExtension().Register(extensions)
-	container.GetCoreHandlerMiddleware().Register(middlewares)
-	container.GetCoreEventDispatcher().Register(listeners)
-	container.GetCoreRouterGateway().Register(servers)
+	container.GetBimaRouterMux().Register(routes)
+	container.GetBimaLoggerExtension().Register(extensions)
+	container.GetBimaHandlerMiddleware().Register(middlewares)
+	container.GetBimaEventDispatcher().Register(listeners)
+	container.GetBimaRouterGateway().Register(servers)
 
 	// Engine ready... It's time to fly!!!
-	container.GetCoreApplication().Run(servers)
+	container.GetBimaApplication().Run(servers)
 }

cmds/dic/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	dics "github.com/crowdeco/skeleton/dics"
+	dics "github.com/crowdeco/skeleton/configs"
 	"github.com/sarulabs/dingo/v4"
 )
 

cmds/module/main.go

@@ -8,17 +8,19 @@ import (
 	"regexp"
 	"strings"
 
-	configs "github.com/crowdeco/skeleton/configs"
+	configs "github.com/crowdeco/bima/configs"
 	dic "github.com/crowdeco/skeleton/generated/dic"
 	"github.com/fatih/color"
 	"github.com/jinzhu/copier"
+	"github.com/joho/godotenv"
 	"github.com/vito/go-interact/interact"
 	"golang.org/x/mod/modfile"
 )
 
 func main() {
+	godotenv.Load()
 	container, _ := dic.NewContainer()
-	util := container.GetCoreUtilCli()
+	util := container.GetBimaUtilCli()
 
 	if len(os.Args) < 2 {
 		util.Println("Cara Penggunaan:")
@@ -38,6 +40,12 @@ func main() {
 
 	if os.Args[1] == "register" {
 		register(container, util)
+
+		_, err := exec.Command("sh", "proto_gen.sh").Output()
+		if err != nil {
+			util.Println(err.Error())
+			os.Exit(1)
+		}
 	}
 
 	if os.Args[1] == "unregister" {
@@ -51,13 +59,7 @@ func main() {
 		unregister(container, util, os.Args[2])
 	}
 
-	_, err := exec.Command("sh", "proto_gen.sh").Output()
-	if err != nil {
-		util.Println(err.Error())
-		os.Exit(1)
-	}
-
-	_, err = exec.Command("go", "run", "cmds/dic/main.go").Output()
+	_, err := exec.Command("go", "run", "cmds/dic/main.go").Output()
 	if err != nil {
 		util.Println(err.Error())
 		os.Exit(1)
@@ -74,12 +76,12 @@ func main() {
 }
 
 func unregister(container *dic.Container, util *color.Color, module string) {
-	config := container.GetCoreConfigParser()
-	word := container.GetCoreUtilWord()
-	pluralizer := container.GetCoreUtilPluralizer()
+	moduleParser := container.GetBimaConfigParserModule()
+	word := container.GetBimaUtilWord()
+	pluralizer := container.GetBimaUtilPluralizer()
 	moduleName := word.Camelcase(pluralizer.Singular(module))
 	modulePlural := word.Underscore(pluralizer.Plural(moduleName))
-	list := config.ParseModules()
+	list := moduleParser.Parse()
 
 	exist := false
 	for _, v := range list {
@@ -101,11 +103,11 @@ func unregister(container *dic.Container, util *color.Color, module string) {
 	}
 
 	packageName := modfile.ModulePath(mod)
-	yaml := fmt.Sprintf("%s/modules.yaml", workDir)
+	yaml := fmt.Sprintf("%s/configs/modules.yaml", workDir)
 	file, _ := ioutil.ReadFile(yaml)
 	modules := string(file)
 
-	provider := fmt.Sprintf("%s/dics/provider.go", workDir)
+	provider := fmt.Sprintf("%s/configs/provider.go", workDir)
 	file, _ = ioutil.ReadFile(provider)
 	codeblock := string(file)
 
@@ -128,11 +130,11 @@ func unregister(container *dic.Container, util *color.Color, module string) {
 }
 
 func register(container *dic.Container, util *color.Color) {
-	generator := container.GetCoreModuleGenerator()
-	module := container.GetCoreTemplateModule()
-	field := container.GetCoreTemplateField()
-	word := container.GetCoreUtilWord()
-	mapType := container.GetCoreConfigType()
+	generator := container.GetBimaModuleGenerator()
+	module := container.GetBimaTemplateModule()
+	field := container.GetBimaTemplateField()
+	word := container.GetBimaUtilWord()
+	mapType := container.GetBimaConfigType()
 
 	util.Println(`
     ______                                           __                   ______   __                  __              __