Merge 4f9cd9f into f29e609

src/EloquentStoredEventRepository.php

@@ -21,7 +21,7 @@ public function retrieveAll(string $uuid = null): LazyCollection
             $query->uuid($uuid);
         }
 
-        return $query->cursor()->map(function (EloquentStoredEvent $storedEvent) {
+        return $query->orderBy('id')->cursor()->map(function (EloquentStoredEvent $storedEvent) {
             return $storedEvent->toStoredEvent();
         });
     }
@@ -35,7 +35,7 @@ public function retrieveAllStartingFrom(int $startingFrom, string $uuid = null):
             $query->uuid($uuid);
         }
 
-        return $query->cursor()->map(function (EloquentStoredEvent $storedEvent) {
+        return $query->orderBy('id')->cursor()->map(function (EloquentStoredEvent $storedEvent) {
             return $storedEvent->toStoredEvent();
         });
     }

tests/AggregateRootTest.php

@@ -84,6 +84,23 @@ public function when_retrieving_an_aggregate_root_all_events_will_be_replayed_to
         $this->assertEquals(300, $aggregateRoot->balance);
     }
 
+    /** @test */
+    public function when_retrieving_an_aggregate_root_all_events_will_be_replayed_to_it_in_the_correct_order()
+    {
+        /** @var \Spatie\EventProjector\Tests\TestClasses\AggregateRoots\AccountAggregateRoot $aggregateRoot */
+        $aggregateRoot = AccountAggregateRoot::retrieve($this->aggregateUuid);
+
+        $aggregateRoot
+            ->multiplyMoney(5)
+            ->addMoney(100);
+
+        $aggregateRoot->persist();
+
+        $aggregateRoot = AccountAggregateRoot::retrieve($this->aggregateUuid);
+
+        $this->assertEquals(100, $aggregateRoot->balance);
+    }
+
     /** @test */
     public function when_retrieving_an_aggregate_root_all_events_will_be_replayed_to_it_with_the_stored_event_repository_specified()
     {

tests/EventSerializers/EventSerializerTest.php

@@ -59,12 +59,14 @@ public function it_serializes_an_event_to_json()
 
         $array = json_decode($json, true);
 
+        $connection = config('database.default');
+        $driver = config("database.connections.{$connection}.driver");
         $this->assertEquals([
             'account' => [
                 'class' => get_class($account),
                 'id' => 1,
                 'relations' => [],
-                'connection' => 'mysql',
+                'connection' => $driver,
             ],
             'amount' => 1234,
         ], $array);

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\EventProjector\Tests;
 
+use Exception;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Artisan;
@@ -47,8 +48,16 @@ protected function setUpDatabase()
         include_once __DIR__.'/../stubs/create_stored_events_table.php.stub';
         (new \CreateStoredEventsTable())->up();
 
+        $connection = config('database.default');
+        $driver = config("database.connections.{$connection}.driver");
         Schema::dropIfExists('other_stored_events');
-        DB::statement('CREATE TABLE other_stored_events LIKE stored_events');
+        if ($driver === 'mysql') {
+            DB::statement('CREATE TABLE other_stored_events LIKE stored_events');
+        } elseif ($driver === 'pgsql') {
+            DB::statement('CREATE TABLE other_stored_events AS TABLE stored_events;');
+        } else {
+            throw new Exception("DB driver [$driver] is not supported by this test suite.");
+        }
     }
 
     protected function assertSeeInConsoleOutput(string $text): self

tests/TestClasses/AggregateRoots/AccountAggregateRoot.php

@@ -4,6 +4,7 @@
 
 use Spatie\EventProjector\AggregateRoot;
 use Spatie\EventProjector\Tests\TestClasses\AggregateRoots\StorableEvents\MoneyAdded;
+use Spatie\EventProjector\Tests\TestClasses\AggregateRoots\StorableEvents\MoneyMultiplied;
 
 final class AccountAggregateRoot extends AggregateRoot
 {
@@ -16,8 +17,20 @@ public function addMoney(int $amount): self
         return $this;
     }
 
+    public function multiplyMoney(int $amount): self
+    {
+        $this->recordThat(new MoneyMultiplied($amount));
+
+        return $this;
+    }
+
     public function applyMoneyAdded(MoneyAdded $event)
     {
         $this->balance += $event->amount;
     }
+
+    public function applyMoneyMultiplied(MoneyMultiplied $event)
+    {
+        $this->balance *= $event->amount;
+    }
 }

tests/TestClasses/AggregateRoots/StorableEvents/MoneyMultiplied.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Spatie\EventProjector\Tests\TestClasses\AggregateRoots\StorableEvents;
+
+use Spatie\EventProjector\ShouldBeStored;
+
+final class MoneyMultiplied implements ShouldBeStored
+{
+    /** @var int */
+    public $amount;
+
+    public function __construct(int $amount)
+    {
+        $this->amount = $amount;
+    }
+}