Merge branch 'master' into ticket-app-master

# Conflicts: # docs/source/development/create-a-new-bundle.md # src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue # src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue # src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php # src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig # src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig # src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig # src/Bundle/ChillCalendarBundle/translations/messages.fr.yml # src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts # src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts # src/Bundle/ChillMainBundle/translations/messages.fr.yml # src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
2026-03-13 09:27:45 +00:00 · 2025-12-05 17:04:49 +01:00
parent d21d03d407 14b891b33d
commit d16de04d27
248 changed files with 11337 additions and 5040 deletions
--- a/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php
+++ b/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php
@@ -69,10 +69,11 @@ readonly class ThirdpartyMergeService
                if (($assoc['type'] & ClassMetadata::TO_ONE) !== 0) {
                    $joinColumn = $meta->getSingleAssociationJoinColumnName($assoc['fieldName']);

-                    $suffix = (ThirdParty::class === $assoc['sourceEntity']) ? 'chill_3party.' : '';
+                    $schema = $meta->getSchemaName();
+                    $prefix = null !== $schema && '' !== $schema ? $schema.'.' : '';

                    $queries[] = [
-                        'sql' => "UPDATE {$suffix}{$tableName} SET {$joinColumn} = :toKeep WHERE {$joinColumn} = :toDelete",
+                        'sql' => "UPDATE {$prefix}{$tableName} SET {$joinColumn} = :toKeep WHERE {$joinColumn} = :toDelete",
                        'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
                    ];
                } elseif (ClassMetadata::MANY_TO_MANY === $assoc['type'] && isset($assoc['joinTable'])) {
@@ -85,13 +86,36 @@ readonly class ThirdpartyMergeService
                    ];

                    $queries[] = [
-                        'sql' => "DELETE FROM {$joinTable} WHERE {$joinColumn} = :toDelete",
+                        'sql' => "DELETE FROM {$prefix}{$joinTable} WHERE {$joinColumn} = :toDelete",
                        'params' => ['toDelete' => $toDelete->getId()],
                    ];
                }
            }
        }

+        // Also handle many-to-many where ThirdParty is the source
+        $thirdPartyMeta = $this->em->getClassMetadata(ThirdParty::class);
+        foreach ($thirdPartyMeta->getAssociationMappings() as $assoc) {
+            if (ClassMetadata::MANY_TO_MANY === $assoc['type'] && isset($assoc['joinTable'])) {
+                $joinTable = $assoc['joinTable']['name'];
+                $prefix = null !== ($assoc['joinTable']['schema'] ?? null) ? $assoc['joinTable']['schema'].'.' : '';
+                $joinColumn = $assoc['joinTable']['joinColumns'][0]['name']; // Note: joinColumns, not inverseJoinColumns
+
+                // Get the other column name to build proper duplicate check
+                $otherColumn = $assoc['joinTable']['inverseJoinColumns'][0]['name'];
+
+                $queries[] = [
+                    'sql' => "UPDATE {$prefix}{$joinTable} SET {$joinColumn} = :toKeep WHERE {$joinColumn} = :toDelete AND NOT EXISTS (SELECT 1 FROM {$prefix}{$joinTable} AS t2 WHERE t2.{$joinColumn} = :toKeep AND t2.{$otherColumn} = {$prefix}{$joinTable}.{$otherColumn})",
+                    'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
+                ];
+
+                $queries[] = [
+                    'sql' => "DELETE FROM {$prefix}{$joinTable} WHERE {$joinColumn} = :toDelete",
+                    'params' => ['toDelete' => $toDelete->getId()],
+                ];
+            }
+        }
+
        return $queries;
    }

@@ -102,10 +126,6 @@ readonly class ThirdpartyMergeService
                'sql' => 'UPDATE chill_3party.third_party SET parent_id = :toKeep WHERE parent_id = :toDelete',
                'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
            ],
