Add Carbon cast

app/Contribution/Actions/GenerateAction.php

@@ -2,11 +2,11 @@
 
 namespace App\Contribution\Actions;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\ContributionFactory;
-use App\Contribution\Documents\ContributionDocument;
+use App\Contribution\Requests\GenerateRequest;
 use App\Rules\JsonBase64Rule;
 use Illuminate\Support\Facades\Validator;
-use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -15,23 +15,18 @@ class GenerateAction
 {
     use AsAction;
 
-    /**
-     * @param class-string<ContributionDocument> $document
-     * @param array<string, mixed>               $payload
-     */
-    public function handle(string $document, array $payload): BaseCompiler
+    public function handle(HasContributionData $request): BaseCompiler
     {
-        return Tex::compile($document::fromRequest($payload));
+        return Tex::compile($request->type()::fromPayload($request));
     }
 
-    public function asController(ActionRequest $request): BaseCompiler
+    public function asController(GenerateRequest $request): BaseCompiler
     {
-        $payload = $this->payload($request);
-        $type = data_get($payload, 'type');
+        $type = $request->type();
         ValidateAction::validateType($type);
-        Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();
+        Validator::make($request->payload(), app(ContributionFactory::class)->rules($type))->validate();
 
-        return $this->handle($type, $payload);
+        return $this->handle($request);
     }
 
     /**
@@ -43,12 +38,4 @@ class GenerateAction
             'payload' => [new JsonBase64Rule()],
         ];
     }
-
-    /**
-     * @return array<string, string>
-     */
-    private function payload(ActionRequest $request): array
-    {
-        return json_decode(rawurldecode(base64_decode($request->input('payload', ''))), true);
-    }
 }

app/Contribution/Actions/GenerateApiAction.php

@@ -2,8 +2,8 @@
 
 namespace App\Contribution\Actions;
 
-use App\Contribution\Documents\ContributionDocument;
-use Lorisleiva\Actions\ActionRequest;
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Requests\GenerateApiRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -13,19 +13,19 @@ class GenerateApiAction
     use AsAction;
 
     /**
-     * @param class-string<ContributionDocument> $document
-     * @param array<string, mixed>               $payload
+     * @todo merge this with GenerateAction
      */
-    public function handle(string $document, array $payload): BaseCompiler
+    public function handle(HasContributionData $request): BaseCompiler
     {
-        return Tex::compile($document::fromApiRequest($payload));
+        return Tex::compile($request->type()::fromPayload($request));
     }
 
-    public function asController(ActionRequest $request): BaseCompiler
+    public function asController(GenerateApiRequest $request): BaseCompiler
     {
-        ValidateAction::validateType($request->input('type'));
+        $type = $request->type();
+        ValidateAction::validateType($type);
 
-        return $this->handle($request->input('type'), $request->input());
+        return $this->handle($request);
     }
 
     /**

app/Contribution/Contracts/HasContributionData.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Contribution\Contracts;
+
+use App\Contribution\Data\MemberData;
+use Carbon\Carbon;
+use App\Contribution\Documents\ContributionDocument;
+use App\Country;
+use Illuminate\Support\Collection;
+
+interface HasContributionData {
+
+    public function dateFrom(): Carbon;
+    public function dateUntil(): Carbon;
+    public function zipLocation(): string;
+    public function eventName(): string;
+    /**
+     * @return class-string<ContributionDocument>
+     */
+    public function type(): string;
+
+    /**
+     * @return Collection<int, MemberData>
+     */
+    public function members(): Collection;
+
+    public function country(): ?Country;
+}

app/Contribution/Documents/BdkjHesse.php

@@ -2,6 +2,7 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
@@ -17,8 +18,8 @@ class BdkjHesse extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -39,33 +40,15 @@ class BdkjHesse extends ContributionDocument
         return Carbon::parse($this->dateUntil)->format('d.m.Y');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
         return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromModels($request['members'])->chunk(20),
-            eventName: $request['eventName'],
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): self
-    {
-        return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromApi($request['member_data'])->chunk(20),
-            eventName: $request['eventName'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(20),
+            eventName: $request->eventName(),
         );
     }
 

app/Contribution/Documents/CityFrankfurtMainDocument.php

@@ -2,12 +2,14 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
 use App\Invoice\InvoiceSettings;
 use Illuminate\Support\Collection;
