Update repository command

Author: Danny-Villa

README.md

@@ -12,6 +12,17 @@ composer require dannyvilla/artisan-commands
 
 ## Usage
 
+### View command
+#### Generate an empty view 
+```bash
+php artisan make:view folder.subfolder.view
+```
+
+#### Generate a view with a layout
+```bash
+php artisan make:view folder.subfolder.view --layout=app
+```
+
 ### Repository command
 #### Generate an empty repository file
 ```bash
@@ -21,16 +32,9 @@ php artisan make:repository UserRepository
 ```bash
 php artisan make:repository UserRepository --model=User
 ```
-
-### View command
-#### Generate an empty view 
-```bash
-php artisan make:view folder.subfolder.view
-```
-
-#### Generate a view with a layout
+OR
 ```bash
-php artisan make:view folder.subfolder.view --layout=app
+php artisan make:repository UserRepository --model=App\Models\User
 ```
 
 ### Lang command

src/Commands/Repository.php

@@ -3,6 +3,7 @@
 namespace Davinet\ArtisanCommand\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Str;
 
 class Repository extends Command
 {
@@ -89,6 +90,18 @@ protected function replaceModelName($name, $stub)
         return str_replace('DummyModel', $model, $stub);
     }
 
+    /**
+     * Replace the namespace of the namespace of the model.
+     *
+     * @param $namespace
+     * @param $stub
+     * @return mixed
+     */
+    protected function replaceModelNamespace($namespace, $stub)
+    {
+        return str_replace('DummyModelNamespace', ucfirst($namespace), $stub);
+    }
+
     /**
      * Rewrite actually the content in the file.
      *
@@ -102,6 +115,36 @@ protected function putInFile($filename, $content)
         file_put_contents($filename, $content);
     }
 
+    /**
+     * Set the right name and namespace.
+     *
+     * @param $model
+     * @param $namespace
+     * @return void
+     */
+    protected function setModelAndNamespace(&$model, &$namespace)
+    {
+        $exploded = explode('\\', $model);
+        $model = array_last($exploded);
+        $namespace = '';
+
+        for ($i = 0; $i < count($exploded) - 1; $i++)
+            $namespace .= $exploded[$i].'\\';
+
+        $namespace = Str::replaceLast('\\','', $namespace);
+    }
+
+    /**
+     * Check if a model file exists.
+     *
+     * @param $model
+     * @return bool
+     */
+    protected function modelFileExists($model)
+    {
+        return file_exists( base_path(lcfirst($model).'.php'));
+    }
+
     /**
      * Execute the console command.
      *
@@ -111,32 +154,45 @@ public function handle()
     {
         $name = $this->argument('name');
         $model = $this->option('model');
-
+        $namespace = 'App';
         if (empty($name)) {
             $this->error('Please the name of the repository is expected.');
         } else {
-            if ((empty($model) || !isset($model)) || (!file_exists(app_path('/'.$model.'.php')))) {
+            $content = null;
+
+            if (is_null($model)) {
                 $content = $this->replaceClassName($name, $this->getEmptyStub());
             } else {
-                $content = $this->replaceClassName($name, $this->getStub());
-                $content = $this->replaceModelName($model, $content);
-                $content = $this->replacePropertyName($model, $content);
+                if (Str::contains($model, '\\')) {
+                    $this->setModelAndNamespace($model, $namespace);
+                }
+
+                if ($this->modelFileExists($namespace.'\\'.$model)) {
+                    $content = $this->replaceModelNamespace($namespace, $this->getStub());
+                    $content = $this->replaceModelName($model, $content);
+                    $content = $this->replacePropertyName($model, $content);
+                    $content = $this->replaceClassName($name, $content);
+                } else {
+                    $this->output->error('The specified model "'.$this->option('model').'" does not exist.');
+                }
             }
 
-            $filename = app_path('Repositories/'.ucfirst($name).'.php');
+            if (!is_null($content)) {
+                $filename = app_path('Repositories/'.ucfirst($name).'.php');
 
-            if (file_exists($filename)) {
-                do {
-                    $input = $this->ask("There is a repository with this name ($name) do you want to replace it ? [o/n] ");
-                } while (strtolower($input) != 'o' && strtolower($input) != 'n');
+                if (file_exists($filename)) {
+                    do {
+                        $input = $this->ask("There is a repository with this name ($name) do you want to replace it ? [o/n] ");
+                    } while (strtolower($input) != 'o' && strtolower($input) != 'n');
 
-                if('o' == strtolower($input)){
+                    if('o' == strtolower($input)){
+                        $this->putInFile($filename, $content);
+                        $this->info('Reporitory created successfully.');
+                    }
+                } else {
                     $this->putInFile($filename, $content);
                     $this->info('Reporitory created successfully.');
                 }
-            } else {
-                $this->putInFile($filename, $content);
-                $this->info('Reporitory created successfully.');
             }
         }
     }

src/Commands/stubs/repository.stub

@@ -2,7 +2,7 @@
 
 namespace App\Repositories;
 
-use App\DummyModel;
+use DummyModelNamespace\DummyModel;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;