Develop for Release v0.1.6

Makefile

@@ -82,3 +82,4 @@ generate-mocks:
 	@mockery --name=ProjectRepo --dir=cmd/repository --output=cmd/repository --outpkg=repository --filename=project_mock.go --structname=MockProjectRepo
 	# Helpers
 	@mockery --name=ProjectHelper --dir=cmd/helpers --output=cmd/helpers --outpkg=helpers --filename=projectHelper_mock.go --structname=MockProjectHelper
+	@mockery --name=CodeHelper --dir=cmd/helpers --output=cmd/helpers --outpkg=helpers --filename=codeHelper_mock.go --structname=MockCodeHelper

cmd/app.go

@@ -1,72 +1,19 @@
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/tech-thinker/gozen/cmd/service"
-	"github.com/tech-thinker/gozen/models"
 	"github.com/urfave/cli/v2"
 )
 
 type App interface {
 	CreateProject() *cli.Command
+	GenerateModel() *cli.Command
 }
 
 type app struct {
 	appService service.AppService
 }
 
-func (c *app) CreateProject() *cli.Command {
-
-	var packageName, outputDir, driver string
-
-	return &cli.Command{
-		Name:  "create",
-		Usage: "Create new Projects.",
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:        "pkg",
-				Aliases:     []string{"p"},
-				Value:       "",
-				Usage:       "Package name for new project.",
-				Destination: &packageName,
-			},
-			&cli.StringFlag{
-				Name:        "output",
-				Aliases:     []string{"o"},
-				Value:       ".",
-				Usage:       "Output directory for new project.",
-				Destination: &outputDir,
-			},
-			&cli.StringFlag{
-				Name:        "driver",
-				Aliases:     []string{"d"},
-				Value:       "sqlite",
-				Usage:       "Database driver for new project. eg. [sqlite, mysql, postgres]",
-				Destination: &driver,
-			},
-		},
-		Action: func(ctx *cli.Context) error {
-			project := models.Project{
-				AppName:     ctx.Args().Get(0),
-				PackageName: packageName,
-				Driver:      driver,
-				WorkingDir:  outputDir,
-			}
-
-			err := project.Validate()
-			if err != nil {
-				fmt.Println(err)
-				return nil
-			}
-
-			project.AutoFixes()
-
-			return c.appService.CreateApp(project)
-		},
-	}
-}
-
 func NewApp(
 	appService service.AppService,
 ) App {

cmd/generate.go

@@ -0,0 +1,46 @@
+package cmd
+
+import (
+	"strings"
+
+	"github.com/tech-thinker/gozen/models"
+	"github.com/tech-thinker/gozen/utils"
+	"github.com/urfave/cli/v2"
+)
+
+func (c *app) GenerateModel() *cli.Command {
+	return &cli.Command{
+		Name:    "generate",
+		Aliases: []string{"g"},
+		Usage:   "Code generator.",
+		Action: func(ctx *cli.Context) error {
+
+			var project models.Project
+			project.LoadFromJsonFile()
+
+			// project := models.Project{
+			// 	AppName:     ctx.Args().Get(0),
+			// 	PackageName: "github.com/mrasif/demo1",
+			// 	WorkingDir:  "./",
+			// }
+
+			// project.AutoFixes()
+
+			generateType := ctx.Args().Get(0)
+			name := ctx.Args().Get(1)
+
+			interfaceName, structName := utils.TransformString(name)
+			route := strings.ToLower(structName)
+
+			generator := models.Generator{
+				Project:       project,
+				Type:          generateType,
+				InterfaceName: interfaceName,
+				StructName:    structName,
+				RouteName:     route,
+			}
+
+			return c.appService.GenerateModel(generator)
+		},
+	}
+}

cmd/helpers/codeHelper.go

@@ -0,0 +1,43 @@
+package helpers
+
+import (
+	"fmt"
+
+	"github.com/tech-thinker/gozen/cmd/repository"
+	"github.com/tech-thinker/gozen/models"
+)
+
+type CodeHelper interface {
+	GenerateModel(doc models.Generator) error
+}
+
+type codeHelper struct {
+	systemRepo repository.SystemRepo
+}
+
+func (h *codeHelper) GenerateModel(doc models.Generator) error {
+
+	modelPath := fmt.Sprintf(`/models/%s.go`, doc.StructName)
+	repoPath := fmt.Sprintf(`/repository/%s.go`, doc.StructName)
+	svcPath := fmt.Sprintf(`/service/%s.go`, doc.StructName)
+	ctrlPath := fmt.Sprintf(`/app/rest/controllers/%s.go`, doc.StructName)
+
+	fileConfigs := []models.FileConfig{
+		{TemplatePath: "templates/models/standard.tmpl", Destination: modelPath},
+		{TemplatePath: "templates/repository/standard.tmpl", Destination: repoPath},
+		{TemplatePath: "templates/service/standard.tmpl", Destination: svcPath},
+		{TemplatePath: "templates/app/rest/controllers/standard.tmpl", Destination: ctrlPath},
+	}
+
+	fmt.Println("Need to add New Service to Service registry.")
+
+	return h.systemRepo.WriteAll(doc.Project.GetCWD(), fileConfigs, doc)
+}
+
+func NewCodeHelper(
+	systemRepo repository.SystemRepo,
+) CodeHelper {
+	return &codeHelper{
+		systemRepo: systemRepo,
+	}
+}

cmd/helpers/projectHelper.go

@@ -42,8 +42,6 @@ func (h *projectHelper) SetupEnv(project models.Project) error {
 	fileConfigs := []models.FileConfig{
 		{TemplatePath: "templates/env.sample.tmpl", Destination: "/.env"},
 		{TemplatePath: "templates/env.sample.tmpl", Destination: "/.env.sample"},
-		{TemplatePath: "templates/env.sample.tmpl", Destination: "/docker/.env"},
-		{TemplatePath: "templates/env.sample.tmpl", Destination: "/docker/.env.sample"},
 	}
 
 	return h.systemRepo.WriteAll(project.GetAppDir(), fileConfigs, project)
@@ -53,11 +51,11 @@ func (h *projectHelper) SetupDocker(project models.Project) error {
 	fileConfigs := []models.FileConfig{
 		{TemplatePath: "templates/docker/Dockerfile.debug", Destination: "/docker/Dockerfile.debug"},
 		{TemplatePath: "templates/docker/Dockerfile.dev", Destination: "/docker/Dockerfile.dev"},
-		{TemplatePath: "templates/docker/Dockerfile.prod", Destination: "/docker/Dockerfile.prod"},
-		{TemplatePath: "templates/docker/docker-compose-debug.yml", Destination: "/docker/docker-compose-debug.yml"},
-		{TemplatePath: "templates/docker/docker-compose.yml", Destination: "/docker/docker-compose.yml"},
 		{TemplatePath: "templates/docker/modd-debug.conf", Destination: "/docker/modd-debug.conf"},
 		{TemplatePath: "templates/docker/modd-dev.conf", Destination: "/docker/modd-dev.conf"},
+		{TemplatePath: "templates/docker/Dockerfile.prod", Destination: "Dockerfile"},
+		{TemplatePath: "templates/docker-compose-debug.yml.tmpl", Destination: "/docker-compose-debug.yml"},
+		{TemplatePath: "templates/docker-compose.yml.tmpl", Destination: "/docker-compose.yml"},
 	}
 
 	return h.systemRepo.WriteAll(project.GetAppDir(), fileConfigs, project)

cmd/project.go

@@ -0,0 +1,59 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/tech-thinker/gozen/models"
+	"github.com/urfave/cli/v2"
+)
+
+func (c *app) CreateProject() *cli.Command {
+
+	var packageName, outputDir, driver string
+
+	return &cli.Command{
+		Name:  "create",
+		Usage: "Create new Projects.",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:        "pkg",
+				Aliases:     []string{"p"},
+				Value:       "",
+				Usage:       "Package name for new project.",
+				Destination: &packageName,
+			},
+			&cli.StringFlag{
+				Name:        "output",
+				Aliases:     []string{"o"},
+				Value:       ".",
+				Usage:       "Output directory for new project.",
+				Destination: &outputDir,
+			},
+			&cli.StringFlag{
+				Name:        "driver",
+				Aliases:     []string{"d"},
+				Value:       "sqlite",
+				Usage:       "Database driver for new project. eg. [sqlite, mysql, postgres]",
+				Destination: &driver,
+			},
+		},
+		Action: func(ctx *cli.Context) error {
+			project := models.Project{
+				AppName:     ctx.Args().Get(0),
+				PackageName: packageName,
+				Driver:      driver,
+				WorkingDir:  outputDir,
+			}
+
+			err := project.Validate()
+			if err != nil {
+				fmt.Println(err)
+				return nil
+			}
+
+			project.AutoFixes()
+
+			return c.appService.CreateApp(project)
+		},
+	}
+}

