.docker/base.Dockerfile

@@ -1,12 +1,11 @@
-FROM php:8.3.11-fpm AS php
+FROM php:8.1.6-fpm as php
 WORKDIR /app
 RUN ls /app
 RUN apt-get update
-RUN apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip poppler-utils libpng-dev libjpeg-dev default-mysql-client libzip-dev imagemagick libmagickwand-dev
+RUN apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip poppler-utils libpng-dev libjpeg-dev default-mysql-client libzip-dev
 RUN apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra texlive-extra-utils
 RUN docker-php-ext-install pdo_mysql curl exif intl mbstring pcntl zip
 RUN pecl install redis && docker-php-ext-enable redis
-RUN pecl install imagick && docker-php-ext-enable imagick
 RUN docker-php-ext-configure gd --with-jpeg
 RUN docker-php-ext-install gd
 RUN usermod -s /bin/bash www-data

.docker/bin/build_base

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-docker buildx build -f .docker/base.Dockerfile .
-docker image tag sha256:... zoomyboy/adrema-base
-docker push zoomyboy/adrema-base
-

.docker/nginx.Dockerfile

@@ -1,16 +1,16 @@
-FROM composer:2.7.9 AS composer
+FROM composer:2.2.7 as composer
 WORKDIR /app
 COPY . /app
 RUN composer install --ignore-platform-reqs --no-dev
 RUN php artisan telescope:publish
 RUN php artisan horizon:publish
 
-FROM node:20.15.0-slim AS node
+FROM node:20.15.0-slim as node
 WORKDIR /app
 COPY . /app
 RUN npm install && npm run prod && npm run img && rm -R node_modules
 
-FROM nginx:1.21.6-alpine AS nginx
+FROM nginx:1.21.6-alpine as nginx
 WORKDIR /app
 COPY --from=node /app /app
 COPY --from=composer /app/public/vendor /app/public/vendor

.docker/php.Dockerfile

@@ -1,14 +1,14 @@
-FROM composer:2.7.9 AS composer
+FROM composer:2.2.7 as composer
 WORKDIR /app
 COPY . /app
 RUN composer install --ignore-platform-reqs --no-dev
 
-FROM node:20.15.0-slim AS node
+FROM node:20.15.0-slim as node
 WORKDIR /app
 COPY . /app
 RUN npm install && npm run prod && npm run img && rm -R node_modules
 
-FROM zoomyboy/adrema-base:latest AS php
+FROM zoomyboy/adrema-base:latest as php
 COPY --chown=www-data:www-data . /app
 COPY --chown=www-data:www-data --from=node /app/public /app/public
 COPY --chown=www-data:www-data --from=composer /app/vendor /app/vendor

.drone.yml

@@ -12,7 +12,7 @@ steps:
           - git submodule update --init --recursive
 
     - name: composer_dev
-      image: composer:2.7.9
+      image: composer:2.2.7
       commands:
           - composer install --ignore-platform-reqs --dev
 
@@ -39,7 +39,6 @@ steps:
     - name: tests
       image: zoomyboy/adrema-base:latest
       commands:
-          - touch .env
           - php artisan migrate
           - php artisan test
           - rm -f .env
@@ -103,7 +102,7 @@ steps:
           event: tag
 
     - name: deploy
-      image: zoomyboy/adrema-base:latest
+      image: php:8.1.6
       environment:
           SSH_KEY:
               from_secret: deploy_private_key
@@ -136,7 +135,7 @@ steps:
           event: push
 
     - name: composer_no_dev
-      image: composer:2.7.9
+      image: composer:2.2.7
       commands:
           - composer install --ignore-platform-reqs --no-dev
 

.eslintrc.json

@@ -0,0 +1,28 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:vue/vue3-recommended",
+        "prettier"
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "vue"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.vue"
+            ],
+            "rules": {
+                "vue/multi-word-component-names": "off"
+            }
+        }
+    ]
+}

.gitignore

@@ -40,4 +40,3 @@ Homestead.json
 /public/sprite.svg
 /.php-cs-fixer.cache
 /groups.sql
-/.phpunit.cache

CHANGELOG.md

@@ -1,102 +1,5 @@
 # Letzte Änderungen
 
-### 1.12.19
-
--   Zuschusslisten können nun aus Veranstaltungs-Daten erstellt werden
--   Veranstaltungs-Übersicht zeigt nun Tags an
-
-### 1.12.18
-
--   Fix: Initialisierung klappt nun auch, wenn Mitgliedsnummer mit einer 0 beginnt
-
-### 1.12.17
-
--   Fix: Mitgliedschaften werden beim Sammel-Speichern nicht mehr doppelt angelegt
-
-### 1.12.16
-
--   Mitgliedschaften können nun bei Mitgliedschaften-Übersicht gelöscht werden
-
-### 1.12.15
-
--   Bestätigung wird eingeblendet beim Kopieren eines Events
-
-### 1.12.14
-
--   Bilder werden nun mitkopiert beim Kopieren eines Events
-
-### 1.12.13
-
--   Kopieren von bestehenden Veranstaltungen
--   Präventions-Erinnerung automatisch versenden
-
-### 1.12.11
-
--   Fix: Bank Account mit abrufen wenn Mitglied editiert wird
-
-### 1.12.7
-
--   Fix: Synchronisation von allen Mitgliedern bei Mail-Verteilern - nicht nur den ersten 20
-
-### 1.12.6
-
--   Fix: Beiträge von Familienmitgliedern splitten
-
-### 1.12.5
-
--   Fix: Synchronisieren von bestehenden Beiträgen aus NaMi
-
-### 1.12.4
-
--   Filter Mitglieder nach Verhaltenskodex
-
-### 1.12.3
-
--   Volltextsuche für Rechnungen
-
-### 1.12.2
-
--   Zuschussliste Gallier
-
-### 1.12.1
-
--   In Teilnehmer-Liste von Veranstaltungen kann nun sortiert und gefiltert werden.
--   Formulare: Feld Registrierung von / bis
-
-### 1.11.5
-
--   Fix: Synchronisation von NaMi-Mitgliedern
-
-### 1.11.4
-
--   Fix: Nicht an Präventions-Unterlagen für vergangene Veranstaltungen erinnern
-
-### 1.11.1
-
--   Es kann nun auch das Feld "Datenweiterverwendung" über Adrema gepflegt werden.
-
-### 1.10.20
-
--   Fixed: Bei Textfeldern wird nun die Einleitung dargestellt
-
-### 1.10.19
-
--   Fixed: Erweiterte Führungszeugnisse und Präventionsschulungen nur für aktive Mitgliedschaften auf Dashboard anzeigen
-
-### 1.10.18
-
--   Fixed: All Gruppen als Option anbieten bei Bedingungen
-
-### 1.10.17
-
--   Es können nun auch Bedingungen für Felder vom Typ Gruppierung definiert werden
-
-### 1.10.16
-
--   Rechnungen und Erinnerungen werden nun automatisch täglich um 10 Uhr verschickt
--   Es kann eingestellt werden, nach wie vielen Wochen an Rechnungen erinnert werden soll (Standard: 12)
--   Name und Profilbild des angemeldeten Benutzers wird nun oben rechts angezeigt
-
 ### 1.10.15
 
 -    "Für Mitglieder zusätzlich abfragen" kann nun im Formular auch gesetzt werden, wenn ein NaMi Feld ausgewählt ist.

Envoy.blade.php

