Feat: Refactor variantValues relationship

composer.json

@@ -114,8 +114,7 @@
     "lunarphp/lunar": "1.1.0",
     "lunarphp/stripe": "^1.1.0",
     "spatie/laravel-newsletter": "^5.1",
-    "spatie/laravel-stripe-webhooks": "^3.6",
-    "staudenmeir/eloquent-has-many-deep": "^1.20"
+    "spatie/laravel-stripe-webhooks": "^3.6"
   },
   "type": "library",
   "authors": [

packages/api/src/Domain/Collections/JsonApi/V1/CollectionSchema.php

@@ -81,6 +81,9 @@ public function fields(): array
             AttributeData::make('attribute_data')
                 ->groupAttributes(),
 
+            Number::make('product_position')
+                ->extractUsing(fn (Collection $model) => $model->pivot?->position),
+
             Number::make('parent_id', 'parent_id')
                 ->hidden(),
 

packages/api/src/Domain/Products/Concerns/HasRelationships.php

@@ -5,7 +5,9 @@
 use Dystore\Api\Domain\Prices\Builders\PriceBuilder;
 use Dystore\Api\Domain\Prices\Models\Price;
 use Dystore\Api\Domain\Products\Models\Product;
+use Dystore\Api\Domain\Products\Relations\BelongsToManyThrough;
 use Dystore\Api\Domain\ProductTypes\Models\ProductType;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
@@ -16,13 +18,9 @@
 use Lunar\Models\Attribute;
 use Lunar\Models\ProductOptionValue;
 use Lunar\Models\ProductVariant;
-use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
-use Staudenmeir\EloquentHasManyDeep\HasRelationships as DeepRelationships;
 
 trait HasRelationships
 {
-    use DeepRelationships;
-
     /**
      * Get the mapped attributes relation.
      */
@@ -199,17 +197,28 @@ public function mostExpensiveVariant(): HasOne
     }
 
     /**
-     * @return HasManyDeep<ProductOptionValue,Product>
+     * Get distinct product option values from all variants.
      */
-    public function variantValues(): HasManyDeep
+    public function variantValues(): BelongsToMany
     {
         /** @var Product $this */
-        $variantsTable = $this->variants()->getModel()->getTable();
         $prefix = Config::get('lunar.database.table_prefix');
+        $pivotTable = "{$prefix}product_option_value_product_variant";
+        $variantsTable = (new (ProductVariant::modelClass()))->getTable();
+
+        $instance = $this->newRelatedInstance(ProductOptionValue::modelClass());
 
-        return $this->hasManyDeepFromRelations(
-            $this->variants(),
-            (new ProductVariant)->values(),
+        return new BelongsToManyThrough(
+            $instance->newQuery(),
+            $this,
+            $pivotTable,
+            'variant_id',
+            'value_id',
+            'id',
+            'id',
+            $variantsTable,
+            'product_id',
+            'variantValues'
         );
     }
 }

packages/api/src/Domain/Products/Models/Product.php

@@ -5,13 +5,12 @@
 use Dystore\Api\Domain\Products\Builders\ProductBuilder;
 use Dystore\Api\Domain\Products\Concerns\InteractsWithDystoreApi;
 use Dystore\Api\Domain\Products\Contracts\Product as ProductContract;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Lunar\Models\Product as LunarProduct;
-use Lunar\Models\ProductOptionValue;
-use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 
 /**
  * @method static ProductBuilder query()
@@ -23,7 +22,7 @@
  * @method HasOneThrough highestPrice() Get the highest price relation through variants.
  * @method HasOne cheapestVariant() Get the cheapest variant relation.
  * @method HasOne mostExpensiveVariant() Get the most expensive variant relation.
- * @method HasManyDeep<ProductOptionValue, Product> variantValues() Get product option values relation through variants.
+ * @method BelongsToMany variantValues() Get distinct product option values from all variants.
  */
 class Product extends LunarProduct implements ProductContract
 {