Compare commits
5 Commits
8f3e2e8aca
...
88487f0d39
Author | SHA1 | Date |
---|---|---|
|
88487f0d39 | |
|
17ce78964a | |
|
6daa8d3243 | |
|
4f2167ea99 | |
|
b29642c8a6 |
|
@ -23,7 +23,7 @@ class GenerateAction
|
||||||
public function asController(GenerateRequest $request): BaseCompiler|JsonResponse
|
public function asController(GenerateRequest $request): BaseCompiler|JsonResponse
|
||||||
{
|
{
|
||||||
app(ContributionFactory::class)->validateType($request);
|
app(ContributionFactory::class)->validateType($request);
|
||||||
app(ContributionFactory::class)->validatePayload($request);
|
$request->validateContribution();
|
||||||
|
|
||||||
return $request->input('validate')
|
return $request->input('validate')
|
||||||
? response()->json([])
|
? response()->json([])
|
||||||
|
|
|
@ -26,5 +26,5 @@ interface HasContributionData {
|
||||||
|
|
||||||
public function country(): ?Country;
|
public function country(): ?Country;
|
||||||
|
|
||||||
public function payload(): array;
|
public function validateContribution(): void;
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,8 +65,4 @@ class ContributionFactory
|
||||||
public function validateType(HasContributionData $request) {
|
public function validateType(HasContributionData $request) {
|
||||||
Validator::make(['type' => $request->type()], $this->typeRule())->validate();
|
Validator::make(['type' => $request->type()], $this->typeRule())->validate();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function validatePayload(HasContributionData $request) {
|
|
||||||
Validator::make($request->payload(), $this->rules($request->type()))->validate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@ class MemberData extends Data
|
||||||
return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
|
return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
|
||||||
...$member,
|
...$member,
|
||||||
'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
|
'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
|
||||||
'gender' => Gender::fromString($member['gender']),
|
'gender' => $member['gender'] ? Gender::fromString($member['gender']) : null,
|
||||||
'isLeader' => $member['is_leader'],
|
'isLeader' => $member['is_leader'],
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ use App\Contribution\Contracts\HasContributionData;
|
||||||
use App\Contribution\Data\MemberData;
|
use App\Contribution\Data\MemberData;
|
||||||
use App\Contribution\Traits\HasPdfBackground;
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
@ -116,4 +117,15 @@ class BdkjHesse extends ContributionDocument
|
||||||
'zipLocation' => 'required|string',
|
'zipLocation' => 'required|string',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function requiredFormSpecialTypes(): array {
|
||||||
|
return [
|
||||||
|
SpecialType::FIRSTNAME,
|
||||||
|
SpecialType::LASTNAME,
|
||||||
|
SpecialType::BIRTHDAY,
|
||||||
|
SpecialType::ZIP,
|
||||||
|
SpecialType::LOCATION,
|
||||||
|
SpecialType::GENDER,
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ use App\Contribution\Data\MemberData;
|
||||||
use App\Contribution\Traits\FormatsDates;
|
use App\Contribution\Traits\FormatsDates;
|
||||||
use App\Contribution\Traits\HasPdfBackground;
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
use App\Invoice\InvoiceSettings;
|
use App\Invoice\InvoiceSettings;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
@ -74,4 +75,15 @@ class CityFrankfurtMainDocument extends ContributionDocument
|
||||||
'zipLocation' => 'required|string',
|
'zipLocation' => 'required|string',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function requiredFormSpecialTypes(): array {
|
||||||
|
return [
|
||||||
|
SpecialType::FIRSTNAME,
|
||||||
|
SpecialType::LASTNAME,
|
||||||
|
SpecialType::BIRTHDAY,
|
||||||
|
SpecialType::ZIP,
|
||||||
|
SpecialType::LOCATION,
|
||||||
|
SpecialType::ADDRESS,
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ use App\Contribution\Contracts\HasContributionData;
|
||||||
use App\Contribution\Traits\FormatsDates;
|
use App\Contribution\Traits\FormatsDates;
|
||||||
use App\Contribution\Traits\HasPdfBackground;
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
use App\Member\Member;
|
use App\Member\Member;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
@ -65,4 +66,16 @@ class CityRemscheidDocument extends ContributionDocument
|
||||||
'country' => 'required|integer|exists:countries,id',
|
'country' => 'required|integer|exists:countries,id',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function requiredFormSpecialTypes(): array {
|
||||||
|
return [
|
||||||
|
SpecialType::FIRSTNAME,
|
||||||
|
SpecialType::LASTNAME,
|
||||||
|
SpecialType::ADDRESS,
|
||||||
|
SpecialType::BIRTHDAY,
|
||||||
|
SpecialType::ZIP,
|
||||||
|
SpecialType::LOCATION,
|
||||||
|
SpecialType::LEADER
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ namespace App\Contribution\Documents;
|
||||||
|
|
||||||
use App\Contribution\Contracts\HasContributionData;
|
use App\Contribution\Contracts\HasContributionData;
|
||||||
use App\Contribution\Data\MemberData;
|
use App\Contribution\Data\MemberData;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
use App\Invoice\InvoiceSettings;
|
use App\Invoice\InvoiceSettings;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
@ -94,4 +95,15 @@ class CitySolingenDocument extends ContributionDocument
|
||||||
'zipLocation' => 'required|string',
|
'zipLocation' => 'required|string',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function requiredFormSpecialTypes(): array {
|
||||||
|
return [
|
||||||
|
SpecialType::FIRSTNAME,
|
||||||
|
SpecialType::LASTNAME,
|
||||||
|
SpecialType::BIRTHDAY,
|
||||||
|
SpecialType::ZIP,
|
||||||
|
SpecialType::LOCATION,
|
||||||
|
SpecialType::ADDRESS,
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
namespace App\Contribution\Documents;
|
namespace App\Contribution\Documents;
|
||||||
|
|
||||||
use App\Contribution\Contracts\HasContributionData;
|
use App\Contribution\Contracts\HasContributionData;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
use Zoomyboy\Tex\Document;
|
use Zoomyboy\Tex\Document;
|
||||||
use Zoomyboy\Tex\Template;
|
use Zoomyboy\Tex\Template;
|
||||||
|
|
||||||
|
@ -14,6 +15,11 @@ abstract class ContributionDocument extends Document
|
||||||
|
|
||||||
abstract public static function fromPayload(HasContributionData $request): self;
|
abstract public static function fromPayload(HasContributionData $request): self;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, SpecialType>
|
||||||
|
*/
|
||||||
|
abstract public static function requiredFormSpecialTypes(): array;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array<string, mixed>
|
* @return array<string, mixed>
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,6 +7,7 @@ use App\Contribution\Data\MemberData;
|
||||||
use App\Contribution\Traits\FormatsDates;
|
use App\Contribution\Traits\FormatsDates;
|
||||||
use App\Contribution\Traits\HasPdfBackground;
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
@ -65,4 +66,15 @@ class RdpNrwDocument extends ContributionDocument
|
||||||
'zipLocation' => 'required|string',
|
'zipLocation' => 'required|string',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function requiredFormSpecialTypes(): array {
|
||||||
|
return [
|
||||||
|
SpecialType::FIRSTNAME,
|
||||||
|
SpecialType::LASTNAME,
|
||||||
|
SpecialType::BIRTHDAY,
|
||||||
|
SpecialType::ZIP,
|
||||||
|
SpecialType::LOCATION,
|
||||||
|
SpecialType::GENDER,
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ use App\Contribution\Data\MemberData;
|
||||||
use App\Contribution\Traits\FormatsDates;
|
use App\Contribution\Traits\FormatsDates;
|
||||||
use App\Contribution\Traits\HasPdfBackground;
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
@ -60,4 +61,17 @@ class WuppertalDocument extends ContributionDocument
|
||||||
'zipLocation' => 'required|string',
|
'zipLocation' => 'required|string',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function requiredFormSpecialTypes(): array {
|
||||||
|
return [
|
||||||
|
SpecialType::FIRSTNAME,
|
||||||
|
SpecialType::LASTNAME,
|
||||||
|
SpecialType::ADDRESS,
|
||||||
|
SpecialType::BIRTHDAY,
|
||||||
|
SpecialType::ZIP,
|
||||||
|
SpecialType::LOCATION,
|
||||||
|
SpecialType::GENDER,
|
||||||
|
SpecialType::LEADER,
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,17 +2,10 @@
|
||||||
|
|
||||||
namespace App\Contribution\Requests;
|
namespace App\Contribution\Requests;
|
||||||
|
|
||||||
use App\Contribution\Contracts\HasContributionData;
|
|
||||||
use App\Contribution\Data\MemberData;
|
use App\Contribution\Data\MemberData;
|
||||||
use App\Contribution\Documents\ContributionDocument;
|
|
||||||
use App\Country;
|
|
||||||
use Lorisleiva\Actions\ActionRequest;
|
|
||||||
use Carbon\Carbon;
|
|
||||||
use Illuminate\Support\Arr;
|
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use RuntimeException;
|
|
||||||
|
|
||||||
class GenerateApiRequest extends ActionRequest implements HasContributionData {
|
class GenerateApiRequest extends GenerateRequest {
|
||||||
/**
|
/**
|
||||||
* @return array<string, string>
|
* @return array<string, string>
|
||||||
*/
|
*/
|
||||||
|
@ -21,47 +14,11 @@ class GenerateApiRequest extends ActionRequest implements HasContributionData {
|
||||||
return $this->input();
|
return $this->input();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public function validateContribution(): void {
|
||||||
* @return string|array<array-key, mixed>
|
|
||||||
*/
|
|
||||||
public function value(string $key): string|array
|
|
||||||
{
|
|
||||||
if (!Arr::has($this->payload(), $key)) {
|
|
||||||
throw new RuntimeException('Wert für '.$key.' nicht gefunden.');
|
|
||||||
}
|
|
||||||
return data_get($this->payload(), $key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return class-string<ContributionDocument>
|
|
||||||
*/
|
|
||||||
public function type(): string
|
|
||||||
{
|
|
||||||
return $this->value('type');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function dateFrom(): Carbon {
|
|
||||||
return Carbon::parse($this->value('dateFrom'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function dateUntil(): Carbon {
|
|
||||||
return Carbon::parse($this->value('dateUntil'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function zipLocation(): string {
|
|
||||||
return $this->value('zipLocation');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function eventName(): string {
|
|
||||||
return $this->value('eventName');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function members(): Collection {
|
public function members(): Collection {
|
||||||
return MemberData::fromApi($this->value('member_data'));
|
return MemberData::fromApi($this->value('members'));
|
||||||
}
|
|
||||||
|
|
||||||
public function country(): ?Country {
|
|
||||||
return Country::where('id', $this->value('country'))->first();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,12 +3,14 @@
|
||||||
namespace App\Contribution\Requests;
|
namespace App\Contribution\Requests;
|
||||||
|
|
||||||
use App\Contribution\Contracts\HasContributionData;
|
use App\Contribution\Contracts\HasContributionData;
|
||||||
|
use App\Contribution\ContributionFactory;
|
||||||
use App\Contribution\Data\MemberData;
|
use App\Contribution\Data\MemberData;
|
||||||
use App\Contribution\Documents\ContributionDocument;
|
use App\Contribution\Documents\ContributionDocument;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
use Lorisleiva\Actions\ActionRequest;
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
|
||||||
class GenerateRequest extends ActionRequest implements HasContributionData {
|
class GenerateRequest extends ActionRequest implements HasContributionData {
|
||||||
/**
|
/**
|
||||||
|
@ -19,6 +21,10 @@ class GenerateRequest extends ActionRequest implements HasContributionData {
|
||||||
return json_decode(rawurldecode(base64_decode($this->input('payload', ''))), true);
|
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>
|
* @return string|array<array-key, mixed>
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Form\Actions;
|
||||||
|
|
||||||
|
use App\Contribution\Contracts\HasContributionData;
|
||||||
|
use App\Contribution\ContributionFactory;
|
||||||
|
use App\Form\Models\Form;
|
||||||
|
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
|
||||||
|
{
|
||||||
|
app(ContributionFactory::class)->validateType($form);
|
||||||
|
$form->validateContribution();
|
||||||
|
|
||||||
|
return $request->input('validate')
|
||||||
|
? response()->json([])
|
||||||
|
: $this->handle($form);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'payload' => [new JsonBase64Rule()],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -114,7 +114,12 @@ class FieldCollection extends Collection
|
||||||
return $this->map(fn ($field) => $field->presentRaw())->toArray();
|
return $this->map(fn ($field) => $field->presentRaw())->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private function findBySpecialType(SpecialType $specialType): ?Field
|
public function hasSpecialType(SpecialType $specialType): bool
|
||||||
|
{
|
||||||
|
return $this->findBySpecialType($specialType) !== null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function findBySpecialType(SpecialType $specialType): ?Field
|
||||||
{
|
{
|
||||||
return $this->first(fn ($field) => $field->specialType === $specialType);
|
return $this->first(fn ($field) => $field->specialType === $specialType);
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,12 @@ enum SpecialType: string
|
||||||
case FIRSTNAME = 'Vorname';
|
case FIRSTNAME = 'Vorname';
|
||||||
case LASTNAME = 'Nachname';
|
case LASTNAME = 'Nachname';
|
||||||
case EMAIL = 'E-Mail-Adresse';
|
case EMAIL = 'E-Mail-Adresse';
|
||||||
|
case BIRTHDAY = 'Geburtsdatum';
|
||||||
|
case ZIP = 'PLZ';
|
||||||
|
case LOCATION = 'Ort';
|
||||||
|
case ADDRESS = 'Adresse';
|
||||||
|
case GENDER = 'Geschlecht';
|
||||||
|
case LEADER = 'LeiterIn';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array<int, array{name: string, id: string}>
|
* @return array<int, array{name: string, id: string}>
|
||||||
|
|
|
@ -2,18 +2,25 @@
|
||||||
|
|
||||||
namespace App\Form\Models;
|
namespace App\Form\Models;
|
||||||
|
|
||||||
|
use App\Contribution\Contracts\HasContributionData;
|
||||||
|
use App\Contribution\Data\MemberData;
|
||||||
|
use App\Country;
|
||||||
use App\Form\Actions\UpdateParticipantSearchIndexAction;
|
use App\Form\Actions\UpdateParticipantSearchIndexAction;
|
||||||
use App\Form\Data\ExportData;
|
use App\Form\Data\ExportData;
|
||||||
use App\Form\Data\FieldCollection;
|
use App\Form\Data\FieldCollection;
|
||||||
use App\Form\Data\FormConfigData;
|
use App\Form\Data\FormConfigData;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
use App\Lib\Editor\Condition;
|
use App\Lib\Editor\Condition;
|
||||||
use App\Lib\Editor\EditorData;
|
use App\Lib\Editor\EditorData;
|
||||||
use App\Lib\Sorting;
|
use App\Lib\Sorting;
|
||||||
|
use Carbon\Carbon;
|
||||||
use Cviebrock\EloquentSluggable\Sluggable;
|
use Cviebrock\EloquentSluggable\Sluggable;
|
||||||
use Database\Factories\Form\Models\FormFactory;
|
use Database\Factories\Form\Models\FormFactory;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
use Laravel\Scout\Searchable;
|
use Laravel\Scout\Searchable;
|
||||||
use Spatie\Image\Enums\Fit;
|
use Spatie\Image\Enums\Fit;
|
||||||
use Spatie\MediaLibrary\HasMedia;
|
use Spatie\MediaLibrary\HasMedia;
|
||||||
|
@ -22,7 +29,7 @@ use Spatie\MediaLibrary\MediaCollections\Models\Media;
|
||||||
use Zoomyboy\MedialibraryHelper\DefersUploads;
|
use Zoomyboy\MedialibraryHelper\DefersUploads;
|
||||||
|
|
||||||
/** @todo replace editor content with EditorData cast */
|
/** @todo replace editor content with EditorData cast */
|
||||||
class Form extends Model implements HasMedia
|
class Form extends Model implements HasMedia, HasContributionData
|
||||||
{
|
{
|
||||||
/** @use HasFactory<FormFactory> */
|
/** @use HasFactory<FormFactory> */
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
@ -74,20 +81,20 @@ class Form extends Model implements HasMedia
|
||||||
{
|
{
|
||||||
$this->addMediaCollection('headerImage')
|
$this->addMediaCollection('headerImage')
|
||||||
->singleFile()
|
->singleFile()
|
||||||
->maxWidth(fn () => 500)
|
->maxWidth(fn() => 500)
|
||||||
->forceFileName(fn (Form $model, string $name) => $model->slug)
|
->forceFileName(fn(Form $model, string $name) => $model->slug)
|
||||||
->convert(fn () => 'jpg')
|
->convert(fn() => 'jpg')
|
||||||
->registerMediaConversions(function (Media $media) {
|
->registerMediaConversions(function (Media $media) {
|
||||||
$this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
|
$this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
|
||||||
});
|
});
|
||||||
$this->addMediaCollection('mailattachments')
|
$this->addMediaCollection('mailattachments')
|
||||||
->withDefaultProperties(fn () => [
|
->withDefaultProperties(fn() => [
|
||||||
'conditions' => [
|
'conditions' => [
|
||||||
'mode' => 'all',
|
'mode' => 'all',
|
||||||
'ifs' => []
|
'ifs' => []
|
||||||
],
|
],
|
||||||
])
|
])
|
||||||
->withPropertyValidation(fn () => [
|
->withPropertyValidation(fn() => [
|
||||||
'conditions.mode' => 'required|string|in:all,any',
|
'conditions.mode' => 'required|string|in:all,any',
|
||||||
'conditions.ifs' => 'array',
|
'conditions.ifs' => 'array',
|
||||||
'conditions.ifs.*.field' => 'required',
|
'conditions.ifs.*.field' => 'required',
|
||||||
|
@ -101,7 +108,7 @@ class Form extends Model implements HasMedia
|
||||||
*/
|
*/
|
||||||
public function getRegistrationRules(): array
|
public function getRegistrationRules(): array
|
||||||
{
|
{
|
||||||
return $this->getFields()->reduce(fn ($carry, $field) => [
|
return $this->getFields()->reduce(fn($carry, $field) => [
|
||||||
...$carry,
|
...$carry,
|
||||||
...$field->getRegistrationRules($this),
|
...$field->getRegistrationRules($this),
|
||||||
], []);
|
], []);
|
||||||
|
@ -112,7 +119,7 @@ class Form extends Model implements HasMedia
|
||||||
*/
|
*/
|
||||||
public function getRegistrationMessages(): array
|
public function getRegistrationMessages(): array
|
||||||
{
|
{
|
||||||
return $this->getFields()->reduce(fn ($carry, $field) => [
|
return $this->getFields()->reduce(fn($carry, $field) => [
|
||||||
...$carry,
|
...$carry,
|
||||||
...$field->getRegistrationMessages($this),
|
...$field->getRegistrationMessages($this),
|
||||||
], []);
|
], []);
|
||||||
|
@ -123,7 +130,7 @@ class Form extends Model implements HasMedia
|
||||||
*/
|
*/
|
||||||
public function getRegistrationAttributes(): array
|
public function getRegistrationAttributes(): array
|
||||||
{
|
{
|
||||||
return $this->getFields()->reduce(fn ($carry, $field) => [
|
return $this->getFields()->reduce(fn($carry, $field) => [
|
||||||
...$carry,
|
...$carry,
|
||||||
...$field->getRegistrationAttributes($this),
|
...$field->getRegistrationAttributes($this),
|
||||||
], []);
|
], []);
|
||||||
|
@ -201,4 +208,91 @@ class Form extends Model implements HasMedia
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function payload(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'dateFrom' => $this->dateFrom()->format('Y-m-d'),
|
||||||
|
'eventName' => $this->name,
|
||||||
|
'members' => [],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return class-string<ContributionDocument>
|
||||||
|
*/
|
||||||
|
public function type(): string
|
||||||
|
{
|
||||||
|
return request()->input('type');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function dateFrom(): Carbon
|
||||||
|
{
|
||||||
|
return now();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function dateUntil(): Carbon
|
||||||
|
{
|
||||||
|
return now();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function zipLocation(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function eventName(): string
|
||||||
|
{
|
||||||
|
return $this->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function members(): Collection
|
||||||
|
{
|
||||||
|
$members = [];
|
||||||
|
$fields = [
|
||||||
|
[SpecialType::FIRSTNAME, 'firstname'],
|
||||||
|
[SpecialType::LASTNAME, 'lastname'],
|
||||||
|
[SpecialType::BIRTHDAY, 'birthday'],
|
||||||
|
[SpecialType::ADDRESS, 'address'],
|
||||||
|
[SpecialType::ZIP, 'zip'],
|
||||||
|
[SpecialType::LOCATION, 'location']
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach ($this->participants as $participant) {
|
||||||
|
$member = [];
|
||||||
|
foreach ($fields as [$type, $name]) {
|
||||||
|
$f = $this->getFields()->findBySpecialType($type);
|
||||||
|
$member[$name] = $participant->getFields()->find($f)->value;
|
||||||
|
}
|
||||||
|
|
||||||
|
$members[] = [
|
||||||
|
'is_leader' => false,
|
||||||
|
'gender' => null,
|
||||||
|
...$member,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return MemberData::fromApi($members);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function country(): ?Country
|
||||||
|
{
|
||||||
|
return Country::first();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function validateContribution(): void
|
||||||
|
{
|
||||||
|
$messages = [];
|
||||||
|
foreach ($this->type()::requiredFormSpecialTypes() as $type) {
|
||||||
|
if (!$this->getFields()->hasSpecialType($type)) {
|
||||||
|
$messages[$type->name] = 'Kein Feld für ' . $type->value . ' vorhanden.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->participants->count() === 0) {
|
||||||
|
$messages['participants'] = 'Veranstaltung besitzt noch keine Teilnehmer*innen.';
|
||||||
|
}
|
||||||
|
|
||||||
|
throw_unless(empty($messages), ValidationException::withMessages($messages));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,6 +92,8 @@ services:
|
||||||
|
|
||||||
socketi:
|
socketi:
|
||||||
image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian
|
image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian
|
||||||
|
ports:
|
||||||
|
- "6001:6001"
|
||||||
environment:
|
environment:
|
||||||
SOKETI_DEFAULT_APP_ID: adremaid
|
SOKETI_DEFAULT_APP_ID: adremaid
|
||||||
SOKETI_DEFAULT_APP_KEY: adremakey
|
SOKETI_DEFAULT_APP_KEY: adremakey
|
||||||
|
@ -104,6 +106,8 @@ services:
|
||||||
|
|
||||||
meilisearch:
|
meilisearch:
|
||||||
image: getmeili/meilisearch:v1.6
|
image: getmeili/meilisearch:v1.6
|
||||||
|
ports:
|
||||||
|
- "7700:7700"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/meilisearch:/meili_data
|
- ./data/meilisearch:/meili_data
|
||||||
env_file:
|
env_file:
|
||||||
|
|
|
@ -34,6 +34,7 @@ use App\Form\Actions\FormtemplateStoreAction;
|
||||||
use App\Form\Actions\FormtemplateUpdateAction;
|
use App\Form\Actions\FormtemplateUpdateAction;
|
||||||
use App\Form\Actions\FormUpdateAction;
|
use App\Form\Actions\FormUpdateAction;
|
||||||
use App\Form\Actions\FormUpdateMetaAction;
|
use App\Form\Actions\FormUpdateMetaAction;
|
||||||
|
use App\Form\Actions\GenerateContributionAction;
|
||||||
use App\Form\Actions\IsDirtyAction;
|
use App\Form\Actions\IsDirtyAction;
|
||||||
use App\Form\Actions\ParticipantAssignAction;
|
use App\Form\Actions\ParticipantAssignAction;
|
||||||
use App\Form\Actions\ParticipantDestroyAction;
|
use App\Form\Actions\ParticipantDestroyAction;
|
||||||
|
@ -178,6 +179,7 @@ Route::group(['middleware' => 'auth:web'], function (): void {
|
||||||
Route::patch('/participant/{participant}', ParticipantUpdateAction::class)->name('participant.update');
|
Route::patch('/participant/{participant}', ParticipantUpdateAction::class)->name('participant.update');
|
||||||
Route::post('/form/{form}/participant', ParticipantStoreAction::class)->name('form.participant.store');
|
Route::post('/form/{form}/participant', ParticipantStoreAction::class)->name('form.participant.store');
|
||||||
Route::post('/form/{form}/copy', FormCopyAction::class)->name('form.copy');
|
Route::post('/form/{form}/copy', FormCopyAction::class)->name('form.copy');
|
||||||
|
Route::get('/form/{form}/contribution', GenerateContributionAction::class)->name('form.contribution');
|
||||||
|
|
||||||
// ------------------------------------ fileshare -----------------------------------
|
// ------------------------------------ fileshare -----------------------------------
|
||||||
Route::post('/fileshare', FileshareStoreAction::class)->name('fileshare.store');
|
Route::post('/fileshare', FileshareStoreAction::class)->name('fileshare.store');
|
||||||
|
|
|
@ -100,3 +100,13 @@ dataset('contribution-assertions', fn () => [
|
||||||
[BdkjHesse::class, ["Max", "Muster", "Jane"]],
|
[BdkjHesse::class, ["Max", "Muster", "Jane"]],
|
||||||
[WuppertalDocument::class, ["Max", "Muster", "Jane", "42777 SG", "15.06.1991", "16.06.1991"]],
|
[WuppertalDocument::class, ["Max", "Muster", "Jane", "42777 SG", "15.06.1991", "16.06.1991"]],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
dataset('contribution-documents', fn () => [
|
||||||
|
CitySolingenDocument::class,
|
||||||
|
RdpNrwDocument::class,
|
||||||
|
CityRemscheidDocument::class,
|
||||||
|
CityFrankfurtMainDocument::class,
|
||||||
|
BdkjHesse::class,
|
||||||
|
WuppertalDocument::class,
|
||||||
|
]);
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,7 @@ it('testItCompilesContributionDocumentsViaApi', function (string $type, array $b
|
||||||
'eventName' => 'Super tolles Lager',
|
'eventName' => 'Super tolles Lager',
|
||||||
'type' => $type,
|
'type' => $type,
|
||||||
'zipLocation' => '42777 SG',
|
'zipLocation' => '42777 SG',
|
||||||
'member_data' => [
|
'members' => [
|
||||||
ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']),
|
ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']),
|
||||||
ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']),
|
ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']),
|
||||||
],
|
],
|
||||||
|
@ -100,6 +100,28 @@ it('testItCompilesContributionDocumentsViaApi', function (string $type, array $b
|
||||||
Tex::assertCompiled($type, fn ($document) => $document->hasAllContent($bodyChecks));
|
Tex::assertCompiled($type, fn ($document) => $document->hasAllContent($bodyChecks));
|
||||||
})->with('contribution-assertions');
|
})->with('contribution-assertions');
|
||||||
|
|
||||||
|
it('compiles when gender is null', function () {
|
||||||
|
$this->withoutExceptionHandling();
|
||||||
|
Tex::spy();
|
||||||
|
Passport::actingAsClient(Client::factory()->create(), ['contribution-generate']);
|
||||||
|
|
||||||
|
$response = $this->postJson('/api/contribution-generate', [
|
||||||
|
'country' => Country::factory()->create()->id,
|
||||||
|
'dateFrom' => '1991-06-15',
|
||||||
|
'dateUntil' => '1991-06-16',
|
||||||
|
'eventName' => 'Super tolles Lager',
|
||||||
|
'type' => CitySolingenDocument::class,
|
||||||
|
'zipLocation' => '42777 SG',
|
||||||
|
'members' => [
|
||||||
|
ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster', 'gender' => null]),
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertSessionDoesntHaveErrors();
|
||||||
|
$response->assertOk();
|
||||||
|
Tex::assertCompiled(CitySolingenDocument::class, fn () => true);
|
||||||
|
});
|
||||||
|
|
||||||
it('testInputShouldBeBase64EncodedJson', function (string $payload) {
|
it('testInputShouldBeBase64EncodedJson', function (string $payload) {
|
||||||
$this->login()->loginNami();
|
$this->login()->loginNami();
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,116 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature\Form;
|
||||||
|
|
||||||
|
use App\Contribution\Documents\CitySolingenDocument;
|
||||||
|
use App\Contribution\Documents\RdpNrwDocument;
|
||||||
|
use App\Form\Enums\SpecialType;
|
||||||
|
use App\Form\Models\Form;
|
||||||
|
use App\Form\Models\Participant;
|
||||||
|
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||||
|
use Tests\Lib\CreatesFormFields;
|
||||||
|
use Zoomyboy\Tex\Tex;
|
||||||
|
|
||||||
|
uses(DatabaseTransactions::class);
|
||||||
|
uses(CreatesFormFields::class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<int, FormtemplateFieldRequest> $fields
|
||||||
|
*/
|
||||||
|
it('doesnt create document when no special fields given', function (array $fields, string $field, string $message, string $type) {
|
||||||
|
$this->login()->loginNami();
|
||||||
|
|
||||||
|
$form = Form::factory()
|
||||||
|
->fields($fields)
|
||||||
|
->has(Participant::factory())
|
||||||
|
->create();
|
||||||
|
|
||||||
|
$this->json('GET', route('form.contribution', [
|
||||||
|
'type' => $type,
|
||||||
|
'form' => $form,
|
||||||
|
'validate' => '1',
|
||||||
|
]))->assertJsonValidationErrors([$field => $message]);
|
||||||
|
})
|
||||||
|
->with([
|
||||||
|
[fn () => [], 'FIRSTNAME', 'Kein Feld für Vorname vorhanden.'],
|
||||||
|
[fn () => [test()->textField('f')->specialType(SpecialType::FIRSTNAME)], 'LASTNAME', 'Kein Feld für Nachname vorhanden.'],
|
||||||
|
[fn () => [test()->textField('f')->specialType(SpecialType::FIRSTNAME), test()->textField('l')->specialType(SpecialType::LASTNAME)], 'BIRTHDAY', 'Kein Feld für Geburtsdatum vorhanden.'],
|
||||||
|
[fn () => [test()->textField('f')->specialType(SpecialType::FIRSTNAME), test()->textField('l')->specialType(SpecialType::LASTNAME), test()->dateField('b')->specialType(SpecialType::BIRTHDAY)], 'ZIP', 'Kein Feld für PLZ vorhanden.'],
|
||||||
|
[fn () => [test()->textField('f')->specialType(SpecialType::FIRSTNAME), test()->textField('l')->specialType(SpecialType::LASTNAME), test()->dateField('b')->specialType(SpecialType::BIRTHDAY), test()->dateField('p')->specialType(SpecialType::ZIP)], 'LOCATION', 'Kein Feld für Ort vorhanden.'],
|
||||||
|
])->with('contribution-documents');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<int, FormtemplateFieldRequest> $fields
|
||||||
|
*/
|
||||||
|
it('validates special types of each document', function (string $type, array $fields, string $field, string $message) {
|
||||||
|
$this->login()->loginNami();
|
||||||
|
|
||||||
|
$form = Form::factory()->fields([
|
||||||
|
test()->textField('f')->specialType(SpecialType::FIRSTNAME),
|
||||||
|
test()->textField('l')->specialType(SpecialType::LASTNAME),
|
||||||
|
test()->dateField('b')->specialType(SpecialType::BIRTHDAY),
|
||||||
|
test()->dateField('p')->specialType(SpecialType::ZIP),
|
||||||
|
test()->dateField('l')->specialType(SpecialType::LOCATION),
|
||||||
|
...$fields,
|
||||||
|
])
|
||||||
|
->has(Participant::factory())
|
||||||
|
->create();
|
||||||
|
|
||||||
|
$this->json('GET', route('form.contribution', [
|
||||||
|
'type' => $type,
|
||||||
|
'form' => $form,
|
||||||
|
'validate' => '1',
|
||||||
|
]))->assertJsonValidationErrors([$field => $message]);
|
||||||
|
})
|
||||||
|
->with([
|
||||||
|
[CitySolingenDocument::class, [], 'ADDRESS', 'Kein Feld für Adresse vorhanden.'],
|
||||||
|
[RdpNrwDocument::class, [], 'GENDER', 'Kein Feld für Geschlecht vorhanden.'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
it('throws error when not validating but fields are not present', function () {
|
||||||
|
$this->login()->loginNami();
|
||||||
|
|
||||||
|
$form = Form::factory()->fields([])
|
||||||
|
->has(Participant::factory())
|
||||||
|
->create();
|
||||||
|
|
||||||
|
$this->json('GET', route('form.contribution', [
|
||||||
|
'type' => CitySolingenDocument::class,
|
||||||
|
'form' => $form,
|
||||||
|
]))->assertStatus(422);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws error when form doesnt have participants', function () {
|
||||||
|
$this->login()->loginNami();
|
||||||
|
|
||||||
|
$form = Form::factory()->fields([])->create();
|
||||||
|
|
||||||
|
$this->json('GET', route('form.contribution', [
|
||||||
|
'type' => CitySolingenDocument::class,
|
||||||
|
'form' => $form,
|
||||||
|
'validate' => '1',
|
||||||
|
]))->assertJsonValidationErrors(['participants' => 'Veranstaltung besitzt noch keine Teilnehmer*innen.']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creates document when fields are present', function () {
|
||||||
|
Tex::spy();
|
||||||
|
$this->login()->loginNami();
|
||||||
|
|
||||||
|
$form = Form::factory()->fields([
|
||||||
|
test()->textField('fn')->specialType(SpecialType::FIRSTNAME),
|
||||||
|
test()->textField('ln')->specialType(SpecialType::LASTNAME),
|
||||||
|
test()->dateField('bd')->specialType(SpecialType::BIRTHDAY),
|
||||||
|
test()->dateField('zip')->specialType(SpecialType::ZIP),
|
||||||
|
test()->dateField('loc')->specialType(SpecialType::LOCATION),
|
||||||
|
test()->dateField('add')->specialType(SpecialType::ADDRESS),
|
||||||
|
])
|
||||||
|
->has(Participant::factory()->data(['fn' => 'Baum', 'ln' => 'Muster', 'bd' => '1991-05-06', 'zip' => '33333', 'loc' => 'Musterstadt', 'add' => 'Laastr 4']))
|
||||||
|
->create();
|
||||||
|
|
||||||
|
$this->json('GET', route('form.contribution', [
|
||||||
|
'type' => CitySolingenDocument::class,
|
||||||
|
'form' => $form,
|
||||||
|
]))->assertOk();
|
||||||
|
Tex::assertCompiled(CitySolingenDocument::class, fn ($document) => $document->hasAllContent(['Baum', 'Muster', '1991', 'Musterstadt', 'Laastr 4', '33333']));
|
||||||
|
});
|
||||||
|
|
Loading…
Reference in New Issue