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

CRM-20789 Fix unsubscribing when link comes from an AB Test #10583

Merged
merged 2 commits into from
Jul 2, 2017
Merged

CRM-20789 Fix unsubscribing when link comes from an AB Test #10583

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abf4cee
CRM-20789 Fix unsubscribing when link comes from an AB Test
seamuslee001 Jun 29, 2017
b6f5751
CRM-20789 Add check based on mailing_type following chat with Tim to …
seamuslee001 Jun 29, 2017
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
24 changes: 22 additions & 2 deletions CRM/Mailing/Event/BAO/Unsubscribe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,35 @@ public static function &unsub_from_mailing($job_id, $queue_id, $hash, $return =
$group = $groupObject->getTableName();
$gcObject = new CRM_Contact_BAO_GroupContact();
$gc = $gcObject->getTableName();
$abObject = new CRM_Mailing_DAO_MailingAB();
$ab = $abObject->getTableName();

//We Need the mailing Id for the hook...
$do->query("SELECT $job.mailing_id as mailing_id
FROM $job
WHERE $job.id = " . CRM_Utils_Type::escape($job_id, 'Integer'));
$do->fetch();
$mailing_id = $do->mailing_id;
$mailing_type = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_Mailing', $mailing_id, 'mailing_type', 'id');
$entity = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_MailingGroup', $mailing_id, 'entity_table', 'mailing_id');

// If $entity is null and $mailing_Type is either winner or experiment then we are deailing with an AB test
$abtest_types = array('experiment', 'winner');
if (empty($entity) && in_array($mailing_type, $abtest_types)) {
Copy link
Contributor

@jitendrapurohit jitendrapurohit Jun 30, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand this aims to fix the query when $entity (entity_table column from civicrm_mailing_group) is NULL, but it always gets set to some value for me whether I choose recipients to be existing group(sets to civicrm_group) or previous mailing(civicrm_mailing).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jitendra was $mailing_id resolving to the id of the A Mailing or the B Mailing or the Final. We were finding issues when $mailing_id = the b or final and there was nothing in the mailing_group table for the b or final.

Copy link
Contributor

@jitendrapurohit jitendrapurohit Jul 1, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me - mailing_group api called here always ensured entity_table to set to either group or mailing. And if it doesn't in your case, not sure but shouldn't the fix be more likely to set this column instead of fixing the query if it is empty ?

Update - the above user tag just notified another jitendra on github, for me it is @jitendrapurohit :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jitendrapurohit the issue for me is that in civicrm_mailing_group the only records there are for the A mailing so when someone clicks a link that is linked to either the mailing id of B or Final then $entity ends up being entity as there are no records for those mailings in civicrm_mailing_group

$mailing_id_a = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_MailingAB', $mailing_id, 'mailing_id_a', 'mailing_id_b');
$field = 'mailing_id_b';
if (empty($mailing_id_a)) {
$mailing_id_a = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_MailingAB', $mailing_id, 'mailing_id_a', 'mailing_id_c');
$field = 'mailing_id_c';
}
$jobJoin = "INNER JOIN $ab ON $ab.mailing_id_a = $mg.mailing_id
INNER JOIN $job ON $job.mailing_id = $ab.$field";
$entity = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_MailingGroup', $mailing_id_a, 'entity_table', 'mailing_id');
}
else {
$jobJoin = "INNER JOIN $job ON $job.mailing_id = $mg.mailing_id";
}

$groupClause = '';
if ($entity == $group) {
$groupClause = "AND $group.is_hidden = 0";
Expand All @@ -167,8 +188,7 @@ public static function &unsub_from_mailing($job_id, $queue_id, $hash, $return =
$mg.entity_id as entity_id,
$mg.group_type as group_type
FROM $mg
INNER JOIN $job
ON $job.mailing_id = $mg.mailing_id
$jobJoin
INNER JOIN $entity
ON $mg.entity_id = $entity.id
WHERE $job.id = " . CRM_Utils_Type::escape($job_id, 'Integer') . "
Expand Down