Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-02 04:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

validate thirdparty merge

Browse Source
This commit is contained in:
Julie Lenaerts
2025-03-03 20:52:05 +01:00
parent 8b334b0e5d
commit cd3b015b18
3 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,6 @@ class ThirdpartyMergeService
$joinColumn = $meta->getSingleAssociationJoinColumnName($assoc['fieldName']);
if (ThirdParty::class === $assoc['sourceEntity'] && 'parent_id' !== $joinColumn) {
// TODO what with 'address_id' and 'civility_id'? This condition also contains columns like updatedBy_id which we want to ignore...
continue;
}
@@ -102,9 +101,7 @@ class ThirdpartyMergeService
'sql' => "UPDATE {$schemaPrefix}{$tableName} SET {$joinColumn} = :toKeep WHERE {$joinColumn} = :toDelete",
'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
];
}
if ($assoc['type'] === 8 && isset($assoc['joinTable'])) {
} elseif (8 === $assoc['type'] && isset($assoc['joinTable'])) {
$joinTable = $assoc['joinTable']['name'];
$joinColumn = $assoc['joinTable']['joinColumns'][0]['name'];
$queries[] = [