Merge branch 'ticket/option-one-multi-person-entity-per-ticket' into 'ticket-app-master'

Add phone number parsing functionality

See merge request Chill-Projet/chill-bundles!848

config/packages/chill_ticket.yaml

@@ -0,0 +1,4 @@
+chill_ticket:
+    ticket:
+        person_per_ticket:    one # One of "one"; "many"
+

src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php

@@ -12,9 +12,11 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Action\Ticket;
 
 use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Validation\Validator\SetPersonCommandConstraint;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
+#[SetPersonCommandConstraint]
 class SetPersonsCommand
 {
     public function __construct(

src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php

@@ -12,15 +12,21 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Controller;
 
 use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Twig\Environment;
 
 class EditTicketController
 {
+    private string $personPerTicket;
+
     public function __construct(
         private readonly Environment $templating,
-    ) {}
+        ParameterBagInterface $parameterBag,
+    ) {
+        $this->personPerTicket = $parameterBag->get('chill_ticket')['ticket']['person_per_ticket'];
+    }
 
     #[Route('/{_locale}/ticket/ticket/{id}/edit', name: 'chill_ticket_ticket_edit')]
     public function __invoke(
@@ -31,6 +37,7 @@ class EditTicketController
                 '@ChillTicket/Ticket/edit.html.twig',
                 [
                     'ticket' => $ticket,
+                    'personPerTicket' => $this->personPerTicket,
                 ]
             )
         );

src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php

@@ -24,6 +24,11 @@ class ChillTicketExtension extends Extension implements PrependExtensionInterfac
 {
     public function load(array $configs, ContainerBuilder $container)
     {
+        $configuration = $this->getConfiguration($configs, $container);
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $container->setParameter('chill_ticket', $config);
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
     }

src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder(): TreeBuilder
+    {
+        $treeBuilder = new TreeBuilder('chill_ticket');
+        /** @var ArrayNodeDefinition $rootNode */
+        $rootNode = $treeBuilder->getRootNode();
+
+        /** @var ArrayNodeDefinition $ticketArray */
+        $ticketArray = $rootNode
+            ->children()
+            ->arrayNode('ticket')
+            ->addDefaultsIfNotSet()
+        ;
+
+        $ticketArray
+            ->children()
+            ->enumNode('person_per_ticket')
+            ->values(['one', 'many'])
+            ->defaultValue('many')
+            ->end();
+
+        return $treeBuilder;
+    }
+}

src/Bundle/ChillTicketBundle/src/Resources/public/types.ts

@@ -111,7 +111,6 @@ export type EmergencyStateEvent = TicketHistory<
 >;
 export type CallerStateEvent = TicketHistory<"set_caller", CallerState>;
 
-// TODO : Remove add_person event from TicketHistoryLine
 export type TicketHistoryLine =
     | AddPersonEvent
     | CreateTicketEvent
@@ -125,11 +124,7 @@ export type TicketHistoryLine =
 
 interface BaseTicket<T extends "ticket_ticket:simple"|"ticket_ticket:extended" = "ticket_ticket:simple"> {
     type_extended: T;
-}
-
-export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
     type: "ticket_ticket";
-    type_extended: "ticket_ticket:simple";
     id: number;
     externalRef: string;
     currentAddressees: UserGroupOrUser[];
@@ -140,6 +135,10 @@ export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
     caller: Person | Thirdparty | null;
 }
 
