fix test cases

database/console/model_make_command.go

@@ -44,13 +44,13 @@ func (receiver *ModelMakeCommand) Extend() command.Extend {
 
 // Handle Execute the console command.
 func (receiver *ModelMakeCommand) Handle(ctx console.Context) error {
-	make, err := supportconsole.NewMake(ctx, "model", ctx.Argument(0), filepath.Join("app", "models"))
+	m, err := supportconsole.NewMake(ctx, "model", ctx.Argument(0), filepath.Join("app", "models"))
 	if err != nil {
 		color.Red().Println(err)
 		return nil
 	}
 
-	if err := file.Create(make.GetFilePath(), receiver.populateStub(receiver.getStub(), make.GetPackageName(), make.GetStructName())); err != nil {
+	if err := file.Create(m.GetFilePath(), receiver.populateStub(receiver.getStub(), m.GetPackageName(), m.GetStructName())); err != nil {
 		return err
 	}
 

support/console/console.go

@@ -81,27 +81,3 @@ func (m *Make) GetFolderPath() string {
 
 	return folderPath
 }
-
-func GetName(ctx console.Context, ttype, name string, getPath func(string) string) (string, error) {
-	if name == "" {
-		var err error
-		name, err = ctx.Ask(fmt.Sprintf("Enter the %s name", ttype), console.AskOption{
-			Validate: func(s string) error {
-				if s == "" {
-					return fmt.Errorf("the %s name cannot be empty", ttype)
-				}
-
-				return nil
-			},
-		})
-		if err != nil {
-			return "", err
-		}
-	}
-
-	if !ctx.OptionBool("force") && file.Exists(getPath(name)) {
-		return "", fmt.Errorf("the %s already exists. Use the --force or -f flag to overwrite", ttype)
-	}
-
-	return name, nil
-}

validation/console/filter_make_command.go

@@ -41,7 +41,7 @@ func (receiver *FilterMakeCommand) Extend() command.Extend {
 
 // Handle Execute the console command.
 func (receiver *FilterMakeCommand) Handle(ctx console.Context) error {
-	m, err := supportconsole.NewMake(ctx, "event", ctx.Argument(0), filepath.Join("app", "filters"))
+	m, err := supportconsole.NewMake(ctx, "filter", ctx.Argument(0), filepath.Join("app", "filters"))
 	if err != nil {
 		color.Red().Println(err)
 		return nil

validation/console/rule_make_command.go

@@ -41,7 +41,7 @@ func (receiver *RuleMakeCommand) Extend() command.Extend {
 
 // Handle Execute the console command.
 func (receiver *RuleMakeCommand) Handle(ctx console.Context) error {
-	m, err := supportconsole.NewMake(ctx, "event", ctx.Argument(0), filepath.Join("app", "rules"))
+	m, err := supportconsole.NewMake(ctx, "rule", ctx.Argument(0), filepath.Join("app", "rules"))
 	if err != nil {
 		color.Red().Println(err)
 		return nil