filter events in subscription engine

src/Store/Criteria/EventsCriterion.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcing\Store\Criteria;
+
+final class EventsCriterion
+{
+    public function __construct(
+        /** @var list<string> */
+        public readonly array $events,
+    ) {
+    }
+}

src/Store/DoctrineDbalStore.php

@@ -5,6 +5,7 @@
 namespace Patchlevel\EventSourcing\Store;
 
 use Closure;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
@@ -26,6 +27,7 @@
 use Patchlevel\EventSourcing\Store\Criteria\AggregateNameCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\ArchivedCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\Criteria;
+use Patchlevel\EventSourcing\Store\Criteria\EventsCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\FromIndexCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\FromPlayheadCriterion;
 use PDO;
@@ -156,6 +158,10 @@ private function applyCriteria(QueryBuilder $builder, Criteria $criteria): void
                     $builder->andWhere('id > :index');
                     $builder->setParameter('index', $criterion->fromIndex, Types::INTEGER);
                     break;
+                case EventsCriterion::class:
+                    $builder->andWhere('event IN (:events)');
+                    $builder->setParameter('events', $criterion->events, ArrayParameterType::STRING);
+                    break;
                 default:
                     throw new UnsupportedCriterion($criterion::class);
             }

src/Store/StreamDoctrineDbalStore.php

@@ -5,6 +5,7 @@
 namespace Patchlevel\EventSourcing\Store;
 
 use Closure;
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
@@ -24,6 +25,7 @@
 use Patchlevel\EventSourcing\Serializer\EventSerializer;
 use Patchlevel\EventSourcing\Store\Criteria\ArchivedCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\Criteria;
+use Patchlevel\EventSourcing\Store\Criteria\EventsCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\FromIndexCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\FromPlayheadCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\StreamCriterion;
@@ -169,6 +171,10 @@ private function applyCriteria(QueryBuilder $builder, Criteria $criteria): void
                     $builder->andWhere('id > :index');
                     $builder->setParameter('index', $criterion->fromIndex, Types::INTEGER);
                     break;
+                case EventsCriterion::class:
+                    $builder->andWhere('event IN (:events)');
+                    $builder->setParameter('events', $criterion->events, ArrayParameterType::STRING);
+                    break;
                 default:
                     throw new UnsupportedCriterion($criterion::class);
             }

src/Subscription/Engine/DefaultSubscriptionEngine.php

@@ -6,7 +6,9 @@
 
 use Closure;
 use Patchlevel\EventSourcing\Message\Message;
+use Patchlevel\EventSourcing\Metadata\Event\EventMetadataFactory;
 use Patchlevel\EventSourcing\Store\Criteria\Criteria;
+use Patchlevel\EventSourcing\Store\Criteria\EventsCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\FromIndexCriterion;
 use Patchlevel\EventSourcing\Store\Store;
 use Patchlevel\EventSourcing\Subscription\RetryStrategy\ClockBasedRetryStrategy;
@@ -16,12 +18,14 @@
 use Patchlevel\EventSourcing\Subscription\Store\LockableSubscriptionStore;
 use Patchlevel\EventSourcing\Subscription\Store\SubscriptionCriteria;
 use Patchlevel\EventSourcing\Subscription\Store\SubscriptionStore;
+use Patchlevel\EventSourcing\Subscription\Subscriber\MetadataSubscriberAccessor;
 use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberAccessor;
 use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberAccessorRepository;
 use Patchlevel\EventSourcing\Subscription\Subscription;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
+use function array_keys;
 use function count;
 use function in_array;
 use function sprintf;
@@ -36,6 +40,7 @@ public function __construct(
         private readonly SubscriberAccessorRepository $subscriberRepository,
         private readonly RetryStrategy $retryStrategy = new ClockBasedRetryStrategy(),
         private readonly LoggerInterface|null $logger = null,
+        private readonly EventMetadataFactory|null $eventMetadataFactory = null,
     ) {
     }
 