+use Carbon\Carbon;
 
 class CityFrankfurtMainDocument extends ContributionDocument
 {
@@ -20,8 +22,8 @@ class CityFrankfurtMainDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -33,33 +35,15 @@ class CityFrankfurtMainDocument extends ContributionDocument
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
         return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromModels($request['members'])->chunk(15),
-            eventName: $request['eventName'],
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): self
-    {
-        return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromApi($request['member_data'])->chunk(15),
-            eventName: $request['eventName'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(15),
+            eventName: $request->eventName(),
         );
     }
 

app/Contribution/Documents/CityRemscheidDocument.php

@@ -2,12 +2,13 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Data\MemberData;
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
 use App\Member\Member;
 use Illuminate\Support\Collection;
+use Carbon\Carbon;
 
 class CityRemscheidDocument extends ContributionDocument
 {
@@ -19,8 +20,8 @@ class CityRemscheidDocument extends ContributionDocument
      * @param Collection<int, Collection<int, Member>> $children
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $leaders,
@@ -32,40 +33,18 @@ class CityRemscheidDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
-        [$leaders, $children] = MemberData::fromModels($request['members'])->partition(fn ($member) => $member->isLeader);
+        [$leaders, $children] = $request->members()->partition(fn ($member) => $member->isLeader);
 
         return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
             leaders: $leaders->values()->toBase()->chunk(6),
             children: $children->values()->toBase()->chunk(20),
-            eventName: $request['eventName'],
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): self
-    {
-        $members = MemberData::fromApi($request['member_data']);
-        [$leaders, $children] = $members->partition(fn ($member) => $member->isLeader);
-
-        return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            leaders: $leaders->values()->toBase()->chunk(6),
-            children: $children->values()->toBase()->chunk(20),
-            eventName: $request['eventName'],
+            eventName: $request->eventName(),
         );
     }
 

app/Contribution/Documents/CitySolingenDocument.php

@@ -2,6 +2,7 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Invoice\InvoiceSettings;
 use Carbon\Carbon;
@@ -16,8 +17,8 @@ class CitySolingenDocument extends ContributionDocument
      * @param Collection<int, MemberData> $members
      */
     final private function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public Collection $members,
         public string $eventName,
@@ -30,28 +31,14 @@ class CitySolingenDocument extends ContributionDocument
     /**
      * {@inheritdoc}
      */
