[person] use the same rendering of person in similar person proposition

homepage (+ ordering)

CHANGELOG.md

@@ -9,9 +9,18 @@ and this project adheres to
 * date versioning for test releases
 
 ## Unreleased
-* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
 
 <!-- write down unreleased development here -->
+* [person] use the same rendering of person in similar person proposition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/348)
+* [person] move similar person matcher to PersonACLAwareRepository and replace the SimilarPersonMatcher uses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/451)
+## Test releases
+
+### test release 2022-02-14
+
+* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
+* [doc-generator] do not set required fields for mainPerson, person1, person2 (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement#456)
+* [doc-generation] add age and obele in the mainPerson, person1 and person2 list + add obele in person renderString if addAge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/370)
+* [person] accompanying course work: fix on-the-fly update of thirdParty
 * fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
 * [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
 * [person] accompanying course work: fix on-the-fly update of thirdParty
@@ -30,8 +39,7 @@ and this project adheres to
 * [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
 * [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
 * [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
-
+* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
-## Test releases
 
 ### test release 2021-02-01
 

src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig

@@ -11,7 +11,6 @@
     * buttonText    string
     * displayBadge  boolean (default: false)  replace button by badge, need to define buttonText for content
     * parent        object  (optional)        pass parent context of the targetEntity (used for course resource comment)
-    * isDead        boolean (default: false)  is the person dead
 
 #}
 <span class="onthefly-container"
@@ -29,10 +28,6 @@
         data-button-text="{{ buttonText|e('html_attr') }}"
     {% endif %}
 
-    {% if isDead is defined and isDead == 1  %}
-        data-is-dead="true"
-    {% endif %}
-
     {% if displayBadge is defined and displayBadge == 1 %}
         data-display-badge="true"
     {% endif %}

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -16,8 +16,8 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\CreationPersonType;
 use Chill\PersonBundle\Form\PersonType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -56,11 +56,6 @@ final class PersonController extends AbstractController
      */
     protected $personRepository;
 
-    /**
-     * @var SimilarPersonMatcher
-     */
-    protected $similarPersonMatcher;
-
     /**
      * @var TranslatorInterface
      */
@@ -76,13 +71,14 @@ final class PersonController extends AbstractController
      */
     private $logger;
 
+    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
+
     /**
      * @var ValidatorInterface
      */
     private $validator;
 
     public function __construct(
-        SimilarPersonMatcher $similarPersonMatcher,
         TranslatorInterface $translator,
         EventDispatcherInterface $eventDispatcher,
         PersonRepository $personRepository,
@@ -90,9 +86,9 @@ final class PersonController extends AbstractController
         LoggerInterface $logger,
         ValidatorInterface $validator,
         EntityManagerInterface $em,
-        Security $security
+        Security $security,
+        PersonACLAwareRepositoryInterface $personACLAwareRepository
     ) {
-        $this->similarPersonMatcher = $similarPersonMatcher;
         $this->translator = $translator;
         $this->eventDispatcher = $eventDispatcher;
         $this->configPersonAltNameHelper = $configPersonAltNameHelper;
@@ -101,6 +97,7 @@ final class PersonController extends AbstractController
         $this->validator = $validator;
         $this->em = $em;
         $this->security = $security;
+        $this->personACLAwareRepository = $personACLAwareRepository;
     }
 
     public function editAction($person_id, Request $request)
@@ -236,8 +233,8 @@ final class PersonController extends AbstractController
             $request->getMethod() === Request::METHOD_POST
             && $form->isValid()
         ) {
-            $alternatePersons = $this->similarPersonMatcher
+            $alternatePersons = $this->personACLAwareRepository
-                ->matchPerson($person);
+                ->findMatchingPersons($person);
 
             if (
                 false === $this->isLastPostDataChanges($form, $request, true)

src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php

@@ -20,9 +20,9 @@ use Chill\PersonBundle\Entity\PersonNotDuplicate;
 use Chill\PersonBundle\Form\PersonConfimDuplicateType;
 use Chill\PersonBundle\Form\PersonFindManuallyDuplicateType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Chill\TaskBundle\Entity\SingleTask;
 use http\Exception\InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -39,6 +39,11 @@ class PersonDuplicateController extends Controller
      */
     private $eventDispatcher;
 
+    /**
+     * @var PersonACLAwareRepositoryInterface
+     */
+    private $personACLAwareRepository;
+
     /**
      * @var \Chill\PersonBundle\Actions\Remove\PersonMove
      */
@@ -49,24 +54,19 @@ class PersonDuplicateController extends Controller
      */
     private $personRepository;
 
-    /**
-     * @var \Chill\PersonBundle\Search\SimilarPersonMatcher
-     */
-    private $similarPersonMatcher;
-
     /**
      * @var \Symfony\Component\Translation\TranslatorInterface
      */
     private $translator;
 
     public function __construct(
-        SimilarPersonMatcher $similarPersonMatcher,
+        PersonACLAwareRepositoryInterface $personACLAwareRepository,
         TranslatorInterface $translator,
         PersonRepository $personRepository,
         PersonMove $personMove,
         EventDispatcherInterface $eventDispatcher
     ) {
-        $this->similarPersonMatcher = $similarPersonMatcher;
+        $this->personACLAwareRepository = $personACLAwareRepository;
         $this->translator = $translator;
         $this->personRepository = $personRepository;
         $this->personMove = $personMove;
@@ -246,8 +246,11 @@ class PersonDuplicateController extends Controller
             'You are not allowed to see this person.'
         );
 
-        $duplicatePersons = $this->similarPersonMatcher->
+        $duplicatePersons = $this->personACLAwareRepository->findMatchingPersons(
-            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
+            $person,
+            0.5,
+            PersonACLAwareRepositoryInterface::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL
+        );
 
         $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 

src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php

@@ -30,7 +30,7 @@ class UserAccompanyingPeriodController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/accompanying-periods", name="chill_person_accompanying_period_user")
+     * @Route("/{_locale}/person/accompanying-periods/my", name="chill_person_accompanying_period_user")
      */
     public function listAction(Request $request)
     {
@@ -44,13 +44,13 @@ class UserAccompanyingPeriodController extends AbstractController
         );
 
         return $this->render('@ChillPerson/AccompanyingPeriod/user_periods_list.html.twig', [
-            'accompanyingds' => $accompanyingPeriods,
+            'accompanyingPeriods' => $accompanyingPeriods,
             'pagination' => $pagination,
         ]);
     }
 
     /**
-     * @Route("/{_locale}/accompanying-periods/drafts", name="chill_person_accompanying_period_draft_user")
+     * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
      */
     public function listDraftsAction(Request $request)
     {

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -71,7 +71,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
         return $qb->select('a')
-            ->distinct(true)
+            ->addOrderBy('userHistory.startDate', 'DESC')
             ->getQuery()
             ->setMaxResults($limit)
             ->setFirstResult($offset)
@@ -95,6 +95,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb
             ->join('a.userHistories', 'userHistory')
             ->where($qb->expr()->eq('a.user', ':user'))
+            ->andWhere($qb->expr()->neq('a.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
             ->andWhere($qb->expr()->gte('userHistory.startDate', ':since'))
             ->andWhere($qb->expr()->isNull('userHistory.endDate'))
             ->setParameter('user', $user)

src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php

@@ -18,6 +18,7 @@ use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
 use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
@@ -40,18 +41,26 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
 
     private EntityManagerInterface $em;
 
+    private PersonNotDuplicateRepository $personNotDuplicateRepository;
+
+    private PersonRender $personRender;
+
     private Security $security;
 
     public function __construct(
         Security $security,
         EntityManagerInterface $em,
         CountryRepository $countryRepository,
-        AuthorizationHelper $authorizationHelper
+        AuthorizationHelper $authorizationHelper,
+        PersonRender $personRender,
+        PersonNotDuplicateRepository $personNotDuplicateRepository
     ) {
         $this->security = $security;
         $this->em = $em;
         $this->countryRepository = $countryRepository;
         $this->authorizationHelper = $authorizationHelper;
+        $this->personRender = $personRender;
+        $this->personNotDuplicateRepository = $personNotDuplicateRepository;
     }
 
     public function buildAuthorizedQuery(
@@ -297,6 +306,70 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         return $this->fetchQueryPerson($query);
     }
 
+    /**
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     *
+     * @return array|Person[]
+     */
+    public function findMatchingPersons(
+        Person $person,
+        float $precision = 0.15,
+        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
+    ): array {
+        $query = $this->matchPerson($person, $precision, $orderBy);
+        $authorizedQuery = $this->addAuthorizations($query);
+
+        return $this->fetchQueryPerson($authorizedQuery);
+    }
+
+    public function matchPerson(
+        Person $person,
+        float $precision = 0.15,
+        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
+    ): SearchApiQuery {
+        $fullName = $this->personRender->renderString($person, []);
+
+        $query = new SearchApiQuery();
+        $query->setFromClause('chill_person_person AS person');
+        $query->andWhereClause(
+            'SIMILARITY(person.fullnameCanonical, UNACCENT(LOWER(?))) >= ?',
+            [$fullName, $precision]
+        );
+
+        if (null !== $person->getId()) {
+            $query->andWhereClause(
+                'person.id != ?',
+                [$person->getId()]
+            );
+
+            $notDuplicatePersons = $this->personNotDuplicateRepository->findNotDuplicatePerson($person);
+
+            if (count($notDuplicatePersons)) {
+                $query->andWhereClause(
+                    'person.id NOT IN (?)',
+                    [$notDuplicatePersons]
+                );
+            }
+        }
+
+        switch ($orderBy) {
+            case self::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL:
+                $query->setSelectPertinence('person.fullnameCanonical');
+
+                break;
+
+            case self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY:
+            default:
+                $query->setSelectPertinence(
+                    'SIMILARITY(person.fullnameCanonical, UNACCENT(LOWER(?)))',
+                    [$fullName]
+                );
+        }
+
+        return $query;
+    }
+
     private function addAuthorizations(SearchApiQuery $query): SearchApiQuery
     {
         $authorizedCenters = $this->authorizationHelper

src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php

@@ -17,6 +17,10 @@ use DateTimeInterface;
 
 interface PersonACLAwareRepositoryInterface
 {
+    public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
+
+    public const SIMILAR_SEARCH_ORDER_BY_SIMILARITY = 'similarity';
+
     public function buildAuthorizedQuery(
         ?string $default = null,
         ?string $firstname = null,
@@ -61,4 +65,13 @@ interface PersonACLAwareRepositoryInterface
         ?string $phonenumber = null,
         ?string $city = null
     ): array;
+
+    /**
+     * @return array|Person[]
+     */
+    public function findMatchingPersons(
+        Person $person,
+        float $precision = 0.15,
+        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
+    ): array;
 }

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig

@@ -20,6 +20,8 @@
         <div class="flex-table accompanyingcourse-list">
             {% for period in accompanyingPeriods %}
                 {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period, 'recordAction': _self.recordAction(period)} %}
+            {% else %}
+                <p class="chill-no-data-statement">{{ 'Any accompanying period'|trans }}</p>
             {% endfor %}
         </div>
 

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

@@ -17,6 +17,15 @@
 
 {% block title %}{{ 'Add a person'|trans }}{% endblock title %}
 
+{% macro button_person_after(person) %}
+    {% set household = person.getCurrentHousehold %}
+    {% if household is not null %}
+        <li>
+            <a href="{{ path('chill_person_household_summary', { 'household_id': household.id }) }}" class="btn btn-sm btn-chill-beige"><i class="fa fa-home"></i></a>
+        </li>
+    {% endif %}
+{% endmacro %}
+
 {% block content %}
 <div class="col-md-10 col-xxl person-new">
 
@@ -31,34 +40,24 @@
             </span>
         </div>
 
-        <table class="table table-bordered border-dark">
+        <div class="flex-table">
-            <thead>
-            <tr>
-                <th class="chill-red">{{ 'Name'|trans }}</th>
-                <th class="chill-green">{{ 'Date of birth'|trans }}</th>
-                <th class="chill-orange">{{ 'Nationality'|trans }}</th>
-            </tr>
-            </thead>
-            <tbody>
             {% for person in alternatePersons %}
-                <tr>
+            <div class="item-bloc">
-                    <td>
+
-                        <a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
+                {{ person|chill_entity_render_box({
-                            {{ person|chill_entity_render_string }}{% apply spaceless %}
+                    'render': 'bloc',
-                                {% if person.isOpen == false %}
+                    'addLink': true,
-                                    <i class="icon-lock"></i>
+                    'addInfo': true,
-                                {% endif %}
+                    'addAge': true,
-                            {% endapply %}
+                    'addAltNames': true,
-                        </a>
+                    'addCenter': true,
-                    </td>
+                    'address_multiline': false,
-                    <td>{% if person.birthdate is not null %}{{ person.birthdate|format_date('long') }}{% else %}&nbsp;{% endif %}</td>
+                    'customButtons': { 'after': _self.button_person_after(person) }
-                    <td>
+                }) }}
-                        {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{%  else  %}{{ 'Without nationality'|trans }}{% endif %}
+            </div>
-                    </td>
-                </tr>
             {% endfor %}
-            </tbody>
+        </div>
-        </table>
+
     {% endif %}
 
     {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}

src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php

@@ -21,6 +21,9 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
 
 use function count;
 
+/**
+ * @deprecated
+ */
 class SimilarPersonMatcher
 {
     public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';

src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php

@@ -62,7 +62,6 @@ class AccompanyingPeriodWorkVoter extends Voter
                 case self::UPDATE:
                     return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod());
 
-
                 default:
                     throw new UnexpectedValueException("attribute {$attribute} is not supported");
             }

src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php

@@ -161,11 +161,13 @@ class AccompanyingPeriodContext implements
                     'class' => Person::class,
                     'choices' => $persons,
                     'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, []);
+                        return $this->personRender->renderString($p, ['addAge' => true]);
                     },
                     'multiple' => false,
                     'expanded' => true,
+                    'required' => false,
                     'label' => $options[$key . 'Label'],
+                    'placeholder' => $this->translator->trans('Any person selected'),
                 ]);
             }
         }

src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php

@@ -83,6 +83,12 @@ class PersonRender extends AbstractChillEntityRender
             . $this->addAltNames($person, false) . ' (' . $this->translator->trans('years_old', ['age' => $person->getAge()]) . ')';
         }
 
+        if (null !== $person->getDeathDate() && $options['addAge']) {
+            return $person->getFirstName() . ' ' . $person->getLastName()
+            . ' (‡)'
+            . $this->addAltNames($person, false);
+        }
+
         return $person->getFirstName() . ' ' . $person->getLastName()
             . $this->addAltNames($person, false);
     }

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

@@ -24,7 +24,7 @@ services:
 
     Chill\PersonBundle\Controller\PersonDuplicateController:
         arguments:
-            $similarPersonMatcher: '@Chill\PersonBundle\Search\SimilarPersonMatcher'
+            $personACLAwareRepository: '@Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface'
             $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $personRepository: '@Chill\PersonBundle\Repository\PersonRepository'
             $personMove: '@Chill\PersonBundle\Actions\Remove\PersonMove'

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -85,6 +85,7 @@ Course number: Parcours n°
 Civility: Civilité
 choose civility: --
 All genders: tous les genres
+Any person selected: Aucune personne sélectionnée
 
 # dédoublonnage
 Old person: Doublon