Make RESOURCE_NAME optional

Author: Admin

src/Exports/ListResourceExcel.php

@@ -43,7 +43,7 @@ public function sheets(): array
     {
         $sheets = [];
 
-        if ($this->baseResourceModel instanceof BaseModel && (string)$this->baseResourceModel::RESOURCE_NAME !== '') {
+        if ($this->baseResourceModel instanceof BaseModel) {
             $sheets [] = GeneralHelper::app(
                 Resource::class,
                 [
@@ -78,7 +78,7 @@ public function sheets(): array
 
     public function failed(\Throwable $e): void
     {
-        Log::error('Download ListResourceExcel error for ' . $this->baseModel::RESOURCE_NAME . ', error: ' .
+        Log::error('Download ListResourceExcel error for ' . $this->baseModel::resourceName() . ', error: ' .
             $e->getMessage());
     }
 

src/Exports/Sheets/Resource.php

@@ -47,7 +47,7 @@ public function collection(): Collection
      */
     public function title(): string
     {
-        return $this->baseModel::RESOURCE_NAME;
+        return $this->baseModel::resourceName();
     }
 
     public function headings(): array
@@ -66,7 +66,7 @@ public function styles(Worksheet $sheet): array
 
     public function failed(\Throwable $e): void
     {
-        Log::error('Download Resource sheet error for ' . $this->baseModel::RESOURCE_NAME . ', error: ' .
+        Log::error('Download Resource sheet error for ' . $this->baseModel::resourceName() . ', error: ' .
             $e->getMessage());
     }
 }

src/Helpers/GeneralHelper.php

@@ -34,7 +34,7 @@ public static function getSafeErrorMessage(\Throwable $e, string $messagePrefix
         }
 
         if ($e instanceof ModelNotFoundException) {
-            return Str::singular($e->getModel()::RESOURCE_NAME ?? 'Resource') . ' not found.';
+            return Str::singular($e->getModel()::resourceName()) . ' not found.';
         }
 
         return $e->getMessage();

src/Helpers/ResourceHelper.php

@@ -23,9 +23,17 @@ public static function getResourceNameToControllerFQNMap(array $modelFqnToContro
 
         foreach ($modelFqnToControllerMap as $resourceFQN => $controllerFQN) {
             /** @var BaseModel $resourceFQN */
-            if (\strlen($resourceFQN::RESOURCE_NAME) > 0 && \strlen($controllerFQN) > 0) {
-                $map[$resourceFQN::RESOURCE_NAME] = $controllerFQN;
+            $resource = $resourceFQN::resourceName();
+
+            if (isset($map[$resource])) {
+                throw new \Exception('Duplicate resource name: ' . $resource);
+            }
+
+            if (!\class_exists($controllerFQN)) {
+                throw new \Exception('Controller class does not exist for resource: ' . $resource);
             }
+
+            $map[$resource] = $controllerFQN;
         }
 
         return $resourceNameToControllerFQNMap = $map;

src/Http/Controllers/ResourceControllerTrait.php

@@ -324,9 +324,9 @@ public function deleteRelated(string $identifier, string $relation, string $rela
     protected function getResourceAsModelFQN(): string
     {
         $resource = ResourceHelper::getResourceControllerToModelFQNMap($this->modelFqnToControllerMap)[$this::class] ??
-            '';
+            null;
 
-        if (\strlen($resource) > 0) {
+        if (\is_string($resource)) {
             return $resource;
         }
 

src/Models/BaseModel.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 use MacropaySolutions\LaravelCrudWizard\Eloquent\CustomRelations\Builders\CleverEloquentBuilder;
 use MacropaySolutions\LaravelCrudWizard\Eloquent\CustomRelations\HasCleverRelationships;
 use MacropaySolutions\LaravelCrudWizard\Helpers\GeneralHelper;
@@ -55,6 +56,11 @@ public function __construct(array $attributes = [])
         $this->append('primary_key_identifier');
     }
 
+    public static function resourceName(): string
+    {
+        return static::RESOURCE_NAME ?? Str::snake(Str::pluralStudly(\class_basename(static::class)), '-');
+    }
+
     /**
      * @inheritDoc
      */
@@ -78,7 +84,7 @@ public function getColumns(bool $includingPrimary = true): array
                 $columns
             )
         ) {
-            Log::warning('LaravelCrudWizard warning: the resource ' . $this::RESOURCE_NAME .
+            Log::warning('LaravelCrudWizard warning: the resource ' . $this::resourceName() .
                 ' uses reserved words as columns: ' . \implode(',', $reservedUsed));
         }
 
@@ -227,7 +233,7 @@ function () use ($driver): array {
 
         try {
             return $result[$this->getConnectionName() . $this->getTable()] ??= \collect(Cache::remember(
-                $this::RESOURCE_NAME . 'IndexesForFiltering',
+                $this::resourceName() . 'IndexesForFiltering',
                 Carbon::now()->addDay(),
                 $callback
             ));

src/Services/BaseResourceService.php

@@ -22,7 +22,7 @@ public function __construct()
 
     public function getResourceName(): string
     {
-        return $this->model::RESOURCE_NAME;
+        return $this->model::resourceName();
     }
 
     /**