-    public static function fromRequest(array $request): static
+    public static function fromPayload(HasContributionData $request): static
     {
         return new static(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            members: MemberData::fromModels($request['members']),
-            eventName: $request['eventName'],
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): static
-    {
-        return new static(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            members: MemberData::fromApi($request['member_data']),
-            eventName: $request['eventName'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            members: $request->members(),
+            eventName: $request->eventName(),
         );
     }
 
@@ -75,8 +62,6 @@ class CitySolingenDocument extends ContributionDocument
 
     public function checkboxes(): string
     {
-        $output = '';
-
         $firstRow = collect(['B' => 'Jugendbildungsmaßnahme', 'G' => 'Gruppenleiter/innenschulung', 'FK' => 'Ferienkolonie', 'F' => 'Freizeitnaßnahme'])->map(function ($item, $key) {
             return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox') . '{' . $item . '}';
         })->implode(' & ') . ' \\\\';

app/Contribution/Documents/ContributionDocument.php

@@ -2,6 +2,7 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use Zoomyboy\Tex\Document;
 use Zoomyboy\Tex\Template;
 
@@ -11,15 +12,7 @@ abstract class ContributionDocument extends Document
 
     abstract public static function getName(): string;
 
-    /**
-     * @param ContributionRequestArray $request
-     */
-    abstract public static function fromRequest(array $request): self;
-
-    /**
-     * @param ContributionApiRequestArray $request
-     */
-    abstract public static function fromApiRequest(array $request): self;
+    abstract public static function fromPayload(HasContributionData $request): self;
 
     /**
      * @return array<string, mixed>

app/Contribution/Documents/RdpNrwDocument.php

@@ -2,11 +2,13 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
 use Illuminate\Support\Collection;
+use Carbon\Carbon;
 
 class RdpNrwDocument extends ContributionDocument
 {
@@ -17,8 +19,8 @@ class RdpNrwDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -29,33 +31,15 @@ class RdpNrwDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
         return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromModels($request['members'])->chunk(17),
-            eventName: $request['eventName'],
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): self
-    {
-        return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromApi($request['member_data'])->chunk(17),
-            eventName: $request['eventName'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(17),
+            eventName: $request->eventName(),
         );
     }
 

app/Contribution/Documents/WuppertalDocument.php

@@ -2,11 +2,13 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
 use Illuminate\Support\Collection;
+use Carbon\Carbon;
 
 class WuppertalDocument extends ContributionDocument
 {
@@ -18,8 +20,8 @@ class WuppertalDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -30,33 +32,15 @@ class WuppertalDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
         return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromModels($request['members'])->chunk(14),
-            eventName: $request['eventName'],
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): self
-    {
-        return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromApi($request['member_data'])->chunk(14),
-            eventName: $request['eventName'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(14),
+            eventName: $request->eventName(),
         );
     }
 

app/Contribution/Requests/GenerateApiRequest.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Contribution\Requests;
+
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Data\MemberData;
+use App\Contribution\Documents\ContributionDocument;
+use App\Country;
+use Lorisleiva\Actions\ActionRequest;
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+use RuntimeException;
+
+class GenerateApiRequest extends ActionRequest implements HasContributionData {
+    /**
+     * @return array<string, string>
+     */
+    public function payload(): array
+    {
+        return $this->input();
+    }
+
+    /**
+     * @return string|array<array-key, mixed>
+     */
+    public function value(string $key): string|array
+    {
+        if (!Arr::has($this->payload(), $key)) {
+            throw new RuntimeException('Wert für '.$key.' nicht gefunden.');
+        }
+        return data_get($this->payload(), $key);
+    }
+
+    /**
+     * @return class-string<ContributionDocument>
+     */
+    public function type(): string
+    {
+        return $this->value('type');
+    }
+
+    public function dateFrom(): Carbon {
+        return Carbon::parse($this->value('dateFrom'));
+    }
+
+    public function dateUntil(): Carbon {
+        return Carbon::parse($this->value('dateUntil'));
+    }
+
+    public function zipLocation(): string {
+        return $this->value('zipLocation');
+    }
+
+    public function eventName(): string {
+        return $this->value('eventName');
+    }
+
+    public function members(): Collection {
+        return MemberData::fromApi($this->value('member_data'));
+    }
+
+    public function country(): ?Country {
+        return Country::where('id', $this->value('country'))->first();
+    }
+
+}

app/Contribution/Requests/GenerateRequest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Contribution\Requests;
+
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Data\MemberData;
+use App\Contribution\Documents\ContributionDocument;
+use App\Country;
+use Lorisleiva\Actions\ActionRequest;
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+
+class GenerateRequest extends ActionRequest implements HasContributionData {
+    /**
+     * @return array<string, string>
+     */
+    public function payload(): array
+    {
+        return json_decode(rawurldecode(base64_decode($this->input('payload', ''))), true);
+    }
+
+    /**
+     * @return string|array<array-key, mixed>
+     */
+    public function value(string $key): string|array
+    {
+        return data_get($this->payload(), $key);
+    }
+
+    /**
+     * @return class-string<ContributionDocument>
+     */
+    public function type(): string
+    {
+        return $this->value('type');
+    }
+
+    public function dateFrom(): Carbon {
+        return Carbon::parse($this->value('dateFrom'));
+    }
+
+    public function dateUntil(): Carbon {
+        return Carbon::parse($this->value('dateUntil'));
+    }
+
+    public function zipLocation(): string {
+        return $this->value('zipLocation');
+    }
+
+    public function eventName(): string {
+        return $this->value('eventName');
+    }
+
+    public function members(): Collection {
+        return MemberData::fromModels($this->value('members'));
+    }
+
+    public function country(): ?Country {
+        return Country::where('id', $this->value('country'))->first();
+    }
+
+}

tests/EndToEnd/Member/PreventionTest.php

@@ -415,7 +415,7 @@ it('renders setting of yearly mail', function () {
     app(PreventionSettings::class)->fill([
         'yearlymail' => EditorRequestFactory::new()->paragraphs(["{wanted}", "bbb"])->toData()
     ])->save();
-    $member = createMember((['efz' =>  now()->subYears(5), 'ps_at' => now(), 'has_vk' => true]));
+    createMember((['efz' =>  now()->subYears(5), 'ps_at' => now(), 'has_vk' => true]));
 
     sleep(2);
     YearlyRememberAction::run();

tests/Feature/Contribution/StoreTest.php

@@ -2,6 +2,9 @@
 
 namespace Tests\Feature\Contribution;
 
+use App\Contribution\Documents\BdkjHesse;
+use App\Contribution\Documents\CityFrankfurtMainDocument;
+use App\Contribution\Documents\CityRemscheidDocument;
 use App\Contribution\Documents\RdpNrwDocument;
 use App\Contribution\Documents\CitySolingenDocument;
 use App\Contribution\Documents\WuppertalDocument;
@@ -103,7 +106,7 @@ dataset('validation', function () {
     ];
 });
 
-it('compiles documents via api', function (string $type, array $bodyChecks) {
+it('compiles documents via base64 param', function (string $type, array $bodyChecks) {
     $this->withoutExceptionHandling();
     Tex::spy();
     $this->login()->loginNami();
@@ -125,12 +128,12 @@ it('compiles documents via api', function (string $type, array $bodyChecks) {
     $response->assertOk();
     Tex::assertCompiled($type, fn ($document) => $document->hasAllContent($bodyChecks));
 })->with([
-    ["App\\Contribution\\Documents\\CitySolingenDocument", ["Super tolles Lager", "Max Muster", "Jane Muster", "15.06.1991"]],
-    ["App\\Contribution\\Documents\\RdpNrwDocument", ["Muster, Max", "Muster, Jane", "15.06.1991", "42777 SG"]],
-    ["App\\Contribution\\Documents\\CityRemscheidDocument", ["Max", "Muster", "Jane"]],
-    ["App\\Contribution\\Documents\\CityFrankfurtMainDocument", ["Max", "Muster", "Jane"]],
-    ["App\\Contribution\\Documents\\BdkjHesse", ["Max", "Muster", "Jane"]],
-    ["App\\Contribution\\Documents\\WuppertalDocument", ["Max", "Muster", "Jane", "42777 SG", "15.06.1991", "16.06.1991"]],
+    [CitySolingenDocument::class, ["Super tolles Lager", "Max Muster", "Jane Muster", "15.06.1991"]],
+    [RdpNrwDocument::class, ["Muster, Max", "Muster, Jane", "15.06.1991", "42777 SG"]],
+    [CityRemscheidDocument::class, ["Max", "Muster", "Jane"]],
+    [CityFrankfurtMainDocument::class, ["Max", "Muster", "Jane"]],
+    [BdkjHesse::class, ["Max", "Muster", "Jane"]],
+    [WuppertalDocument::class, ["Max", "Muster", "Jane", "42777 SG", "15.06.1991", "16.06.1991"]],
 ]);
 
 it('testItCompilesGroupNameInSolingenDocument', function () {
@@ -145,33 +148,37 @@ it('testItCompilesGroupNameInSolingenDocument', function () {
     Tex::assertCompiled(CitySolingenDocument::class, fn ($document) => $document->hasAllContent(['Stamm BiPi']));
 });
 
-it('testItCompilesContributionDocumentsViaApi', function () {
+it('testItCompilesContributionDocumentsViaApi', function (string $type, array $bodyChecks) {
     $this->withoutExceptionHandling();
     Tex::spy();
     Gender::factory()->female()->create();
     Gender::factory()->male()->create();
     Passport::actingAsClient(Client::factory()->create(), ['contribution-generate']);
-    $country = Country::factory()->create();
-    Member::factory()->defaults()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']);
-    Member::factory()->defaults()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']);
 
     $response = $this->postJson('/api/contribution-generate', [
-        'country' => $country->id,
+        'country' => Country::factory()->create()->id,
         'dateFrom' => '1991-06-15',
         'dateUntil' => '1991-06-16',
         'eventName' => 'Super tolles Lager',
-        'type' => CitySolingenDocument::class,
+        'type' => $type,
         'zipLocation' => '42777 SG',
         'member_data' => [
-            ContributionMemberApiRequestFactory::new()->create(),
-            ContributionMemberApiRequestFactory::new()->create(),
+            ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']),
+            ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']),
         ],
     ]);
 
     $response->assertSessionDoesntHaveErrors();
     $response->assertOk();
-    Tex::assertCompiled(CitySolingenDocument::class, fn ($document) => $document->hasAllContent(['Super']));
-});
+    Tex::assertCompiled($type, fn ($document) => $document->hasAllContent($bodyChecks));
+})->with([
+    [CitySolingenDocument::class, ["Super tolles Lager", "Max Muster", "Jane Muster", "15.06.1991"]],
+    [RdpNrwDocument::class, ["Muster, Max", "Muster, Jane", "15.06.1991", "42777 SG"]],
+    [CityRemscheidDocument::class, ["Max", "Muster", "Jane"]],
+    [CityFrankfurtMainDocument::class, ["Max", "Muster", "Jane"]],
+    [BdkjHesse::class, ["Max", "Muster", "Jane"]],
+    [WuppertalDocument::class, ["Max", "Muster", "Jane", "42777 SG", "15.06.1991", "16.06.1991"]],
+]);
 
 it('testInputShouldBeBase64EncodedJson', function (string $payload) {
     $this->login()->loginNami();