@@ -187,9 +192,15 @@ function ($subscriptions) use ($limit): ProcessedResult {
                     $messageCounter = 0;
 
                     try {
-                        $stream = $this->messageStore->load(
-                            new Criteria(new FromIndexCriterion($startIndex)),
-                        );
+                        $criteria = new Criteria(new FromIndexCriterion($startIndex));
+
+                        $events = $this->events($subscriptions);
+
+                        if ($events !== null && $events !== []) {
+                            $criteria = $criteria->add(new EventsCriterion($events));
+                        }
+
+                        $stream = $this->messageStore->load($criteria);
 
                         foreach ($stream as $message) {
                             $index = $stream->index();
@@ -354,6 +365,13 @@ function (array $subscriptions) use ($limit): ProcessedResult {
 
                     try {
                         $criteria = new Criteria(new FromIndexCriterion($startIndex));
+
+                        $events = $this->events($subscriptions);
+
+                        if ($events !== null && $events !== []) {
+                            $criteria = $criteria->add(new EventsCriterion($events));
+                        }
+
                         $stream = $this->messageStore->load($criteria);
 
                         foreach ($stream as $message) {
@@ -990,4 +1008,44 @@ private function handleError(Subscription $subscription, Throwable $throwable):
         $subscription->error($throwable);
         $this->subscriptionStore->update($subscription);
     }
+
+    /**
+     * @param list<Subscription> $subscriptions
+     *
+     * @return list<string>|null
+     */
+    private function events(array $subscriptions): array|null
+    {
+        if ($this->eventMetadataFactory === null) {
+            return null;
+        }
+
+        $eventNames = [];
+
+        foreach ($subscriptions as $subscription) {
+            $subscriber = $this->subscriber($subscription->id());
+
+            if (!$subscriber instanceof MetadataSubscriberAccessor) {
+                return null;
+            }
+
+            $events = $subscriber->events();
+
+            foreach ($events as $event) {
+                if ($event === '*') {
+                    return null;
+                }
+
+                $metadata = $this->eventMetadataFactory->metadata($event);
+
+                $eventNames[$metadata->name] = true;
+
+                foreach ($metadata->aliases as $alias) {
+                    $eventNames[$alias] = true;
+                }
+            }
+        }
+
+        return array_keys($eventNames);
+    }
 }

src/Subscription/Subscriber/MetadataSubscriberAccessor.php

@@ -13,6 +13,7 @@
 use Patchlevel\EventSourcing\Subscription\Subscriber\ArgumentResolver\ArgumentResolver;
 
 use function array_key_exists;
+use function array_keys;
 use function array_map;
 use function array_merge;
 
@@ -66,6 +67,12 @@ public function teardownMethod(): Closure|null
         return $this->subscriber->$method(...);
     }
 
+    /** @return list<class-string|'*'> */
+    public function events(): array
+    {
+        return array_keys($this->metadata->subscribeMethods);
+    }
+
     /**
      * @param class-string $eventClass
      *

tests/Benchmark/SubscriptionEngineBench.php

@@ -5,6 +5,7 @@
 namespace Patchlevel\EventSourcing\Tests\Benchmark;
 
 use Patchlevel\EventSourcing\Aggregate\AggregateRootId;
+use Patchlevel\EventSourcing\Metadata\Event\AttributeEventMetadataFactory;
 use Patchlevel\EventSourcing\Repository\DefaultRepository;
 use Patchlevel\EventSourcing\Repository\Repository;
 use Patchlevel\EventSourcing\Schema\ChainDoctrineSchemaConfigurator;
@@ -63,7 +64,11 @@ public function setUp(): void
         $profile = Profile::create($this->id, 'Peter');
 
         for ($i = 1; $i < 10_000; $i++) {
-            $profile->changeName('Peter ' . $i);
+            if ($i % 2 === 0) {
+                $profile->changeEmail('peter' . $i . '@example.com');
+            } else {
+                $profile->changeName('Peter ' . $i);
+            }
         }
 
         $this->repository->save($profile);
@@ -77,6 +82,7 @@ public function setUp(): void
                     new SendEmailProcessor(),
                 ],
             ),
+            eventMetadataFactory: new AttributeEventMetadataFactory(),
         );
     }
 

tests/Integration/Subscription/SubscriptionTest.php

@@ -17,6 +17,7 @@
 use Patchlevel\EventSourcing\Debug\Trace\TraceStack;
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootRegistry;
+use Patchlevel\EventSourcing\Metadata\Event\AttributeEventMetadataFactory;
 use Patchlevel\EventSourcing\Repository\DefaultRepositoryManager;
 use Patchlevel\EventSourcing\Schema\ChainDoctrineSchemaConfigurator;
 use Patchlevel\EventSourcing\Schema\DoctrineSchemaDirector;
@@ -97,6 +98,7 @@ public function testHappyPath(): void
             $store,
             $subscriptionStore,
             new MetadataSubscriberAccessorRepository([new ProfileProjection($this->projectionConnection)]),
+            eventMetadataFactory: new AttributeEventMetadataFactory(),
         );
 
         self::assertEquals(