EP/myep-team
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: collect teamers' meal preferences

Browse Source
This commit is contained in:
fromme
2026-08-27 18:27:17 +02:00
parent e7f3233dbc
commit 15a4af93f9
15 changed files with 427 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/services.yaml
+1
View File
@@ -266,6 +266,7 @@ services:
- '@App\RequiredTeamerCheck\DriverLicenseRequiredCheck'
- '@App\RequiredTeamerCheck\FinancialDataRequiredCheck'
- '@App\RequiredTeamerCheck\PersonalDataVerificationRequiredCheck'
- '@App\RequiredTeamerCheck\MealPreferenceRequiredCheck'
App\RequiredTeamerCheck\PersonalDataVerificationRequiredCheck:
arguments:
migrations/Version20260827101926.php
+26
View File
@@ -0,0 +1,26 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20260827101926 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE teamer ADD meal_preference VARCHAR(255) DEFAULT NULL');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE teamer DROP meal_preference');
}
}
src/Controller/Teamer/Check/MealPreferenceController.php
+62
View File
@@ -0,0 +1,62 @@
<?php
namespace App\Controller\Teamer\Check;
use App\Entity\Teamer;
use App\Entity\User;
use App\Form\MealPreferenceType;
use App\Model\MealPreferenceDto;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Security\Http\Attribute\IsGranted;
class MealPreferenceController extends AbstractController
{
public function __construct(
private readonly EntityManagerInterface $entityManager,
private readonly LoggerInterface $logger,
) {
}
#[Route('/teamer/check/meal-preference', name: 'app_teamer_check_meal_preference')]
#[IsGranted('ROLE_TEAMER')]
public function index(Request $request): Response
{
/** @var User $user */
$user = $this->getUser();
$teamer = $user->getTeamer();
if (null === $teamer) {
$teamer = new Teamer();
$user->setTeamer($teamer);
$this->entityManager->persist($teamer);
$this->entityManager->flush();
}
$formData = MealPreferenceDto::fromTeamer($teamer);
$form = $this->createForm(MealPreferenceType::class, $formData);
$form->handleRequest($request);
if (true === $form->isSubmitted() && true === $form->isValid()) {
$formData->applyTo($teamer);
$this->entityManager->flush();
$this->addFlash('success', 'Deine Angaben wurden gespeichert.');
$this->logger->info('Submit teamer meal preference', [
'teamer_id' => $teamer->getId(),
'teamer_name' => (string) $teamer,
]);
return $this->redirectToRoute('app_teamer_index');
}
return $this->render('teamer/check/meal_preference.html.twig', [
'form' => $form->createView(),
'teamer' => $teamer,
]);
}
}
src/Entity/Teamer.php
+17
View File
@@ -8,6 +8,7 @@ use App\Entity\Embeddable\BankAccount;
use App\Entity\Embeddable\Communication;
use App\Entity\Traits\SoftDeletableEntity;
use App\Entity\Traits\TimestampableEntity;
use App\Enum\MealPreference;
use App\Repository\TeamerRepository;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
@@ -138,6 +139,10 @@ class Teamer implements TimestampableEntityInterface, SoftDeletableEntityInterfa
#[ORM\Column(length: 3, nullable: true)]
private ?string $size = null;
#[ORM\Column(nullable: true, enumType: MealPreference::class)]
#[Assert\NotNull(message: 'Bitte gib deine Ernährungsweise an', groups: ['profile', 'profile_preflight'])]
private ?MealPreference $mealPreference = null;
#[ORM\Column(nullable: true)]
private ?array $crmSelections = null;
@@ -923,6 +928,18 @@ class Teamer implements TimestampableEntityInterface, SoftDeletableEntityInterfa
return $this;
}
public function getMealPreference(): ?MealPreference
{
return $this->mealPreference;
}
public function setMealPreference(?MealPreference $mealPreference): static
{
$this->mealPreference = $mealPreference;
return $this;
}
public function getCrmSelections(): ?array
{
return $this->crmSelections;
src/Enum/MealPreference.php
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace App\Enum;
enum MealPreference: string
{
case VEGETARIAN = 'vegetarian';
case VEGAN = 'vegan';
case NONE = 'none';
public function label(): string
{
return match ($this) {
self::VEGETARIAN => 'Vegetarisch',
self::VEGAN => 'Vegan',
self::NONE => 'Keine Präferenz',
};
}
}
src/Form/MealPreferenceType.php
+32
View File
@@ -0,0 +1,32 @@
<?php
namespace App\Form;
use App\Enum\MealPreference;
use App\Model\MealPreferenceDto;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\EnumType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
class MealPreferenceType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
->add('mealPreference', EnumType::class, [
'label' => 'Ernährungsweise',
'class' => MealPreference::class,
'choice_label' => 'label',
'expanded' => true,
])
;
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'data_class' => MealPreferenceDto::class,
]);
}
}
src/Form/TeamerProfileType.php
+7
View File
@@ -3,12 +3,14 @@
namespace App\Form;
use App\Entity\Teamer;
use App\Enum\MealPreference;
use App\Model\UploadSessionDto;
use App\Service\Upload\UploadHandler;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\Extension\Core\Type\EnumType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormInterface;
@@ -93,6 +95,11 @@ class TeamerProfileType extends AbstractType
'XXL' => 'XXL',
],
])
->add('mealPreference', EnumType::class, [
'label' => 'Ernährungsweise',
'class' => MealPreference::class,
'choice_label' => 'label',
])
;
}
src/Model/MealPreferenceDto.php
+35
View File
@@ -0,0 +1,35 @@
<?php
namespace App\Model;
use App\Entity\Teamer;
use App\Enum\MealPreference;
use Symfony\Component\Validator\Constraints as Assert;
class MealPreferenceDto
{
#[Assert\NotNull(message: 'Bitte gib deine Ernährungsweise an')]
private ?MealPreference $mealPreference = null;
public static function fromTeamer(Teamer $teamer): self
{
return (new self())->setMealPreference($teamer->getMealPreference());
}
public function applyTo(Teamer $teamer): void
{
$teamer->setMealPreference($this->getMealPreference());
}
public function getMealPreference(): ?MealPreference
{
return $this->mealPreference;
}
public function setMealPreference(?MealPreference $mealPreference): static
{
$this->mealPreference = $mealPreference;
return $this;
}
}
src/RequiredTeamerCheck/MealPreferenceRequiredCheck.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace App\RequiredTeamerCheck;
use App\Entity\User;
class MealPreferenceRequiredCheck extends AbstractRequiredTeamerCheck
{
public function getCode(): string
{
return 'meal_preference';
}
public function isSatisfied(User $user): bool
{
$teamer = $user->getTeamer();
if (null === $teamer) {
return false;
}
return null !== $teamer->getMealPreference();
}
public function getRouteName(): string
{
return 'app_teamer_check_meal_preference';
}
}
templates/administrative/teamer/modal_info.html.twig
+10
View File
@@ -15,6 +15,16 @@
<div class="flex-1 pr-8">
{% include '_partials/_teamer_training_info.html.twig' %}
{% include '_partials/_teamer_license_info.html.twig' %}
<h2 class="text-lg font-bold">
Ernährungsweise
</h2>
<p class="pb-4">
{% if teamer.mealPreference %}
{{ teamer.mealPreference.label }}
{% else %}
_
{% endif %}
</p>
<h2 class="text-lg font-bold">
Zustiege
</h2>
templates/administrative/teamer/profile.html.twig
+12
View File
@@ -222,6 +222,18 @@
{{ teamer.size|default('-') }}
</div>
</div>
<div>
<div class="font-bold">
Ernährungsweise:
</div>
<div>
{% if teamer.mealPreference %}
{{ teamer.mealPreference.label }}
{% else %}
_
{% endif %}
</div>
</div>
</div>
</div>
templates/teamer/check/meal_preference.html.twig
+36
View File
@@ -0,0 +1,36 @@
{% extends 'teamer/layout.html.twig' %}
{% block title %}Ernährungsweise{% endblock %}
{% block content %}
{{ form_start(form) }}
<div class="max-w-2xl">
<h1 class="text-2xl font-bold pb-2">
Ernährungsweise
</h1>
<p class="pb-6">
Damit wir bei deinen Einsätzen die Verpflegung passend planen können, benötigen wir einmalig deine
Ernährungsweise. Bitte wähle eine der folgenden Optionen:
</p>
{% if not form.vars.valid %}
{% embed '_partials/_alert.html.twig' with { 'type': 'warning' } %}
{% block message %}
{% include '_partials/_form_errors.html.twig' with { 'form': form } %}
{% endblock %}
{% endembed %}
{% endif %}
<div class="flex flex-col space-y-4 pb-6">
{{ form_row(form.mealPreference) }}
</div>
<button type="submit" class="btn">
Speichern
</button>
</div>
{{ form_rest(form) }}
{{ form_end(form) }}
{% endblock %}
templates/teamer/profile/index.html.twig
+1
View File
@@ -127,6 +127,7 @@
{{ form_row(form.healthInsuranceCompany) }}
{{ form_row(form.language) }}
{{ form_row(form.size) }}
{{ form_row(form.mealPreference) }}
<div>
<div class="font-bold pb-2">Führerschein</div>
<div class="pb-2">
tests/Form/MealPreferenceTypeTest.php
+62
View File
@@ -0,0 +1,62 @@
<?php
declare(strict_types=1);
namespace App\Tests\Form;
use App\Entity\Teamer;
use App\Entity\User;
use App\Enum\MealPreference;
use App\Form\MealPreferenceType;
use App\Model\MealPreferenceDto;
use App\RequiredTeamerCheck\MealPreferenceRequiredCheck;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\FormInterface;
class MealPreferenceTypeTest extends KernelTestCase
{
/**
* Guards against the form and the check drifting apart: what the form accepts
* as complete must be exactly what unlocks the portal.
*/
public function testAValidSubmissionSatisfiesTheCheck(): void
{
$teamer = new Teamer();
$user = (new User())
->setRoles(['ROLE_TEAMER'])
->setTeamer($teamer)
;
$check = new MealPreferenceRequiredCheck();
$this->assertFalse($check->isSatisfied($user));
$formData = MealPreferenceDto::fromTeamer($teamer);
$form = $this->createForm($formData);
$form->submit(['mealPreference' => MealPreference::VEGETARIAN->value]);
$formData->applyTo($teamer);
$this->assertTrue($check->isSatisfied($user));
}
public function testEmptySubmitIsRejected(): void
{
$form = $this->createForm(new MealPreferenceDto());
$form->submit(['mealPreference' => '']);
$this->assertFalse($form->isValid());
$this->assertCount(1, $form->get('mealPreference')->getErrors());
}
private function createForm(MealPreferenceDto $formData): FormInterface
{
self::bootKernel();
/** @var FormFactoryInterface $formFactory */
$formFactory = self::getContainer()->get(FormFactoryInterface::class);
return $formFactory->create(MealPreferenceType::class, $formData, [
'csrf_protection' => false,
]);
}
}
tests/Security/RequiredCheck/MealPreferenceRequiredCheckTest.php
+78
View File
@@ -0,0 +1,78 @@
<?php
declare(strict_types=1);
namespace App\Tests\Security\RequiredCheck;
use App\Entity\Teamer;
use App\Entity\User;
use App\Enum\MealPreference;
use App\RequiredTeamerCheck\MealPreferenceRequiredCheck;
use PHPUnit\Framework\TestCase;
class MealPreferenceRequiredCheckTest extends TestCase
{
private MealPreferenceRequiredCheck $check;
protected function setUp(): void
{
$this->check = new MealPreferenceRequiredCheck();
}
/**
* @dataProvider mixedRoleProvider
*/
public function testDoesNotApplyToExcludedMixedRoleUsersWithTeamerRole(string $excludedRole): void
{
$user = $this->createTeamerUser();
$user->setRoles([$excludedRole, 'ROLE_TEAMER']);
$this->assertFalse($this->check->appliesTo($user));
}
public function mixedRoleProvider(): array
{
return [
['ROLE_ADMIN'],
['ROLE_MANAGER'],
['ROLE_HOUSE_MANAGER'],
];
}
public function testRedirectsToItsOwnCheckPage(): void
{
$this->assertSame('app_teamer_check_meal_preference', $this->check->getRouteName());
}
public function testIsNotSatisfiedWithoutTeamer(): void
{
$user = (new User())->setRoles(['ROLE_TEAMER']);
$this->assertFalse($this->check->isSatisfied($user));
}
public function testIsNotSatisfiedWhenMealPreferenceIsMissing(): void
{
$user = $this->createTeamerUser();
$this->assertFalse($this->check->isSatisfied($user));
}
public function testIsSatisfiedWhenMealPreferenceIsSet(): void
{
$user = $this->createTeamerUser();
$user->getTeamer()?->setMealPreference(MealPreference::NONE);
$this->assertTrue($this->check->isSatisfied($user));
}
private function createTeamerUser(): User
{
$teamer = new Teamer();
return (new User())
->setRoles(['ROLE_TEAMER'])
->setTeamer($teamer)
;
}
}