Added a way to add reason rejection in the filtering plugin configura…

…tion
php-etl · Oct 20, 2023 · d58d507 · d58d507
1 parent 59de5a4
commit d58d507
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 64 deletions.
diff --git a/src/Plugin/Filtering/Builder/Reject.php b/src/Plugin/Filtering/Builder/Reject.php
@@ -6,6 +6,8 @@
 
 use Kiboko\Component\Bucket\AcceptanceResultBucket;
 use Kiboko\Component\Bucket\RejectionResultBucket;
+use Kiboko\Component\Bucket\RejectionWithReasonResultBucket;
+use Kiboko\Component\Satellite\Plugin\Filtering\DTO\Exclusion;
 use Kiboko\Contract\Configurator\StepBuilderInterface;
 use Kiboko\Contract\Pipeline\TransformerInterface;
 use PhpParser\Builder;
@@ -16,11 +18,9 @@ final class Reject implements StepBuilderInterface
     private ?Node\Expr $logger = null;
     private ?Node\Expr $rejection = null;
     private ?Node\Expr $state = null;
-    /** @var list<?Node\Expr> */
+    /** @var list<?Exclusion> */
     private array $exclusions = [];
 
-    public function __construct() {}
-
     public function withLogger(Node\Expr $logger): self
     {
         $this->logger = $logger;
@@ -42,53 +42,46 @@ public function withState(Node\Expr $state): self
         return $this;
     }
 
-    public function withExclusions(Node\Expr ...$exclusions): self
+    public function withExclusions(Exclusion ...$exclusions): self
     {
         array_push($this->exclusions, ...$exclusions);
 
         return $this;
     }
 
-    private function buildExclusions(Node\Expr ...$exclusions): Node\Expr
+    private function buildExclusions(Exclusion ...$exclusions): array
     {
-        if (\count($exclusions) > 3) {
-            $length = \count($exclusions);
-            $middle = (int) floor($length / 2);
-            $left = \array_slice($exclusions, 0, $middle);
-            $right = \array_slice($exclusions, $middle, $length);
-
-            return new Node\Expr\BinaryOp\BooleanAnd(
-                $this->buildExclusions(...$left),
-                $this->buildExclusions(...$right),
-            );
-        }
-
-        if (\count($exclusions) > 2) {
-            $right = array_shift($exclusions);
-
-            return new Node\Expr\BinaryOp\BooleanAnd(
-                $this->buildExclusions(...$exclusions),
-                $right,
-            );
-        }
-
-        if (\count($exclusions) > 1) {
-            $left = array_pop($exclusions);
-            $right = array_pop($exclusions);
-
-            return new Node\Expr\BinaryOp\BooleanAnd(
-                $left,
-                $right,
+        $statements = [];
+        foreach ($exclusions as $exclusion) {
+            $statements[] = new Node\Stmt\If_(
+                $exclusion->when,
+                [
+                    'stmts' => [
+                        new Node\Stmt\Expression(
+                            new Node\Expr\Assign(
+                                new Node\Expr\Variable('input'),
+                                new Node\Expr\Yield_(
+                                    new Node\Expr\New_(
+                                        $exclusion->reason ? new Node\Name\FullyQualified(RejectionWithReasonResultBucket::class) : new Node\Name\FullyQualified(RejectionResultBucket::class),
+                                        [
+                                            new Node\Arg(new Node\Expr\Variable('input')),
+                                            $exclusion->reason ? new Node\Arg($exclusion->reason) : new Node\Arg(
+                                                new Node\Expr\ConstFetch(
+                                                    new Node\Name(null)
+                                                ),
+                                            ),
+                                        ]
+                                    ),
+                                ),
+                            ),
+                        ),
+                        new Node\Stmt\Continue_(),
+                    ],
+                ]
             );
         }
 
-        if (\count($exclusions) > 0) {
-            return array_pop($exclusions);
-        }
-
-        return new Node\Expr\ConstFetch(
-            new Node\Name('false'),
-        );
+        return $statements;
     }
 
     public function getNode(): Node
@@ -114,27 +107,7 @@ class: new Node\Stmt\Class_(null, [
                                     new Node\Name('true'),
                                 ),
                                 [
-                                    new Node\Stmt\If_(
-                                        $this->buildExclusions(...$this->exclusions),
-                                        [
-                                            'stmts' => [
-                                                new Node\Stmt\Expression(
-                                                    new Node\Expr\Assign(
-                                                        new Node\Expr\Variable('input'),
-                                                        new Node\Expr\Yield_(
-                                                            new Node\Expr\New_(
-                                                                new Node\Name\FullyQualified(RejectionResultBucket::class),
-                                                                [
-                                                                    new Node\Arg(new Node\Expr\Variable('input')),
-                                                                ]
-                                                            ),
-                                                        ),
-                                                    ),
-                                                ),
-                                                new Node\Stmt\Continue_(),
-                                            ],
-                                        ]
-                                    ),
+                                    ...$this->buildExclusions(...$this->exclusions),
                                     new Node\Stmt\Expression(
                                         new Node\Expr\Assign(
                                             new Node\Expr\Variable('input'),

diff --git a/src/Plugin/Filtering/Configuration/Reject.php b/src/Plugin/Filtering/Configuration/Reject.php
@@ -29,8 +29,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->end()
                     ->end()
                     ->scalarNode('reason')
-                        ->isRequired()
-                        ->cannotBeEmpty()
                         ->validate()
                             ->ifTrue(isExpression())
                             ->then(asExpression())

diff --git a/src/Plugin/Filtering/DTO/Exclusion.php b/src/Plugin/Filtering/DTO/Exclusion.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kiboko\Component\Satellite\Plugin\Filtering\DTO;
+
+use PhpParser\Node\Expr;
+
+class Exclusion
+{
+    public function __construct(
+        public Expr $when,
+        public ?Expr $reason = null
+    ){}
+}
diff --git a/src/Plugin/Filtering/Factory/Reject.php b/src/Plugin/Filtering/Factory/Reject.php
@@ -14,6 +14,7 @@
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 
 use function Kiboko\Component\SatelliteToolbox\Configuration\compileExpression;
+use function Kiboko\Component\SatelliteToolbox\Configuration\compileValueWhenExpression;
 
 class Reject implements Configurator\FactoryInterface
 {
@@ -69,7 +70,10 @@ public function compile(array $config): Repository\Reject
 
         foreach ($config as $condition) {
             $builder->withExclusions(
-                compileExpression($interpreter, $condition['when'])
+                new Filtering\DTO\Exclusion(
+                    compileExpression($interpreter, $condition['when']),
+                    compileValueWhenExpression($interpreter, $condition['reason']) ?: null,
+                ),
             );
         }