- Fixed error when trying to create a module which already exists. Checked if the module is already exists and showed an error message and skipped directory creating part.

Author: mehedijaman

src/Console/MakeModuleCommand.php

@@ -2,9 +2,11 @@
 
 namespace Modular\Modular\Console;
 
+use Illuminate\Support\Str;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Artisan;
 
 class MakeModuleCommand extends Command
 {
@@ -18,27 +20,30 @@ public function handle(): ?int
     {
         $this->setModuleName();
 
-        $this->comment('Creating Module '.$this->moduleName);
+        $this->comment('Creating Module ' . $this->moduleName);
+
+        if ($this->createModuleDirectoryStructure()) {
+            $this->createServiceProvider();
 
-        $this->createModuleDirectoryStructure();
-        $this->createServiceProvider();
+            $params = [
+                'moduleName' => $this->moduleName,
+                'resourceName' => $this->moduleName,
+            ];
 
-        $params = [
-            'moduleName' => $this->moduleName,
-            'resourceName' => $this->moduleName,
-        ];
+            $this->call('modular:make-controller', $params);
+            $this->call('modular:make-validate', $params);
+            $this->call('modular:make-model', $params);
+            $this->call('modular:make-route', $params);
 
-        $this->call('modular:make-controller', $params);
-        $this->call('modular:make-validate', $params);
-        $this->call('modular:make-model', $params);
-        $this->call('modular:make-route', $params);
+            $this->call('modular:make-migration', ['moduleName' => $this->moduleName, 'migrationName' => "create{$this->moduleName}s_table"]);
 
-        $this->call('modular:make-migration', ['moduleName' => $this->moduleName, 'migrationName' => "create{$this->moduleName}s_table"]);
+            $this->call('modular:make-page', $params);
+            $this->call('modular:make-test', $params);
 
-        $this->call('modular:make-page', $params);
-        $this->call('modular:make-test', $params);
+            return self::SUCCESS;
+        }
 
-        return self::SUCCESS;
+        return false;
     }
 
     private function setModulename(): void
@@ -48,7 +53,7 @@ private function setModulename(): void
 
     private function createServiceProvider(): void
     {
-        $stub = file_get_contents(__DIR__.'/../../stubs/module-stub/modules/ModuleServiceProvider.stub');
+        $stub = file_get_contents(__DIR__ . '/../../stubs/module-stub/modules/ModuleServiceProvider.stub');
 
         $stub = str_replace('{{ moduleName }}', $this->moduleName, $stub);
         $stub = str_replace('{{ resourceName }}', Str::camel($this->moduleName), $stub);
@@ -58,14 +63,26 @@ private function createServiceProvider(): void
         file_put_contents($path, $stub);
     }
 
-    private function createModuleDirectoryStructure(): void
+    private function createModuleDirectoryStructure(): bool
     {
-        (new Filesystem)->makeDirectory(base_path("modules/{$this->moduleName}"));
-        (new Filesystem)->makeDirectory(base_path("modules/{$this->moduleName}/Http/Controllers"), 0755, true);
-        (new Filesystem)->makeDirectory(base_path("modules/{$this->moduleName}/Http/Requests"));
-        (new Filesystem)->makeDirectory(base_path("modules/{$this->moduleName}/Models"));
-        (new Filesystem)->makeDirectory(base_path("modules/{$this->moduleName}/routes"));
-        (new Filesystem)->makeDirectory(base_path("modules/{$this->moduleName}/Tests"));
-        (new Filesystem)->makeDirectory(base_path("modules/{$this->moduleName}/Database/Migrations"), 0755, true);
+        $modulePath = base_path("modules/{$this->moduleName}");
+
+        // Check if the module directory already exists
+        if (File::exists($modulePath)) {
+            // Output an error message to the console
+            $this->info("Module {$this->moduleName} already exists. SKIPPING");
+            return false;
+        }
+
+        // Create the necessary directories
+        (new Filesystem)->makeDirectory($modulePath);
+        (new Filesystem)->makeDirectory("{$modulePath}/Http/Controllers", 0755, true);
+        (new Filesystem)->makeDirectory("{$modulePath}/Http/Requests");
+        (new Filesystem)->makeDirectory("{$modulePath}/Models");
+        (new Filesystem)->makeDirectory("{$modulePath}/routes");
+        (new Filesystem)->makeDirectory("{$modulePath}/Tests");
+        (new Filesystem)->makeDirectory("{$modulePath}/Database/Migrations", 0755, true);
+
+        return true;
     }
 }