Fix create:mapped-resources command

Author: MikeAlhayek

src/Commands/Framework/CreateMappedResourcesCommand.php

@@ -2,7 +2,8 @@
 
 namespace CrestApps\CodeGenerator\Commands\Framework;
 
-use CrestApps\CodeGenerator\Models\ResourceInput;
+use CrestApps\CodeGenerator\Models\Bases\ScaffoldInputBase;
+use CrestApps\CodeGenerator\Models\ScaffoldInput;
 use CrestApps\CodeGenerator\Support\Config;
 use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
@@ -20,20 +21,28 @@ class CreateMappedResourcesCommand extends Command
      */
     protected $signature = 'create:mapped-resources
                             {--controller-directory= : The directory where the controller should be created under. }
-                            {--controller-extends=Http\Controllers\Controller : The base controller to be extend.}
                             {--model-directory= : The path of the model.}
                             {--views-directory= : The name of the view path.}
                             {--models-per-page=25 : The amount of models per page for index pages.}
+                            {--language-filename= : The languages file name to put the labels in.}
+                            {--table-name= : The name of the table.}
+                            {--controller-name= : The name of the controler.}
                             {--with-form-request : This will extract the validation into a request form class.}
                             {--with-auth : Generate the controller with Laravel auth middlewear. }
+                            {--with-migration : Prevent creating a migration for this resource.}
                             {--with-soft-delete : Enables softdelete future should be enable in the model.}
                             {--without-timestamps : Prevent Eloquent from maintaining both created_at and the updated_at properties.}
-                            {--with-migration : Prevent creating a migration for this resource.}
+                            {--without-languages : Generate the resource without the language files. }
+                            {--without-model : Generate the resource without the model file. }
+                            {--without-controller : Generate the resource without the controller file. }
+                            {--without-form-request : Generate the resource without the form-request file. }
+                            {--without-views : Generate the resource without the views. }
                             {--connection-name= : A specific connection name.}
                             {--engine-name= : A specific engine name.}
-                            {--layout-name=layouts.app : This will extract the validation into a request form class.}
+                            {--layout-name= : This will extract the validation into a request form class.}
                             {--template-name= : The template name to use when generating the code.}
                             {--table-exists : This option will attempt to fetch the field from existing database table.}
+                            {--routes-prefix=default-form : Prefix of the route group.}
                             {--primary-key=id : The name of the primary key.}
                             {--translation-for= : A comma seperated string of languages to create fields for.}
                             {--form-request-directory= : The directory of the form-request.}
