Merge pull request #476 from maartenpaauw/fix/use-class-map-name-when…

…-querying-event-class

Use class map name when querying event class

src/StoredEvents/Models/EloquentStoredEventQueryBuilder.php

@@ -3,6 +3,8 @@
 namespace Spatie\EventSourcing\StoredEvents\Models;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Arr;
+use Spatie\EventSourcing\StoredEvents\StoredEvent;
 
 /**
  * @method \Spatie\EventSourcing\StoredEvents\Models\EloquentStoredEventCollection get
@@ -32,7 +34,10 @@ public function whereAggregateRoot(string $uuid): self
 
     public function whereEvent(string ...$eventClasses): self
     {
-        $this->whereIn('event_class', $eventClasses);
+        $this->whereIn('event_class', array_map(
+           fn (string $eventClass): string => StoredEvent::getEventClass($eventClass),
+            $eventClasses,
+        ));
 
         return $this;
     }

src/StoredEvents/StoredEvent.php

@@ -150,7 +150,7 @@ protected static function getActualClassForEvent(string $class): string
         return Arr::get(config('event-sourcing.event_class_map', []), $class, $class);
     }
 
-    protected static function getEventClass(string $class): string
+    public static function getEventClass(string $class): string
     {
         $map = config('event-sourcing.event_class_map', []);