Updated logic to keep the updated_at timestamp of the previous revision correct (#63)

Author: bbredewold

src/Concerns/HasDrafts.php

@@ -99,15 +99,16 @@ protected function newRevision(): void
             return;
         }
 
-        $revision = $this->fresh()?->replicate();
+        $updatingModel = $this->fresh();
+        $revision = $updatingModel?->replicate();
 
-        static::saved(function (Model $model) use ($revision): void {
+        static::saved(function (Model $model) use ($updatingModel, $revision): void {
             if ($model->isNot($this)) {
                 return;
             }
 
-            $revision->{$this->getCreatedAtColumn()} = $this->{$this->getCreatedAtColumn()};
-            $revision->{$this->getUpdatedAtColumn()} = $this->{$this->getUpdatedAtColumn()};
+            $revision->{$this->getCreatedAtColumn()} = $updatingModel->{$this->getCreatedAtColumn()};
+            $revision->{$this->getUpdatedAtColumn()} = $updatingModel->{$this->getUpdatedAtColumn()};
             $revision->is_current = false;
             $revision->is_published = false;
 

tests/RevisionsTest.php

@@ -2,6 +2,7 @@
 
 use Oddvalue\LaravelDrafts\Tests\Post;
 use Oddvalue\LaravelDrafts\Tests\SoftDeletingPost;
+use function Spatie\PestPluginTestTime\testTime;
 
 it('keeps the correct number of revisions', function () {
     config(['drafts.revisions.keep' => 3]);
@@ -14,7 +15,6 @@
         }
     };
 
-    config(['drafts.revisions.keep' => 3]);
     $post = Post::factory()->create(['title' => 'Rev 1']);
     $revsExist('Rev 1');
     $this->travel(1)->minutes();
@@ -39,6 +39,46 @@
     ]);
 });
 
+it('sets the correct timestamps on revisions', function () {
+    $recordsExist = function (...$records) {
+        foreach ($records as $record) {
+            $this->assertDatabaseHas('posts', $record);
+        }
+    };
+
+    testTime()->freeze('2021-01-02 14:00:00');
+
+    $post = Post::factory()->create(['title' => 'Rev 1']);
+    $recordsExist(['title' => 'Rev 1', 'updated_at' => '2021-01-02 14:00:00']);
+
+    testTime()->addMinute();
+    $post->fresh()->update(['title' => 'Rev 2']);
+
+    $recordsExist(
+        ['title' => 'Rev 1', 'updated_at' => '2021-01-02 14:00:00'],
+        ['title' => 'Rev 2', 'updated_at' => '2021-01-02 14:01:00'],
+    );
+
+    testTime()->addMinute();
+    $post->fresh()->update(['title' => 'Rev 3']);
+
+    $recordsExist(
+        ['title' => 'Rev 1', 'updated_at' => '2021-01-02 14:00:00'],
+        ['title' => 'Rev 2', 'updated_at' => '2021-01-02 14:01:00'],
+        ['title' => 'Rev 3', 'updated_at' => '2021-01-02 14:02:00'],
+    );
+
+    testTime()->addMinute();
+    $post->fresh()->update(['title' => 'Rev 4']);
+
+    $recordsExist(
+        ['title' => 'Rev 1', 'updated_at' => '2021-01-02 14:00:00'],
+        ['title' => 'Rev 2', 'updated_at' => '2021-01-02 14:01:00'],
+        ['title' => 'Rev 3', 'updated_at' => '2021-01-02 14:02:00'],
+        ['title' => 'Rev 4', 'updated_at' => '2021-01-02 14:03:00'],
+    );
+});
+
 it('can disable revisions', function () {
     config(['drafts.revisions.keep' => 0]);
     $post = Post::factory()->create(['title' => 'Foo']);