@@ -65,25 +74,32 @@ public function handle()
 
         foreach ($validInputs as $validInput) {
             $this->call(
-                'create:resources',
+                'create:scaffold',
                 [
                     'model-name' => $validInput->modelName,
                     '--controller-name' => $validInput->controllerName,
                     '--controller-directory' => $validInput->controllerDirectory,
                     '--controller-extends' => $validInput->controllerExtends,
                     '--model-directory' => $validInput->modelDirectory,
+                    '--model-extends' => $validInput->modelExtends,
                     '--views-directory' => $validInput->viewsDirectory,
                     '--resource-file' => $validInput->resourceFile,
                     '--routes-prefix' => $validInput->prefix,
                     '--models-per-page' => $validInput->perPage,
                     '--language-filename' => $validInput->languageFileName,
-                    '--with-form-request' => $validInput->formRequest,
+                    '--with-form-request' => $validInput->withFormRequest,
+                    '--form-request-directory' => $validInput->formRequestDirectory,
                     '--form-request-directory' => $validInput->formRequestDirectory,
                     '--with-auth' => $validInput->withAuth,
                     '--table-name' => $validInput->table,
                     '--primary-key' => $validInput->primaryKey,
                     '--with-soft-delete' => $validInput->withSoftDelete,
+                    '--without-model' => $validInput->withoutModel,
+                    '--without-controller' => $validInput->withoutController,
+                    '--without-form-request' => $validInput->withoutFormRequest,
+                    '--without-views' => $validInput->withoutViews,
                     '--without-timestamps' => $validInput->withoutTimeStamps,
+                    '--without-languages' => $validInput->withoutLanguages,
                     '--with-migration' => $validInput->withMigration,
                     '--migration-class-name' => $validInput->migrationClass,
                     '--connection-name' => $validInput->connectionName,
@@ -108,15 +124,15 @@ public function handle()
      * @param array $object
      * @param CrestApps\CodeGenerator\Models\ResourceInput $input
      *
-     * @return array of CrestApps\CodeGenerator\Models\ResourceInput
+     * @return array of CrestApps\CodeGenerator\Models\ScaffoldInput
      */
-    protected function getValidInputs(array $objects, ResourceInput $originalInput)
+    protected function getValidInputs(array $objects, ScaffoldInput $originalInput)
     {
         $validInputs = [];
 
-        foreach ($objects as $object) {
+        foreach ($objects as $obj) {
             $input = clone $originalInput;
-            $object = (object) $object;
+            $object = (object) $obj;
 
             if (!isset($object->{'model-name'})) {
                 throw new Exception('Each entry in the mapping file must a have value for model-name');
@@ -134,15 +150,22 @@ protected function getValidInputs(array $objects, ResourceInput $originalInput)
             $input->table = $this->getValue($object, 'table-name', $madeupTableName);
             $input->viewsDirectory = $this->getValue($object, 'views-directory', $input->viewsDirectory);
             $input->perPage = $this->getValue($object, 'models-per-page', $input->perPage);
-            $input->formRequest = $this->getValue($object, 'with-form-request', $input->formRequest);
+            $input->withFormRequest = $this->getValue($object, 'with-form-request', $input->withFormRequest);
             $input->controllerDirectory = $this->getValue($object, 'controller-directory', $input->controllerDirectory);
-            $input->controllerExtends = $this->getValue($object, 'controller-extends', $input->controllerExtends);
+            $input->controllerExtends = $this->getValue($object, 'controller-extends', 'default-controller');
+
+            $input->modelExtends = $this->getValue($object, 'model-extends', 'default-model');
             $input->withMigration = $this->getValue($object, 'with-migration', $input->withMigration);
             $input->force = $this->getValue($object, 'force', $input->force);
             $input->modelDirectory = $this->getValue($object, 'model-directory', $input->modelDirectory);
             $input->primaryKey = $this->getValue($object, 'primary-key', $input->primaryKey);
             $input->withSoftDelete = $this->getValue($object, 'with-soft-delete', $input->withSoftDelete);
             $input->withoutTimeStamps = $this->getValue($object, 'without-timestamps', $input->withoutTimeStamps);
+            $input->withoutLanguages = $this->getValue($object, 'without-languages', $input->withoutLanguages);
+            $input->withoutModel = $this->getValue($object, 'without-model', $input->withoutModel);
+            $input->withoutController = $this->getValue($object, 'without-controller', $input->withoutController);
+            $input->withoutFormRequest = $this->getValue($object, 'without-form-request', $input->withoutFormRequest);
+            $input->withoutViews = $this->getValue($object, 'without-views', $input->withoutViews);
             $input->migrationClass = $this->getValue($object, 'migration-class-name', $input->migrationClass);
             $input->connectionName = $this->getValue($object, 'connection-name', $input->connectionName);
             $input->engineName = $this->getValue($object, 'engine-name', $input->engineName);
@@ -182,7 +205,7 @@ protected function getMappingFile()
      */
     protected function getValue($object, $name, $default = null)
     {
-        if (isset($object->{$name})) {
+        if (property_exists($object, $name)) {
             return $object->{$name};
         }
 
@@ -222,30 +245,37 @@ protected function validateField($fields)
     /**
      * Gets a clean user inputs.
      *
-     * @return CrestApps\CodeGenerator\Models\ResourceInput
+     * @return CrestApps\CodeGenerator\Models\ScaffoldInput
      */
     protected function getCommandInput()
     {
-        $input = new ResourceInput(Config::getDefaultMapperFileName());
+        $inputBase = new ScaffoldInputBase('');
+
+        $inputBase->perPage = intval($this->option('models-per-page'));
+        $inputBase->withFormRequest = $this->option('with-form-request');
+        $inputBase->controllerDirectory = $this->option('controller-directory');
+        $inputBase->withMigration = $this->option('with-migration');
+        $inputBase->force = $this->option('force');
+        $inputBase->modelDirectory = $this->option('model-directory');
+        $inputBase->primaryKey = $this->option('primary-key');
+        $inputBase->withSoftDelete = $this->option('with-soft-delete');
+        $inputBase->connectionName = $this->option('connection-name');
+        $inputBase->engineName = $this->option('engine-name');
+        $inputBase->template = $this->getTemplateName();
+        $inputBase->tableExists = $this->option('table-exists');
+        $inputBase->translationFor = $this->option('translation-for');
+        $inputBase->withAuth = $this->option('with-auth');
+        $inputBase->formRequestDirectory = $this->option('form-request-directory');
+        $inputBase->withoutTimeStamps = $this->option('without-timestamps');
+        $inputBase->withoutLanguages = $this->option('without-languages');
+        $inputBase->withoutModel = $this->option('without-model');
+        $inputBase->withoutController = $this->option('without-controller');
+        $inputBase->withoutFormRequest = $this->option('without-form-request');
+        $inputBase->withoutViews = $this->option('without-views');
+
+        $input = new ScaffoldInput($inputBase);
         $input->viewsDirectory = trim($this->option('views-directory'));
-        $input->perPage = intval($this->option('models-per-page'));
-        $input->formRequest = $this->option('with-form-request');
-        $input->controllerDirectory = $this->option('controller-directory');
-        $input->controllerExtends = $this->option('controller-extends') ?: null;
-        $input->withMigration = $this->option('with-migration');
-        $input->force = $this->option('force');
-        $input->modelDirectory = $this->option('model-directory');
-        $input->primaryKey = $this->option('primary-key');
-        $input->withSoftDelete = $this->option('with-soft-delete');
-        $input->withoutTimeStamps = $this->option('without-timestamps');
-        $input->connectionName = $this->option('connection-name');
-        $input->engineName = $this->option('engine-name');
-        $input->template = $this->getTemplateName();
         $input->layoutName = $this->option('layout-name') ?: 'layouts.app';
-        $input->tableExists = $this->option('table-exists');
-        $input->translationFor = $this->option('translation-for');
-        $input->withAuth = $this->option('with-auth');
-        $input->formRequestDirectory = $this->option('form-request-directory');
 
         return $input;
     }

src/Commands/Framework/CreateScaffoldCommand.php

@@ -129,7 +129,7 @@ protected function createController(ScaffoldInput $input)
                     '--models-per-page' => $input->perPage,
                     '--routes-prefix' => $input->prefix,
                     '--language-filename' => $input->languageFileName,
-                    '--with-form-request' => $input->formRequest,
+                    '--with-form-request' => $input->withFormRequest,
                     '--without-form-request' => $this->option('without-form-request'),
                     '--form-request-directory' => $input->formRequestDirectory,
                     '--with-auth' => $input->withAuth,

src/Traits/CommonCommand.php

@@ -98,6 +98,10 @@ protected function getTemplateVariable($key)
      */
     protected function getUseClassCommand($name)
     {
+        if (empty($name)) {
+            return '';
+        }
+
         return sprintf('use %s;', $name);
     }