CRM-21524 - Fix merge contacts when one is deceased

[lemacarl]

Overview

When exporting contacts and merge contacts with the same address is selected then contacts with the same address are still merged even though one is deceased.

---

• CRM-21524: CiviCRM exports (postal) mailing lists including Contacts clearly marked is_deceased in the database

[civicrm-builder]

Can one of the admins verify this patch?

[mlutfy]

jenkins, test this please

[seamuslee001]

hi @lemacarl thanks for the patch. Can you please fix the style errors found https://test.civicrm.org/job/CiviCRM-Core-PR/18786/checkstyleResult/new/

[lemacarl]

@seamuslee001 Please recheck. I think I've fixed them

[seamuslee001]

Jenkins test this please

[eileenmcnaughton]

There is still one reported - the warning says
ExportTest.php:352
Which is a file you didn't alter :-(

I have hit this before & while I don't recall all I would try rebasing & squashing ie .
git pull --rebase origin master

followed by

git rebase -i origin/master

in the second case you can squash the commits.

use the -f switch to force push to your branch after

[lemacarl]

@eileenmcnaughton Thanks! I've done the rebase. Hope it works.

[lemacarl]

Jenkins test this please

[seamuslee001]

Jenkins test this please

[lemacarl]

@eileenmcnaughton Looks like the rebase hasn't worked. Please help

[eileenmcnaughton]

At least it's clear the error is in a line you edited now - it seems to be saying there is a space after 'contact_type' => 'Individual', below

    $contactB = $this->callAPISuccess('contact', 'create', array(
      'first_name' => 'Jane',
      'last_name' => 'Doe',
      'contact_type' => 'Individual',   
      'is_deceased' => 1,
    ));

[lemacarl]

@eileenmcnaughton Thanks! I've used a tool to remove the trailing white spaces as well as run the modified files through Civilint. Please help me test this

[eileenmcnaughton]

jenkins add to whitelist

[lemacarl]

@eileenmcnaughton Is this good to go now?

[eileenmcnaughton]

@lemacarl I took a look at this & agree with your analysis & that the test demonstrates the fix. One thing though - the code you have added

      // if postalMailing option is checked, exclude contacts who are deceased, have
      // "Do not mail" privacy setting, or have no street address
      if (isset($exportParams['postal_mailing_export']['postal_mailing_export']) &&
        $exportParams['postal_mailing_export']['postal_mailing_export'] == 1
      ) {
        self::postalMailingFormat($exportTempTable, $headerRows, $sqlColumns, $exportMode);
      }

Is called a few lines further down - I believe it could be moved rather than duplicated? I believe the point of your change is to remove non-mailable people from the address table BEFORE concantenating the names of people at the same address but we won't need it AFTER as well

Also - any chance you could quash the 2 commits to one?

[lemacarl]

@eileenmcnaughton Thanks for spotting that. I've removed the duplicate conditional and squashed the commits into one.

[lemacarl]

Jenkins test this please

[eileenmcnaughton]

Looks great - seems like a really solid fix with a test to lock it in. Adding merge on pass