🔨 improve on createNonModuleModel() method to create sub-directory models

Signed-off-by: otengkwame <developerkwame@gmail.com>

Author: otengkwame

Core/controllers/commands/Create.php

@@ -941,7 +941,7 @@ public function createCommand($location = '', $commandName = '', $defaultCommand
             return;
         }
     }
-    
+
     /**
      * Create A Non Module Command
      *
@@ -1098,7 +1098,7 @@ public function createNonModuleController($controllerName = '', $addController =
      * @param string $location
      * @return void
      */
-    public function createNonModuleModel($modelName = '', $modelType = '--easy', $removeModel = '', $location = 'App/Models') 
+    public function createNonModuleModel($modelName = '', $modelType = '--easy', $removeModel = '', $location = 'Models') 
     {
 
         $created = '';
@@ -1107,6 +1107,17 @@ public function createNonModuleModel($modelName = '', $modelType = '--easy', $re
 
         $this->model = 'Models';
         $this->namespace = $namespace;
+
+        if ($removeModel == '--dir' && $location != 'Models') {
+            $location = str_replace('_', ' ', $location);
+            $location = ucwords($location);
+            $location = str_replace(' ', '/', $location);
+
+            $this->model = 'Models' .DS. $location;
+            $this->namespace = 'App\\' .  str_replace('/', '\\', $this->model);
+            $location = $this->model;
+        }
+
         $modelDirectory = $this->createAppRootDirectory($this->model);
 
         if ($removeModel == '--remove-model') {
@@ -1115,11 +1126,15 @@ public function createNonModuleModel($modelName = '', $modelType = '--easy', $re
             $modelName = Inflector::singularize($modelName) . 'Model';
         }
 
+        $location = 'App/' . ucwords($location);
+
         if (file_exists($modelDirectory . DS . $modelName . $this->fileExtention)) {
             $this->failureOutput(ucfirst($modelName) . " exists already in the " . $location . " directory");
             return;
         }
 
+        $this->model = 'Models';
+
         if ($modelDirectory && is_dir($modelDirectory)) {
             $filePath = $modelDirectory . DS . $modelName;
             $modelType = str_replace('-', '', $modelType);