fix order

Author: goshasafonov

database/migrations/000_create_groups_table.php

@@ -43,7 +43,7 @@ public function up(): void
                 ->cascadeOnDelete();
 
             $table->string('slug')->unique();
-            $table->string('name')->unique();
+            $table->string('name');
             $table->string('type')->nullable();
 
             $table->order();

src/Models/Group.php

@@ -5,6 +5,7 @@
 use Yuges\Package\Models\Model;
 use Yuges\Groupable\Config\Config;
 use Yuges\Sluggable\Traits\HasSlug;
+use Yuges\Groupable\Traits\HasOrder;
 use Yuges\Groupable\Traits\HasParent;
 use Yuges\Sluggable\Options\SlugOptions;
 use Yuges\Sluggable\Interfaces\Sluggable;
@@ -18,7 +19,7 @@
  */
 class Group extends Model implements Sluggable
 {
-    use HasFactory, HasParent, HasGrouperator, HasSlug;
+    use HasFactory, HasParent, HasGrouperator, HasSlug, HasOrder;
 
     protected $table = 'groups';
 
@@ -40,4 +41,12 @@ public function sluggable(): SlugOptions
 
         return $options;
     }
+
+    public function getHighestOrderNumber(): int
+    {
+        return (int) static::query()
+            ->where('grouperator_id', $this->grouperator_id)
+            ->where('grouperator_type', $this->grouperator_type)
+            ->max($this->determineOrderColumnName());
+    }
 }

src/Models/Groupable.php

@@ -4,6 +4,7 @@
 
 use Yuges\Groupable\Config\Config;
 use Yuges\Package\Traits\HasTable;
+use Yuges\Groupable\Traits\HasOrder;
 use Yuges\Package\Traits\HasTimestamps;
 use Yuges\Groupable\Traits\HasGrouperator;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -12,7 +13,7 @@
 
 class Groupable extends MorphPivot
 {
-    use HasFactory, HasTable, HasTimestamps, HasGrouperator;
+    use HasFactory, HasTable, HasTimestamps, HasGrouperator, HasOrder;
 
     public $table = 'groupables';
 
@@ -27,4 +28,13 @@ public function groupable(): MorphTo
     {
         return $this->morphTo();
     }
+
+    public function getHighestOrderNumber(): int
+    {
+        return (int) static::query()
+            ->where('group_id', $this->group_id)
+            ->where('grouperator_id', $this->grouperator_id)
+            ->where('grouperator_type', $this->grouperator_type)
+            ->max($this->determineOrderColumnName());
+    }
 }

src/Observers/GroupObserver.php

@@ -7,6 +7,15 @@
 
 class GroupObserver
 {
+    public function creating(Group $group): void
+    {
+        if ($group->shouldSortWhenCreating()) {
+            if (is_null($group->order)) {
+                $group->setHighestOrderNumber();
+            }
+        }
+    }
+
     public function saving(Group $group): void
     {
 

src/Observers/GroupableObserver.php

@@ -2,16 +2,25 @@
 
 namespace Yuges\Groupable\Observers;
 
-use Illuminate\Database\Eloquent\Model;
+use Yuges\Groupable\Models\Groupable;
 
 class GroupableObserver
 {
-    public function saving(Model $model): void
+    public function creating(Groupable $groupable): void
+    {
+        if ($groupable->shouldSortWhenCreating()) {
+            if (is_null($groupable->order)) {
+                $groupable->setHighestOrderNumber();
+            }
+        }
+    }
+
+    public function saving(Groupable $groupable): void
     {
 
     }
 
-    public function deleted(Model $model): void
+    public function deleted(Groupable $groupable): void
     {
 
     }

src/Traits/HasOrder.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Yuges\Groupable\Traits;
+
+use Illuminate\Database\Eloquent\Builder;
+
+/**
+ * @property integer $order
+ */
+trait HasOrder
+{
+    abstract public function getHighestOrderNumber(): int;
+
+    public function setHighestOrderNumber(): void
+    {
+        $column = $this->determineOrderColumnName();
+
+        $this->$column = $this->getHighestOrderNumber() + 1;
+    }
+
+    public function scopeOrdered(Builder $query): Builder
+    {
+        return $query->orderBy($this->determineOrderColumnName());
+    }
+
+    protected function determineOrderColumnName(): string
+    {
+        return 'order';
+    }
+
+    public function shouldSortWhenCreating(): bool
+    {
+        return true;
+    }
+}