Merge branch 'dev'

Author: nezaboravi

.github/workflows/dependabot-auto-merge.yml

@@ -14,7 +14,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/fix-php-code-style-issues.yml

@@ -22,7 +22,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.3.1
+        uses: aglipanci/laravel-pint-action@2.4
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/phpstan.yml

@@ -22,7 +22,7 @@ jobs:
           coverage: none
 
       - name: Install composer dependencies
-        uses: ramsey/composer-install@v2
+        uses: ramsey/composer-install@v3
 
       - name: Run PHPStan
         run: ./vendor/bin/phpstan --error-format=github

config/slug-auto-generator.php

@@ -4,4 +4,5 @@
 // replace it with your model column
 return [
     'sluggable_field' => 'name',
+    'groupable_field' => null,
 ];

src/SlugGenerator.php

@@ -26,45 +26,35 @@ protected static function getSluggableField(): string
         return config('sluggenerator.sluggable_field') ?? 'name';
     }
 
+    protected static function getGroupableField(): ?string
+    {
+        return config('sluggenerator.groupable_field') ?? null;
+    }
+
     public function generateUniqueSlug(string $slug): string
     {
-        // Check if the slug already has a number at the end
         $originalSlug = $slug;
-        $slugNumber = 0;
+        $slugNumberSuffix = '';
 
-        if (preg_match('/-(\d+)$/', $slug, $matches)) {
-            $slugNumber = $matches[1];
-            $slug = Str::replaceLast("-$slugNumber", '', $slug);
-        }
-
-        $existingSlugs = $this->getExistingSlugs($slug, $this->getTable());
+        $existingSlugs = $this->getExistingSlugs($slug, $this->getTable(), $this->getGroupableField());
 
-        if (! in_array($slug, $existingSlugs)) {
-            return $slug.($slugNumber ? "-$slugNumber" : '');
+        while (in_array($slug . $slugNumberSuffix, $existingSlugs)) {
+            $slugNumberSuffix = $slugNumberSuffix !== '' ? $slugNumberSuffix + 1 : 1;
         }
 
-        $i = $slugNumber ? ($slugNumber + 1) : 1;
-        $uniqueSlugFound = false;
-
-        while (! $uniqueSlugFound) {
-            $newSlug = $slug.'-'.$i;
+        return $slug . ($slugNumberSuffix !== '' ? '-' . $slugNumberSuffix : '');
+    }
 
-            if (! in_array($newSlug, $existingSlugs)) {
-                // Unique slug found
-                return $newSlug;
-            }
+    private function getExistingSlugs(string $slug, string $table, ?string $groupable): array
+    {
+        $query = $this->where('slug', 'LIKE', $slug.'%')
+            ->where('id', '!=', $this->id ?? null);
 
-            $i++;
+        // If a groupable field is present and is not null in this model, handle grouping.
+        if (!is_null($groupable) && !is_null($this->{$groupable})) {
+            $query->where($groupable, $this->{$groupable});
         }
 
-        return $originalSlug.'-'.mt_rand(1000, 9999);
-    }
-
-    private function getExistingSlugs(string $slug, string $table): array
-    {
-        return $this->where('slug', 'LIKE', $slug.'%')
-            ->where('id', '!=', $this->id ?? null)
-            ->pluck('slug')
-            ->toArray();
+        return $query->pluck('slug')->toArray();
     }
 }

tests/SlugGeneratorTest.php

@@ -18,30 +18,46 @@ public function it_generates_a_unique_slug()
         $title = 'Existing Title';
 
         // Create the first entry in test_models with the slug
-        $model1 = TestModel::create(['title' => $title, 'slug' => Str::slug($title)]);
+        $model1 = TestModel::create(['title' => $title]);
         $this->assertEquals('existing-title', $model1->slug);
 
-        // Create another model with the same title
-        $model2 = TestModel::create(['title' => $title, 'slug' => Str::slug($title)]);
+        // Create another model with the same title;
+        // let the SlugGenerator trait handle the slug creation
+        $model2 = TestModel::create(['title' => $title]);
         $this->assertEquals('existing-title-1', $model2->slug);
         // Ensure that the two models have different slugs
         $this->assertNotEquals($model1->slug, $model2->slug);
-    }
 
+        $model3 = TestModel::create(['title' => 'Groupable Title', 'groupable_field' => 1]);
+        $this->assertEquals('groupable-title', $model3->slug);
+
+        // Create another model with the same title and groupable_field;
+        // let the SlugGenerator trait handle the slug creation
+        $model4 = TestModel::create(['title' => $title, 'groupable_field' => 1]);
+        $this->assertEquals('existing-title', $model4->slug);
+
+        $model5 = TestModel::create(['title' => $title]);
+        $this->assertEquals('existing-title-1', $model5->slug);
+
+
+        $model6 = TestModel::create(['title' => 'Groupable Title', 'groupable_field' => 1]);
+        $this->assertEquals('groupable-title-1', $model6->slug);
+    }
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('database.default', 'sqlite');
         $app['config']->set('database.connections.sqlite', [
             'driver' => 'sqlite',
             'database' => ':memory:',
-            'prefix' => '',
+            'prefix' => 'cw-slug-generator-test-',
         ]);
 
         // Database setup
         Schema::create('test_models', function (Blueprint $table) {
             $table->increments('id');
             $table->string('title');
             $table->string('slug');
+            $table->string('groupable_field')->nullable();
         });
     }
 }
@@ -51,12 +67,20 @@ class TestModel extends \Illuminate\Database\Eloquent\Model
 
     protected $table = 'test_models';
 
-    protected $guarded = [];
+    protected $fillable = [
+        'title',
+        'slug',
+        'groupable_field',
+    ];
 
     public $timestamps = false;
 
     public static function getSluggableField()
     {
         return 'title';
     }
+    public static function getGroupableField()
+    {
+        return 'groupable_field';
+    }
 }