@@ -1,4 +1,4 @@
-@servers(['docker' => ['stamm-silva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])
+@servers(['docker' => ['stammsilva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])
 
 @task('deploy', ['on' => 'docker'])
 cd $ADREMA_PATH

README.md

@@ -32,16 +32,16 @@ Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles
 
 ## Installation des Produktivsystems
 
-1. Verschieben der Docker-Compose
+1. Herunterladen der Beispiel Docker-Compose
 
     ```cmd
-    mv docker-compose.prod.yml docker-compose.yml
+    curl https://git.zoomyboy.de/silva/adrema/raw/branch/master/docker-compose.prod.yml -o docker-compose.yml
     ```
 
-2. Anwenden der Beispiel Environmentvariablen-Datei
+2. Herunterladen der Beispiel Environmentvariablen-Datei
 
     ```cmd
-    mv .app.env.example .app.env
+    curl https://git.zoomyboy.de/silva/adrema/raw/branch/master/.app.env.example -o .app.env
     ```
 
 3. In der `.app.env` notwendige Einstellungen vornehmen:
@@ -50,8 +50,7 @@ Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles
     - Mail-Server Einstellungen `MAIL_PORT`, `MAIL_HOST`, `MAIL_USERNAME`, `MAIL_PASSWORD` und `MAIL_ENCRYPTION` anpassen
     - `MAIL_FROM_NAME`: Der Name, der als Absender von E-Mails gesetzt wird (z.B. `Stamm Bipi Service`)
     - `MAIL_FROM_ADDRESS`: Die dazu gehörige E-Mail-Adresse, die natürlich für antworten erreichbar sein sollte (z.B. `vorstand@stamm-bipi.de`)
-    - `DB_PASSWORD` und `MYSQL_PASSWORD`: Mit dem selben neu erstellten, sicheren Passwort für die Datenbank versehen
+    - `DB_PASSWORD` und `MYSQL_PASSWORD`: Mit dem selben sicheren Passwort für die Datenbank versehen
-    - `MEILI_MASTER_KEY` Mit einem neu erstellten, sicheren Passwort versehen
     - `USER_EMAIL` und `USER_PASSWORD`: Einstellen des standard Adrema Logins
 
 4. Container zur Gennerierung des App-Key starten
@@ -100,22 +99,28 @@ Bei dem Setup wird im Daten-Verzeichniss ein Ordner `./data/setup` angelegt. Hie
     git clone https://git.zoomyboy.de/silva/adrema.git
     ```
 
-2. Kopieren der Beispiel Environmentvariablen-Datei
+2. Kopieren der Beispiel Docker-Compose für das Entwickeln und nach Wünschen anpassen
+
+    ```cmd
+    cp docker-compose.dev.yml docker-compose.yml
+    ```
+
+3. Kopieren der Beispiel Environmentvariablen-Datei
 
     ```cmd
     cp .app.env.example .app.env
     ```
 
-3. Submodule aktuallisieren
+4. Submodule aktuallisieren
 
     ```cmd
     git submodule update --init
     ```
 
-4. Container erstellen
+5. Container erstellen
 
     ```cmd
     docker compose build
     ```
 
-5. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren
+6. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren

app/Actions/InsertMemberAction.php

@@ -22,7 +22,7 @@ class InsertMemberAction
     {
         $region = Region::firstWhere('nami_id', $member->regionId ?: -1);
 
-        $payload = [
+        return Member::updateOrCreate(['nami_id' => $member->id], [
             'firstname' => $member->firstname,
             'lastname' => $member->lastname,
             'joined_at' => $member->joinedAt,
@@ -50,27 +50,7 @@ class InsertMemberAction
             'nationality_id' => Nationality::where('nami_id', $member->nationalityId)->firstOrFail()->id,
             'mitgliedsnr' => $member->memberId,
             'version' => $member->version,
-            'keepdata' => $member->keepdata,
-        ];
-
-        // Dont update subscription if fee id of existing member's subscription is already the same
-        if ($existing = Member::nami($member->id)) {
-            if ($existing->subscription && $existing->subscription->fee->nami_id === $member->feeId) {
-                $payload['subscription_id'] = $existing->subscription->id;
-            }
-        }
-
-        return tap(Member::updateOrCreate(['nami_id' => $member->id], $payload), function ($insertedMember) use ($member) {
-            $insertedMember->bankAccount->update([
-                'iban' => $member->bankAccount->iban,
-                'bic' => $member->bankAccount->bic,
-                'blz' => $member->bankAccount->blz,
-                'account_number' => $member->bankAccount->accountNumber,
-                'person' => $member->bankAccount->person,
-                'bank_name' => $member->bankAccount->bankName,
-                'nami_id' => $member->bankAccount->id,
         ]);
-        });
     }
 
     public function getSubscription(NamiMember $member): ?Subscription

app/Activity.php

@@ -4,14 +4,12 @@ namespace App;
 
 use App\Nami\HasNamiField;
 use Cviebrock\EloquentSluggable\Sluggable;
-use Database\Factories\ActivityFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Activity extends Model
 {
-    /** @use HasFactory<ActivityFactory> */
     use HasFactory;
     use HasNamiField;
     use Sluggable;
@@ -34,7 +32,7 @@ class Activity extends Model
     }
 
     /**
-     * @return BelongsToMany<Subactivity, $this>
+     * @return BelongsToMany<Subactivity>
      */
     public function subactivities(): BelongsToMany
     {

app/Activity/Resources/ActivityResource.php

@@ -54,7 +54,6 @@ class ActivityResource extends JsonResource
                 'index' => route('activity.index'),
                 'create' => route('activity.create'),
                 'membership_masslist' => route('membership.masslist.index'),
-                'membership_index' => route('membership.index'),
             ],
         ];
     }

app/Confession.php

@@ -2,13 +2,11 @@
 
 namespace App;
 
-use Database\Factories\ConfessionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Confession extends Model
 {
-    /** @use HasFactory<ConfessionFactory> */
     use HasFactory;
 
     public $fillable = ['name', 'nami_id', 'is_null'];

app/Console/Kernel.php

@@ -6,7 +6,6 @@ use App\Actions\DbMaintainAction;
 use App\Form\Actions\PreventionRememberAction;
 use App\Initialize\InitializeMembers;
 use App\Invoice\Actions\InvoiceSendAction;
-use App\Prevention\Actions\YearlyRememberAction;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -22,7 +21,6 @@ class Kernel extends ConsoleKernel
         InitializeMembers::class,
         DbMaintainAction::class,
         PreventionRememberAction::class,
-        YearlyRememberAction::class,
     ];
 
     /**
@@ -35,8 +33,6 @@ class Kernel extends ConsoleKernel
         $schedule->command(DbMaintainAction::class)->daily();
         $schedule->command(InitializeMembers::class)->dailyAt('03:00');
         $schedule->command(PreventionRememberAction::class)->dailyAt('11:00');
-        $schedule->command(InvoiceSendAction::class)->dailyAt('10:00');
-        $schedule->command(YearlyRememberAction::class)->dailyAt('09:00');
     }
 
     /**

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\Requests\GenerateRequest;
+use App\Contribution\Documents\ContributionDocument;
 use App\Rules\JsonBase64Rule;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -15,19 +15,23 @@ class GenerateAction
 {
     use AsAction;
 
-    public function handle(HasContributionData $request): BaseCompiler
+    /**
+     * @param class-string<ContributionDocument> $document
+     * @param array<string, mixed>               $payload
+     */
+    public function handle(string $document, array $payload): BaseCompiler
     {
-        return Tex::compile($request->type()::fromPayload($request));
+        return Tex::compile($document::fromRequest($payload));
     }
 
-    public function asController(GenerateRequest $request): BaseCompiler|JsonResponse
+    public function asController(ActionRequest $request): BaseCompiler
     {
-        app(ContributionFactory::class)->validateType($request);
+        $payload = $this->payload($request);
-        $request->validateContribution();
+        $type = data_get($payload, 'type');
+        ValidateAction::validateType($type);
+        Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();
 
-        return $request->input('validate')
+        return $this->handle($type, $payload);
-            ? response()->json([])
-            : $this->handle($request);
     }
 
     /**
@@ -39,4 +43,12 @@ 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,9 +2,8 @@
 
 namespace App\Contribution\Actions;
 
-use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Documents\ContributionDocument;
-use App\Contribution\ContributionFactory;
+use Lorisleiva\Actions\ActionRequest;
-use App\Contribution\Requests\GenerateApiRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -14,17 +13,26 @@ class GenerateApiAction
     use AsAction;
 
     /**
-     * @todo merge this with GenerateAction
+     * @param class-string<ContributionDocument> $document
+     * @param array<string, mixed>               $payload
      */
-    public function handle(HasContributionData $request): BaseCompiler
+    public function handle(string $document, array $payload): BaseCompiler
     {
-        return Tex::compile($request->type()::fromPayload($request));
+        return Tex::compile($document::fromApiRequest($payload));
     }
 
-    public function asController(GenerateApiRequest $request): BaseCompiler
+    public function asController(ActionRequest $request): BaseCompiler
     {
-        app(ContributionFactory::class)->validateType($request);
+        ValidateAction::validateType($request->input('type'));
 
-        return $this->handle($request);
+        return $this->handle($request->input('type'), $request->input());
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [];
     }
 }

app/Contribution/Actions/ValidateAction.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Contribution\Actions;
+
+use App\Contribution\ContributionFactory;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ValidateAction
+{
+    use AsAction;
+
+    public function asController(): JsonResponse
+    {
+        return response()->json(['valid' => true]);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return app(ContributionFactory::class)->rules(request()->type);
+    }
+
+    public function prepareForValidation(ActionRequest $request): void
+    {
+        static::validateType($request->input('type'));
+    }
+
+    public static function validateType(?string $type = null): void
+    {
+        Validator::make(['type' => $type], app(ContributionFactory::class)->typeRule())->validate();
+    }
+}

app/Contribution/Contracts/HasContributionData.php

@@ -1,30 +0,0 @@
-<?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;
-
-    public function validateContribution(): void;
-}

app/Contribution/ContributionFactory.php

@@ -2,16 +2,13 @@
 
 namespace App\Contribution;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Documents\BdkjHesse;
 use App\Contribution\Documents\ContributionDocument;
 use App\Contribution\Documents\RdpNrwDocument;
 use App\Contribution\Documents\CityRemscheidDocument;
 use App\Contribution\Documents\CitySolingenDocument;
 use App\Contribution\Documents\CityFrankfurtMainDocument;
-use App\Contribution\Documents\WuppertalDocument;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 
 class ContributionFactory
@@ -25,17 +22,16 @@ class ContributionFactory
         CityRemscheidDocument::class,
         CityFrankfurtMainDocument::class,
         BdkjHesse::class,
-        WuppertalDocument::class,
     ];
 
     /**
-     * @return Collection<int, array{name: string, id: class-string<ContributionDocument>}>
+     * @return Collection<int, array{title: string, class: class-string<ContributionDocument>}>
      */
     public function compilerSelect(): Collection
     {
         return collect($this->documents)->map(fn ($document) => [
-            'name' => $document::getName(),
+            'title' => $document::getName(),
-            'id' => $document,
+            'class' => $document,
         ]);
     }
 
@@ -61,9 +57,4 @@ class ContributionFactory
             ...$type::rules(),
         ];
     }
-
-    public function validateType(HasContributionData $request): void {
-        Validator::make(['type' => $request->type()], $this->typeRule())->validate();
-    }
 }
-

app/Contribution/Data/MemberData.php

@@ -29,7 +29,7 @@ class MemberData extends Data
      */
     public static function fromModels(array $ids): Collection
     {
-        return Member::whereIn('id', $ids)->orderByRaw('lastname, firstname')->get()->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
+        return Member::whereIn('id', $ids)->orderByRaw('lastname, firstname')->get()->map(fn ($member) => self::withoutMagicalCreationFrom([
             ...$member->toArray(),
             'birthday' => $member->birthday->toAtomString(),
             'isLeader' => $member->isLeader(),
@@ -44,51 +44,41 @@ class MemberData extends Data
      */
     public static function fromApi(array $data): Collection
     {
-        return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
+        return collect($data)->map(fn ($member) => self::withoutMagicalCreationFrom([
             ...$member,
             'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
-            'gender' => $member['gender'] ? Gender::fromString($member['gender']) : null,
+            'gender' => Gender::fromString($member['gender']),
             'isLeader' => $member['is_leader'],
         ]));
     }
 
     public function fullname(): string
     {
-        return $this->firstname . ' ' . $this->lastname;
+        return $this->firstname.' '.$this->lastname;
     }
 
     public function separatedName(): string
     {
-        return $this->lastname . ', ' . $this->firstname;
+        return $this->lastname.', '.$this->firstname;
     }
 
     public function fullAddress(): string
     {
-        return $this->address . ', ' . $this->zip . ' ' . $this->location;
+        return $this->address.', '.$this->zip.' '.$this->location;
     }
 
     public function city(): string
     {
-        return $this->zip . ' ' . $this->location;
+        return $this->zip.' '.$this->location;
     }
 
-    public function age(): int
+    public function age(): string
     {
-        return intval($this->birthday->diffInYears(now()));
+        return (string) $this->birthday->diffInYears(now()) ?: '';
     }
 
     public function birthYear(): string
     {
         return (string) $this->birthday->year;
     }
-
-    public function birthdayHuman(): string
-    {
-        return $this->birthday->format('d.m.Y');
-    }
-
-    public function genderLetter(): string
-    {
-        return $this->gender->short;
-    }
 }

app/Contribution/Documents/BdkjHesse.php

@@ -2,25 +2,22 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
-use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
+use Zoomyboy\Tex\Engine;
+use Zoomyboy\Tex\Template;
 
 class BdkjHesse extends ContributionDocument
 {
-
-    use HasPdfBackground;
-
     /**
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -28,7 +25,6 @@ class BdkjHesse extends ContributionDocument
         public ?string $filename = '',
         public string $type = 'F',
     ) {
-        $this->setEventName($eventName);
     }
 
     public function dateFrom(): string
@@ -41,15 +37,33 @@ class BdkjHesse extends ContributionDocument
         return Carbon::parse($this->dateUntil)->format('d.m.Y');
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: $request->members()->chunk(20),
+            members: MemberData::fromModels($request['members'])->chunk(20),
-            eventName: $request->eventName(),
+            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'],
         );
     }
 
@@ -60,7 +74,7 @@ class BdkjHesse extends ContributionDocument
 
     public function durationDays(): int
     {
-        return intVal(Carbon::parse($this->dateUntil)->diffInDays(Carbon::parse($this->dateFrom))) + 1;
+        return Carbon::parse($this->dateUntil)->diffInDays(Carbon::parse($this->dateFrom)) + 1;
     }
 
     /**
@@ -100,9 +114,36 @@ class BdkjHesse extends ContributionDocument
         return $member->birthYear();
     }
 
+    public function basename(): string
+    {
+        return 'zuschuesse-bdkj-hessen' . Str::slug($this->eventName);
+    }
+
+    public function view(): string
+    {
+        return 'tex.contribution.bdkj-hesse';
+    }
+
+    public function template(): Template
+    {
+        return Template::make('tex.templates.contribution');
+    }
+
+    public function setFilename(string $filename): static
+    {
+        $this->filename = $filename;
+
+        return $this;
+    }
+
+    public function getEngine(): Engine
+    {
+        return Engine::PDFLATEX;
+    }
+
     public static function getName(): string
     {
-        return 'BDKJ Hessen';
+        return 'Für BDKJ Hessen erstellen';
     }
 
     /**
@@ -115,17 +156,7 @@ class BdkjHesse extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-        ];
+            'eventName' => 'required|string',
-    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
         ];
     }
 }

app/Contribution/Documents/CityFrankfurtMainDocument.php

@@ -2,29 +2,25 @@
 
 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\Form\Enums\SpecialType;
 use App\Invoice\InvoiceSettings;
-use Illuminate\Support\Collection;
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
+use Zoomyboy\Tex\Engine;
+use Zoomyboy\Tex\Template;
 
 class CityFrankfurtMainDocument extends ContributionDocument
 {
-    use HasPdfBackground;
-    use FormatsDates;
-
     public string $fromName;
 
     /**
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -32,22 +28,50 @@ class CityFrankfurtMainDocument extends ContributionDocument
         public ?string $filename = '',
         public string $type = 'F',
     ) {
-        $this->setEventName($eventName);
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: $request->members()->chunk(15),
+            members: MemberData::fromModels($request['members'])->chunk(15),
-            eventName: $request->eventName(),
+            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'],
+        );
+    }
+
+    public function dateFromHuman(): string
+    {
+        return Carbon::parse($this->dateFrom)->format('d.m.Y');
+    }
+
+    public function dateUntilHuman(): string
+    {
+        return Carbon::parse($this->dateUntil)->format('d.m.Y');
+    }
+
+
     public function countryName(): string
     {
         return $this->country->name;
@@ -58,9 +82,56 @@ class CityFrankfurtMainDocument extends ContributionDocument
         return count($this->members);
     }
 
+    public function memberShort(MemberData $member): string
+    {
+        return $member->isLeader ? 'L' : '';
+    }
+
+    public function memberName(MemberData $member): string
+    {
+        return $member->separatedName();
+    }
+
+    public function memberAddress(MemberData $member): string
+    {
+        return $member->fullAddress();
+    }
+
+    public function memberAge(MemberData $member): string
+    {
+        return $member->age();
+    }
+
+    public function basename(): string
+    {
+        return 'zuschuesse-frankfurt-' . Str::slug($this->eventName);
+    }
+
+    public function view(): string
+    {
+        return 'tex.contribution.city-frankfurt-main';
+    }
+
+    public function template(): Template
+    {
+        return Template::make('tex.templates.contribution');
+    }
+
+    public function setFilename(string $filename): static
+    {
+        $this->filename = $filename;
+
+        return $this;
+    }
+
+    public function getEngine(): Engine
+    {
+        return Engine::PDFLATEX;
+    }
+
     public static function getName(): string
     {
-        return 'Frankfurt';
+        return 'Für Frankfurt erstellen';
     }
 
     /**
@@ -73,17 +144,7 @@ class CityFrankfurtMainDocument extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-        ];
+            'eventName' => 'required|string',
-    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::ADDRESS,
         ];
     }
 }

app/Contribution/Documents/CityRemscheidDocument.php

@@ -2,56 +2,107 @@
 
 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\Form\Enums\SpecialType;
 use App\Member\Member;
-use Illuminate\Support\Collection;
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
+use Zoomyboy\Tex\Engine;
+use Zoomyboy\Tex\Template;
 
 class CityRemscheidDocument extends ContributionDocument
 {
-    use HasPdfBackground;
-    use FormatsDates;
-
     /**
      * @param Collection<int, Collection<int, Member>> $leaders
      * @param Collection<int, Collection<int, Member>> $children
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $leaders,
         public Collection $children,
         public ?string $filename = '',
         public string $type = 'F',
-        public string $eventName = '',
     ) {
-        $this->setEventName($eventName);
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    public function niceDateFrom(): string
     {
-        [$leaders, $children] = $request->members()->partition(fn ($member) => $member->isLeader);
+        return Carbon::parse($this->dateFrom)->format('d.m.Y');
+    }
+
+    public function niceDateUntil(): string
+    {
+        return Carbon::parse($this->dateUntil)->format('d.m.Y');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
+    {
+        [$leaders, $children] = MemberData::fromModels($request['members'])->partition(fn ($member) => $member->isLeader);
 
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
             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),
+        );
+    }
+
+    public function basename(): string
+    {
+        return 'zuschuesse-remscheid';
+    }
+
+    public function view(): string
+    {
+        return 'tex.contribution.city-remscheid';
+    }
+
+    public function template(): Template
+    {
+        return Template::make('tex.templates.contribution');
+    }
+
+    public function setFilename(string $filename): static
+    {
+        $this->filename = $filename;
+
+        return $this;
+    }
+
+    public function getEngine(): Engine
+    {
+        return Engine::PDFLATEX;
+    }
+
     public static function getName(): string
     {
-        return 'Remscheid';
+        return 'Für Remscheid erstellen';
     }
 
     /**
@@ -66,15 +117,4 @@ class CityRemscheidDocument extends ContributionDocument
             'country' => 'required|integer|exists:countries,id',
         ];
     }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::ADDRESS,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-        ];
-    }
 }

app/Contribution/Documents/CitySolingenDocument.php

@@ -2,13 +2,13 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
-use App\Form\Enums\SpecialType;
 use App\Invoice\InvoiceSettings;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use Zoomyboy\Tex\Engine;
+use Zoomyboy\Tex\Template;
 
 class CitySolingenDocument extends ContributionDocument
 {
@@ -18,28 +18,41 @@ class CitySolingenDocument extends ContributionDocument
      * @param Collection<int, MemberData> $members
      */
     final private function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public Collection $members,
         public string $eventName,
         public string $type = 'F',
     ) {
-        $this->setEventName($eventName);
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function fromPayload(HasContributionData $request): static
+    public static function fromRequest(array $request): static
     {
         return new static(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            members: $request->members(),
+            members: MemberData::fromModels($request['members']),
-            eventName: $request->eventName(),
+            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'],
         );
     }
 
@@ -61,8 +74,15 @@ class CitySolingenDocument extends ContributionDocument
         return Carbon::parse($this->dateUntil)->format('d.m.Y');
     }
 
+    public function template(): Template
+    {
+        return Template::make('tex.templates.contribution');
+    }
+
     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(' & ') . ' \\\\';
@@ -74,6 +94,16 @@ class CitySolingenDocument extends ContributionDocument
         return $firstRow . "\n" . $secondRow;
     }
 
+    public function basename(): string
+    {
+        return 'zuschuesse-solingen-' . Str::slug($this->eventName);
+    }
+
+    public function view(): string
+    {
+        return 'tex.contribution.city-solingen';
+    }
+
     public function getEngine(): Engine
     {
         return Engine::PDFLATEX;
@@ -81,7 +111,7 @@ class CitySolingenDocument extends ContributionDocument
 
     public static function getName(): string
     {
-        return 'Stadt Solingen';
+        return 'Für Stadt Solingen erstellen';
     }
 
     /**
@@ -93,17 +123,7 @@ class CitySolingenDocument extends ContributionDocument
             'dateFrom' => 'required|string|date_format:Y-m-d',
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'zipLocation' => 'required|string',
-        ];
+            'eventName' => 'required|string',
-    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::ADDRESS,
         ];
     }
 }

app/Contribution/Documents/ContributionDocument.php

@@ -2,23 +2,21 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Contracts\HasContributionData;
-use App\Form\Enums\SpecialType;
 use Zoomyboy\Tex\Document;
-use Zoomyboy\Tex\Template;
 
 abstract class ContributionDocument extends Document
 {
-    private string $eventName;
-
     abstract public static function getName(): string;
 
-    abstract public static function fromPayload(HasContributionData $request): self;
+    /**
+     * @param ContributionRequestArray $request
+     */
+    abstract public static function fromRequest(array $request): self;
 
     /**
-     * @return array<int, SpecialType>
+     * @param ContributionApiRequestArray $request
      */
-    abstract public static function requiredFormSpecialTypes(): array;
+    abstract public static function fromApiRequest(array $request): self;
 
     /**
      * @return array<string, mixed>
@@ -31,29 +29,8 @@ abstract class ContributionDocument extends Document
     public static function globalRules(): array
     {
         return [
-            'eventName' => 'required|string',
             'members' => 'present|array|min:1',
             'members.*' => 'integer|exists:members,id',
         ];
     }
-
-    public function setEventName(string $eventName): void
-    {
-        $this->eventName = $eventName;
-    }
-
-    public function basename(): string
-    {
-        return str('Zuschüsse ')->append($this->getName())->append(' ')->append($this->eventName)->slug();
-    }
-
-    public function template(): Template
-    {
-        return Template::make('tex.templates.contribution');
-    }
-
-    public function view(): string
-    {
-        return 'tex.contribution.' . str(class_basename(static::class))->replace('Document', '')->kebab()->toString();
-    }
 }

app/Contribution/Documents/RdpNrwDocument.php

@@ -2,45 +2,61 @@
 
 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\Form\Enums\SpecialType;
-use Illuminate\Support\Collection;
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
+use Zoomyboy\Tex\Engine;
+use Zoomyboy\Tex\Template;
 
 class RdpNrwDocument extends ContributionDocument
 {
-    use HasPdfBackground;
-    use FormatsDates;
-
     /**
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public Carbon $dateFrom,
+        public string $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
         public ?string $filename = '',
         public string $type = 'F',
-        public string $eventName = '',
     ) {
-        $this->setEventName($eventName);
     }
 
-    public static function fromPayload(HasContributionData $request): self
+    public function dateRange(): string
+    {
+        return Carbon::parse($this->dateFrom)->format('d.m.Y')
+            . ' - '
+            . Carbon::parse($this->dateUntil)->format('d.m.Y');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request->dateFrom(),
+            dateFrom: $request['dateFrom'],
-            dateUntil: $request->dateUntil(),
+            dateUntil: $request['dateUntil'],
-            zipLocation: $request->zipLocation(),
+            zipLocation: $request['zipLocation'],
-            country: $request->country(),
+            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: $request->members()->chunk(17),
+            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),
         );
     }
 
@@ -49,9 +65,65 @@ class RdpNrwDocument extends ContributionDocument
         return $this->country->name;
     }
 
+    public function memberShort(MemberData $member): string
+    {
+        return $member->isLeader ? 'L' : '';
+    }
+
+    public function memberName(MemberData $member): string
+    {
+        return $member->separatedName();
+    }
+
+    public function memberAddress(MemberData $member): string
+    {
+        return $member->fullAddress();
+    }
+
+    public function memberGender(MemberData $member): string
+    {
+        if (!$member->gender) {
+            return '';
+        }
+
+        return strtolower(substr($member->gender->name, 0, 1));
+    }
+
+    public function memberAge(MemberData $member): string
+    {
+        return $member->age();
+    }
+
+    public function basename(): string
+    {
+        return 'zuschuesse-rdp-nrw';
+    }
+
+    public function view(): string
+    {
+        return 'tex.contribution.rdp-nrw';
+    }
+
+    public function template(): Template
+    {
+        return Template::make('tex.templates.contribution');
+    }
+
+    public function setFilename(string $filename): static
+    {
+        $this->filename = $filename;
+
+        return $this;
+    }
+
+    public function getEngine(): Engine
+    {
+        return Engine::PDFLATEX;
+    }
+
     public static function getName(): string
     {
-        return 'RdP NRW';
+        return 'Für RdP NRW erstellen';
     }
 
     /**
@@ -64,17 +136,7 @@ class RdpNrwDocument extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-        ];
+            'eventName' => 'required|string',
-    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
         ];
     }
 }

app/Contribution/Documents/WuppertalDocument.php

@@ -1,76 +0,0 @@
-<?php
-
-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\Form\Enums\SpecialType;
-use Illuminate\Support\Collection;
-use Carbon\Carbon;
-
-class WuppertalDocument extends ContributionDocument
-{
-
-    use HasPdfBackground;
-    use FormatsDates;
-
-    /**
-     * @param Collection<int, Collection<int, MemberData>> $members
-     */
-    public function __construct(
-        public Carbon $dateFrom,
-        public Carbon $dateUntil,
-        public string $zipLocation,
-        public ?Country $country,
-        public Collection $members,
-        public ?string $filename = '',
-        public string $type = 'F',
-        public string $eventName = '',
-    ) {
-        $this->setEventName($eventName);
-    }
-
-    public static function fromPayload(HasContributionData $request): self
-    {
-        return new self(
-            dateFrom: $request->dateFrom(),
-            dateUntil: $request->dateUntil(),
-            zipLocation: $request->zipLocation(),
-            country: $request->country(),
-            members: $request->members()->chunk(14),
-            eventName: $request->eventName(),
-        );
-    }
-
-    public static function getName(): string
-    {
-        return 'Wuppertal';
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public static function rules(): array
-    {
-        return [
-            'dateFrom' => 'required|string|date_format:Y-m-d',
-            'dateUntil' => 'required|string|date_format:Y-m-d',
-            'zipLocation' => 'required|string',
-        ];
-    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::ADDRESS,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
-        ];
-    }
-}

app/Contribution/Enums/Country.php

@@ -1,256 +0,0 @@
-<?php
-
-namespace App\Contribution\Enums;
-
-enum Country: string {
-    case AD = 'Andorra';
-    case AE = 'Vereinigte Arabische Emirate';
-    case AF = 'Afghanistan';
-    case AG = 'Antigua und Barbuda';
-    case AI = 'Anguilla';
-    case AL = 'Albanien';
-    case AM = 'Armenien';
-    case AN = 'Niederländische Antillen';
-    case AO = 'Angola';
-    case AQ = 'Antarktis';
-    case AR = 'Argentinien';
-    case AS = 'Amerikanisch-Samoa';
-    case AT = 'Österreich (Austria)';
-    case AU = 'Australien';
-    case AW = 'Aruba';
-    case AZ = 'Azerbaijan';
-    case BA = 'Bosnien-Herzegovina';
-    case BB = 'Barbados';
-    case BD = 'Bangladesh';
-    case BE = 'Belgien';
-    case BF = 'Burkina Faso';
-    case BG = 'Bulgarien';
-    case BH = 'Bahrain';
-    case BI = 'Burundi';
-    case BJ = 'Benin';
-    case BM = 'Bermudas';
-    case BN = 'Brunei Darussalam';
-    case BO = 'Bolivien';
-    case BR = 'Brasilien';
-    case BS = 'Bahamas';
-    case BT = 'Bhutan';
-    case BV = 'Bouvet Island';
-    case BW = 'Botswana';
-    case BY = 'Weißrußland (Belarus)';
-    case BZ = 'Belize';
-    case CA = 'Canada';
-    case CC = 'Cocos (Keeling) Islands';
-    case CD = 'Demokratische Republik Kongo';
-    case CF = 'Zentralafrikanische Republik';
-    case CG = 'Kongo';
-    case CH = 'Schweiz';
-    case CI = 'Elfenbeinküste (Cote D’Ivoire)';
-    case CK = 'Cook Islands';
-    case CL = 'Chile';
-    case CM = 'Kamerun';
-    case CN = 'China';
-    case CO = 'Kolumbien';
-    case CR = 'Costa Rica';
-    case CS = 'Tschechoslowakei (ehemalige)';
-    case CU = 'Kuba';
-    case CV = 'Kap Verde';
-    case CX = 'Christmas Island';
-    case CY = 'Zypern';
-    case CZ = 'Tschechische Republik';
-    case DE = 'Deutschland';
-    case DJ = 'Djibouti';
-    case DK = 'Dänemark';
-    case DM = 'Dominica';
-    case DO = 'Dominikanische Republik';
-    case DZ = 'Algerien';
-    case EC = 'Ecuador';
-    case EE = 'Estland';
-    case EG = 'Ägypten';
-    case EH = 'Westsahara';
-    case ER = 'Eritrea';
-    case ES = 'Spanien';
-    case ET = 'Äthiopien';
-    case FI = 'Finnland';
-    case FJ = 'Fiji';
-    case FK = 'Falkland-Inseln (Malvinas)';
-    case FM = 'Micronesien';
-    case FO = 'Faröer-Inseln';
-    case FR = 'Frankreich';
-    case FX = 'France, Metropolitan';
-    case GA = 'Gabon';
-    case GD = 'Grenada';
-    case GE = 'Georgien';
-    case GF = 'Französisch Guiana';
-    case GH = 'Ghana';
-    case GI = 'Gibraltar';
-    case GL = 'Grönland';
-    case GM = 'Gambia';
-    case GN = 'Guinea';
-    case GP = 'Guadeloupe';
-    case GQ = 'Äquatorialguinea';
-    case GR = 'Griechenland';
-    case GS = 'Südgeorgien und Südliche Sandwich-Inseln';
-    case GT = 'Guatemala';
-    case GU = 'Guam';
-    case GW = 'Guinea-Bissau';
-    case GY = 'Guyana';
-    case HK = 'Kong Hong';
-    case HM = 'Heard und Mc Donald Islands';
-    case HN = 'Honduras';
-    case HT = 'Haiti';
-    case HU = 'Ungarn';
-    case ID = 'Indonesien';
-    case IE = 'Irland';
-    case IL = 'Israel';
-    case IN = 'Indien';
-    case IO = 'British Indian Ocean Territory';
-    case IQ = 'Irak';
-    case IR = 'Iran (Islamische Republik)';
-    case IS = 'Island';
-    case IT = 'Italien';
-    case JM = 'Jamaica';
-    case JO = 'Jordanien';
-    case JP = 'Japan';
-    case KE = 'Kenya';
-    case KG = 'Kirgisien';
-    case KH = 'Königreich Kambodscha';
-    case KI = 'Kiribati';
-    case KM = 'Komoren';
-    case KN = 'Saint Kitts und Nevis';
-    case KP = 'Korea, Volksrepublik';
-    case KR = 'Korea';
-    case KW = 'Kuwait';
-    case KY = 'Kayman Islands';
-    case KZ = 'Kasachstan';
-    case LA = 'Laos';
-    case LB = 'Libanon';
-    case LC = 'Saint Lucia';
-    case LI = 'Liechtenstein';
-    case LK = 'Sri Lanka';
-    case LR = 'Liberia';
-    case LS = 'Lesotho';
-    case LT = 'Littauen';
-    case LU = 'Luxemburg';
-    case LV = 'Lettland';
-    case LY = 'Libyen';
-    case MA = 'Marokko';
-    case MC = 'Monaco';
-    case MD = 'Moldavien';
-    case MG = 'Madagaskar';
-    case MH = 'Marshall-Inseln';
-    case MK = 'Mazedonien, ehem. Jugoslawische Republik';
-    case ML = 'Mali';
-    case MM = 'Myanmar';
-    case MN = 'Mongolei';
-    case MO = 'Macao';
-    case MP = 'Nördliche Marianneninseln';
-    case MQ = 'Martinique';
-    case MR = 'Mauretanien';
-    case MS = 'Montserrat';
-    case MT = 'Malta';
-    case MU = 'Mauritius';
-    case MV = 'Malediven';
-    case MW = 'Malawi';
-    case MX = 'Mexico';
-    case MY = 'Malaysien';
-    case MZ = 'Mozambique';
-    case NA = 'Namibia';
-    case NC = 'Neu Kaledonien';
-    case NE = 'Niger';
-    case NF = 'Norfolk Island';
-    case NG = 'Nigeria';
-    case NI = 'Nicaragua';
-    case NL = 'Niederlande';
-    case NO = 'Norwegen';
-    case NP = 'Nepal';
-    case NR = 'Nauru';
-    case NU = 'Niue';
-    case NZ = 'Neuseeland';
-    case OM = 'Oman';
-    case PA = 'Panama';
-    case PE = 'Peru';
-    case PF = 'Französisch Polynesien';
-    case PG = 'Papua Neuguinea';
-    case PH = 'Philippinen';
-    case PK = 'Pakistan';
-    case PL = 'Polen';
-    case PM = 'St. Pierre und Miquelon';
-    case PN = 'Pitcairn';
-    case PR = 'Puerto Rico';
-    case PT = 'Portugal';
-    case PW = 'Palau';
-    case PY = 'Paraguay';
-    case QA = 'Katar';
-    case RE = 'Reunion';
-    case RO = 'Rumänien';
-    case RU = 'Russische Föderation';
-    case RW = 'Ruanda';
-    case SA = 'Saudi Arabien';
-    case SB = 'Salomonen';
-    case SC = 'Seychellen';
-    case SD = 'Sudan';
-    case SE = 'Schweden';
-    case SG = 'Singapur';
-    case SH = 'St. Helena';
-    case SI = 'Slovenien';
-    case SJ = 'Svalbard und Jan Mayen Islands';
-    case SK = 'Slowakei';
-    case SL = 'Sierra Leone';
-    case SM = 'San Marino';
-    case SN = 'Senegal';
-    case SO = 'Somalia';
-    case SR = 'Surinam';
-    case ST = 'Sao Tome und Principe';
-    case SV = 'El Salvador';
-    case SY = 'Syrien, Arabische Republik';
-    case SZ = 'Swaziland';
-    case TC = 'Turk und Caicos-Inseln';
-    case TD = 'Tschad';
-    case TF = 'Französisches Südl.Territorium';
-    case TG = 'Togo';
-    case TH = 'Thailand';
-    case TJ = 'Tadschikistan';
-    case TK = 'Tokelau';
-    case TM = 'Turkmenistan';
-    case TN = 'Tunesien';
-    case TO = 'Tonga';
-    case TP = 'Ost-Timor';
-    case TR = 'Türkei';
-    case TT = 'Trinidad und Tobago';
-    case TV = 'Tuvalu';
-    case TW = 'Taiwan';
-    case TZ = 'Tansania, United Republic of';
-    case UA = 'Ukraine';
-    case UG = 'Uganda';
-    case GB = 'Großbritannien';
-    case US = 'Vereinigte Staaten';
-    case UM = 'Vereinigte Staaten, Minor Outlying Islands';
-    case UY = 'Uruguay';
-    case UZ = 'Usbekistan';
-    case VA = 'Vatikanstaat';
-    case VC = 'Saint Vincent und Grenadines';
-    case VE = 'Venezuela';
-    case VG = 'Virgin Islands (Britisch)';
-    case VI = 'Virgin Islands (U.S.)';
-    case VN = 'Vietnam';
-    case VU = 'Vanuatu';
-    case WF = 'Wallis und Futuna Islands';
-    case WS = 'Samoa';
-    case YE = 'Jemen';
-    case YT = 'Mayotte';
-    case YU = 'Jugoslawien';
-    case ZA = 'Südafrika';
-    case ZM = 'Sambia';
-    case ZW = 'Zimbabw';
-
-    /**
-     * @return array<int, array{name: string, id: string}>
-     */
-    public static function forSelect(): array
-    {
-        return collect(static::cases())
-            ->map(fn ($case) => ['id' => $case->value, 'name' => $case->value])
-            ->toArray();
-    }
-}
-

app/Contribution/Requests/GenerateApiRequest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Contribution\Requests;
-
-use App\Contribution\Data\MemberData;
-use Illuminate\Support\Collection;
-
-class GenerateApiRequest extends GenerateRequest {
-    /**
-     * @return array<string, string>
-     */
-    public function payload(): array
-    {
-        return $this->input();
-    }
-
-    public function validateContribution(): void {
-    }
-
-    public function members(): Collection {
-        return MemberData::fromApi($this->value('members'));
-    }
-
-}

app/Contribution/Requests/GenerateRequest.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Contribution\Requests;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\ContributionFactory;
-use App\Contribution\Data\MemberData;
-use App\Contribution\Documents\ContributionDocument;
-use App\Country;
-use Lorisleiva\Actions\ActionRequest;
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
-
-class GenerateRequest extends ActionRequest implements HasContributionData {
-    /**
-     * @return array<string, string>
-     */
-    protected function payload(): array
-    {
-        return json_decode(rawurldecode(base64_decode($this->input('payload', ''))), true);
-    }
-
-    public function validateContribution(): void {
-        Validator::make($this->payload(), app(ContributionFactory::class)->rules($this->type()))->validate();
-    }
-
-    /**
-     * @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();
-    }
-
-}

app/Contribution/Traits/FormatsDates.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Contribution\Traits;
-
-use Carbon\Carbon;
-
-trait FormatsDates
-{
-
-    public function niceDateFrom(): string
-    {
-        return Carbon::parse($this->dateFrom)->format('d.m.Y');
-    }
-
-    public function niceDateUntil(): string
-    {
-        return Carbon::parse($this->dateUntil)->format('d.m.Y');
-    }
-
-    public function dateRange(): string
-    {
-        return implode(' - ', [$this->niceDateFrom(), $this->niceDateUntil()]);
-    }
-}

app/Contribution/Traits/HasPdfBackground.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Contribution\Traits;
-
-use Zoomyboy\Tex\Engine;
-
-trait HasPdfBackground
-{
-    public function getEngine(): Engine
-    {
-        return Engine::PDFLATEX;
-    }
-}

app/Country.php

@@ -3,13 +3,11 @@
 namespace App;
 
 use App\Nami\HasNamiField;
-use Database\Factories\CountryFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Country extends Model
 {
-    /** @use HasFactory<CountryFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Course/Models/Course.php

@@ -3,13 +3,11 @@
 namespace App\Course\Models;
 
 use App\Nami\HasNamiField;
-use Database\Factories\Course\Models\CourseFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Course extends Model
 {
-    /** @use HasFactory<CourseFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Course/Models/CourseMember.php

@@ -3,21 +3,19 @@
 namespace App\Course\Models;
 
 use App\Member\Member;
-use Database\Factories\Course\Models\CourseMemberFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class CourseMember extends Model
 {
-    /** @use HasFactory<CourseMemberFactory> */
     use HasFactory;
 
     /** @var array<int, string> */
     public $guarded = [];
 
     /**
-     * @return BelongsTo<Course, $this>
+     * @return BelongsTo<Course, self>
      */
     public function course(): BelongsTo
     {
@@ -25,7 +23,7 @@ class CourseMember extends Model
     }
 
     /**
-     * @return BelongsTo<Member, $this>
+     * @return BelongsTo<Member, self>
      */
     public function member(): BelongsTo
     {

app/Dashboard/DashboardServiceProvider.php

@@ -2,9 +2,7 @@
 
 namespace App\Dashboard;
 
-use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
-use App\Dashboard\Actions\IndexAction as DashboardIndexAction;
 
 class DashboardServiceProvider extends ServiceProvider
 {
@@ -25,8 +23,5 @@ class DashboardServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) {
-            $router->get('/', DashboardIndexAction::class)->name('home');
-        });
     }
 }

app/Dav/Principal.php

@@ -129,7 +129,6 @@ class Principal implements PrincipalBackendInterface
      */
     public function findByUri($uri, $principalPrefix)
     {
-        return null;
     }
 
     /**
@@ -179,7 +178,7 @@ class Principal implements PrincipalBackendInterface
     private function userToPrincipal(User $user): array
     {
         return [
-            '{DAV:}displayname' => $user->firstname . ' ' . $user->lastname,
+            '{DAV:}displayname' => $user->name,
             'uri' => 'principals/' . $user->email,
             '{http://sabredav.org/ns}email-address' => $user->email,
         ];

app/Efz/EfzPendingBlock.php

@@ -19,7 +19,7 @@ class EfzPendingBlock extends Block
         })
             ->whereCurrentGroup()
             ->orderByRaw('lastname, firstname')
-            ->whereHas('memberships', fn ($builder) => $builder->isLeader()->active());
+            ->whereHas('memberships', fn ($builder) => $builder->isLeader());
     }
 
     /**

app/Fee.php

@@ -4,24 +4,23 @@ namespace App;
 
 use App\Nami\HasNamiField;
 use App\Payment\Subscription;
-use Database\Factories\FeeFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Fee extends Model
 {
-    /** @use HasFactory<FeeFactory> */
     use HasFactory;
     use HasNamiField;
 
+    /** @var array<int, string> */
     public $fillable = ['name', 'nami_id'];
 
     /** @var bool */
     public $timestamps = false;
 
     /**
-     * @return HasMany<Subscription, $this>
+     * @return HasMany<Subscription>
      */
     public function subscriptions(): HasMany
     {

app/Fileshare/Actions/FileshareIndexAction.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Fileshare\Actions;
+
+use App\Fileshare\Models\Fileshare;
+use App\Fileshare\Resources\FileshareResource;
+use Inertia\Inertia;
+use Inertia\Response;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class FileshareIndexAction
+{
+    use AsAction;
+
+    public function handle(): Response
+    {
+        session()->put('menu', 'setting');
+        session()->put('title', 'Datei-Verbindungen');
+
+        return Inertia::render('fileshare/Index', [
+            'data' => FileshareResource::collection(Fileshare::paginate(15)),
+        ]);
+    }
+}

app/Fileshare/Actions/ListFilesAction.php

@@ -17,6 +17,6 @@ class ListFilesAction
      */
     public function handle(ActionRequest $request, Fileshare $fileshare): DataCollection
     {
-        return ResourceData::collect($fileshare->type->getSubDirectories($request->input('parent')), DataCollection::class)->wrap('data');
+        return ResourceData::collection($fileshare->type->getSubDirectories($request->input('parent')))->wrap('data');
     }
 }

app/Fileshare/FileshareSettings.php

@@ -2,29 +2,29 @@
 
 namespace App\Fileshare;
 
-use App\Fileshare\Models\Fileshare;
+use App\Fileshare\Actions\FileshareIndexAction;
-use App\Fileshare\Resources\FileshareResource;
+use App\Setting\Contracts\Indexable;
 use App\Setting\LocalSettings;
 
-class FileshareSettings extends LocalSettings
+class FileshareSettings extends LocalSettings implements Indexable
 {
     public static function group(): string
     {
         return 'fileshare';
     }
 
+    public static function slug(): string
+    {
+        return 'fileshare';
+    }
+
+    public static function indexAction(): string
+    {
+        return FileshareIndexAction::class;
+    }
+
     public static function title(): string
     {
         return 'Datei-Verbindungen';
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function viewData(): array
-    {
-        return [
-            'data' => FileshareResource::collection(Fileshare::paginate(15))
-        ];
-    }
 }

app/Fileshare/Models/Fileshare.php

@@ -3,13 +3,11 @@
 namespace App\Fileshare\Models;
 
 use App\Fileshare\ConnectionTypes\ConnectionType;
-use Database\Factories\Fileshare\Models\FileshareFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Fileshare extends Model
 {
-    /** @use HasFactory<FileshareFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Form/Actions/FormApiListAction.php

@@ -16,7 +16,7 @@ class FormApiListAction
 
     /**
      * @param string $filter
-     * @return LengthAwarePaginator<int, Form>
+     * @return LengthAwarePaginator<Form>
      */
     public function handle(string $filter, int $perPage): LengthAwarePaginator
     {

app/Form/Actions/FormCopyAction.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\Models\Form;
-use App\Lib\Events\Succeeded;
-use Illuminate\Http\JsonResponse;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class FormCopyAction
-{
-    use AsAction;
-
-    public function handle(Form $form): Form
-    {
-        $newForm = $form->replicate();
-        $newForm->save();
-        $newForm->update(['name' => $form->name.' - Kopie', 'is_active' => false]);
-
-        foreach ($form->getRegisteredMediaCollections() as $collection) {
-            foreach ($form->getMedia($collection->name) as $media) {
-                $media->copy($newForm, $collection->name);
-            }
-        }
-
-        ClearFrontendCacheAction::run();
-
-        return $form;
-    }
-
-    public function asController(Form $form): JsonResponse
-    {
-        $this->handle($form);
-
-        Succeeded::message('Veranstaltung kopiert.')->dispatch();
-        return response()->json([]);
-    }
-}

app/Form/Actions/FormIndexAction.php

@@ -16,7 +16,7 @@ class FormIndexAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<int, Form>
+     * @return LengthAwarePaginator<Form>
      */
     public function handle(string $filter): LengthAwarePaginator
     {

app/Form/Actions/FormStoreAction.php

@@ -36,10 +36,6 @@ class FormStoreAction
             'needs_prevention' => 'present|boolean',
             'prevention_text' => 'array',
             'prevention_conditions' => 'array',
-            'leader_conditions' => 'array',
-            'zip' => 'present|nullable|string',
-            'location' => 'present|nullable|string',
-            'country' => 'nullable|string|max:255',
         ];
     }
 

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;
@@ -35,10 +36,6 @@ class FormUpdateAction
             'needs_prevention' => 'present|boolean',
             'prevention_text' => 'array',
             'prevention_conditions' => 'array',
-            'location' => 'present|nullable|string',
-            'zip' => 'present|nullable|string',
-            'country' => 'nullable|string|max:255',
-            'leader_conditions' => 'array',
         ];
     }
 

app/Form/Actions/FormUpdateMetaAction.php

@@ -22,8 +22,8 @@ class FormUpdateMetaAction
 
         return [
             'sorting' => 'array',
-            'sorting.by' => 'required|string',
+            'sorting.0' => 'required|string',
-            'sorting.direction' => 'required|boolean',
+            'sorting.1' => 'required|string|in:asc,desc',
             'active_columns' => 'array',
             'active_columns.*' => ['string', Rule::in([...$form->getFields()->pluck('key')->toArray(), 'created_at', 'prevention'])]
         ];

app/Form/Actions/FormtemplateIndexAction.php

@@ -14,7 +14,7 @@ class FormtemplateIndexAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<int, Formtemplate>
+     * @return LengthAwarePaginator<Formtemplate>
      */
     public function handle(): LengthAwarePaginator
     {

app/Form/Actions/GenerateContributionAction.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\ContributionFactory;
-use App\Form\Models\Form;
-use App\Form\Requests\FormCompileRequest;
-use App\Rules\JsonBase64Rule;
-use Illuminate\Http\JsonResponse;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-use Zoomyboy\Tex\BaseCompiler;
-use Zoomyboy\Tex\Tex;
-
-class GenerateContributionAction
-{
-    use AsAction;
-
-    public function handle(HasContributionData $request): BaseCompiler
-    {
-        return Tex::compile($request->type()::fromPayload($request));
-    }
-
-    public function asController(ActionRequest $request, Form $form): BaseCompiler|JsonResponse
-    {
-        $r = FormCompileRequest::from(['form' => $form]);
-        app(ContributionFactory::class)->validateType($r);
-        $r->validateContribution();
-
-        return $request->input('validate')
-            ? response()->json([])
-            : $this->handle($r);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'payload' => [new JsonBase64Rule()],
-        ];
-    }
-}

app/Form/Actions/ParticipantIndexAction.php

@@ -6,8 +6,9 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Form\Resources\ParticipantResource;
 use App\Form\Scopes\ParticipantFilterScope;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Laravel\Scout\Builder;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class ParticipantIndexAction
@@ -15,22 +16,29 @@ class ParticipantIndexAction
     use AsAction;
 
     /**
-     * @return Builder<Participant>
+     * @return HasMany<Participant>
      */
-    protected function getQuery(Form $form, ParticipantFilterScope $filter): Builder
+    protected function getQuery(Form $form, ParticipantFilterScope $filter): HasMany
     {
-        return $filter->setForm($form)->getQuery()
+        return $form->participants()->withFilter($filter)->withCount('children')->with('form');
-            ->query(fn ($q) => $q->withCount('children')->with('form'));
+    }
+
+    /**
+     * @return LengthAwarePaginator<Participant>
+     */
+    public function handle(Form $form, ParticipantFilterScope $filter): LengthAwarePaginator
+    {
+        return $this->getQuery($form, $filter)->paginate(15);
     }
 
     public function asController(Form $form, ?int $parent = null): AnonymousResourceCollection
     {
-        $filter = ParticipantFilterScope::fromRequest(request()->input('filter', ''))->parent($parent);
+        $filter = ParticipantFilterScope::fromRequest(request()->input('filter'));
 
         $data = match ($parent) {
-            null => $this->getQuery($form, $filter)->paginate(15),                              // initial all elements - paginate
+            null => $this->handle($form, $filter),
-            -1 => $this->getQuery($form, $filter)->paginate(15),      // initial root elements - parinate
+            -1 => $this->getQuery($form, $filter)->where('parent_id', null)->paginate(15),
-            default => $this->getQuery($form, $filter)->get(),     // specific parent element - show all
+            default => $this->getQuery($form, $filter)->where('parent_id', $parent)->get(),
         };
 
         return ParticipantResource::collection($data)->additional(['meta' => ParticipantResource::meta($form)]);

app/Form/Actions/PreventionRememberAction.php

@@ -13,18 +13,13 @@ class PreventionRememberAction
 {
     use AsAction;
 
-    public string $commandSignature = 'prevention:remember-forms';
+    public string $commandSignature = 'prevention:remember';
 
     public function handle(): void
     {
-        $query = Participant::whereHas(
+        $query = Participant::whereHas('form', fn ($form) => $form->where('needs_prevention', true))
-            'form',
-            fn($form) => $form
-                ->where('needs_prevention', true)
-                ->where('from', '>=', now())
-        )
             ->where(
-                fn($q) => $q
+                fn ($q) => $q
                     ->where('last_remembered_at', '<=', now()->subWeeks(2))
                     ->orWhereNull('last_remembered_at')
             );
@@ -33,7 +28,7 @@ class PreventionRememberAction
                 continue;
             }
 
-            if ($participant->getFields()->getMailRecipient() === null || $participant->preventions()->count() === 0) {
+            if ($participant->getFields()->getMailRecipient() === null || count($participant->preventions()) === 0) {
                 continue;
             }
 
@@ -41,7 +36,7 @@ class PreventionRememberAction
                 ->placeholder('formname', $participant->form->name)
                 ->append($participant->form->prevention_text);
 
-            Mail::send(new PreventionRememberMail($participant, $body, $participant->preventions()));
+            Mail::send(new PreventionRememberMail($participant, $body));
 
             $participant->update(['last_remembered_at' => now()]);
         }

app/Form/Actions/RegisterAction.php

@@ -7,9 +7,6 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Member\Member;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\URL;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\ValidationException;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 
@@ -24,7 +21,7 @@ class RegisterAction
     {
         $memberQuery = FieldCollection::fromRequest($form, $input)
             ->withNamiType()
-            ->reduce(fn($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
+            ->reduce(fn ($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
         $member = $form->getFields()->withNamiType()->count() && $memberQuery->count() === 1 ? $memberQuery->first() : null;
 
         $participant = $form->participants()->create([
@@ -32,7 +29,7 @@ class RegisterAction
             'member_id' => $member?->id,
         ]);
 
-        $form->getFields()->each(fn($field) => $field->afterRegistration($form, $participant, $input));
+        $form->getFields()->each(fn ($field) => $field->afterRegistration($form, $participant, $input));
 
         $participant->sendConfirmationMail();
         ExportSyncAction::dispatch($form->id);
@@ -75,26 +72,8 @@ class RegisterAction
 
     public function asController(ActionRequest $request, Form $form): JsonResponse
     {
-        if (!$form->canRegister() && !$this->isRegisteringLater($request)) {
-            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
-        }
-
         $participant = $this->handle($form, $request->validated());
 
         return response()->json($participant);
     }
-
-    public function isRegisteringLater(ActionRequest $request): bool {
-        if (!is_array($request->query())) {
-            return false;
-        }
-
-        $validator = Validator::make($request->query(), [
-            'later' => 'required|numeric|in:1',
-            'id' => 'required|string|uuid:4',
-            'signature' => 'required|string',
-        ]);
-
-        return URL::hasValidSignature($request) && $validator->passes();
-    }
 }

app/Form/Actions/SettingIndexAction.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\FormSettings;
+use Inertia\Inertia;
+use Inertia\Response;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SettingIndexAction
+{
+    use AsAction;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function handle(FormSettings $settings): array
+    {
+        return [
+            'data' => [
+                'register_url' => $settings->registerUrl,
+                'clear_cache_url' => $settings->clearCacheUrl,
+            ],
+        ];
+    }
+
+    public function asController(FormSettings $settings): Response
+    {
+        session()->put('menu', 'setting');
+        session()->put('title', 'Module');
+
+        return Inertia::render('setting/Form', [
+            'data' => $this->handle($settings),
+        ]);
+    }
+}

app/Form/Actions/SettingStoreAction.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\FormSettings;
+use Illuminate\Http\RedirectResponse;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SettingStoreAction
+{
+    use AsAction;
+
+    /**
+     * @param array<string, mixed> $input
+     */
+    public function handle(array $input): void
+    {
+        $settings = app(FormSettings::class);
+
+        $settings->fill([
+            'registerUrl' => $input['register_url'],
+            'clearCacheUrl' => $input['clear_cache_url'],
+        ]);
+
+        $settings->save();
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'register_url' => 'present|string',
+            'clear_cache_url' => 'present|string',
+        ];
+    }
+
+    public function asController(ActionRequest $request): RedirectResponse
+    {
+        $this->handle($request->validated());
+
+        return redirect()->back();
+    }
+}

app/Form/Actions/UpdateParticipantSearchIndexAction.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\Models\Form;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class UpdateParticipantSearchIndexAction
-{
-    use AsAction;
-
-    public function handle(Form $form): void
-    {
-        if (config('scout.driver') !== 'meilisearch') {
-            return;
-        }
-
-        $form->searchableUsing()->updateIndexSettings(
-            $form->participantsSearchableAs(),
-            [
-                'filterableAttributes' => [...$form->getFields()->filterables()->getKeys(), 'parent-id'],
-                'searchableAttributes' => $form->getFields()->searchables()->getKeys(),
-                'sortableAttributes' => [...$form->getFields()->sortables()->getKeys(), 'id', 'created_at'],
-                'displayedAttributes' => [...$form->getFields()->filterables()->getKeys(), ...$form->getFields()->searchables()->getKeys(), 'id'],
-                'pagination' => [
-                    'maxTotalHits' => 1000000,
-                ]
-            ]
-        );
-    }
-}

app/Form/Casts/CollectionCast.php

@@ -6,7 +6,6 @@ use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Casts\Cast;
 use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Support\Creation\CreationContext;
 use Spatie\LaravelData\Support\DataProperty;
 
 class CollectionCast implements Cast
@@ -21,9 +20,10 @@ class CollectionCast implements Cast
 
     /**
      * @param array<int, array<string, mixed>> $value
+     * @param array<string, mixed> $context
      * @return Collection<int, Data>
      */
-    public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
+    public function cast(DataProperty $property, mixed $value, array $context): mixed
     {
         return collect($value)->map(fn ($item) => $this->target::from($item));
     }

app/Form/Casts/FieldCollectionCast.php

@@ -5,16 +5,16 @@ namespace App\Form\Casts;
 use App\Form\Data\FieldCollection;
 use App\Form\Fields\Field;
 use Spatie\LaravelData\Casts\Cast;
-use Spatie\LaravelData\Support\Creation\CreationContext;
 use Spatie\LaravelData\Support\DataProperty;
 
 class FieldCollectionCast implements Cast
 {
     /**
      * @param array<int, array<string, string>> $value
+     * @param array<string, mixed> $context
      * @return FieldCollection
      */
-    public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
+    public function cast(DataProperty $property, mixed $value, array $context): mixed
     {
         return new FieldCollection(collect($value)->map(fn ($value) => Field::classFromType($value['type'])::from($value))->all());
     }

app/Form/Contracts/Filterable.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Form\Contracts;
-
-interface Filterable
-{
-    /** @param mixed $value */
-    public function filter($value): string;
-}

app/Form/Data/ExportData.php

@@ -3,11 +3,11 @@
 namespace App\Form\Data;
 
 use App\Fileshare\Data\FileshareResourceData;
+use App\Form\Fields\Field;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
 
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
@@ -16,13 +16,4 @@ class ExportData extends Data
     public function __construct(public ?FileshareResourceData $root = null, public ?string $groupBy = null, public ?string $toGroupField = null)
     {
     }
-
-    /**
-     * @param array<int, mixed> $arguments
-     * @return DataEloquentCast<self>
-     */
-    public static function castUsing(array $arguments): DataEloquentCast
-    {
-        return new DataEloquentCast(static::class, $arguments);
-    }
 }

app/Form/Data/FieldCollection.php

@@ -2,7 +2,6 @@
 
 namespace App\Form\Data;
 
-use App\Form\Contracts\Filterable;
 use App\Form\Enums\SpecialType;
 use App\Form\Fields\Field;
 use App\Form\Fields\NamiField;
@@ -114,36 +113,8 @@ class FieldCollection extends Collection
         return $this->map(fn ($field) => $field->presentRaw())->toArray();
     }
 
-    public function hasSpecialType(SpecialType $specialType): bool
+    private function findBySpecialType(SpecialType $specialType): ?Field
-    {
-        return $this->findBySpecialType($specialType) !== null;
-    }
-
-    public function findBySpecialType(SpecialType $specialType): ?Field
     {
         return $this->first(fn ($field) => $field->specialType === $specialType);
     }
-
-    public function searchables(): self
-    {
-        return $this;
-    }
-
-    public function sortables(): self
-    {
-        return $this;
-    }
-
-    public function filterables(): self
-    {
-        return $this->filter(fn ($field) => $field instanceof Filterable);
-    }
-
-    /**
-     * @return array<int, string>
-     */
-    public function getKeys(): array
-    {
-        return $this->map(fn ($field) => $field->key)->toArray();
-    }
 }

app/Form/Data/FormConfigData.php

@@ -8,7 +8,6 @@ use Illuminate\Support\Collection;
 use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Attributes\WithCast;
 use Spatie\LaravelData\Attributes\WithTransformer;
-use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
 
 class FormConfigData extends Data
 {
@@ -30,13 +29,4 @@ class FormConfigData extends Data
             new FieldCollection([])
         );
     }
-
-    /**
-     * @param array<int, mixed> $arguments
-     * @return DataEloquentCast<self>
-     */
-    public static function castUsing(array $arguments): DataEloquentCast
-    {
-        return new DataEloquentCast(static::class, $arguments);
-    }
 }

app/Form/Enums/NamiType.php

@@ -48,7 +48,7 @@ enum NamiType: string
             static::LOCATION => $member->location,
             static::NICKNAME => $member->nickname,
             static::GENDER => $member->gender?->name,
-            static::AGE => intVal($member->birthday->diffInYears(now())),
+            static::AGE => $member->birthday->diffInYears(now()),
             static::AGEEVENT => $member->birthday->diffInYears($form->from),
             static::MOBILEPHONE => $member->mobile_phone,
         };

app/Form/Enums/SpecialType.php

@@ -7,11 +7,6 @@ enum SpecialType: string
     case FIRSTNAME = 'Vorname';
     case LASTNAME = 'Nachname';
     case EMAIL = 'E-Mail-Adresse';
-    case BIRTHDAY = 'Geburtsdatum';
-    case ZIP = 'PLZ';
-    case LOCATION = 'Ort';
-    case ADDRESS = 'Adresse';
-    case GENDER = 'Geschlecht';
 
     /**
      * @return array<int, array{name: string, id: string}>

app/Form/Fields/CheckboxField.php

@@ -2,7 +2,6 @@
 
 namespace App\Form\Fields;
 
-use App\Form\Contracts\Filterable;
 use App\Form\Matchers\BooleanMatcher;
 use App\Form\Matchers\Matcher;
 use App\Form\Models\Form;
@@ -10,8 +9,9 @@ use App\Form\Models\Participant;
 use App\Form\Presenters\BooleanPresenter;
 use App\Form\Presenters\Presenter;
 use Faker\Generator;
+use Illuminate\Validation\Rule;
 
-class CheckboxField extends Field implements Filterable
+class CheckboxField extends Field
 {
     public bool $required;
     public string $description;
@@ -86,11 +86,4 @@ class CheckboxField extends Field implements Filterable
     {
         return app(BooleanMatcher::class);
     }
-
-    public function filter($value): string
-    {
-        $asString = $value ? 'true' : 'false';
-
-        return "{$this->key} = $asString";
-    }
 }

app/Form/Fields/DropdownField.php

@@ -2,7 +2,6 @@
 
 namespace App\Form\Fields;
 
-use App\Form\Contracts\Filterable;
 use App\Form\Matchers\Matcher;
 use App\Form\Matchers\SingleValueMatcher;
 use App\Form\Models\Form;
@@ -10,7 +9,7 @@ use App\Form\Models\Participant;
 use Faker\Generator;
 use Illuminate\Validation\Rule;
 
-class DropdownField extends Field implements Filterable
+class DropdownField extends Field
 {
     public bool $required;
     /** @var array<int, string> */
@@ -88,14 +87,4 @@ class DropdownField extends Field implements Filterable
     {
         return app(SingleValueMatcher::class);
     }
-
-    /** @inheritdoc */
-    public function filter($value): string
-    {
-        if (is_null($value)) {
-            return "{$this->key} IS NULL";
-        }
-
-        return $this->key . ' = \'' . $value . '\'';
-    }
 }

app/Form/Fields/Field.php

@@ -180,10 +180,4 @@ abstract class Field extends Data
     {
         return app(SingleValueMatcher::class);
     }
-
-    /** @param mixed $value */
-    public function filter($value): string
-    {
-        return '';
-    }
 }

app/Form/Fields/RadioField.php

@@ -2,7 +2,6 @@
 
 namespace App\Form\Fields;
 
-use App\Form\Contracts\Filterable;
 use App\Form\Matchers\Matcher;
 use App\Form\Matchers\SingleValueMatcher;
 use App\Form\Models\Form;
@@ -10,7 +9,7 @@ use App\Form\Models\Participant;
 use Faker\Generator;
 use Illuminate\Validation\Rule;
 
-class RadioField extends Field implements Filterable
+class RadioField extends Field
 {
     public bool $required;
     /** @var array<int, string> */
@@ -88,13 +87,4 @@ class RadioField extends Field implements Filterable
     {
         return app(SingleValueMatcher::class);
     }
-
-    public function filter($value): string
-    {
-        if (is_null($value)) {
-            return "{$this->key} IS NULL";
-        }
-
-        return $this->key . ' = \'' . $value . '\'';
-    }
 }

app/Form/FormSettings.php

@@ -2,12 +2,13 @@
 
 namespace App\Form;
 
+use App\Form\Actions\SettingIndexAction;
 use App\Form\Actions\SettingStoreAction;
+use App\Setting\Contracts\Indexable;
 use App\Setting\Contracts\Storeable;
 use App\Setting\LocalSettings;
-use Lorisleiva\Actions\ActionRequest;
 
-class FormSettings extends LocalSettings implements Storeable
+class FormSettings extends LocalSettings implements Indexable, Storeable
 {
     public string $registerUrl;
     public string $clearCacheUrl;
@@ -17,38 +18,23 @@ class FormSettings extends LocalSettings implements Storeable
         return 'form';
     }
 
+    public static function slug(): string
+    {
+        return 'form';
+    }
+
     public static function title(): string
     {
         return 'Formulare';
     }
 
-    /**
+    public static function indexAction(): string
-     * @inheritdoc
-     */
-    public function rules(): array
     {
-        return [
+        return SettingIndexAction::class;
-            'registerUrl' => 'present|string',
-            'clearCacheUrl' => 'present|string',
-        ];
     }
 
-    public function beforeSave(ActionRequest $request): void
+    public static function storeAction(): string
     {
-    }
+        return SettingStoreAction::class;
-
-    /**
-     * @inheritdoc
-     */
-    public function viewData(): array
-    {
-        return [
-            'data' => [
-                'data' => [
-                    'registerUrl' => $this->registerUrl,
-                    'clearCacheUrl' => $this->clearCacheUrl,
-                ]
-            ]
-        ];
     }
 }

app/Form/Mails/ConfirmRegistrationMail.php

@@ -69,8 +69,10 @@ class ConfirmRegistrationMail extends Mailable
      */
     public function attachments()
     {
+        $conditionResolver = app(FormConditionResolver::class)->forParticipant($this->participant);
+
         return $this->participant->form->getMedia('mailattachments')
-            ->filter(fn ($media) => $this->participant->matchesCondition(Condition::fromMedia($media)))
+            ->filter(fn ($media) => $conditionResolver->filterCondition(Condition::fromMedia($media)))
             ->map(fn ($media) => Attachment::fromStorageDisk($media->disk, $media->getPathRelativeToRoot()))
             ->all();
     }

app/Form/Models/Form.php

@@ -2,29 +2,25 @@
 
 namespace App\Form\Models;
 
-use App\Contribution\Enums\Country;
-use App\Form\Actions\UpdateParticipantSearchIndexAction;
 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 App\Lib\Sorting;
 use Cviebrock\EloquentSluggable\Sluggable;
-use Database\Factories\Form\Models\FormFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Laravel\Scout\Searchable;
-use Spatie\Image\Enums\Fit;
+use Spatie\Image\Manipulations;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Zoomyboy\MedialibraryHelper\DefersUploads;
 
 /** @todo replace editor content with EditorData cast */
 class Form extends Model implements HasMedia
 {
-    /** @use HasFactory<FormFactory> */
     use HasFactory;
     use Sluggable;
     use InteractsWithMedia;
@@ -45,14 +41,11 @@ class Form extends Model implements HasMedia
         'needs_prevention' => 'boolean',
         'prevention_text' => EditorData::class,
         'prevention_conditions' => Condition::class,
-        'from' => 'datetime',
-        'to' => 'datetime',
-        'registration_from' => 'datetime',
-        'registration_until' => 'datetime',
-        'country' => Country::class,
-        'leader_conditions' => Condition::class,
     ];
 
+    /** @var array<int, string> */
+    public $dates = ['from', 'to', 'registration_from', 'registration_until'];
+
     /**
      * @return SluggableConfig
      */
@@ -64,31 +57,32 @@ class Form extends Model implements HasMedia
     }
 
     /**
-     * @return HasMany<Participant, $this>
+     * @return HasMany<Participant>
      */
     public function participants(): HasMany
     {
         return $this->hasMany(Participant::class);
     }
 
+
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('headerImage')
             ->singleFile()
-            ->maxWidth(fn() => 500)
+            ->maxWidth(fn () => 500)
-            ->forceFileName(fn(Form $model) => $model->slug)
+            ->forceFileName(fn (Form $model, string $name) => $model->slug)
-            ->convert(fn() => 'jpg')
+            ->convert(fn () => 'jpg')
-            ->registerMediaConversions(function () {
+            ->registerMediaConversions(function (Media $media) {
-                $this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
+                $this->addMediaConversion('square')->fit(Manipulations::FIT_CROP, 400, 400);
             });
         $this->addMediaCollection('mailattachments')
-            ->withDefaultProperties(fn() => [
+            ->withDefaultProperties(fn () => [
                 'conditions' => [
                     'mode' => 'all',
                     'ifs' => []
                 ],
             ])
-            ->withPropertyValidation(fn() => [
+            ->withPropertyValidation(fn () => [
                 'conditions.mode' => 'required|string|in:all,any',
                 'conditions.ifs' => 'array',
                 'conditions.ifs.*.field' => 'required',
@@ -102,7 +96,7 @@ class Form extends Model implements HasMedia
      */
     public function getRegistrationRules(): array
     {
-        return $this->getFields()->reduce(fn($carry, $field) => [
+        return $this->getFields()->reduce(fn ($carry, $field) => [
             ...$carry,
             ...$field->getRegistrationRules($this),
         ], []);
@@ -113,7 +107,7 @@ class Form extends Model implements HasMedia
      */
     public function getRegistrationMessages(): array
     {
-        return $this->getFields()->reduce(fn($carry, $field) => [
+        return $this->getFields()->reduce(fn ($carry, $field) => [
             ...$carry,
             ...$field->getRegistrationMessages($this),
         ], []);
@@ -124,7 +118,7 @@ class Form extends Model implements HasMedia
      */
     public function getRegistrationAttributes(): array
     {
-        return $this->getFields()->reduce(fn($carry, $field) => [
+        return $this->getFields()->reduce(fn ($carry, $field) => [
             ...$carry,
             ...$field->getRegistrationAttributes($this),
         ], []);
@@ -161,7 +155,7 @@ class Form extends Model implements HasMedia
             if (is_null(data_get($model->meta, 'active_columns'))) {
                 $model->setAttribute('meta', [
                     'active_columns' => $model->getFields()->count() ? $model->getFields()->take(4)->pluck('key')->toArray() : null,
-                    'sorting' => Sorting::by('id'),
+                    'sorting' => $model->getFields()->count() ? [$model->getFields()->first()->key, 'asc'] : null,
                 ]);
                 return;
             }
@@ -174,36 +168,5 @@ class Form extends Model implements HasMedia
                 return;
             }
         });
-
-        static::saved(function ($model) {
-            UpdateParticipantSearchIndexAction::dispatch($model);
-        });
-    }
-
-    public function participantsSearchableAs(): string
-    {
-        return config('scout.prefix') . 'forms_' . $this->id . '_participants';
-    }
-
-    public function defaultSorting(): Sorting
-    {
-        return Sorting::from($this->meta['sorting']);
-    }
-
-    public function isInDates(): bool {
-        if ($this->registration_from && $this->registration_from->gt(now())) {
-            return false;
-        }
-
-        if ($this->registration_until && $this->registration_until->lt(now())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function canRegister(): bool
-    {
-        return $this->is_active && $this->isInDates();
     }
 }

app/Form/Models/Formtemplate.php

@@ -4,7 +4,6 @@ namespace App\Form\Models;
 
 use App\Form\Data\FormConfigData;
 use App\Lib\Editor\EditorData;
-use Database\Factories\Form\Models\FormtemplateFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -13,7 +12,6 @@ use Illuminate\Database\Eloquent\Model;
  */
 class Formtemplate extends Model
 {
-    /** @use HasFactory<FormtemplateFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Form/Models/Participant.php

@@ -4,27 +4,21 @@ namespace App\Form\Models;
 
 use App\Form\Data\FieldCollection;
 use App\Form\Data\FormConfigData;
-use App\Form\Editor\FormConditionResolver;
 use App\Form\Mails\ConfirmRegistrationMail;
-use App\Lib\Editor\Condition;
+use App\Form\Scopes\ParticipantFilterScope;
 use App\Member\Member;
 use App\Prevention\Contracts\Preventable;
-use Database\Factories\Form\Models\ParticipantFactory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Mail;
-use Laravel\Scout\Searchable;
 use stdClass;
 
 class Participant extends Model implements Preventable
 {
-
-    /** @use HasFactory<ParticipantFactory> */
     use HasFactory;
-    use Searchable;
 
     public $guarded = [];
 
@@ -34,7 +28,7 @@ class Participant extends Model implements Preventable
     ];
 
     /**
-     * @return BelongsTo<Form, $this>
+     * @return BelongsTo<Form, self>
      */
     public function form(): BelongsTo
     {
@@ -42,7 +36,7 @@ class Participant extends Model implements Preventable
     }
 
     /**
-     * @return HasMany<Participant, $this>
+     * @return HasMany<self>
      */
     public function children(): HasMany
     {
@@ -50,7 +44,16 @@ class Participant extends Model implements Preventable
     }
 
     /**
-     * @return BelongsTo<Member, $this>
+     * @param  Builder<self> $query
+     * @return Builder<self>
+     */
+    public function scopeWithFilter(Builder $query, ParticipantFilterScope $filter): Builder
+    {
+        return $filter->apply($query);
+    }
+
+    /**
+     * @return BelongsTo<Member, self>
      */
     public function member(): BelongsTo
     {
@@ -82,15 +85,20 @@ class Participant extends Model implements Preventable
         Mail::to($this->getMailRecipient())->queue(new ConfirmRegistrationMail($this));
     }
 
+    public function preventableLayout(): string
+    {
+        return 'mail.prevention.prevention-remember-participant';
+    }
+
     /**
      * @inheritdoc
      */
-    public function preventions(): Collection
+    public function preventions(): array
     {
-        return $this->member?->preventions($this->form->from) ?: collect([]);
+        return $this->member?->preventions($this->form->from) ?: [];
     }
 
-    public function getMailRecipient(): ?stdClass
+    public function getMailRecipient(): stdClass
     {
         return $this->getFields()->getMailRecipient();
     }
@@ -99,19 +107,4 @@ class Participant extends Model implements Preventable
     {
         return 'Nachweise erforderlich für deine Anmeldung zu ' . $this->form->name;
     }
-
-    public function searchableAs(): string
-    {
-        return $this->form->participantsSearchableAs();
-    }
-
-    /** @return array<string, mixed> */
-    public function toSearchableArray(): array
-    {
-        return [...$this->data, 'parent-id' => $this->parent_id, 'created_at' => $this->created_at->timestamp];
-    }
-
-    public function matchesCondition(Condition $condition): bool {
-        return app(FormConditionResolver::class)->forParticipant($this)->filterCondition($condition);
-    }
 }

app/Form/Requests/FormCompileRequest.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace App\Form\Requests;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\Data\MemberData;
-use App\Contribution\Documents\ContributionDocument;
-use App\Country;
-use App\Form\Editor\FormConditionResolver;
-use App\Form\Enums\SpecialType;
-use App\Form\Models\Form;
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
-use Spatie\LaravelData\Data;
-
-class FormCompileRequest extends Data implements HasContributionData {
-
-    public function __construct(public Form $form) {}
-
-    /**
-     * @return class-string<ContributionDocument>
-     */
-    public function type(): string
-    {
-        $payload = json_decode(rawurldecode(base64_decode(request()->input('payload'))), true);
-
-        return $payload['type'];
-    }
-
-    public function dateFrom(): Carbon
-    {
-        return $this->form->from;
-    }
-
-    public function dateUntil(): Carbon
-    {
-        return $this->form->to;
-    }
-
-    public function zipLocation(): string
-    {
-        return $this->form->zip.' '.$this->form->location;
-    }
-
-    public function eventName(): string
-    {
-        return $this->form->name;
-    }
-
-    public function members(): Collection
-    {
-        $members = [];
-        $fields = [
-            [SpecialType::FIRSTNAME, 'firstname'],
-            [SpecialType::LASTNAME, 'lastname'],
-            [SpecialType::BIRTHDAY, 'birthday'],
-            [SpecialType::GENDER, 'gender'],
-            [SpecialType::ADDRESS, 'address'],
-            [SpecialType::ZIP, 'zip'],
-            [SpecialType::LOCATION, 'location'],
-        ];
-
-        foreach ($this->form->participants as $participant) {
-            $member = [];
-            foreach ($fields as [$type, $name]) {
-                $f = $this->form->getFields()->findBySpecialType($type);
-                if (!$f) {
-                    continue;
-                }
-                $member[$name] = $participant->getFields()->find($f)->value;
-            }
-
-            $members[] = [
-                'is_leader' => $participant->matchesCondition($participant->form->leader_conditions),
-                'gender' => 'weiblich',
-                ...$member,
-            ];
-        }
-
-        return MemberData::fromApi($members);
-    }
-
-    public function country(): ?Country
-    {
-        return Country::first();
-    }
-
-    public function validateContribution(): void
-    {
-        Validator::make($this->form->toArray(), [
-            'zip' => 'required',
-            'location' => 'required'
-        ])
-            ->after(function($validator) {
-                foreach ($this->type()::requiredFormSpecialTypes() as $type) {
-                    if (!$this->form->getFields()->hasSpecialType($type)) {
-                        $validator->errors()->add($type->name, 'Kein Feld für ' . $type->value . ' vorhanden.');
-                    }
-                }
-                if ($this->form->participants->count() === 0) {
-                    $validator->errors()->add('participants',  'Veranstaltung besitzt noch keine Teilnehmer*innen.');
-                }
-            })
-            ->validate();
-    }
-}

app/Form/Resources/FormApiResource.php

@@ -35,7 +35,6 @@ class FormApiResource extends JsonResource
             'image' => $this->getMedia('headerImage')->first()->getFullUrl('square'),
             'is_active' => $this->is_active,
             'is_private' => $this->is_private,
-            'can_register' => $this->getModel()->canRegister(),
         ];
     }
 

app/Form/Resources/FormResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Form\Resources;
 
-use App\Contribution\Enums\Country;
 use App\Form\Data\ExportData;
 use App\Form\Enums\NamiType;
 use App\Form\Enums\SpecialType;
@@ -15,7 +14,6 @@ use App\Group;
 use App\Lib\Editor\EditorData;
 use App\Lib\HasMeta;
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Contribution\ContributionFactory;
 
 /**
  * @mixin Form
@@ -46,7 +44,6 @@ class FormResource extends JsonResource
             'mail_bottom' => $this->mail_bottom,
             'registration_from' => $this->registration_from?->format('Y-m-d H:i:s'),
             'registration_until' => $this->registration_until?->format('Y-m-d H:i:s'),
-            'is_in_dates' => $this->isInDates(),
             'config' => $this->config,
             'participants_count' => $this->participants_count,
             'is_active' => $this->is_active,
@@ -56,20 +53,14 @@ class FormResource extends JsonResource
             'needs_prevention' => $this->needs_prevention,
             'prevention_text' => $this->prevention_text,
             'prevention_conditions' => $this->prevention_conditions,
-            'leader_conditions' => $this->leader_conditions,
-            'zip' => $this->zip,
-            'location' => $this->location,
-            'country' => $this->country,
             'links' => [
                 'participant_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => null]),
                 'participant_root_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => -1]),
-                'update' => route('form.update', $this->getModel()),
+                'update' => route('form.update', ['form' => $this->getModel()]),
-                'destroy' => route('form.destroy', $this->getModel()),
+                'destroy' => route('form.destroy', ['form' => $this->getModel()]),
-                'is_dirty' => route('form.is-dirty', $this->getModel()),
+                'is_dirty' => route('form.is-dirty', ['form' => $this->getModel()]),
                 'frontend' => str(app(FormSettings::class)->registerUrl)->replace('{slug}', $this->slug),
-                'export' => route('form.export', $this->getModel()),
+                'export' => route('form.export', ['form' => $this->getModel()]),
-                'copy' => route('form.copy', $this->getModel()),
-                'contribution' => route('form.contribution', $this->getModel()),
             ]
         ];
     }
@@ -91,8 +82,6 @@ class FormResource extends JsonResource
             'templates' => FormtemplateResource::collection(Formtemplate::get()),
             'namiTypes' => NamiType::forSelect(),
             'specialTypes' => SpecialType::forSelect(),
-            'countries' => Country::forSelect(),
-            'contribution_types' => app(ContributionFactory::class)->compilerSelect(),
             'default' => [
                 'description' => [],
                 'is_active' => true,
@@ -112,9 +101,6 @@ class FormResource extends JsonResource
                 'id' => null,
                 'export' => ExportData::from([]),
                 'prevention_conditions' => ['mode' => 'all', 'ifs' => []],
-                'zip' => '',
-                'location' => '',
-                'country' => null,
             ],
             'section_default' => [
                 'name' => '',

app/Form/Scopes/ParticipantFilterScope.php

@@ -4,76 +4,32 @@ namespace App\Form\Scopes;
 
 use App\Form\Models\Form;
 use App\Form\Models\Participant;
-use App\Lib\ScoutFilter;
+use App\Lib\Filter;
-use App\Lib\Sorting;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Arr;
-use Laravel\Scout\Builder;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
 
 /**
- * @extends ScoutFilter<Participant>
+ * @extends Filter<Participant>
  */
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-class ParticipantFilterScope extends ScoutFilter
+class ParticipantFilterScope extends Filter
 {
-
-    public static string $nan = 'deeb3ef4-d185-44b1-a4bc-0a4e7addebc3d8900c6f-a344-4afb-b54e-065ed483a7ba';
-    private Form $form;
-
     /**
      * @param array<string, mixed> $data
-     * @param array<string, mixed> $options
      */
     public function __construct(
         public array $data = [],
-        public string $search = '',
-        public array $options = [],
-        public ?int $parent = null,
-        public ?Sorting $sort = null
     ) {
     }
 
-    public function getQuery(): Builder
+    public static string $nan = 'deeb3ef4-d185-44b1-a4bc-0a4e7addebc3d8900c6f-a344-4afb-b54e-065ed483a7ba';
-    {
-        $this->search = $this->search ?: '';
-
-        return Participant::search($this->search, function ($engine, string $query, array $options) {
-            $filter = collect([]);
-
-            foreach ($this->form->getFields()->filterables() as $field) {
-                if ($this->data[$field->key] === static::$nan) {
-                    continue;
-                }
-                $filter->push($field->filter($this->data[$field->key]));
-            }
-
-            if ($this->parent === -1) {
-                $filter->push('parent-id IS NULL');
-            }
-
-            if ($this->parent !== null && $this->parent !== -1) {
-                $filter->push('parent-id = ' . $this->parent);
-            }
-
-            $options['filter'] = $filter->map(fn ($expression) => "($expression)")->implode(' AND ');
-
-            $options['sort'] = $this->sort->toMeilisearch();
-
-            return $engine->search($query, [...$this->options, ...$options]);
-        })->within($this->form->participantsSearchableAs());
-    }
 
     public function setForm(Form $form): self
     {
-        $this->form = $form;
-
-        if (is_null($this->sort)) {
-            $this->sort = $this->form->defaultSorting();
-        }
-
         foreach ($form->getFields() as $field) {
             if (!Arr::has($this->data, $field->key)) {
                 data_set($this->data, $field->key, static::$nan);
@@ -83,10 +39,18 @@ class ParticipantFilterScope extends ScoutFilter
         return $this;
     }
 
-    public function parent(?int $parent): self
+    /**
+     * @inheritdoc
+     */
+    public function apply(Builder $query): Builder
     {
-        $this->parent = $parent;
+        foreach ($this->data as $key => $value) {
+            if ($value === static::$nan) {
+                continue;
+            }
+            $query = $query->where('data->' . $key, $value);
+        }
 
-        return $this;
+        return $query;
     }
 }

app/Form/Transformers/CollectionTransformer.php

@@ -5,7 +5,6 @@ namespace App\Form\Transformers;
 use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Support\DataProperty;
-use Spatie\LaravelData\Support\Transformation\TransformationContext;
 use Spatie\LaravelData\Transformers\Transformer;
 
 class CollectionTransformer implements Transformer
@@ -19,7 +18,7 @@ class CollectionTransformer implements Transformer
      * @param Collection<int, Field> $value
      * @return array<string, mixed>
      */
-    public function transform(DataProperty $property, mixed $value, TransformationContext $context): mixed
+    public function transform(DataProperty $property, mixed $value): mixed
     {
         return $value->toArray();
     }

app/Form/Transformers/FieldCollectionTransformer.php

@@ -5,7 +5,6 @@ namespace App\Form\Transformers;
 use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Support\DataProperty;
-use Spatie\LaravelData\Support\Transformation\TransformationContext;
 use Spatie\LaravelData\Transformers\Transformer;
 
 class FieldCollectionTransformer implements Transformer
@@ -15,7 +14,7 @@ class FieldCollectionTransformer implements Transformer
      * @param Collection<int, Field> $value
      * @return array<string, mixed>
      */
-    public function transform(DataProperty $property, mixed $value, TransformationContext $context): mixed
+    public function transform(DataProperty $property, mixed $value): mixed
     {
         return $value->map(fn ($field) => [
             ...$field->toArray(),

app/Gender.php

@@ -3,15 +3,12 @@
 namespace App;
 
 use App\Nami\HasNamiField;
-use Database\Factories\GenderFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Gender extends Model
 {
     use HasNamiField;
-
-    /** @use HasFactory<GenderFactory> */
     use HasFactory;
 
     public $fillable = ['name', 'nami_id'];
@@ -25,15 +22,6 @@ class Gender extends Model
         };
     }
 
-    public function getShortAttribute(): string
-    {
-        return match ($this->name) {
-            'Männlich' => 'm',
-            'Weiblich' => 'w',
-            default => ''
-        };
-    }
-
     public static function fromString(string $title): self
     {
         return self::firstWhere('name', $title);

app/Group.php

@@ -5,7 +5,6 @@ namespace App;
 use App\Fileshare\Data\FileshareResourceData;
 use App\Group\Enums\Level;
 use App\Nami\HasNamiField;
-use Database\Factories\GroupFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -13,7 +12,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Group extends Model
 {
-    /** @use HasFactory<GroupFactory> */
     use HasFactory;
     use HasNamiField;
 
@@ -26,19 +24,19 @@ class Group extends Model
     ];
 
     /**
-     * @return BelongsTo<Group, $this>
+     * @return BelongsTo<static, self>
      */
     public function parent(): BelongsTo
     {
-        return $this->belongsTo(self::class, 'parent_id');
+        return $this->belongsTo(static::class, 'parent_id');
     }
 
     /**
-     * @return HasMany<Group, $this>
+     * @return HasMany<self>
      */
     public function children(): HasMany
     {
-        return $this->hasMany(self::class, 'parent_id');
+        return $this->hasMany(static::class, 'parent_id');
     }
 
     public static function booted(): void

app/Group/Actions/GroupApiIndexAction.php

@@ -6,7 +6,6 @@ use App\Group;
 use App\Group\Resources\GroupResource;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class GroupApiIndexAction
@@ -21,12 +20,8 @@ class GroupApiIndexAction
         return Group::get();
     }
 
-    public function asController(ActionRequest $request, ?Group $group = null): AnonymousResourceCollection
+    public function asController(?Group $group = null): AnonymousResourceCollection
     {
-        return GroupResource::collection(
+        return GroupResource::collection($group ? $group->children()->withCount('children')->get() : Group::where('parent_id', null)->withCount('children')->get());
-            $request->has('all')
-                ? Group::with('children')->get()
-                : ($group ? $group->children()->withCount('children')->get() : Group::where('parent_id', null)->withCount('children')->get())
-        );
     }
 }

app/Http/Middleware/Authenticate.php

@@ -18,7 +18,5 @@ class Authenticate extends Middleware
         if (!$request->expectsJson()) {
             return route('login');
         }
-
-        return null;
     }
 }

app/Http/Resources/UserResource.php

@@ -21,9 +21,7 @@ class UserResource extends JsonResource
     public function toArray($request): array
     {
         return [
-            'firstname' => $this->firstname,
+            'name' => $this->name,
-            'lastname' => $this->lastname,
-            'avatar_url' => $this->getGravatarUrl(),
             'email' => $this->email,
             'avatar' => [
                 'src' => Storage::url('avatar.png'),

app/Initialize/Actions/InitializeAction.php

@@ -71,7 +71,7 @@ class InitializeAction
 
     public function asController(ActionRequest $request, NamiSettings $settings): RedirectResponse
     {
-        $settings->mglnr = $request->input('mglnr');
+        $settings->mglnr = (int) $request->input('mglnr');
         $settings->password = $request->input('password');
         $settings->default_group_id = (int) $request->input('group_id');
         $settings->search_params = $request->input('params');

app/Initialize/Actions/NamiGetSearchLayerAction.php

@@ -21,7 +21,7 @@ class NamiGetSearchLayerAction
      */
     public function handle(array $input): Collection
     {
-        return Nami::login($input['mglnr'], $input['password'])->searchLayerOptions(
+        return Nami::login((int) $input['mglnr'], $input['password'])->searchLayerOptions(
             SearchLayer::from($input['layer'] ?: 0),
             $input['parent'] ?: null
         );

app/Initialize/Actions/NamiLoginCheckAction.php

@@ -16,7 +16,7 @@ class NamiLoginCheckAction
      */
     public function handle(array $input): void
     {
-        Nami::freshLogin($input['mglnr'], $input['password']);
+        Nami::freshLogin((int) $input['mglnr'], $input['password']);
     }
 
     /**

app/Initialize/Actions/NamiSearchAction.php

@@ -16,7 +16,7 @@ class NamiSearchAction
     /**
      * @param array<string, mixed> $params
      *
-     * @return LengthAwarePaginator<int, MemberEntry>
+     * @return LengthAwarePaginator<MemberEntry>
      */
     public function handle(Api $api, int $page, array $params, int $perPage = 10): LengthAwarePaginator
     {
@@ -36,7 +36,7 @@ class NamiSearchAction
     }
 
     /**
-     * @return LengthAwarePaginator<int, MemberEntry>
+     * @return LengthAwarePaginator<MemberEntry>
      */
     public function asController(ActionRequest $request): LengthAwarePaginator
     {

app/Invoice/Actions/InvoiceIndexAction.php

@@ -6,9 +6,9 @@ use Lorisleiva\Actions\Concerns\AsAction;
 use App\Invoice\Models\Invoice;
 use App\Invoice\Resources\InvoiceResource;
 use App\Invoice\Scopes\InvoiceFilterScope;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Inertia\Inertia;
 use Inertia\Response;
-use Laravel\Scout\Builder;
 use Lorisleiva\Actions\ActionRequest;
 
 class InvoiceIndexAction
@@ -17,11 +17,11 @@ class InvoiceIndexAction
 
 
     /**
-     * @return Builder<Invoice>
+     * @return LengthAwarePaginator<Invoice>
      */
-    public function handle(InvoiceFilterScope $filter): Builder
+    public function handle(InvoiceFilterScope $filter): LengthAwarePaginator
     {
-        return $filter->getQuery()->query(fn ($q) => $q->with('positions'));
+        return Invoice::withFilter($filter)->with('positions')->paginate(15);
     }
 
     public function asController(ActionRequest $request): Response
@@ -32,7 +32,7 @@ class InvoiceIndexAction
         $filter = InvoiceFilterScope::fromRequest($request->input('filter', ''));
 
         return Inertia::render('invoice/Index', [
-            'data' => InvoiceResource::collection($this->handle($filter)->paginate(15)),
+            'data' => InvoiceResource::collection($this->handle($filter)),
         ]);
     }
 }

app/Invoice/Actions/InvoiceSendAction.php

@@ -4,6 +4,7 @@ namespace App\Invoice\Actions;
 
 use App\Invoice\BillDocument;
 use App\Invoice\BillKind;
+use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\Mails\BillMail;
 use App\Invoice\Mails\RememberMail;
 use App\Invoice\Models\Invoice;

app/Invoice/Actions/MassStoreAction.php

@@ -39,7 +39,7 @@ class MassStoreAction
         foreach ($memberGroup as $members) {
             $invoice = Invoice::createForMember($members->first(), $members, $year);
             $invoice->save();
-            $invoice->positions()->createMany($invoice->positions->toArray());
+            $invoice->positions()->createMany($invoice->positions);
             $invoices->push($invoice->fresh('positions'));
         }
 

app/Invoice/InvoiceDocument.php

@@ -36,7 +36,7 @@ abstract class InvoiceDocument extends Document
 
     public static function fromInvoice(Invoice $invoice): self
     {
-        return static::factory()->withoutMagicalCreation()->from([
+        return static::withoutMagicalCreationFrom([
             'toName' => $invoice->to['name'],
             'toAddress' => $invoice->to['address'],
             'toZip' => $invoice->to['zip'],

app/Invoice/InvoiceSettings.php

@@ -2,73 +2,50 @@
 
 namespace App\Invoice;
 
+use App\Setting\Contracts\Indexable;
 use App\Setting\Contracts\Storeable;
 use App\Setting\LocalSettings;
-use Lorisleiva\Actions\ActionRequest;
 
-class InvoiceSettings extends LocalSettings implements Storeable
+class InvoiceSettings extends LocalSettings implements Indexable, Storeable
 {
-    public ?string $from_long;
+    public string $from_long;
-    public ?string $from;
+
-    public ?string $mobile;
+    public string $from;
-    public ?string $email;
+
-    public ?string $website;
+    public string $mobile;
-    public ?string $address;
+
-    public ?string $place;
+    public string $email;
-    public ?string $zip;
+
-    public ?string $iban;
+    public string $website;
-    public ?string $bic;
+
-    public ?int $rememberWeeks;
+    public string $address;
+
+    public string $place;
+
+    public string $zip;
+
+    public string $iban;
+
+    public string $bic;
 
     public static function group(): string
     {
         return 'bill';
     }
 
-    /**
+    public static function slug(): string
-     * @inheritdoc
-     */
-    public function viewData(): array
     {
-        return [
+        return 'bill';
-            'data' => [
-                'from_long' => $this->from_long,
-                'from' => $this->from,
-                'mobile' => $this->mobile,
-                'email' => $this->email,
-                'website' => $this->website,
-                'address' => $this->address,
-                'place' => $this->place,
-                'zip' => $this->zip,
-                'iban' => $this->iban,
-                'bic' => $this->bic,
-                'rememberWeeks' => $this->rememberWeeks,
-            ]
-        ];
     }
 
-    /**
+    public static function indexAction(): string
-     * @inheritdoc
-     */
-    public function rules(): array
     {
-        return [
+        return SettingIndexAction::class;
-            'from_long' => '',
-            'from' => '',
-            'mobile' => '',
-            'email' => '',
-            'website' => '',
-            'address' => '',
-            'place' => '',
-            'zip' => '',
-            'iban' => '',
-            'bic' => '',
-            'rememberWeeks' => '',
-        ];
     }
 
-    public function beforeSave(ActionRequest $request): void
+    public static function storeAction(): string
     {
+        return SettingSaveAction::class;
     }
 
     public static function title(): string

app/Invoice/Models/Invoice.php

@@ -6,25 +6,20 @@ use App\Invoice\BillDocument;
 use App\Invoice\BillKind;
 use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\InvoiceDocument;
-use App\Invoice\InvoiceSettings;
 use App\Invoice\RememberDocument;
 use App\Invoice\Scopes\InvoiceFilterScope;
 use App\Member\Member;
 use App\Payment\Subscription;
-use Database\Factories\Invoice\Models\InvoiceFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Laravel\Scout\Searchable;
 use stdClass;
 
 class Invoice extends Model
 {
-    /** @use HasFactory<InvoiceFactory> */
     use HasFactory;
-    use Searchable;
 
     public $guarded = [];
 
@@ -32,12 +27,16 @@ class Invoice extends Model
         'to' => 'json',
         'status' => InvoiceStatus::class,
         'via' => BillKind::class,
-        'sent_at' => 'datetime',
+    ];
-        'last_remembered_at' => 'datetime',
+
+    /** @var array<int, string> */
+    public $dates = [
+        'sent_at',
+        'last_remembered_at',
     ];
 
     /**
-     * @return HasMany<InvoicePosition, $this>
+     * @return HasMany<InvoicePosition>
      */
     public function positions(): HasMany
     {
@@ -49,6 +48,7 @@ class Invoice extends Model
      */
     public static function createForMember(Member $member, Collection $members, int $year, Subscription $subscription = null): self
     {
+        $subscription = $subscription ?: $member->subscription;
         $invoice = new self([
             'to' => [
                 'name' => 'Familie ' . $member->lastname,
@@ -65,8 +65,7 @@ class Invoice extends Model
 
         $positions = collect([]);
         foreach ($members as $member) {
-            $memberSubscription = $subscription ?: $member->subscription;
+            foreach ($subscription->children as $child) {
-            foreach ($memberSubscription->children as $child) {
                 $positions->push([
                     'description' => str($child->name)->replace('{name}', $member->firstname . ' ' . $member->lastname)->replace('{year}', (string) $year),
                     'price' => $child->amount,
@@ -112,14 +111,22 @@ class Invoice extends Model
      *
      * @return Builder<self>
      */
-    public function scopeWhereNeedsRemember(Builder $query, ?int $weeks = null): Builder
+    public function scopeWhereNeedsRemember(Builder $query): Builder
     {
-        $weeks = $weeks ?: app(InvoiceSettings::class)->rememberWeeks;
         return $query
             ->where('status', InvoiceStatus::SENT)
             ->whereNotNull('sent_at')
             ->whereNotNull('last_remembered_at')
-            ->where('last_remembered_at', '<=', now()->subWeeks($weeks));
+            ->where('last_remembered_at', '<=', now()->subMonths(3));
+    }
+
+    /**
+     * @param  Builder<self> $query
+     * @return Builder<self>
+     */
+    public function scopeWithFilter(Builder $query, InvoiceFilterScope $filter): Builder
+    {
+        return $filter->apply($query);
     }
 
     public function getMailRecipient(): stdClass
@@ -147,20 +154,4 @@ class Invoice extends Model
             ]);
         }
     }
-
-    /**
-     * Get the indexable data array for the model.
-     *
-     * @return array<string, mixed>
-     */
-    public function toSearchableArray(): array
-    {
-        return [
-            'to' => implode(', ', $this->to),
-            'usage' => $this->usage,
-            'greeting' => $this->greeting,
-            'mail_email' => $this->mail_email,
-            'status' => $this->status->value,
-        ];
-    }
 }

app/Invoice/Models/InvoicePosition.php

@@ -3,20 +3,18 @@
 namespace App\Invoice\Models;
 
 use App\Member\Member;
-use Database\Factories\Invoice\Models\InvoicePositionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class InvoicePosition extends Model
 {
-    /** @use HasFactory<InvoicePositionFactory> */
     use HasFactory;
 
     public $guarded = [];
 
     /**
-     * @return BelongsTo<Member, $this>
+     * @return BelongsTo<Member, self>
      */
     public function member(): BelongsTo
     {
@@ -24,7 +22,7 @@ class InvoicePosition extends Model
     }
 
     /**
-     * @return BelongsTo<Invoice, $this>
+     * @return BelongsTo<Invoice, self>
      */
     public function invoice(): BelongsTo
     {

app/Invoice/Scopes/InvoiceFilterScope.php

@@ -4,43 +4,43 @@ namespace App\Invoice\Scopes;
 
 use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\Models\Invoice;
-use App\Lib\ScoutFilter;
+use App\Lib\Filter;
-use Laravel\Scout\Builder;
+use Illuminate\Database\Eloquent\Builder;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
 
 /**
- * @extends ScoutFilter<Invoice>
+ * @extends Filter<Invoice>
  */
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-class InvoiceFilterScope extends ScoutFilter
+class InvoiceFilterScope extends Filter
 {
     /**
      * @param array<int, string> $statuses
      */
     public function __construct(
         public ?array $statuses = null,
-        public ?string $search = null
     ) {
-        $this->statuses = $this->statuses === null ? InvoiceStatus::defaultVisibleValues()->toArray() : $this->statuses;
     }
 
     /**
      * @inheritdoc
      */
-    public function getQuery(): Builder
+    public function apply(Builder $query): Builder
     {
-        $this->search = $this->search ?: '';
+        $query = $query->whereIn('status',  $this->statuses);
 
-        return Invoice::search($this->search, function ($engine, string $query, array $options) {
+        return $query;
-            if (empty($this->statuses)) {
-                $filter = 'status = "asa6aeruuni4BahC7Wei6ahm1"';
-            } else {
-                $filter = collect($this->statuses)->map(fn (string $status) => "status = \"$status\"")->join(' OR ');
     }
-            return $engine->search($query, [...$options, 'filter' => $filter]);
+
-        });
+    /**
+     * @inheritdoc
+     */
+    public function toDefault(): self
+    {
+        $this->statuses = $this->statuses === null ? InvoiceStatus::defaultVisibleValues()->toArray() : $this->statuses;
+        return $this;
     }
 }

app/Invoice/SettingIndexAction.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Invoice;
+
+use Inertia\Inertia;
+use Inertia\Response;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SettingIndexAction
+{
+    use AsAction;
+
+    /**
+     * @return array<string, string>
+     */
+    public function handle(InvoiceSettings $settings): array
+    {
+        return [
+            'from_long' => $settings->from_long,
+            'from' => $settings->from,
+            'mobile' => $settings->mobile,
+            'email' => $settings->email,
+            'website' => $settings->website,
+            'address' => $settings->address,
+            'place' => $settings->place,
+            'zip' => $settings->zip,
+            'iban' => $settings->iban,
+            'bic' => $settings->bic,
+        ];
+    }
+
+    public function asController(InvoiceSettings $settings): Response
+    {
+        session()->put('menu', 'setting');
+        session()->put('title', 'Rechnungs-Einstellungen');
+
+        return Inertia::render('setting/Bill', [
+            'data' => $this->handle($settings),
+        ]);
+    }
+}

app/Invoice/SettingSaveAction.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Invoice;
+
+use Illuminate\Http\RedirectResponse;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class SettingSaveAction
+{
+    use AsAction;
+
+    /**
+     * @param array<string, string> $input
+     */
+    public function handle(array $input): void
+    {
+        $settings = app(InvoiceSettings::class);
+
+        $settings->fill([
+            'from_long' => $input['from_long'] ?? '',
+            'from' => $input['from'] ?? '',
+            'mobile' => $input['mobile'] ?? '',
+            'email' => $input['email'] ?? '',
+            'website' => $input['website'] ?? '',
+            'address' => $input['address'] ?? '',
+            'place' => $input['place'] ?? '',
+            'zip' => $input['zip'] ?? '',
+            'iban' => $input['iban'] ?? '',
+            'bic' => $input['bic'] ?? '',
+        ]);
+
+        $settings->save();
+    }
+
+    public function asController(ActionRequest $request): RedirectResponse
+    {
+        $this->handle($request->all());
+
+        return redirect()->back();
+    }
+}