app/Form/Editor/FormConditionResolver.php

@@ -20,8 +20,11 @@ class FormConditionResolver extends ConditionResolver
     /**
      * @inheritdoc
      */
-    public function filterCondition($mode, $ifs): bool
+    public function filterBlock(array $block): bool
     {
+        $mode = data_get($block, 'tunes.condition.mode', 'any');
+        $ifs = data_get($block, 'tunes.condition.ifs', []);
+
         if (count($ifs) === 0) {
             return true;
         }

app/Form/Mails/ConfirmRegistrationMail.php

@@ -33,8 +33,8 @@ class ConfirmRegistrationMail extends Mailable
         $conditionResolver = app(FormConditionResolver::class)->forParticipant($participant);
         $this->fullname = $participant->getFields()->getFullname();
         $this->config = $participant->getConfig();
-        $this->topText = $conditionResolver->makeBlocks($participant->form->mail_top);
+        $this->topText = $conditionResolver->make($participant->form->mail_top);
-        $this->bottomText = $conditionResolver->makeBlocks($participant->form->mail_bottom);
+        $this->bottomText = $conditionResolver->make($participant->form->mail_bottom);
     }
 
     /**
@@ -68,13 +68,7 @@ class ConfirmRegistrationMail extends Mailable
      */
     public function attachments()
     {
-        $conditionResolver = app(FormConditionResolver::class)->forParticipant($this->participant);
-
         return $this->participant->form->getMedia('mailattachments')
-            ->filter(fn ($media) => $conditionResolver->filterCondition(
-                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/Models/Form.php

@@ -139,12 +139,11 @@ class Form extends Model implements HasMedia
     public static function booted(): void
     {
         static::saving(function (self $model) {
-            if (is_null(data_get($model->meta, 'active_columns'))) {
+            if (is_null($model->meta)) {
                 $model->setAttribute('meta', [
                     'active_columns' => $model->getFields()->count() ? $model->getFields()->take(4)->pluck('key')->toArray() : null,
                     'sorting' => $model->getFields()->count() ? [$model->getFields()->first()->key, 'asc'] : null,
                 ]);
-                return;
             }
 
             if (is_array(data_get($model->meta, 'active_columns'))) {
@@ -152,7 +151,6 @@ class Form extends Model implements HasMedia
                     ...$model->meta,
                     'active_columns' => array_values(array_intersect([...$model->getFields()->pluck('key')->toArray(), 'created_at'], $model->meta['active_columns'])),
                 ]);
-                return;
             }
         });
     }

app/Lib/Editor/ConditionResolver.php

@@ -6,27 +6,16 @@ abstract class ConditionResolver
 {
 
     /**
-     * @param array<string, mixed> $ifs
+     * @param array<string, mixed> $block
      */
-    abstract public function filterCondition(string $mode, array $ifs): bool;
+    abstract public function filterBlock(array $block): bool;
 
     /**
      * @param array<string, mixed> $content
      * @return array<string, mixed>
      */
-    public function makeBlocks(array $content): array
+    public function make(array $content): array
     {
         return array_filter(data_get($content, 'blocks', []), fn ($block) => $this->filterBlock($block));
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function filterBlock(array $block): bool
-    {
-        $mode = data_get($block, 'tunes.condition.mode', 'any');
-        $ifs = data_get($block, 'tunes.condition.ifs', []);
-
-        return $this->filterCondition($mode, $ifs);
-    }
 }

database/factories/Traits/FakesMedia.php

@@ -22,9 +22,9 @@ trait FakesMedia
         });
     }
 
