Add data for conditions

app/Form/Editor/FormConditionResolver.php

@@ -3,6 +3,7 @@
 namespace App\Form\Editor;
 
 use App\Form\Models\Participant;
+use App\Lib\Editor\Condition;
 use App\Lib\Editor\ConditionResolver;
 
 class FormConditionResolver extends ConditionResolver
@@ -20,24 +21,24 @@ class FormConditionResolver extends ConditionResolver
     /**
      * @inheritdoc
      */
-    public function filterCondition(string $mode, array $ifs): bool
+    public function filterCondition(Condition $condition): bool
     {
-        if (count($ifs) === 0) {
+        if (!$condition->hasStatements()) {
             return true;
         }
 
-        foreach ($ifs as $if) {
+        foreach ($condition->ifs as $if) {
-            $field = $this->participant->getFields()->findByKey($if['field']);
+            $field = $this->participant->getFields()->findByKey($if->field);
-            $matches = $field->matches($if['comparator'], $if['value']);
+            $matches = $field->matches($if->comparator, $if->value);
-            if ($matches && $mode === 'any') {
+            if ($matches && $condition->isAny()) {
                 return true;
             }
-            if (!$matches && $mode === 'all') {
+            if (!$matches && $condition->isAll()) {
                 return false;
             }
         }
 
-        if ($mode === 'any') {
+        if ($condition->isAny()) {
             return false;
         }
 

app/Form/Fields/Field.php

@@ -11,6 +11,7 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Form\Presenters\DefaultPresenter;
 use App\Form\Presenters\Presenter;
+use App\Lib\Editor\Comparator;
 use Faker\Generator;
 use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Attributes\MapInputName;
@@ -170,7 +171,7 @@ abstract class Field extends Data
         return $this->key . '_display';
     }
 
-    public function matches(string $comparator, mixed $value): bool
+    public function matches(Comparator $comparator, mixed $value): bool
     {
         return $this->getMatcher()->setValue($this->value)->matches($comparator, $value);
     }

app/Form/Mails/ConfirmRegistrationMail.php

@@ -5,6 +5,7 @@ namespace App\Form\Mails;
 use App\Form\Data\FormConfigData;
 use App\Form\Editor\FormConditionResolver;
 use App\Form\Models\Participant;
+use App\Lib\Editor\Condition;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Attachment;
 use Illuminate\Mail\Mailable;
@@ -71,10 +72,7 @@ class ConfirmRegistrationMail extends Mailable
         $conditionResolver = app(FormConditionResolver::class)->forParticipant($this->participant);
 
         return $this->participant->form->getMedia('mailattachments')
-            ->filter(fn ($media) => $conditionResolver->filterCondition(
+            ->filter(fn ($media) => $conditionResolver->filterCondition(Condition::fromMedia($media)))
-                data_get($media->getCustomProperty('conditions'), 'mode', 'all'),
-                data_get($media->getCustomProperty('conditions'), 'ifs', []),
-            ))
             ->map(fn ($media) => Attachment::fromStorageDisk($media->disk, $media->getPathRelativeToRoot()))
             ->all();
     }

app/Form/Matchers/Matcher.php

@@ -2,6 +2,8 @@
 
 namespace App\Form\Matchers;
 
+use App\Lib\Editor\Comparator;
+
 abstract class Matcher
 {
 
@@ -14,5 +16,5 @@ abstract class Matcher
         return $this;
     }
 
-    abstract public function matches(string $comparator, mixed $value): bool;
+    abstract public function matches(Comparator $comparator, mixed $value): bool;
 }

app/Form/Matchers/SingleValueMatcher.php

@@ -2,24 +2,26 @@
 
 namespace App\Form\Matchers;
 
+use App\Lib\Editor\Comparator;
+
 class SingleValueMatcher extends Matcher
 {
 
-    public function matches(string $comparator, mixed $value): bool
+    public function matches(Comparator $comparator, mixed $value): bool
     {
-        if ($comparator === 'isEqual' && $value === $this->value) {
+        if ($comparator === Comparator::EQUAL && $value === $this->value) {
             return true;
         }
 
-        if ($comparator === 'isNotEqual' && $value !== $this->value) {
+        if ($comparator === Comparator::NOTEQUAL && $value !== $this->value) {
             return true;
         }
 
-        if ($comparator === 'isIn' && in_array($this->value, $value)) {
+        if ($comparator === Comparator::IN && in_array($this->value, $value)) {
             return true;
         }
 
-        if ($comparator === 'isNotIn' && !in_array($this->value, $value)) {
+        if ($comparator === Comparator::NOTIN && !in_array($this->value, $value)) {
             return true;
         }
 

app/Lib/Editor/Comparator.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Lib\Editor;
+
+enum Comparator: string
+{
+    case EQUAL = 'isEqual';
+    case NOTEQUAL = 'isNotEqual';
+    case IN = 'isIn';
+    case NOTIN = 'isNotIn';
+
+}

app/Lib/Editor/Condition.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Lib\Editor;
+
+use Illuminate\Database\Eloquent\Model;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\DataCollection;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
+use Spatie\LaravelData\Attributes\DataCollectionOf;
+
+class Condition extends Data
+{
+
+    /** @param DataCollection<int, Statement> $ifs */
+    public function __construct(
+        public ConditionMode $mode,
+        #[DataCollectionOf(Statement::class)]
+        public DataCollection $ifs,
+    ) {
+    }
+
+    public static function fromMedia(Media $media): self
+    {
+        return static::withoutMagicalCreationFrom($media->getCustomProperty('conditions') ?: [
+            'mode' => 'any',
+            'ifs' => [],
+        ]);
+    }
+
+    /**
+     * @param array<string, mixed> $block
+     */
+    public static function fromBlock(array $block): self
+    {
+
+        return static::withoutMagicalCreationFrom([
+            'mode' => data_get($block, 'tunes.condition.mode', 'any'),
+            'ifs' =>  data_get($block, 'tunes.condition.ifs', []),
+        ]);
+    }
+
+    public function hasStatements(): bool
+    {
+        return count($this->ifs) > 0;
+    }
+
+    public function isAny(): bool
+    {
+        return $this->mode === ConditionMode::ANY;
+    }
+
+    public function isAll(): bool
+    {
+        return $this->mode === ConditionMode::ALL;
+    }
+}

app/Lib/Editor/ConditionMode.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Lib\Editor;
+
+enum ConditionMode: string
+{
+    case ALL = 'all';
+    case ANY = 'any';
+}

app/Lib/Editor/ConditionResolver.php

@@ -5,10 +5,7 @@ namespace App\Lib\Editor;
 abstract class ConditionResolver
 {
 
-    /**
+    abstract public function filterCondition(Condition $condition): bool;
-     * @param array<string, mixed> $ifs
-     */
-    abstract public function filterCondition(string $mode, array $ifs): bool;
 
     /**
      * @param array<string, mixed> $content
@@ -24,9 +21,6 @@ abstract class ConditionResolver
      */
     public function filterBlock(array $block): bool
     {
-        $mode = data_get($block, 'tunes.condition.mode', 'any');
+        return $this->filterCondition(Condition::fromBlock($block));
-        $ifs = data_get($block, 'tunes.condition.ifs', []);
-
-        return $this->filterCondition($mode, $ifs);
     }
 }

app/Lib/Editor/Statement.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Lib\Editor;
+
+use Spatie\LaravelData\Data;
+
+class Statement extends Data
+{
+    /** @param mixed $value */
+    public function __construct(public string $field, public $value, public Comparator $comparator)
+    {
+    }
+}