-            [
-                'sql' => 'UPDATE chill_3party.thirdparty_category SET thirdparty_id = :toKeep WHERE thirdparty_id = :toDelete AND NOT EXISTS (SELECT 1 FROM chill_3party.thirdparty_category WHERE thirdparty_id = :toKeep)',
-                'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
-            ],
            [
                'sql' => 'DELETE FROM chill_3party.third_party WHERE id = :toDelete',
                'params' => ['toDelete' => $toDelete->getId()],
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Service/ThirdpartyMergeServiceTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Service/ThirdpartyMergeServiceTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ThirdPartyBundle\Tests\Service;

 use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Entity\Center;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
 use Chill\ThirdPartyBundle\Service\ThirdpartyMergeService;
@@ -47,19 +48,20 @@ class ThirdpartyMergeServiceTest extends KernelTestCase
        $toDelete->setName('Thirdparty to delete');
        $this->em->persist($toDelete);

-        // Create a related entity with TO_ONE relation (thirdparty parent)
+        // Create a related entity with TO_ONE relation (thirdparty parent) - tests schema handling for TO_ONE
        $relatedToOneEntity = new ThirdParty();
        $relatedToOneEntity->setName('RelatedToOne thirdparty');
        $relatedToOneEntity->setParent($toDelete);
        $this->em->persist($relatedToOneEntity);

-        // Create a related entity with TO_MANY relation (thirdparty category)
+        // Create a related entity with MANY_TO_MANY relation (thirdparty category) - tests schema handling for MANY_TO_MANY where ThirdParty is target
        $thirdpartyCategory = new ThirdPartyCategory();
        $thirdpartyCategory->setName(['fr' => 'Thirdparty category']);
        $this->em->persist($thirdpartyCategory);
        $toDelete->addCategory($thirdpartyCategory);
        $this->em->persist($toDelete);

+        // Test MANY_TO_MANY relation from another bundle (Activity) - tests cross-bundle schema handling
        $activity = new Activity();
        $activity->setDate(new \DateTime());
        $activity->addThirdParty($toDelete);
@@ -73,14 +75,55 @@ class ThirdpartyMergeServiceTest extends KernelTestCase
        $this->em->refresh($relatedToOneEntity);

        // Check that references were updated
-        $this->assertEquals($toKeep->getId(), $relatedToOneEntity->getParent()->getId(), 'The parent thirdparty was succesfully merged');

+        // Test TO_ONE relation in chill_3party schema was properly handled
+        $this->assertEquals($toKeep->getId(), $relatedToOneEntity->getParent()->getId(), 'The parent thirdparty in chill_3party schema was successfully merged');
+
+        // Test MANY_TO_MANY relation in chill_3party schema was properly handled
        $updatedRelatedManyEntity = $this->em->find(ThirdPartyCategory::class, $thirdpartyCategory->getId());
-        $this->assertContains($updatedRelatedManyEntity, $toKeep->getCategories(), 'The thirdparty category was found in the toKeep entity');
+        $this->assertContains($updatedRelatedManyEntity, $toKeep->getCategories(), 'The thirdparty category in chill_3party schema was found in the toKeep entity');
+
+        // Test MANY_TO_MANY relation from different schema (Activity bundle) was properly handled
+        $this->em->refresh($activity);
+        $this->assertContains($toKeep, $activity->getThirdParties(), 'The activity relation from different schema was successfully merged');
+        $this->assertNotContains($toDelete, $activity->getThirdParties(), 'The toDelete thirdparty was removed from activity relation');

        // Check that toDelete was removed
        $this->em->clear();
        $deletedThirdParty = $this->em->find(ThirdParty::class, $toDelete->getId());
-        $this->assertNull($deletedThirdParty);
+        $this->assertNull($deletedThirdParty, 'The toDelete thirdparty was successfully removed');
+    }
+
+    public function testMergeWithSharedCenterDoesNotCauseUniqueConstraintViolation(): void
+    {
+        // Create a center that will be shared by both thirdparties
+        $sharedCenter = new Center();
+        $sharedCenter->setName('Shared Center');
+        $this->em->persist($sharedCenter);
+
+        // Create ThirdParty entities
+        $toKeep = new ThirdParty();
+        $toKeep->setName('Thirdparty to keep');
+        $toKeep->addCenter($sharedCenter); // Both thirdparties linked to same center
+        $this->em->persist($toKeep);
+
+        $toDelete = new ThirdParty();
+        $toDelete->setName('Thirdparty to delete');
+        $toDelete->addCenter($sharedCenter); // Both thirdparties linked to same center
+        $this->em->persist($toDelete);
+
+        $this->em->flush();
+
+        // This should not throw a unique constraint violation
+        $this->service->merge($toKeep, $toDelete);
+
+        // Verify that toKeep still has the shared center
+        $this->em->refresh($toKeep);
+        $this->assertContains($sharedCenter, $toKeep->getCenters(), 'The shared center is still linked to the kept thirdparty');
+
+        // Verify that toDelete was removed
+        $this->em->clear();
+        $deletedThirdParty = $this->em->find(ThirdParty::class, $toDelete->getId());
+        $this->assertNull($deletedThirdParty, 'The toDelete thirdparty was successfully removed');
    }
 }
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.nl.yml
@@ -0,0 +1,169 @@
+Third party: Externe partner
+Third parties: Externe partners
+third parties: externe partners
+firstname: Voornaam
+name: Naam
+telephone: Telefoon
+telephone2: Ander telefoonnummer
+adress: Adres
+email: E-mail
+comment: Opmerking
+thirdparty.type: type
+thirdparty.Type: Type
+thirdparty.No_phonenumber: Geen telefoonnummer
+thirdparty.No_email: Geen e-mail
+thirdparty.No_comment: Geen opmerking
+
+thirdparty.NameCompany: Dienst/Afdeling
+thirdparty.Acronym: Afkorting
+thirdparty.Categories: Categorieën
+thirdparty.no_categories: Geen categorie
+thirdparty.Child: Contactpersoon
+thirdparty.child: Contactpersoon
+thirdparty.Children: Contactpersonen
+thirdparty.children: Contactpersonen
+thirdparty.Parent: Institutionele externe partner
+thirdparty.Parents: Institutionele externe partners
+thirdparty.Civility: Aanspreekvorm
+thirdparty.choose civility: --
+thirdparty.Profession: Hoedanigheid
+thirdparty.choose profession: --
+thirdparty.CreatedAt.short: 'Aangemaakt op '
+thirdparty.UpdatedAt.short: 'Gewijzigd op '
+thirdparty.UpdateBy.short: ' door '
+thirdparty.CreatedAt.long: Aanmaakdatum
+thirdparty.UpdatedAt.long: Datum van de laatste wijziging
+thirdparty.UpdateBy.long: Gebruiker die de laatste wijziging heeft uitgevoerd
+thirdparty.A company: Een rechtspersoon
+thirdparty.company: Rechtspersoon
+thirdparty.A contact: Een natuurlijk persoon
+thirdparty.contact: Natuurlijk persoon
+thirdparty.Contact of: Contact van
+thirdparty.a_company_explanation: >-
+    Rechtspersonen kunnen één of meerdere contacten hebben, intern aan de instelling. Het is ook mogelijk om
+    hen een afkorting en de naam van een dienst toe te kennen.
+thirdparty.a_contact_explanation: >-
+    Natuurlijke personen hebben geen afkorting, dienst of onderliggende contacten. Het is mogelijk om hen
+    een aanspreekvorm en een beroep toe te kennen.
+thirdparty.Which kind of third party ?: Welk type externe partner wilt u aanmaken?
+thirdparty.Contact data are confidential: Contactgegevens zijn vertrouwelijk
+
+New third party: Nieuwe externe partner toevoegen
+Show third party %name%: Externe partner "%name%"
+Create third party: Externe partner aanmaken
+Update third party %name%: Externe partner "%name%" bijwerken
+List of third parties: Lijst van externe partners
+Third party updated: De externe partner is bijgewerkt
+Third party created: De externe partner is aangemaakt
+thirdparty.Status: Status
+Active, shown to users: Actief, zichtbaar voor gebruikers
+Active: Actief
+shown to users: zichtbaar voor gebruikers
+Inactive, not shown to users: Inactief, onzichtbaar voor gebruikers
+Inactive: Inactief
+not shown to users: onzichtbaar voor gebruikers
+Show thirdparty: Externe partner bekijken
+Add a contact: Contact toevoegen
+Remove a contact: Verwijderen
+Contacts: Contacten
+No contacts associated: Geen contact
+
+No nameCompany given: Geen bedrijfsnaam ingevuld
+No acronym given: Geen afkorting ingevuld
+No phone given: Geen telefoon ingevuld
+No email given: Geen e-mailadres ingevuld
+
+The party is visible in those centers: De externe partner is zichtbaar in deze territoria
+The party is not visible in any center: De externe partner is niet gekoppeld aan een territorium
+No third parties: Geen externe partners
+Any third party selected: Geen externe partner geselecteerd
+
+Thirdparty handling: Behandelende externe partner
+Thirdparty workers: Tussenkomende externe partners
+Third party category: Categorieën van externe partners
+
+Third party configuration: Beheer van externe partners
+
+# person resource
+Select a thirdparty: "Kies een externe partner"
+Contact person: "Contactpersoon"
+
+# Residential address
+The address of a third party: Het adres van een externe partner
+residential_address_third_party_explanation: Het adres zal worden gekoppeld aan dat van een externe partner.
+Host third party: Het adres van een externe partner kiezen
+
+# ROLES
+CHILL_3PARTY_3PARTY_CREATE: Externe partner toevoegen
+CHILL_3PARTY_3PARTY_SHOW: Externe partner bekijken
+CHILL_3PARTY_3PARTY_UPDATE: Externe partner bewerken
+
+# crud:
+crud:
+    3party_3party:
+        index:
+            add_new: Aanmaken
+    thirdparty_thirdparty-category:
+        index:
+            title: Lijst van categorieën van externe partners
+            add_new: Nieuwe toevoegen
+        title_new: Nieuwe categorie van externe partners
+        title_edit: Categorie van externe partners bewerken
+
+# docgen
+docgen:
+    A context for person with a third party (for sending mail): Een context van een persoon met een externe partner (om bijvoorbeeld een brief naar deze externe partner te sturen)
+    Person with third party: Persoon met keuze van een externe partner
+    Ask for thirdParty: Vragen aan de gebruiker om een externe partner te specificeren
+    thirdParty label: Benaming van de externe partner
+
+# exports
+export:
+    list:
+        acp:
+            isRequestorThirdParty: Is de aanvrager een externe partner?
+            requestorThirdPartyId: Identificatie van de externe partner
+            acprequestorThirdPaty: Naam van de aanvragende externe partner
+        acpw:
+            handlingThierParty: Behandelende externe partner
+            thirdParties: Tussenkomende externe partner
+
+# exports filters/aggregators
+Filtered by person\'s who have a residential address located at a thirdparty of type %thirparty_type%: Alleen de gebruikers die een woonadres hebben bij een externe partner van categorie %thirdparty_type%
+is thirdparty: De aanvrager is een externe partner
+
+Filter by person's who have a residential address located at a thirdparty of type: Gebruikers filteren die een woonadres hebben bij een externe partner
+"Filtered by person's who have a residential address located at a thirdparty of type %thirdparty_type% and valid on %date_calc%": "Alleen de gebruikers die een woonadres hebben bij een externe partner van categorie %thirdparty_type% en geldig op datum %date_calc%"
+
+# admin
+admin:
+    export_description: Lijst van externe partners (CSV-formaat)
+
+Profession: Beroep
+Firstname: Voornaam
+Name_company: Dienst/Afdeling
+Address: Adres
+Civility: Aanspreekvorm
+Id: Identificatie
+Contact id: Identificatie van het contact
+Contact name: Naam van het contact
+Contact  firstname: Voornaam van het contact
+Contact phone: Telefoon van het contact
+Contact phone2: Andere telefoon van het contact
+Telephone2: Andere telefoon
+Contact email: E-mail van het contact
+Contact address: Adres van het contact
+Contact profession: Beroep van het contact
+
+thirdparty_duplicate:
+    title: Dubbele externe partners samenvoegen
+    find: Een dubbele externe partner aanwijzen
+    Thirdparty to keep: Te behouden externe partner
+    Thirdparty to delete: Te verwijderen externe partner
+    Thirdparty to delete explanation: Deze externe partner zal worden verwijderd. Alleen de contacten van deze externe partner, hieronder opgesomd, zullen worden overgedragen.
+    Thirdparty to keep explanation: Deze externe partner zal worden behouden
+    Data to keep: Bewaarde gegevens
+    You cannot merge a thirdparty with itself. Please choose a different thirdparty: U kunt een externe partner niet met zichzelf samenvoegen. Kies een andere externe partner.
+    A thirdparty can only be merged with a thirdparty of the same kind: Een externe partner kan alleen worden samengevoegd met een externe partner van hetzelfde type.
+    Two child thirdparties must have the same parent: Twee externe partners van het type "contact" moeten gelinked zijn aan dezelfde hiërarchische "ouder".
+    Merge successful: Het samenvoegen is succesvol uitgevoerd
--- a/src/Bundle/ChillThirdPartyBundle/translations/validators.nl.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/validators.nl.yml
@@ -0,0 +1,2 @@
+thirdParty:
+    thirdParty_has_no_email: De externe partner {{ thirdParty }} heeft geen e-mail adres.