Add prevention conditions

app/Form/Actions/FormStoreAction.php

@@ -37,6 +37,7 @@ class FormStoreAction
             'export' => 'nullable|array',
             'needs_prevention' => 'present|boolean',
             'prevention_text' => 'array',
+            'prevention_conditions' => 'array',
         ];
     }
 

app/Form/Actions/FormUpdateAction.php

@@ -3,6 +3,7 @@
 namespace App\Form\Actions;
 
 use App\Form\Models\Form;
+use App\Lib\Editor\Condition;
 use App\Lib\Events\Succeeded;
 use Illuminate\Http\JsonResponse;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -36,6 +37,7 @@ class FormUpdateAction
             'export' => 'nullable|array',
             'needs_prevention' => 'present|boolean',
             'prevention_text' => 'array',
+            'prevention_conditions' => 'array',
         ];
     }
 

app/Form/Actions/PreventionRememberAction.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Actions;
 
+use App\Form\Editor\FormConditionResolver;
 use App\Form\Models\Participant;
 use App\Prevention\Mails\PreventionRememberMail;
 use App\Prevention\PreventionSettings;
@@ -23,6 +24,10 @@ class PreventionRememberAction
                     ->orWhereNull('last_remembered_at')
             );
         foreach ($query->get() as $participant) {
+            if (!app(FormConditionResolver::class)->forParticipant($participant)->filterCondition($participant->form->prevention_conditions)) {
+                continue;
+            }
+
             if ($participant->getFields()->getMailRecipient() === null || count($participant->preventions()) === 0) {
                 continue;
             }

app/Form/Models/Form.php

@@ -5,6 +5,7 @@ namespace App\Form\Models;
 use App\Form\Data\ExportData;
 use App\Form\Data\FieldCollection;
 use App\Form\Data\FormConfigData;
+use App\Lib\Editor\Condition;
 use App\Lib\Editor\EditorData;
 use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -39,6 +40,7 @@ class Form extends Model implements HasMedia
         'export' => ExportData::class,
         'needs_prevention' => 'boolean',
         'prevention_text' => EditorData::class,
+        'prevention_conditions' => Condition::class,
     ];
 
     /** @var array<int, string> */

app/Form/Resources/FormResource.php

@@ -52,6 +52,7 @@ class FormResource extends JsonResource
             'export' => $this->export,
             'needs_prevention' => $this->needs_prevention,
             'prevention_text' => $this->prevention_text,
+            'prevention_conditions' => $this->prevention_conditions,
             'links' => [
                 'participant_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => null]),
                 'participant_root_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => -1]),
@@ -99,6 +100,7 @@ class FormResource extends JsonResource
                 'prevention_text' => EditorData::default(),
                 'id' => null,
                 'export' => ExportData::from([]),
+                'prevention_conditions' => ['mode' => 'all', 'ifs' => []],
             ],
             'section_default' => [
                 'name' => '',

app/Lib/Editor/Condition.php

@@ -20,21 +20,12 @@ class Condition extends Data
 
     public static function fromMedia(Media $media): self
     {
-        return static::withoutMagicalCreationFrom($media->getCustomProperty('conditions') ?: [
+        return $media->getCustomProperty('conditions') ? static::withoutMagicalCreationFrom($media->getCustomProperty('conditions')) : static::default();
-            'mode' => 'any',
-            'ifs' => [],
-        ]);
     }
 
-    /**
+    public static function defaults(): self
-     * @param array<string, mixed> $block
-     */
-    public static function fromBlock(array $block): self
     {
-        return static::withoutMagicalCreationFrom([
+        return static::withoutMagicalCreationFrom(['mode' => 'any', 'ifs' => []]);
-            'mode' => data_get($block, 'tunes.condition.mode', 'any'),
-            'ifs' =>  data_get($block, 'tunes.condition.ifs', []),
-        ]);
     }
 
     public function hasStatements(): bool

app/Lib/Editor/ConditionResolver.php

@@ -21,6 +21,9 @@ abstract class ConditionResolver
      */
     public function filterBlock(array $block): bool
     {
-        return $this->filterCondition(Condition::fromBlock($block));
+        return $this->filterCondition(Condition::withoutMagicalCreationFrom([
+            'mode' => data_get($block, 'tunes.condition.mode', 'any'),
+            'ifs' =>  data_get($block, 'tunes.condition.ifs', []),
+        ]));
     }
 }

database/factories/Form/Models/FormFactory.php

@@ -4,6 +4,7 @@ namespace Database\Factories\Form\Models;
 
 use App\Form\Data\ExportData;
 use App\Form\Models\Form;
+use App\Lib\Editor\Condition;
 use Database\Factories\Traits\FakesMedia;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Tests\Feature\Form\FormtemplateFieldRequest;