cmd/service/createApp.go

@@ -8,11 +8,13 @@ import (
 
 type AppService interface {
 	CreateApp(project models.Project) error
+	GenerateModel(doc models.Generator) error
 }
 
 type appService struct {
 	projectRepo   repository.ProjectRepo
 	projectHelper helpers.ProjectHelper
+	codeHelper    helpers.CodeHelper
 }
 
 func (cmd *appService) CreateApp(project models.Project) error {
@@ -88,12 +90,21 @@ func (cmd *appService) CreateApp(project models.Project) error {
 	return nil
 }
 
+func (cmd *appService) GenerateModel(doc models.Generator) error {
+
+	return cmd.codeHelper.GenerateModel(doc)
+
+	// return nil
+}
+
 func NewAppService(
 	projectRepo repository.ProjectRepo,
 	projectHelper helpers.ProjectHelper,
+	codeHelper helpers.CodeHelper,
 ) AppService {
 	return &appService{
 		projectRepo:   projectRepo,
 		projectHelper: projectHelper,
+		codeHelper:    codeHelper,
 	}
 }

cmd/service/createApp_test.go

@@ -14,6 +14,7 @@ func Test_appService_CreateApp(t *testing.T) {
 	type fields struct {
 		projectRepo   *repository.MockProjectRepo
 		projectHelper *helpers.MockProjectHelper
+		codeHelper    *helpers.MockCodeHelper
 	}
 	type args struct {
 		project models.Project
@@ -346,6 +347,7 @@ func Test_appService_CreateApp(t *testing.T) {
 			tt.fields = fields{
 				projectRepo:   repository.NewMockProjectRepo(t),
 				projectHelper: helpers.NewMockProjectHelper(t),
+				codeHelper:    helpers.NewMockCodeHelper(t),
 			}
 
 			if tt.prepare != nil {
@@ -355,6 +357,7 @@ func Test_appService_CreateApp(t *testing.T) {
 			cmd := NewAppService(
 				tt.fields.projectRepo,
 				tt.fields.projectHelper,
+				tt.fields.codeHelper,
 			)
 			if err := cmd.CreateApp(tt.args.project); (err != nil) != tt.wantErr {
 				t.Errorf("appService.CreateApp() error = %v, wantErr %v", err, tt.wantErr)