WIP: Implement profile validation

src/Controller/Teamer/ProfileController.php

@@ -17,10 +17,12 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 class ProfileController extends AbstractController
 {
     public function __construct(
+        private readonly ValidatorInterface $validator,
         private readonly EntityManagerInterface $entityManager,
         private readonly ApiClient $apiClient,
         private readonly UploadHandler $uploadHandler,
@@ -48,6 +50,9 @@ class ProfileController extends AbstractController
             $this->updatePhoto($user, $uploadSession);
         }
 
+        // Validate teamer data to show missing data right away
+        $errors = $this->validator->validate($teamer);
+
         $form = $this->createForm(TeamerProfileType::class, $teamer, ['upload_session' => $uploadSession]);
         $form->handleRequest($request);
 
@@ -72,6 +77,7 @@ class ProfileController extends AbstractController
         return $this->render('teamer/profile.html.twig', [
             'form' => $form->createView(),
             'teamer' => $teamer,
+            'errors' => $errors,
         ]);
     }
 

src/Entity/Embeddable/Address.php

@@ -11,15 +11,15 @@ use Symfony\Component\Validator\Constraints as Assert;
 class Address
 {
     #[ORM\Column(type: 'string', nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib deine Straße an')]
     protected ?string $street = null;
 
     #[ORM\Column(type: 'string', nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib deine Postleitzahl an')]
     protected ?string $postCode = null;
 
     #[ORM\Column(type: 'string', nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib deinen Ort an')]
     protected ?string $city = null;
 
     #[ORM\Column(type: 'string', nullable: true)]

src/Entity/Embeddable/BankAccount.php

@@ -2,27 +2,25 @@
 
 namespace App\Entity\Embeddable;
 
+use App\Validator\Constraints as AppAssert;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
 #[ORM\Embeddable]
+#[AppAssert\BankAccount]
 class BankAccount
 {
     #[ORM\Column(nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
-    #[Assert\Iban(message: 'Diese IBAN ist ungültig')]
+    #[Assert\Iban(message: 'Die IBAN ist ungültig')]
     private ?string $iban = null;
 
     #[ORM\Column(nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
     private ?string $bic = null;
 
     #[ORM\Column(nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
     private ?string $bank = null;
 
     #[ORM\Column(nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
     private ?string $holder = null;
 
     public function getIban(bool $obfuscated = false): ?string

src/Entity/Teamer.php

@@ -32,19 +32,19 @@ class Teamer implements TimestampableEntityInterface
     private string $uuid;
 
     #[ORM\Column(length: 255)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib deinen Vornamen an')]
     private ?string $firstName = null;
 
     #[ORM\Column(length: 255)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib deinen Nachnamen an')]
     private ?string $lastName = null;
 
     #[ORM\Column(length: 1)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib dein Geschlecht an')]
     private ?string $gender = null;
 
     #[ORM\Column(type: Types::DATE_IMMUTABLE)]
-    #[Assert\NotNull(message: 'Bitte angeben')]
+    #[Assert\NotNull(message: 'Bitte gib dein Geburtsdatum an')]
     private ?\DateTimeImmutable $dateOfBirth = null;
 
     #[ORM\Column(length: 255, nullable: true)]
@@ -54,7 +54,7 @@ class Teamer implements TimestampableEntityInterface
     private ?string $salutation = null;
 
     #[ORM\Column(length: 255, nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib deine Nationalität an')]
     private ?string $nationality = null;
 
     #[ORM\Embedded(class: Address::class)]
@@ -70,11 +70,11 @@ class Teamer implements TimestampableEntityInterface
     private ?BankAccount $bankAccount = null;
 
     #[ORM\Column(length: 255, nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib deine SteuerID an')]
     private ?string $taxId = null;
 
     #[ORM\Column(length: 255, nullable: true)]
-    #[Assert\NotBlank(message: 'Bitte angeben')]
+    #[Assert\NotBlank(message: 'Bitte gib deine Krankenversicherung an')]
     private ?string $healthInsuranceCompany = null;
 
     #[ORM\Column(length: 32)]

src/Validator/Constraints/BankAccount.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+#[\Attribute]
+class BankAccount extends Constraint
+{
+    public string $message = 'Die Bankverbindung ist unvollständig';
+
+    public function __construct(string $message = null, array $groups = null, $payload = null)
+    {
+        parent::__construct([], $groups, $payload);
+
+        $this->message = $message ?? $this->message;
+    }
+
+    public function getTargets(): string
+    {
+        return Constraint::CLASS_CONSTRAINT;
+    }
+}

src/Validator/Constraints/BankAccountValidator.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Validator\Constraints;
+
+use App\Entity\Embeddable\BankAccount as BankAccountEntity;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+
+class BankAccountValidator extends ConstraintValidator
+{
+    public function validate(mixed $value, Constraint $constraint): void
+    {
+        if (!$value instanceof BankAccountEntity) {
+            throw new UnexpectedTypeException($value, BankAccountEntity::class);
+        }
+
+        if (!$constraint instanceof BankAccount) {
+            throw new UnexpectedTypeException($constraint, BankAccount::class);
+        }
+
+        $isIncomplete = null === $value->getIban()
+            || null === $value->getBic()
+            || null === $value->getBank()
+            || null === $value->getHolder()
+        ;
+
+        if ($isIncomplete) {
+            $this->context
+                ->buildViolation($constraint->message)
+                ->atPath('iban')
+                ->addViolation()
+            ;
+        }
+    }
+}

templates/teamer/profile.html.twig

@@ -7,7 +7,7 @@
         {% for child in form.children %}
             {% for error in child.vars.errors %}
                 <li>
-                    {{ child.vars.label }}: {{error.message}}
+                    {{error.message}}
                 </li>
             {% endfor %}
         {%endfor%}
@@ -42,7 +42,17 @@
                         {{ _self.formErrors(form.communication) }}
                         {{ _self.formErrors(form.bankAccount) }}
                     </div>
-                {%endif%}
+                {% elseif errors|length > 0 %}
+                    <div class="max-w-screen-md mx-auto border border-red-500 rounded-md p-4 text-red-500 mb-8">
+                        <ul>
+                            {% for error in errors %}
+                                <li>
+                                    {{ error.message }}
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% endif %}
                 <div class="pb-8 max-w-screen-md mx-auto" {{ stimulus_target('tabs', 'tab') }}>
                     <h3 class="text-xl font-bold pb-2">
                         Persönliche Daten