Fix event firing for extended models

packages/core/src/Base/Traits/HasModelExtending.php

@@ -138,4 +138,23 @@ public static function observe($classes): void
             $instance->registerObserver($class);
         }
     }
+
+    /**
+     * Fire the given event for the model.
+     */
+    protected function fireModelEvent($event, $halt = true): mixed
+    {
+        // Fire the actual models events
+        $result = parent::fireModelEvent($event, $halt);
+
+        $lunarClass = str_replace('Contracts\\', '', ModelManifest::guessContractClass(static::class));
+
+        if ($lunarClass == static::class) {
+            return $result;
+        }
+
+        return static::$dispatcher->{($halt ? 'until' : 'dispatch')}(
+            "eloquent.{$event}: ".$lunarClass, $this
+        );
+    }
 }

packages/core/src/LunarServiceProvider.php

@@ -68,6 +68,7 @@
 use Lunar\Models\Language;
 use Lunar\Models\Order;
 use Lunar\Models\OrderLine;
+use Lunar\Models\Product;
 use Lunar\Models\ProductOption;
 use Lunar\Models\ProductOptionValue;
 use Lunar\Models\ProductVariant;
@@ -83,6 +84,7 @@
 use Lunar\Observers\MediaObserver;
 use Lunar\Observers\OrderLineObserver;
 use Lunar\Observers\OrderObserver;
+use Lunar\Observers\ProductObserver;
 use Lunar\Observers\ProductOptionObserver;
 use Lunar\Observers\ProductOptionValueObserver;
 use Lunar\Observers\ProductVariantObserver;
@@ -296,6 +298,8 @@ protected function registerStateListeners()
      */
     protected function registerObservers(): void
     {
+        Product::observe(ProductObserver::class);
+
         Channel::observe(ChannelObserver::class);
         CustomerGroup::observe(CustomerGroupObserver::class);
         Language::observe(LanguageObserver::class);

packages/core/src/Observers/ProductObserver.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Lunar\Observers;
+
+use Lunar\Models\Product;
+
+class ProductObserver
+{
+    /**
+     * Handle the ProductVariant "deleted" event.
+     *
+     * @return void
+     */
+    public function deleting(Product $product): void
+    {
+        $product->variants()->delete();
+    }
+
+    public function restored(Product $product): void
+    {
+        $product->variants()->restore();
+    }
+}

tests/core/Unit/Base/Traits/HasModelExtendingTest.php

@@ -68,3 +68,28 @@ function () {
         ->and(Product::morphName())
         ->toBe('product');
 });
+
+test('core model events are triggered with extended models', function () {
+    \Illuminate\Support\Facades\Event::fake();
+
+    $product = \Lunar\Tests\Core\Stubs\Models\Product::factory()->create();
+
+    $product->delete();
+
+    \Illuminate\Support\Facades\Event::assertDispatched(
+        'eloquent.deleted: ' . Product::class
+    );
+
+    \Lunar\Facades\ModelManifest::replace(
+        \Lunar\Models\Contracts\Product::class,
+        \Lunar\Tests\Core\Stubs\Models\CustomProduct::class
+    );
+
+    $product = \Lunar\Tests\Core\Stubs\Models\CustomProduct::factory()->create();
+
+    $product->delete();
+
+    \Illuminate\Support\Facades\Event::assertDispatched(
+        'eloquent.deleted: ' . Product::class
+    );
+});