Merge pull request #15 from michaelpetri/fix-missing-reset-after-fail…

…ed-ack

fixed handling for failed ack calls

composer.json

@@ -14,7 +14,7 @@
         "symfony/process": "^6.2.7",
         "symfony/dependency-injection": "^6.2.7",
         "symfony/framework-bundle": "^6.2.7",
-        "michaelpetri/php-git": "^0.3.1"
+        "michaelpetri/php-git": "^0.4.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.15.1",

src/Infrastructure/Transport/EventReceiver.php

@@ -4,6 +4,7 @@
 
 namespace MichaelPetri\SymfonyFileWatcher\Infrastructure\Transport;
 
+use MichaelPetri\Git\Exception\FileNotCommitted;
 use MichaelPetri\Git\GitRepositoryInterface;
 use MichaelPetri\Git\Value\File;
 use MichaelPetri\Git\Value\Status;
@@ -93,10 +94,16 @@ public function ack(Envelope $envelope): void
     {
         $stamp = self::getStampFromEnvelope(FilenameStamp::class, $envelope);
 
-        $this->repository->commit(
-            'Successfully processed file',
-            File::from($stamp->filename)
-        );
+        $file = File::from($stamp->filename);
+
+        try {
+            $this->repository->commit(
+                'Successfully processed file',
+                $file
+            );
+        } catch (FileNotCommitted) {
+            $this->repository->reset($file);
+        }
     }
 
     public function reject(Envelope $envelope): void

tests/Unit/Infrastructure/Transport/EventReceiverTest.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\MichaelPetri\SymfonyFileWatcher\Unit\Infrastructure\Transport;
+
+use MichaelPetri\Git\Exception\FileNotCommitted;
+use MichaelPetri\Git\GitRepositoryInterface;
+use MichaelPetri\Git\Value\File;
+use MichaelPetri\SymfonyFileWatcher\Domain\Event\FileCreated;
+use MichaelPetri\SymfonyFileWatcher\Infrastructure\Transport\EventReceiver;
+use MichaelPetri\SymfonyFileWatcher\Infrastructure\Transport\Stamp\FilenameStamp;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Envelope;
+
+final class EventReceiverTest extends TestCase
+{
+    private GitRepositoryInterface&MockObject $repository;
+    private EventReceiver $receiver;
+
+    protected function setUp(): void
+    {
+        $this->repository = $this->createMock(GitRepositoryInterface::class);
+
+        $this->receiver = new EventReceiver(
+            $this->repository
+        );
+    }
+
+    public function testAckResetsFileOnFailure(): void
+    {
+        $file = File::from('bar.baz');
+
+        $this->repository
+            ->expects(self::once())
+            ->method('commit')
+            ->with(
+                'Successfully processed file',
+                $file
+            )
+            ->willThrowException(
+                FileNotCommitted::fromDirectoryAndFiles(
+                    $file->directory,
+                    [$file]
+                )
+            );
+
+        $this->repository
+            ->expects(self::once())
+            ->method('reset')
+            ->with($file);
+
+        $this->receiver->ack(
+            Envelope::wrap(
+                new FileCreated($file->name)
+            )->with(
+                new FilenameStamp($file->name)
+            )
+        );
+    }
+}