order and groupables relation

Author: goshasafonov

composer.json

@@ -24,7 +24,8 @@
     "require": {
         "php": "^8.4",
         "yuges-code/laravel-package": "^1.0",
-        "yuges-code/laravel-sluggable": "^1.0"
+        "yuges-code/laravel-sluggable": "^1.0",
+        "yuges-code/laravel-orderable": "^1.0"
     },
     "require-dev": {
         "orchestra/testbench": "^10.0"

src/Models/Group.php

@@ -5,10 +5,14 @@
 use Yuges\Package\Models\Model;
 use Yuges\Groupable\Config\Config;
 use Yuges\Sluggable\Traits\HasSlug;
-use Yuges\Groupable\Traits\HasOrder;
+use Yuges\Orderable\Traits\HasOrder;
 use Yuges\Groupable\Traits\HasParent;
 use Yuges\Sluggable\Options\SlugOptions;
+use Yuges\Orderable\Options\OrderOptions;
 use Yuges\Sluggable\Interfaces\Sluggable;
+use Yuges\Orderable\Interfaces\Orderable;
+use Illuminate\Database\Eloquent\Builder;
+use Yuges\Groupable\Traits\HasGroupables;
 use Yuges\Groupable\Traits\HasGrouperator;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
@@ -17,9 +21,9 @@
  * @property string $slug
  * @property null|string $type
  */
-class Group extends Model implements Sluggable
+class Group extends Model implements Sluggable, Orderable
 {
-    use HasFactory, HasParent, HasGrouperator, HasSlug, HasOrder;
+    use HasFactory, HasParent, HasGrouperator, HasGroupables, HasSlug, HasOrder;
 
     protected $table = 'groups';
 
@@ -42,11 +46,14 @@ public function sluggable(): SlugOptions
         return $options;
     }
 
-    public function getHighestOrderNumber(): int
+    public function orderable(): OrderOptions
     {
-        return (int) static::query()
+        $options = new OrderOptions();
+
+        $options->query = fn (Builder $builder) => $builder
             ->where('grouperator_id', $this->grouperator_id)
-            ->where('grouperator_type', $this->grouperator_type)
-            ->max($this->determineOrderColumnName());
+            ->where('grouperator_type', $this->grouperator_type);
+
+        return $options;
     }
 }

src/Models/Groupable.php

@@ -4,14 +4,17 @@
 
 use Yuges\Groupable\Config\Config;
 use Yuges\Package\Traits\HasTable;
-use Yuges\Groupable\Traits\HasOrder;
+use Yuges\Orderable\Traits\HasOrder;
 use Yuges\Package\Traits\HasTimestamps;
+use Illuminate\Database\Eloquent\Builder;
+use Yuges\Orderable\Options\OrderOptions;
+use Yuges\Orderable\Interfaces\Orderable;
 use Yuges\Groupable\Traits\HasGrouperator;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphPivot;
 
-class Groupable extends MorphPivot
+class Groupable extends MorphPivot implements Orderable
 {
     use HasFactory, HasTable, HasTimestamps, HasGrouperator, HasOrder;
 
@@ -29,12 +32,15 @@ public function groupable(): MorphTo
         return $this->morphTo();
     }
 
-    public function getHighestOrderNumber(): int
+    public function orderable(): OrderOptions
     {
-        return (int) static::query()
+        $options = new OrderOptions();
+
+        $options->query = fn (Builder $builder) => $builder
             ->where('group_id', $this->group_id)
             ->where('grouperator_id', $this->grouperator_id)
-            ->where('grouperator_type', $this->grouperator_type)
-            ->max($this->determineOrderColumnName());
+            ->where('grouperator_type', $this->grouperator_type);
+
+        return $options;
     }
 }

src/Traits/HasGroupables.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Yuges\Groupable\Traits;
+
+use Illuminate\Support\Collection;
+use Yuges\Groupable\Config\Config;
+use Yuges\Groupable\Models\Groupable;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+/**
+ * @property Collection<array-key, Groupable> $groupables
+ */
+trait HasGroupables
+{
+    public function groupables(): HasMany
+    {
+        return $this->hasMany(Config::getGroupableClass(Groupable::class));
+    }
+}