Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-11 18:29:53 +00:00
Code Issues Actions Projects Releases Wiki Activity

rebase on master

Browse Source
This commit is contained in:
Julie Lenaerts 2025-08-11 08:44:03 +02:00
parent fdaba87264
commit 81cb1c0647
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php
View File

@ -12,13 +12,18 @@ declare(strict_types=1);
namespace Chill\ThirdPartyBundle\Service; namespace Chill\ThirdPartyBundle\Service;
use Chill\ThirdPartyBundle\Entity\ThirdParty; use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Doctrine\DBAL\Exception;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Mapping\MappingException;
class ThirdpartyMergeService readonly class ThirdpartyMergeService
{ {
public function __construct(private readonly EntityManagerInterface $em) {} public function __construct(private EntityManagerInterface $em) {}
/**
* @throws Exception
*/
public function merge(ThirdParty $toKeep, ThirdParty $toDelete): void public function merge(ThirdParty $toKeep, ThirdParty $toDelete): void
{ {
$conn = $this->em->getConnection(); $conn = $this->em->getConnection();
@ -41,6 +46,9 @@ class ThirdpartyMergeService
} }
} }
/**
* @throws MappingException
*/
private function updateReferences(ThirdParty $toKeep, ThirdParty $toDelete): array private function updateReferences(ThirdParty $toKeep, ThirdParty $toDelete): array
{ {
$queries = []; $queries = [];

4
src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
View File

@ -134,9 +134,6 @@ is thirdparty: Le demandeur est un tiers
Filter by person's who have a residential address located at a thirdparty of type: Filtrer les usagers qui ont une addresse de résidence chez un tiers Filter by person's who have a residential address located at a thirdparty of type: Filtrer les usagers qui ont une addresse de résidence chez un tiers
"Filtered by person's who have a residential address located at a thirdparty of type %thirdparty_type% and valid on %date_calc%": "Uniquement les usagers qui ont une addresse de résidence chez un tiers de catégorie %thirdparty_type% et valide sur la date %date_calc%" "Filtered by person's who have a residential address located at a thirdparty of type %thirdparty_type% and valid on %date_calc%": "Uniquement les usagers qui ont une addresse de résidence chez un tiers de catégorie %thirdparty_type% et valide sur la date %date_calc%"
find duplicate thirdparty: 'Désigner un tier doublon'
find duplicate thirdparty: 'Désigner un tier doublon'
# admin # admin
admin: admin:
@ -158,7 +155,6 @@ Contact email: Courrier électronique du contact
Contact address: Adresse du contact Contact address: Adresse du contact
Contact profession: Profession du contact Contact profession: Profession du contact
find_thirdparty_duplicate: 'Désigner un tiers doublon'
thirdparty_duplicate: thirdparty_duplicate:
title: Fusionner les tiers doublons title: Fusionner les tiers doublons
find: Désigner un tiers doublon find: Désigner un tiers doublon