Fixed filtering rejections code

php-etl · Dec 11, 2024 · 9694ef8 · 9694ef8
1 parent 8382034
commit 9694ef8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/src/Plugin/Filtering/Builder/Drop.php b/src/Plugin/Filtering/Builder/Drop.php
@@ -13,6 +13,9 @@ final class Drop implements StepBuilderInterface
     private ?Node\Expr $logger = null;
     private ?Node\Expr $rejection = null;
     private ?Node\Expr $state = null;
+
+    private ?string $reason = null;
+
     /** @var list<?Node\Expr> */
     private array $exclusions = [];
 
@@ -48,6 +51,13 @@ public function withExclusions(Node\Expr ...$exclusions): self
         return $this;
     }
 
+    public function withReason(string $reason): self
+    {
+        $this->reason = $reason;
+
+        return $this;
+    }
+
     private function buildExclusions(Node\Expr ...$exclusions): Node\Expr
     {
         if (\count($exclusions) > 3) {
@@ -122,16 +132,15 @@ class: new Node\Stmt\Class_(null, [
                                                         new Node\Expr\Variable('input'),
                                                         new Node\Expr\Yield_(
                                                             new Node\Expr\New_(
-                                                                class: new Node\Name\FullyQualified('Kiboko\\Component\\Bucket\\RejectionResultBucket'),
+                                                                class: new Node\Name\FullyQualified(
+                                                                    \Kiboko\Component\Bucket\RejectionResultBucket::class
+                                                                ),
                                                                 args: [
                                                                     new Node\Arg(
-                                                                        new Node\Expr\MethodCall(
-                                                                            new Node\Expr\Variable('exception'),
-                                                                            'getMessage'
-                                                                        ),
+                                                                        new Node\Scalar\String_($this->reason),
                                                                     ),
                                                                     new Node\Arg(
-                                                                        new Node\Expr\Variable('exception'),
+                                                                        new Node\Expr\ConstFetch(new Node\Name('null')),
                                                                     ),
                                                                     new Node\Arg(
                                                                         new Node\Expr\Variable('input'),

diff --git a/src/Plugin/Filtering/Builder/Reject.php b/src/Plugin/Filtering/Builder/Reject.php
@@ -13,6 +13,9 @@ final class Reject implements StepBuilderInterface
     private ?Node\Expr $logger = null;
     private ?Node\Expr $rejection = null;
     private ?Node\Expr $state = null;
+
+    private ?string $reason = null;
+
     /** @var list<?Node\Expr> */
     private array $exclusions = [];
 
@@ -48,6 +51,13 @@ public function withExclusions(Node\Expr ...$exclusions): self
         return $this;
     }
 
+    public function withReason(string $reason): self
+    {
+        $this->reason = $reason;
+
+        return $this;
+    }
+
     private function buildExclusions(Node\Expr ...$exclusions): Node\Expr
     {
         if (\count($exclusions) > 3) {
@@ -127,13 +137,10 @@ class: new Node\Name\FullyQualified(
                                                                 ),
                                                                 args: [
                                                                     new Node\Arg(
-                                                                        new Node\Expr\MethodCall(
-                                                                            new Node\Expr\Variable('exception'),
-                                                                            'getMessage'
-                                                                        ),
+                                                                        new Node\Scalar\String_($this->reason),
                                                                     ),
                                                                     new Node\Arg(
-                                                                        new Node\Expr\Variable('exception'),
+                                                                        new Node\Expr\ConstFetch(new Node\Name('null')),
                                                                     ),
                                                                     new Node\Arg(
                                                                         new Node\Expr\Variable('input'),