Added the possibility to define a custom item index for exception logs (

#66)
code-rhapsodie · Jul 27, 2023 · 3c56a90 · 3c56a90
1 parent 1b2b1be
commit 3c56a90
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 4.1.0
+
+* Added custom index for exception log
+
 # Version 4.0.0
 
 * Added Symfony 6 support

diff --git a/src/DataflowType/Dataflow/Dataflow.php b/src/DataflowType/Dataflow/Dataflow.php
@@ -19,6 +19,8 @@ class Dataflow implements DataflowInterface, LoggerAwareInterface
     /** @var WriterInterface[] */
     private array $writers = [];
 
+    private ?\Closure $customExceptionIndex = null;
+
     public function __construct(private iterable $reader, private ?string $name)
     {
     }
@@ -43,6 +45,16 @@ public function addWriter(WriterInterface $writer): self
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function setCustomExceptionIndex(callable $callable): self
+    {
+        $this->customExceptionIndex = \Closure::fromCallable($callable);
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -61,8 +73,17 @@ public function process(): Result
                 try {
                     $this->processItem($item);
                 } catch (\Throwable $e) {
-                    $exceptions[$index] = $e;
-                    $this->logException($e, (string) $index);
+                    $exceptionIndex = $index;
+                    try {
+                        if (is_callable($this->customExceptionIndex)) {
+                            $exceptionIndex = (string) ($this->customExceptionIndex)($item, $index);
+                        }
+                    } catch (\Throwable $e2) {
+                        $exceptions[$index] = $e2;
+                        $this->logException($e2, $index);
+                    }
+                    $exceptions[$exceptionIndex] = $e;
+                    $this->logException($e, $exceptionIndex);
                 }
 
                 ++$count;

diff --git a/src/DataflowType/DataflowBuilder.php b/src/DataflowType/DataflowBuilder.php
@@ -19,6 +19,8 @@ class DataflowBuilder
     /** @var WriterInterface[] */
     private array $writers = [];
 
+    private ?\Closure $customExceptionIndex = null;
+
     public function setName(string $name): self
     {
         $this->name = $name;
@@ -47,6 +49,13 @@ public function addWriter(WriterInterface $writer): self
         return $this;
     }
 
+    public function setCustomExceptionIndex(callable $callable): self
+    {
+        $this->customExceptionIndex = \Closure::fromCallable($callable);
+
+        return $this;
+    }
+
     public function getDataflow(): DataflowInterface
     {
         $dataflow = new Dataflow($this->reader, $this->name);
@@ -62,6 +71,10 @@ public function getDataflow(): DataflowInterface
             $dataflow->addWriter($writer);
         }
 
+        if (is_callable($this->customExceptionIndex)) {
+            $dataflow->setCustomExceptionIndex($this->customExceptionIndex);
+        }
+
         return $dataflow;
     }
 }