-    public function withDocument(string $collection, string $filename, string $content = '', array $properties = []): self
+    public function withDocument(string $collection, string $filename, string $content = ''): self
     {
-        return $this->afterCreating(function (HasMedia $model) use ($filename, $collection, $content, $properties) {
+        return $this->afterCreating(function (HasMedia $model) use ($filename, $collection, $content) {
             $pathinfo = pathinfo($filename);
 
             UploadedFile::fake()->create($filename, $content, 'application/pdf')->storeAs('media-library', $filename, 'temp');
@@ -32,7 +32,6 @@ trait FakesMedia
             $model->addMediaFromDisk('media-library/' . $filename, 'temp')
                 ->usingName($pathinfo['filename'])
                 ->usingFileName($pathinfo['basename'])
-                ->withCustomProperties($properties)
                 ->toMediaCollection($collection);
         });
     }

resources/views/mail/form/confirm-registration.blade.php

@@ -4,8 +4,6 @@
 
 <x-mail-view::editor :content="$topText"></x-mail-view::editor>
 
-# Deine Daten
-
 @foreach($config->sections as $section)
 ## {{$section->name}}
 @foreach ($section->fields as $field)

tests/Feature/Form/FormRegisterMailTest.php

@@ -214,8 +214,6 @@ class FormRegisterMailTest extends FormTestCase
 
     /**
      * @dataProvider blockDataProvider
-     * @param array<string, mixed> $conditions
-     * @param array<string, mixed> $participantValues
      */
     public function testItFiltersForBlockConditions(array $conditions, FormtemplateFieldRequest $field, array $participantValues, bool $result): void
     {
@@ -240,52 +238,4 @@ class FormRegisterMailTest extends FormTestCase
             $mail->assertDontSeeInText('::content::');
         }
     }
-
-    public function testItSendsEmailWhenMailTopIsEmpty(): void
-    {
-        $this->login()->loginNami()->withoutExceptionHandling();
-
-        $participant = Participant::factory()->for(
-            Form::factory()
-                ->fields([
-                    $this->textField('firstname')->specialType(SpecialType::FIRSTNAME),
-                    $this->textField('lastname')->specialType(SpecialType::LASTNAME),
-                ])->state(['mail_top' => []])
-        )
-            ->data(['firstname' => 'Max', 'lastname' => 'Muster'])
-            ->create();
-
-        $mail = new ConfirmRegistrationMail($participant);
-        $mail->assertSeeInText('Max');
-    }
-
-    /**
-     * @dataProvider blockDataProvider
-     * @param array<string, mixed> $conditions
-     * @param array<string, mixed> $participantValues
-     */
-    public function testItFiltersForAttachments(array $conditions, FormtemplateFieldRequest $field, array $participantValues, bool $result): void
-    {
-        $this->login()->loginNami()->withoutExceptionHandling();
-
-        $participant = Participant::factory()->for(
-            Form::factory()
-                ->fields([
-                    $field,
-                    $this->textField('firstname')->specialType(SpecialType::FIRSTNAME),
-                    $this->textField('lastname')->specialType(SpecialType::LASTNAME),
-                ])
-                ->withDocument('mailattachments', 'beispiel.pdf', 'content', ['conditions' => $conditions])
-        )
-            ->data(['firstname' => 'Max', 'lastname' => 'Muster', ...$participantValues])
-            ->create();
-
-        $mail = new ConfirmRegistrationMail($participant);
-        $mail->assertSeeInHtml('Daten');
-        if ($result) {
-            $this->assertTrue($mail->hasAttachedData('content', 'beispiel.pdf', ['mime' => 'application/pdf']));
-        } else {
-            $this->assertFalse($mail->hasAttachedData('content', 'beispiel.pdf', ['mime' => 'application/pdf']));
-        }
-    }
 }

tests/Feature/Form/FormUpdateActionTest.php

@@ -47,22 +47,4 @@ class FormUpdateActionTest extends FormTestCase
         $this->patchJson(route('form.update', ['form' => $form]), $payload)->assertSessionDoesntHaveErrors()->assertOk();
         $this->assertEquals(['firstname'], $form->fresh()->meta['active_columns']);
     }
-
-    public function testItUpdatesActiveColumnsWhenFieldsAdded(): void
-    {
-        $this->login()->loginNami()->withoutExceptionHandling();
-        $form = Form::factory()
-            ->sections([FormtemplateSectionRequest::new()->fields([])])
-            ->create();
-        $payload = FormRequest::new()->sections([
-            FormtemplateSectionRequest::new()->fields([
-                $this->textField('firstname'),
-                $this->textField('geb'),
-                $this->textField('lastname'),
-            ])
-        ])->create();
-
-        $this->patchJson(route('form.update', ['form' => $form]), $payload)->assertSessionDoesntHaveErrors()->assertOk();
-        $this->assertEquals(['firstname', 'geb', 'lastname'], $form->fresh()->meta['active_columns']);
-    }
 }