Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 15:13:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

Duplicate module

Browse Source 
Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
This commit is contained in:
Mathieu Jaumotte
2021-03-21 14:06:37 +01:00
parent 728ea73bdf
commit 0149457fba
12 changed files with 292 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
View File

@@ -2,13 +2,17 @@
namespace Chill\PersonBundle\Controller;
use Chill\PersonBundle\Actions\Remove\PersonMove;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Entity\PersonNotDuplicate;
use Chill\PersonBundle\Form\PersonConfimDuplicateType;
use Chill\PersonBundle\Privacy\PrivacyEvent;
use Chill\PersonBundle\Repository\PersonRepository;
use Chill\PersonBundle\Search\SimilarPersonMatcher;
use http\Exception\InvalidArgumentException;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Translation\TranslatorInterface;
@@ -29,14 +33,28 @@ class PersonDuplicateController extends Controller
*/
private $personRepository;
/**
* @var \Chill\PersonBundle\Actions\Remove\PersonMove
*/
private $personMove;
/**
* @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
*/
private $eventDispatcher;
public function __construct(
SimilarPersonMatcher $similarPersonMatcher,
TranslatorInterface $translator,
PersonRepository $personRepository
PersonRepository $personRepository,
PersonMove $personMove,
EventDispatcherInterface $eventDispatcher
) {
$this->similarPersonMatcher = $similarPersonMatcher;
$this->translator = $translator;
$this->personRepository = $personRepository;
$this->personMove = $personMove;
$this->eventDispatcher = $eventDispatcher;
}
public function viewAction($person_id)
@@ -47,88 +65,88 @@ class PersonDuplicateController extends Controller
. " found on this server");
}
$duplicatePersons = $this->similarPersonMatcher->matchPerson($person, 0.5);
$duplicatePersons = $this->similarPersonMatcher->
matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
$notDuplicatePersons = $this->getDoctrine()->getRepository(PersonNotDuplicate::class)
->findNotDuplicatePerson($person);
return $this->render('ChillPersonBundle:PersonDuplicate:view.html.twig', [
"person" => $person,
'duplicatePersons' => $duplicatePersons
'person' => $person,
'duplicatePersons' => $duplicatePersons,
'notDuplicatePersons' => $notDuplicatePersons,
]);
}
public function confirmAction($person_id, $person2_id, Request $request)
public function confirmAction($person1_id, $person2_id, Request $request)
{
if ($person_id === $person2_id) {
throw new InvalidArgumentException('Can not merge same person');
}
if ($person_id > $person2_id) {
$tmpId = $person2_id;
$person2_id = $person_id;
$person_id = $tmpId;
unset($tmpId);
}
$person = $this->_getPerson($person_id);
if ($person === null) {
throw $this->createNotFoundException("Person with id $person_id not"
. " found on this server");
}
$person2 = $this->_getPerson($person2_id);
if ($person2 === null) {
throw $this->createNotFoundException("Person with id $person2_id not"
. " found on this server");
}
[$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
$form = $this->createForm(PersonConfimDuplicateType::class);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
dd('todo');
$event = new PrivacyEvent($person1, array(
'element_class' => Person::class,
'action' => 'move'
));
$event->addPerson($person2);
$this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
$sqls = $this->personMove->getSQL($person2, $person1);
$connection = $this->getDoctrine()->getConnection();
$connection->beginTransaction();
foreach($sqls as $sql) {
$connection->executeQuery($sql);
}
$connection->commit();
return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
}
return $this->render('ChillPersonBundle:PersonDuplicate:confirm.html.twig', [
'person' => $person,
'person' => $person1,
'person2' => $person2,
'form' => $form->createView(),
]);
}
public function notDuplicateAction($person_id, $person2_id)
public function notDuplicateAction($person1_id, $person2_id)
{
if ($person_id === $person2_id) {
throw new InvalidArgumentException('Can not merge same person');
[$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
$personNotDuplicate = $this->getDoctrine()->getRepository(PersonNotDuplicate::class)
->findOneBy(['person1' => $person1, 'person2' => $person2]);
if (!$personNotDuplicate instanceof PersonNotDuplicate) {
$personNotDuplicate = new PersonNotDuplicate();
$personNotDuplicate->setPerson1($person1);
$personNotDuplicate->setPerson2($person2);
$personNotDuplicate->setUser($this->getUser());
$this->getDoctrine()->getManager()->persist($personNotDuplicate);
$this->getDoctrine()->getManager()->flush();
}
if ($person_id > $person2_id) {
$tmpId = $person2_id;
$person2_id = $person_id;
$person_id = $tmpId;
unset($tmpId);
return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
}
public function removeNotDuplicateAction($person1_id, $person2_id)
{
[$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
$personNotDuplicate = $this->getDoctrine()->getRepository(PersonNotDuplicate::class)
->findOneBy(['person1' => $person1, 'person2' => $person2]);
if ($personNotDuplicate instanceof PersonNotDuplicate) {
$this->getDoctrine()->getManager()->remove($personNotDuplicate);
$this->getDoctrine()->getManager()->flush();
}
$person = $this->_getPerson($person_id);
if ($person === null) {
throw $this->createNotFoundException("Person with id $person_id not"
. " found on this server");
}
$person2 = $this->_getPerson($person2_id);
if ($person2 === null) {
throw $this->createNotFoundException("Person with id $person2_id not"
. " found on this server");
}
$personNotDuplicate = new PersonNotDuplicate();
$personNotDuplicate->setPerson1($person);
$personNotDuplicate->setPerson2($person2);
$personNotDuplicate->setUser($this->getUser());
$this->getDoctrine()->getManager()->persist($personNotDuplicate);
$this->getDoctrine()->getManager()->flush();
return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person->getId()]);
return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
}
/**
@@ -138,4 +156,31 @@ class PersonDuplicateController extends Controller
{
return $this->personRepository->find($id);
}
private function _getPersonsByPriority($person1_id, $person2_id)
{
if ($person1_id === $person2_id) {
throw new InvalidArgumentException('Can not merge same person');
}
if ($person1_id > $person2_id) {
$person1 = $this->_getPerson($person2_id);
$person2 = $this->_getPerson($person1_id);
} else {
$person1 = $this->_getPerson($person1_id);
$person2 = $this->_getPerson($person2_id);
}
if ($person1 === null) {
throw $this->createNotFoundException("Person with id $person1_id not"
. " found on this server");
}
if ($person2 === null) {
throw $this->createNotFoundException("Person with id $person2_id not"
. " found on this server");
}
return [$person1, $person2];
}
}