Merge remote-tracking branch 'origin/features/new-phones' into dune

src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php

@@ -141,6 +141,18 @@ class PhonenumberHelper
         return \in_array($validation, [ 'landline', 'voip', 'mobile' ]);
     }
 
+    /**
+     * Get type (mobile, landline, ...) for phone number
+     *
+     * @param string $phonenumber
+     *
+     * @return string
+     */
+    public function getType(string $phonenumber): string
+    {
+        return $this->performTwilioLookup($phonenumber);
+    }
+
     public function format($phonenumber)
     {
         return $this->performTwilioFormat($phonenumber);

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -58,7 +58,6 @@ class PersonController extends AbstractController
      */
     protected $translator;
 
-    
     /**
      * @var EventDispatcherInterface
      */

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -177,6 +177,18 @@ class Person implements HasCenterInterface
      */
     private $mobilenumber = '';
 
+    /**
+     * @var Collection
+     *
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\PersonBundle\Entity\PersonPhone",
+     *     mappedBy="person",
+     *     cascade={"persist", "remove", "merge", "detach"},
+     *     orphanRemoval=true
+     * )
+     */
+    private $otherPhoneNumbers;
+
     //TO-ADD caseOpeningDate
     //TO-ADD nativeLanguag
 
@@ -256,7 +268,6 @@ class Person implements HasCenterInterface
      */
     private $fullnameCanonical;
 
-    
     /**
      * Person constructor.
      *
@@ -268,6 +279,7 @@ class Person implements HasCenterInterface
         $this->spokenLanguages = new ArrayCollection();
         $this->addresses = new ArrayCollection();
         $this->altNames = new ArrayCollection();
+        $this->otherPhoneNumbers = new ArrayCollection();
 
         if ($opening === null) {
             $opening = new \DateTime();
@@ -864,6 +876,52 @@ class Person implements HasCenterInterface
         return $this->mobilenumber;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getOtherPhoneNumbers(): Collection
+    {
+        return $this->otherPhoneNumbers;
+    }
+
+    /**
+     * @param Collection $otherPhoneNumbers
+     * @return $this
+     */
+    public function setOtherPhoneNumbers(Collection $otherPhoneNumbers)
+    {
+        $this->otherPhoneNumbers = $otherPhoneNumbers;
+
+        return $this;
+    }
+
+    /**
+     * @param PersonPhone $otherPhoneNumber
+     * @return $this
+     */
+    public function addOtherPhoneNumber(PersonPhone $otherPhoneNumber)
+    {
+        if (false === $this->otherPhoneNumbers->contains($otherPhoneNumber)) {
+            $otherPhoneNumber->setPerson($this);
+            $this->otherPhoneNumbers->add($otherPhoneNumber);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param PersonPhone $otherPhoneNumber
+     * @return $this
+     */
+    public function removeOtherPhoneNumber(PersonPhone $otherPhoneNumber)
+    {
+        if ($this->otherPhoneNumbers->contains($otherPhoneNumber)) {
+            $this->otherPhoneNumbers->removeElement($otherPhoneNumber);
+        }
+
+        return $this;
+    }
+
     /**
      * @return string
      */

src/Bundle/ChillPersonBundle/Entity/PersonPhone.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace Chill\PersonBundle\Entity;
+
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Person Phones
+ *
+ * @ORM\Entity()
+ * @ORM\Table(name="chill_person_phone")
+ */
+class PersonPhone
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private ?int $id;
+
+    /**
+     * @ORM\ManyToOne(
+     *  targetEntity="Chill\PersonBundle\Entity\Person",
+     *  inversedBy="otherPhoneNumbers"
+     * )
+     */
+    private Person $person;
+
+    /**
+     * @ORM\Column(type="text", length=40, nullable=true)
+     */
+    private ?string $type;
+
+    /**
+     * @ORM\Column(type="text", length=40, nullable=false)
+     */
+    private string $phonenumber = '';
+
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private ?string $description = null;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=false)
+     */
+    private \DateTime $date;
+
+    public function __construct()
+    {
+        $this->date = new \DateTime();
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): Person
+    {
+        return $this->person;
+    }
+
+    public function setPerson(Person $person): void
+    {
+        $this->person = $person;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function setType(string $type): void
+    {
+        $this->type = $type;
+    }
+
+    public function getPhonenumber(): string
+    {
+        return $this->phonenumber;
+    }
+
+    public function setPhonenumber(string $phonenumber): void
+    {
+        $this->phonenumber = $phonenumber;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
+    public function setDescription(?string $description): void
+    {
+        $this->description = $description;
+    }
+
+    public function getDate(): \DateTime
+    {
+        return $this->date;
+    }
+
+    public function setDate(\DateTime $date): void
+    {
+        $this->date = $date;
+    }
+}

src/Bundle/ChillPersonBundle/Form/PersonType.php

@@ -21,21 +21,23 @@
 
 namespace Chill\PersonBundle\Form;
 
+use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
+use Chill\MainBundle\Form\Type\ChillCollectionType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Form\Type\Select2CountryType;
+use Chill\MainBundle\Form\Type\Select2LanguageType;
+use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Form\Type\GenderType;
+use Chill\PersonBundle\Form\Type\PersonAltNameType;
+use Chill\PersonBundle\Form\Type\PersonPhoneType;
+use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\TelType;
-use Chill\PersonBundle\Form\Type\GenderType;
-use Chill\MainBundle\Form\Type\Select2CountryType;
-use Chill\MainBundle\Form\Type\Select2LanguageType;
-use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
-use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
-use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
-use Chill\PersonBundle\Form\Type\PersonAltNameType;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonType extends AbstractType
 {
@@ -109,6 +111,17 @@ class PersonType extends AbstractType
             $builder->add('mobilenumber', TelType::class, array('required' => false));
         }
 
+        $builder->add('otherPhoneNumbers', ChillCollectionType::class, [
+            'entry_type' => PersonPhoneType::class,
+            'button_add_label' => 'Add new phone',
+            'button_remove_label' => 'Remove phone',
+            'required' => false,
+            'allow_add' => true,
+            'allow_delete' => true,
+            'by_reference' => false,
+            'label' => false,
+        ]);
+
         if ($this->config['email'] === 'visible') {
             $builder->add('email', EmailType::class, array('required' => false));
         }
@@ -153,7 +166,7 @@ class PersonType extends AbstractType
     {
         $resolver->setDefaults(array(
             'data_class' => 'Chill\PersonBundle\Entity\Person',
-            'validation_groups' => array('general', 'creation')
+            'validation_groups' => array('general', 'creation'),
         ));
 
         $resolver->setRequired(array(

src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Chill\PersonBundle\Form\Type;
+
+use Chill\MainBundle\Phonenumber\PhonenumberHelper;
+use Chill\PersonBundle\Entity\PersonPhone;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TelType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class PersonPhoneType extends AbstractType
+{
+    private PhonenumberHelper $phonenumberHelper;
+
+    private EntityManagerInterface $em;
+
+    public function __construct(PhonenumberHelper $phonenumberHelper, EntityManagerInterface $em)
+    {
+        $this->phonenumberHelper = $phonenumberHelper;
+        $this->em = $em;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('phonenumber', TelType::class, [
+            'label' => 'Other phonenumber',
+            'required' => true,
+        ]);
+
+        $builder->add('description', TextType::class, [
+            'required' => false,
+        ]);
+
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
+            $oldPersonPhone = $this->em->getUnitOfWork()
+                ->getOriginalEntityData($event->getData());
+
+            if ($oldPersonPhone['phonenumber'] !== $event->getForm()->getData()->getPhonenumber()) {
+                $type = $this->phonenumberHelper->getType($event->getData()->getPhonenumber());
+                $event->getData()->setType($type);
+            }
+        });
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefaults([
+                'data_class' => PersonPhone::class,
+                'validation_groups' => ['general', 'creation'],
+            ])
+        ;
+    }
+}

src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig

@@ -83,6 +83,9 @@
     {%- if form.mobilenumber is defined -%}
     {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
     {%- endif -%}
+    {%- if form.otherPhoneNumbers is defined -%}
+        {{ form_row(form.otherPhoneNumbers) }}
+    {%- endif -%}
     {%- if form.contactInfo is defined -%}
     {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
     {%- endif -%}

src/Bundle/ChillPersonBundle/config/services/form.yaml

@@ -46,3 +46,10 @@ services:
             $translatableStringHelper: '@chill.main.helper.translatable_string'
         tags:
             - { name: form.type }
+
+    Chill\PersonBundle\Form\Type\PersonPhoneType:
+        arguments:
+            $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
+            $em: '@Doctrine\ORM\EntityManagerInterface'
+        tags:
+            - { name: form.type }

src/Bundle/ChillPersonBundle/config/validation.yaml

@@ -51,8 +51,9 @@ Chill\PersonBundle\Entity\Person:
              - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint:
                   type: mobile
                   groups: [ general, creation ]
-
-
+        otherPhoneNumbers:
+            -   Valid:
+                    traverse: true
     constraints:
           - Callback:
                   callback: isAccompanyingPeriodValid
@@ -77,3 +78,14 @@ Chill\PersonBundle\Entity\AccompanyingPeriod:
     constraints:
           - Callback:
               callback: isDateConsistent
+
+Chill\PersonBundle\Entity\PersonPhone:
+    properties:
+        phonenumber:
+            - Regex:
+                pattern: '/^([\+{1}])([0-9\s*]{4,20})$/'
+                groups: [ general, creation ]
+                message: 'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33123456789'
+            - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint:
+                type: any
+                groups: [ general, creation ]

src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210318095831 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+
+        $this->addSql('CREATE SEQUENCE chill_person_phone_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_person_phone (id INT NOT NULL, person_id INT DEFAULT NULL, phonenumber TEXT NOT NULL, description TEXT DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_72C1F87217BBB47 ON chill_person_phone (person_id)');
+        $this->addSql('ALTER TABLE chill_person_phone ADD CONSTRAINT FK_72C1F87217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP SEQUENCE chill_person_phone_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_phone');
+    }
+}

src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210325141540 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_phone ADD type TEXT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your need
+        $this->addSql('ALTER TABLE chill_person_phone DROP type');
+    }
+}