Move count of collection after Criteria event.

Document that when using a collection filter you must first resolve the
criteria on the collection.

Author: TomHAnderson

docs/events.rst

@@ -128,7 +128,10 @@ Using the Criteria object is the most efficient way to filter the collection.
   $driver->get(EventDispatcher::class)->subscribeTo(
       Artist::class . '.performances.criteria',
       function (Criteria $event): void {
-          $event->setCollection($event->getCollection()->filter(
+          // Match the collection with the criteria FIRST
+          $matchingCollection = $event->getCollection()->matching($event->getCriteria());
+          // Then filter the collection
+          $event->setCollection($matchingCollection->filter(
               static function ($performance) {
                   return $performance->getIsDeleted() === false;
               }

src/Resolve/ResolveCollectionFactory.php

@@ -149,8 +149,6 @@ protected function buildPagination(
             $paginationFields[$field] = (int) base64_decode($value, true);
         }
 
-        $itemCount = count($collection->matching($criteria));
-
         /**
          * Fire the event dispatcher using the passed event name.
          */
@@ -166,6 +164,8 @@ protected function buildPagination(
             $collection = $event->getCollection();
         }
 
+        $itemCount = count($collection->matching($criteria));
+
         // Add offset and limit after Criteria event
         $offsetAndLimit = $this->calculateOffsetAndLimit($resolve[3]->fieldName, $entityClassName, $targetClassName, $paginationFields, $itemCount);
         if ($offsetAndLimit['offset']) {

test/Entity/Performance.php

@@ -79,6 +79,7 @@ class Performance
     #[GraphQL\Field(group: 'LimitTest')]
     #[GraphQL\Field(group: 'AttributeLimit')]
     #[GraphQL\Field(group: 'ExtractionMap', alias: 'key')]
+    #[GraphQL\Field(group: 'CriteriaEvent')]
 
     #[ORM\Id]
     #[ORM\Column(type: 'integer')]

test/Feature/Event/CriteriaTest.php

@@ -101,9 +101,11 @@ public function testEventFilterCollection(): void
             function (CriteriaEvent $event): void {
                 $this->assertInstanceOf(Criteria::class, $event->getCriteria());
 
-                $event->setCollection($event->getCollection()->filter(
+                $matchingCollection = $event->getCollection()->matching($event->getCriteria());
+                $event->setCollection($matchingCollection->filter(
                     static function ($performance) {
-                        return $performance->getVenue() === 'Delta Center';
+                        return $performance->getVenue() === 'Delta Center'
+                            || $performance->getVenue() === 'Soldier Field';
                     },
                 ));
 
@@ -137,9 +139,10 @@ static function ($performance) {
                 node {
                   id
                   name
-                  performances {
+                  performances (filter: { venue: { sort: "DESC" } } ) {
                     edges {
                       node {
+                        id
                         venue
                       }
                     }
@@ -160,8 +163,12 @@ static function ($performance) {
         $this->assertEquals(1, count($data['artist']['edges']));
         $this->assertEquals(1, count($data['artist']['edges'][0]['node']['performances']));
         $this->assertEquals(
-            'Delta Center',
+            'Soldier Field',
             $data['artist']['edges'][0]['node']['performances']['edges'][0]['node']['venue'],
         );
+        $this->assertEquals(
+            'Delta Center',
+            $data['artist']['edges'][0]['node']['performances']['edges'][1]['node']['venue'],
+        );
     }
 }

test/Feature/Resolve/CollectionFilterTest.php

@@ -28,14 +28,7 @@ public function setUp(): void
             'query' => new ObjectType([
                 'name' => 'query',
                 'fields' => [
-                    'artist' => [
-                        'type' => $driver->connection(Artist::class),
-                        'args' => [
-                            'filter' => $driver->filter(Artist::class),
-                            'pagination' => $driver->pagination(),
-                        ],
-                        'resolve' => $driver->resolve(Artist::class),
-                    ],
+                    'artist' => $driver->completeConnection(Artist::class),
                 ],
             ]),
         ]);