@@ -54,6 +55,7 @@ class FormFactory extends Factory
             'is_active' => true,
             'is_private' => false,
             'export' => ExportData::from([]),
+            'prevention_conditions' => Condition::defaults(),
         ];
     }
 

database/migrations/2024_07_11_154303_create_forms_prevention_conditions_column.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->json('prevention_conditions')->default(json_encode(['mode' => 'all', 'ifs' => []]));
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->dropColumn('prevention_conditions');
+        });
+    }
+};

resources/js/views/form/Index.vue

@@ -124,6 +124,9 @@
                         :rows="6"
                         label="Präventions-Hinweis"
                     ></f-editor>
+                    <ui-box heading="Bedingung für Präventions-Unterlagen">
+                        <conditions id="prevention_conditions" v-model="single.prevention_conditions" :single="single"> </conditions>
+                    </ui-box>
                 </div>
             </div>
             <template #actions>

tests/EndToEnd/Form/FormIndexActionTest.php

@@ -61,6 +61,7 @@ class FormIndexActionTest extends FormTestCase
             ->assertInertiaPath('data.meta.templates.0.name', 'tname')
             ->assertInertiaPath('data.meta.templates.0.config.sections.0.name', 'sname')
             ->assertInertiaPath('data.meta.default.name', '')
+            ->assertInertiaPath('data.meta.default.prevention_conditions', ['mode' => 'all', 'ifs' => []])
             ->assertInertiaPath('data.meta.default.prevention_text.version', '1.0')
             ->assertInertiaPath('data.meta.default.description', [])
             ->assertInertiaPath('data.meta.default.excerpt', '')

tests/Feature/Form/FormRequest.php

@@ -3,6 +3,7 @@
 namespace Tests\Feature\Form;
 
 use App\Form\Data\ExportData;
+use App\Lib\Editor\Condition;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use Tests\RequestFactories\EditorRequestFactory;
@@ -52,6 +53,7 @@ class FormRequest extends RequestFactory
             'export' => ExportData::from([])->toArray(),
             'needs_prevention' => $this->faker->boolean(),
             'prevention_text' => EditorRequestFactory::new()->create(),
+            'prevention_conditions' => Condition::defaults(),
         ];
     }
 

tests/Feature/Form/FormUpdateActionTest.php

@@ -5,6 +5,7 @@ namespace Tests\Feature\Form;
 use App\Fileshare\Data\FileshareResourceData;
 use App\Form\Data\ExportData;
 use App\Form\Models\Form;
+use App\Lib\Editor\Condition;
 use App\Lib\Editor\EditorData;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\RequestFactories\EditorRequestFactory;
@@ -132,11 +133,12 @@ class FormUpdateActionTest extends FormTestCase
         $form = Form::factory()->create();
         $payload = FormRequest::new()
             ->preventionText(EditorRequestFactory::new()->text(10, 'lorem ipsum'))
-            ->state(['needs_prevention' => true])
+            ->state(['needs_prevention' => true, 'prevention_conditions' => ['mode' => 'all', 'ifs' => [['field' => 'vorname', 'value' => 'Max', 'comparator' => 'isEqual']]]])
             ->create();
 
         $this->patchJson(route('form.update', ['form' => $form]), $payload);
         $this->assertTrue($form->fresh()->needs_prevention);
         $this->assertEquals('lorem ipsum', $form->fresh()->prevention_text->blocks[0]['data']['text']);
+        $this->assertEquals(['mode' => 'all', 'ifs' => [['field' => 'vorname', 'value' => 'Max', 'comparator' => 'isEqual']]], $form->fresh()->prevention_conditions->toArray());
     }
 }

tests/Feature/Member/PreventionTest.php

@@ -9,6 +9,7 @@ use App\Form\Enums\SpecialType;
 use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Invoice\InvoiceSettings;
+use App\Lib\Editor\Condition;
 use App\Prevention\Mails\PreventionRememberMail;
 use App\Member\Member;
 use App\Member\Membership;
@@ -37,6 +38,19 @@ class PreventionTest extends TestCase
         $this->assertEquals(now()->format('Y-m-d'), $participant->fresh()->last_remembered_at->format('Y-m-d'));
     }
 
+    public function testItDoesntRememberWhenConditionDoesntMatch(): void
+    {
+        Mail::fake();
+        $form = $this->createForm();
+        $form->update(['prevention_conditions' => Condition::from(['mode' => 'all', 'ifs' => [['field' => 'vorname', 'comparator' => 'isEqual', 'value' => 'Max']]])]);
+        $participant = $this->createParticipant($form);
+        $participant->update(['data' => [...$participant->data, 'vorname' => 'Jane']]);
+
+        PreventionRememberAction::run();
+
+        $this->assertNull($participant->fresh()->last_remembered_at);
+    }
+
     public function testItRemembersWhenRememberIsDue(): void
     {
         Mail::fake();