+export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
+    type_extended: "ticket_ticket:simple";
+}
+
 export interface Ticket extends BaseTicket<"ticket_ticket:extended"> {
     type_extended: "ticket_ticket:extended";
     createdAt: DateTime | null;

src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts

@@ -9,6 +9,7 @@ import { store } from "./store";
 declare global {
     interface Window {
         initialTicket: string;
+        ticketPersonPerTicket: 'one'|'multi';
     }
 }
 

src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig

@@ -9,6 +9,7 @@
     {{ parent() }}
     <script type="text/javascript">
         window.initialTicket = "{{ ticket|serialize('json', {'groups': 'read'})|escape('js') }}";
+        window.ticketPersonPerTicket = "{{ personPerTicket|escape('js') }}";
     </script>
     {{ encore_entry_script_tags('vue_ticket_app') }}
 {% endblock %}

src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraint.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Validation\Validator;
+
+use Symfony\Component\Validator\Constraint;
+
+#[\Attribute]
+class SetPersonCommandConstraint extends Constraint
+{
+    public string $notMulti = 'ticket.set_persons.Only one person can be set.';
+
+    public function getTargets(): string
+    {
+        return Constraint::CLASS_CONSTRAINT;
+    }
+}

src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Validation\Validator;
+
+use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+class SetPersonCommandConstraintValidator extends ConstraintValidator
+{
+    private bool $isMulti;
+
+    public function __construct(ParameterBagInterface $parameterBag)
+    {
+        $this->isMulti = 'multi' === $parameterBag->get('chill_ticket')['ticket']['person_per_ticket'];
+    }
+
+    public function validate($value, Constraint $constraint)
+    {
+        if (!$value instanceof SetPersonsCommand) {
+            throw new UnexpectedValueException($value, SetPersonsCommand::class);
+        }
+
+        if (!$constraint instanceof SetPersonCommandConstraint) {
+            throw new UnexpectedValueException($constraint, SetPersonCommandConstraint::class);
+        }
+
+        if (!$this->isMulti) {
+            if (1 < count($value->persons)) {
+                $this->context->buildViolation($constraint->notMulti)
+                    ->atPath('persons')
+                    ->addViolation();
+            }
+        }
+    }
+}

src/Bundle/ChillTicketBundle/src/config/services.yaml

@@ -23,5 +23,8 @@ services:
     Chill\TicketBundle\Menu\:
         resource: '../Menu/'
 
+    Chill\TicketBundle\Validation\:
+        resource: '../Validation/'
+
     Chill\TicketBundle\DataFixtures\:
         resource: '../DataFixtures/'

src/Bundle/ChillTicketBundle/tests/Validation/Validator/SetPersonCommandConstraintValidatorTest.php

@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Validation\Validator;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
+use Chill\TicketBundle\Validation\Validator\SetPersonCommandConstraint;
+use Chill\TicketBundle\Validation\Validator\SetPersonCommandConstraintValidator;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class SetPersonCommandConstraintValidatorTest extends ConstraintValidatorTestCase
+{
+    private string $personPerTicket = 'many';
+
+    protected function createValidator()
+    {
+        return new SetPersonCommandConstraintValidator(
+            new ParameterBag(['chill_ticket' => ['ticket' => ['person_per_ticket' => $this->personPerTicket]]])
+        );
+    }
+
+    /**
+     * Helper method to set the configuration and recreate the validator.
+     */
+    private function setPersonPerTicket(string $personPerTicket): void
+    {
+        $this->personPerTicket = $personPerTicket;
+        $this->validator = $this->createValidator();
+        $this->validator->initialize($this->context);
+    }
+
+    public function testValidatorWithManyPersonsPerTicket(): void
+    {
+        $this->setPersonPerTicket('multi');
+
+        $command = new SetPersonsCommand([new Person(), new Person()]);
+
+        $this->validator->validate($command, new SetPersonCommandConstraint());
+
+        $this->assertNoViolation();
+    }
+
+    public function testValidatorWithSinglePersonPerTicket(): void
+    {
+        $this->setPersonPerTicket('single');
+
+        $command = new SetPersonsCommand([new Person(), new Person()]);
+
+        $this->validator->validate($command, $command = new SetPersonCommandConstraint());
+
+        $this->buildViolation($command->notMulti)->atPath('property.path.persons')->assertRaised();
+    }
+
+    public function testValidatorWithSinglePersonPerTicketAndEmptyPersons(): void
+    {
+        $this->setPersonPerTicket('single');
+
+        $command = new SetPersonsCommand([]);
+
+        $this->validator->validate($command, new SetPersonCommandConstraint());
+
+        $this->assertNoViolation();
+    }
+
+    public function testValidatorWithSinglePersonPerTicketAndOnlyOnePerson(): void
+    {
+        $this->setPersonPerTicket('single');
+
+        $command = new SetPersonsCommand([new Person()]);
+
+        $this->validator->validate($command, new SetPersonCommandConstraint());
+
+        $this->assertNoViolation();
+    }
+}