Added possibility to configure amount of required phone numbers

theoboldt · Oct 4, 2023 · 2e57bd8 · 2e57bd8
1 parent b88e0f3
commit 2e57bd8
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -61,3 +61,6 @@ parameters:
 
     # Set to true to enable newsletter feature
     feature.newsletter: true
+
+    # Specify amount of phone numbers required per participation
+    required_participation_phone_number_count: 1
diff --git a/app/config/parameters_defaults.yml b/app/config/parameters_defaults.yml
@@ -22,3 +22,4 @@ parameters:
     app.gender.exclude: ''
     mailer_imap_host: null
     feature.registration: true
+    required_participation_phone_number_count: 1
diff --git a/app/config/services.yml b/app/config/services.yml
@@ -704,6 +704,7 @@ services:
         arguments:
             $featureRegistration: "%feature.registration%"
             $featureNewsletter: '%feature.newsletter%'
+            $requiredParticipationPhoneNumberCount: '%required_participation_phone_number_count%'
         tags: [ 'controller.service_arguments' ]
 
     AppBundle\Controller\UserController:

diff --git a/app/src/AppBundle/Controller/Event/Participation/PublicParticipateController.php b/app/src/AppBundle/Controller/Event/Participation/PublicParticipateController.php
@@ -52,6 +52,11 @@ class PublicParticipateController
      * @var bool
      */
     private bool $featureRegistration;
+
+    /**
+     * @var int 
+     */
+    private int $requiredParticipationPhoneNumberCount;
 
     /**
      * app.participation_manager
@@ -72,6 +77,7 @@ class PublicParticipateController
      * @param SessionInterface $session
      * @param string $featureNewsletter
      * @param string $featureRegistration
+     * @param string $requiredParticipationPhoneNumberCount
      * @param ParticipationManager $participationManager
      */
     public function __construct(
@@ -84,6 +90,7 @@ public function __construct(
         SessionInterface $session,
         string $featureNewsletter,
         string $featureRegistration,
+        string $requiredParticipationPhoneNumberCount,
         ParticipationManager $participationManager
     )
     {
@@ -97,6 +104,7 @@ public function __construct(
         $this->featureNewsletter    = $featureNewsletter;
         $this->featureRegistration  = $featureRegistration;
         $this->participationManager = $participationManager;
+        $this->requiredParticipationPhoneNumberCount = (int)$requiredParticipationPhoneNumberCount;
     }
 
     /**
@@ -132,6 +140,7 @@ public function participateAction(Event $event, Request $request)
             [
                 ParticipationType::ACQUISITION_FIELD_PUBLIC  => true,
                 ParticipationType::ACQUISITION_FIELD_PRIVATE => false,
+                ParticipationType::PHONE_NUMBER_MIN_COUNT    => $this->requiredParticipationPhoneNumberCount,
             ]
         );
 

diff --git a/app/src/AppBundle/Entity/Participation.php b/app/src/AppBundle/Entity/Participation.php
@@ -87,8 +87,8 @@ class Participation implements EventRelatedEntity, SummandCausableInterface, Ent
      * @Assert\Valid()
      * @Assert\Count(
      *      min = "1",
-     *      minMessage = "Bei einer Anmeldung muss mindestens eine Telefonnummer angegeben werden, unter der wir Sie in
-     *      Notfällen erreichen können. Bitte fügen Sie mindestens noch eine Telefonnummer hinzu."
+     *      minMessage = "Bei einer Anmeldung müssen Telefonnummern angegeben werden, unter der wir Sie in
+     *      Notfällen erreichen können. Bitte fügen Sie Telefonnummern hinzu."
      * )
      */
     protected $phoneNumbers;

diff --git a/app/src/AppBundle/Form/ParticipationBaseType.php b/app/src/AppBundle/Form/ParticipationBaseType.php
@@ -19,9 +19,13 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Count;
 
 class ParticipationBaseType extends AbstractType
 {
+
+    const PHONE_NUMBER_MIN_COUNT = 'phoneNumberMinCount';
+
     const ACQUISITION_FIELD_PUBLIC = 'acquisitionFieldPublic';
 
     const ACQUISITION_FIELD_PRIVATE = 'acquisitionFieldPrivate';
@@ -30,6 +34,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         /** @var Participation $participation */
         $participation = $options['data'] ?? null;
+
+        if ($options[self::PHONE_NUMBER_MIN_COUNT] > 1) {
+            $phoneNumberConstraints = [
+                new Count([
+                  'min' => $options[self::PHONE_NUMBER_MIN_COUNT],
+                  'minMessage' => 'Es müssen mindestens '.(int)$options[self::PHONE_NUMBER_MIN_COUNT].' Telefonnummern angegeben werden',
+                ])
+            ];
+        } else {
+            $phoneNumberConstraints = [];
+        }
 
         $builder
             ->add(
@@ -90,6 +105,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'allow_delete' => true,
                     'attr'         => ['aria-describedby' => 'help-info-phone-numbers'],
                     'required'     => true,
+                    'constraints'  => $phoneNumberConstraints
                 ]
             )
             ->add(
@@ -130,6 +146,10 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setRequired(self::ACQUISITION_FIELD_PRIVATE);
         $resolver->setAllowedTypes(self::ACQUISITION_FIELD_PRIVATE, 'bool');
 
+        $resolver->setRequired(self::PHONE_NUMBER_MIN_COUNT);
+        $resolver->setDefault(self::PHONE_NUMBER_MIN_COUNT, 1);
+        $resolver->setAllowedTypes(self::PHONE_NUMBER_MIN_COUNT, 'int');
+
         $resolver->setDefaults(
             [
                 'data_class'         => Participation::class,