fix wirecrud id detection

manusiakemos · May 13, 2024 · b6c6f77 · b6c6f77
1 parent 68c93cf
commit b6c6f77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -16,8 +16,8 @@ composer require manusiakemos/wirecrud
 
 ## Usage
 
-```php
-// Usage description here
+```bash
+php artisan wirecrud:make
 ```
 
 ### Testing

diff --git a/src/Console/WireCrudConsole.php b/src/Console/WireCrudConsole.php
@@ -104,7 +104,7 @@ public function handle(): bool
             $labelColumn = false;
             $type = Schema::getColumnType($tableName, $column);
             $keyType = false;
-            if (Str::contains(haystack: $column, needles: '_id') || Str::contains(haystack: $column, needles: '_by')) {
+            if (Str::contains(haystack: $column, needles: 'id')) {
                 $keyType = select(
                     label: 'choose ' . $column . ' key type',
                     options: ['primary', 'foreign', 'false'],
@@ -131,8 +131,8 @@ public function handle(): bool
             }
 
             if (!Str::contains(haystack: $column, needles: '_at')) {
-                if (Str::contains(haystack: $column, needles: '_id') && $keyType == 'foreign') {
-                    $label = Str::replace(search: '_id', replace: '', subject: $column);
+                if (Str::contains(haystack: $column, needles: 'id') || Str::contains(haystack: $column, needles: '_by') && $keyType == 'foreign') {
+                    $label = Str::replace(search: 'id', replace: '', subject: $column);
                 } else {
                     $label = Str::title(Str::snake($column, ' '));
                 }