Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[REF] clean up merge array. #15970

Merged
merged 1 commit into from
Dec 2, 2019
Merged

[REF] clean up merge array. #15970

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 23 additions & 36 deletions CRM/Export/BAO/ExportProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,13 @@ public function setAdditionalFieldsForPostalExport() {
*/
protected $exportedHouseholds = [];

/**
* Contacts to be merged by virtue of their shared address.
*
* @var array
*/
protected $contactsToMerge = [];

/**
* Households to skip during export as they will be exported via their relationships anyway.
*
Expand Down Expand Up @@ -1919,14 +1926,12 @@ public function replaceMergeTokens($contactId) {
/**
* Build array for merging same addresses.
*
* @param $sql
* @param string $sql
* @param bool $sharedAddress
*
* @return array
*/
public function buildMasterCopyArray($sql, $sharedAddress = FALSE) {

$merge = $parents = [];
$parents = [];
$dao = CRM_Core_DAO::executeQuery($sql);

while ($dao->fetch()) {
Expand All @@ -1936,7 +1941,7 @@ public function buildMasterCopyArray($sql, $sharedAddress = FALSE) {
$this->cacheContactGreetings((int) $dao->master_contact_id);
$this->cacheContactGreetings((int) $dao->copy_contact_id);

if (!isset($merge[$masterID])) {
if (!isset($this->contactsToMerge[$masterID])) {
// check if this is an intermediate child
// this happens if there are 3 or more matches a,b, c
// the above query will return a, b / a, c / b, c
Expand All @@ -1946,33 +1951,34 @@ public function buildMasterCopyArray($sql, $sharedAddress = FALSE) {
$masterID = $parents[$masterID];
}
else {
$merge[$masterID] = [
$this->contactsToMerge[$masterID] = [
'addressee' => $this->getContactGreeting((int) $dao->master_contact_id, 'addressee', $dao->master_addressee),
'copy' => [],
'postalGreeting' => $this->getContactGreeting((int) $dao->master_contact_id, 'postal_greeting', $dao->master_postal_greeting),
];
$merge[$masterID]['emailGreeting'] = &$merge[$masterID]['postalGreeting'];
$this->contactsToMerge[$masterID]['emailGreeting'] = &$this->contactsToMerge[$masterID]['postalGreeting'];
}
}
$parents[$copyID] = $masterID;

if (!$sharedAddress && !array_key_exists($copyID, $merge[$masterID]['copy'])) {
if (!$sharedAddress && !array_key_exists($copyID, $this->contactsToMerge[$masterID]['copy'])) {
$copyPostalGreeting = $this->getContactPortionOfGreeting((int) $dao->copy_contact_id, (int) $dao->copy_postal_greeting_id, 'postal_greeting', $dao->copy_postal_greeting);
if ($copyPostalGreeting) {
$merge[$masterID]['postalGreeting'] = "{$merge[$masterID]['postalGreeting']}, {$copyPostalGreeting}";
$this->contactsToMerge[$masterID]['postalGreeting'] = "{$this->contactsToMerge[$masterID]['postalGreeting']}, {$copyPostalGreeting}";
// if there happens to be a duplicate, remove it
$merge[$masterID]['postalGreeting'] = str_replace(" {$copyPostalGreeting},", "", $merge[$masterID]['postalGreeting']);
$this->contactsToMerge[$masterID]['postalGreeting'] = str_replace(" {$copyPostalGreeting},", "", $this->contactsToMerge[$masterID]['postalGreeting']);
}

$copyAddressee = $this->getContactPortionOfGreeting((int) $dao->copy_contact_id, (int) $dao->copy_addressee_id, 'addressee', $dao->copy_addressee);
if ($copyAddressee) {
$merge[$masterID]['addressee'] = "{$merge[$masterID]['addressee']}, " . trim($copyAddressee);
$this->contactsToMerge[$masterID]['addressee'] = "{$this->contactsToMerge[$masterID]['addressee']}, " . trim($copyAddressee);
}
}
$merge[$masterID]['copy'][$copyID] = $copyAddressee ?? $dao->copy_addressee;
if (!isset($this->contactsToMerge[$masterID]['copy'][$copyID])) {
// If it was set in the first run through - share routine, don't subsequently clobber.
$this->contactsToMerge[$masterID]['copy'][$copyID] = $copyAddressee ?? $dao->copy_addressee;
}
}

return $merge;
}

/**
Expand Down Expand Up @@ -2000,7 +2006,7 @@ public function mergeSameAddress() {
INNER JOIN civicrm_address adr ON r1.master_id = adr.id
INNER JOIN $tableName r2 ON adr.contact_id = r2.civicrm_primary_id
ORDER BY r1.id";
$linkedMerge = $this->buildMasterCopyArray($sql, TRUE);
$this->buildMasterCopyArray($sql, TRUE);

// find all the records that have the same street address BUT not in a household
// require match on city and state as well
Expand All @@ -2027,28 +2033,9 @@ public function mergeSameAddress() {
AND r2.id > r1.id
ORDER BY r1.id
";
$merge = $this->buildMasterCopyArray($sql);

// unset ids from $merge already present in $linkedMerge
foreach ($linkedMerge as $masterID => $values) {
$keys = [$masterID];
$keys = array_merge($keys, array_keys($values['copy']));
foreach ($merge as $mid => $vals) {
if (in_array($mid, $keys)) {
unset($merge[$mid]);
}
else {
foreach ($values['copy'] as $copyId) {
if (in_array($copyId, $keys)) {
unset($merge[$mid]['copy'][$copyId]);
}
}
}
}
}
$merge = $merge + $linkedMerge;
$this->buildMasterCopyArray($sql);

foreach ($merge as $masterID => $values) {
foreach ($this->contactsToMerge as $masterID => $values) {
$sql = "
UPDATE $tableName
SET addressee = %1, postal_greeting = %2, email_greeting = %3
Expand Down