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

Incoming SMS replies are not linked to CiviCRM Contacts #26997

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Incoming SMS replies are not linked to CiviCRM Contacts #26997

wants to merge 1 commit into from

Conversation

agileware-justin
Copy link
Contributor

Overview

Incoming SMS replies are not linked to CiviCRM Contacts because the formatted phone number is used for a like comparison, whereas the phone_numeric provides a match.

Before

SMS reply is not linked to the correct CiviCRM Contact.
Related Activity is created with no subject line.

After

SMS reply is linked to the correct CiviCRM Contact.
Related Activity is created with useful subject line.

Technical Details

This PR has been in our PROD build for 3 years. Would be interested to know why no one else has found this problem.

Comments

Agileware Ref: CIVICRM-1521

@civibot
Copy link

civibot bot commented Aug 3, 2023

Thank you for contributing to CiviCRM! ❤️ We will need to test and review the PR. 👷

Introduction for new contributors
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers

@civibot civibot bot added the master label Aug 3, 2023
@colemanw
Copy link
Member

colemanw commented Aug 3, 2023

@civicrm-builder retest this please

@eileenmcnaughton
Copy link
Contributor

CRM_SMS_ProviderTest::testProcessInbound
Exception: CRM_Core_Exception: "Not enough data to create activity object"
#0 /home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/CRM/SMS/Provider.php(235): CRM_Activity_BAO_Activity::create((Array:8))
#1 /home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CRM/SMS/ProviderTest.php(53): CRM_SMS_Provider->processInbound("+61412345678", "This is a test message", "+61487654321")

@eileenmcnaughton
Copy link
Contributor

This seems to be blocked on the test fail but it's not obvious why it would fail from skimming the code - let's run again - test this please

@eileenmcnaughton
Copy link
Contributor

test this please - maybe something has changed....

@eileenmcnaughton
Copy link
Contributor

CRM_SMS_ProviderTest::testProcessInbound
Exception: CRM_Core_Exception: "Not enough data to create activity object"
#0 /home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/CRM/SMS/Provider.php(235): CRM_Activity_BAO_Activity::create((Array:8))
#1 /home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CRM/SMS/ProviderTest.php(53): CRM_SMS_Provider->processInbound("+61412345678", "This is a test message", "+61487654321")
#2 phar:///home/homer/buildkit/extern/phpunit9/phpunit9.phar/phpunit/Framework/TestCase.php(1315): CRM_SMS_ProviderTest->testProcessInbound()
#3 /home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php(247): PHPUnit\Framework\TestCase->runTest()
#4 phar:///home/homer/buildkit/extern/phpunit9/phpunit9.phar/phpunit/Framework/TestCase.php(981): CiviUnitTestCase->runTest()

demeritcowboy
demeritcowboy reviewed Feb 8, 2024
View reviewed changes
CRM/SMS/Provider.php
@@ -207,7 +207,7 @@ public function processInbound($from, $body, $to = NULL, $trackID = NULL) {
if (!$message->toContactID) {
// find recipient if $toContactID not set by hook
if ($message->to) {
$message->toContactID = CRM_Core_DAO::singleValueQuery("SELECT contact_id FROM civicrm_phone JOIN civicrm_contact ON civicrm_contact.id = civicrm_phone.contact_id WHERE !civicrm_contact.is_deleted AND phone LIKE %1", [
$message->toContactID = CRM_Core_DAO::singleValueQuery("SELECT contact_id FROM civicrm_phone JOIN civicrm_contact ON civicrm_contact.id = civicrm_phone.contact_id WHERE !civicrm_contact.is_deleted AND phone_numeric LIKE %1", [
1 => ['%' . $message->to, 'String'],
Copy link
Contributor

Choose a reason for hiding this comment

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

Off the top of my head, this is now comparing message->to to phone_numeric, but that's unlikely to match.

@eileenmcnaughton eileenmcnaughton mentioned this pull request Mar 15, 2024
Merged
@eileenmcnaughton
Copy link
Contributor

test this please

@eileenmcnaughton
Copy link
Contributor

OK - I think the issue is that this part can pass https://github.com/civicrm/civicrm-core/pull/29740/files because of the $formatFrom line that was already there but the to part doesn't have that

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@demeritcowboy demeritcowboy demeritcowboy left review comments

Assignees
No one assigned
Labels
master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@agileware-justin @colemanw @eileenmcnaughton @demeritcowboy