Add test for contact.merge action

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 5ae6f01a053e9dd29861eca802637a502cd33ce9..305a7c8b917a96b3aee1017f0d35ed85ad9d1263 100644 (file)
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -43,6 +43,12 @@ class CRM_Dedupe_Merger {
   public static function relTables() {
     static $relTables;
 
+    // Setting these merely prevents enotices - but it may be more appropriate not to add the user table below
+    // if the url can't be retrieved. A more standardised way to retrieve them is.
+    // CRM_Core_Config::singleton()->userSystem->getUserRecordUrl() - however that function takes a contact_id &
+    // we may need a different function when it is not known.
+    $title = $userRecordUrl = '';
+
     $config = CRM_Core_Config::singleton();
     if ($config->userSystem->is_drupal) {
       $userRecordUrl = CRM_Utils_System::url('user/%ufid');

diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index f425d781d0f259ad2a8c55e21bc531ccf76044ab..c0b08bdde9875e142aec28404f36c0fe38da3bb1 100644 (file)
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -1010,23 +1010,43 @@ function _civicrm_api3_contact_deprecation() {
  *
  * @return array
  *   API Result Array
+ * @throws CiviCRM_API3_Exception
  */
 function civicrm_api3_contact_merge($params) {
   $mode = CRM_Utils_Array::value('mode', $params, 'safe');
   $autoFlip = CRM_Utils_Array::value('auto_flip', $params, TRUE);
 
-  $dupePairs = array(array(
-  'srcID' => CRM_Utils_Array::value('main_id', $params),
+  $dupePairs = array(
+    array(
+      'srcID' => CRM_Utils_Array::value('main_id', $params),
       'dstID' => CRM_Utils_Array::value('other_id', $params),
-    ));
-  $result = CRM_Dedupe_Merger::merge($dupePairs, array(), $mode, $autoFlip);
+    ),
+  );
 
-  if ($result['is_error'] == 0) {
-    return civicrm_api3_create_success();
-  }
-  else {
-    return civicrm_api3_create_error($result['messages']);
+  if (($result = CRM_Dedupe_Merger::merge($dupePairs, array(), $mode, $autoFlip)) != FALSE) {
+    return civicrm_api3_create_success($result, $params);
   }
+  throw new CiviCRM_API3_Exception('Merge failed');
+}
+
+/**
+ * Adjust metadata for contact_proximity api function.
+ *
+ * @param array $params
+ */
+function _civicrm_api3_contact_merge_spec(&$params) {
+  $params['main_id'] = array(
+    'title' => 'ID of the contact to merge & remove',
+    'description' => ts('Wow - these 2 params are the logical reverse of what I expect - but what to do?'),
+    'api.required' => 1,
+    'type' => CRM_Utils_Type::T_INT,
+  );
+  $params['other_id'] = array(
+    'title' => 'ID of the contact to keep',
+    'description' => ts('Wow - these 2 params are the logical reverse of what I expect - but what to do?'),
+    'api.required' => 1,
+    'type' => CRM_Utils_Type::T_INT,
+  );
 }
 
 /**

diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php
index 94465a73d05e2f5d551b776740f1211ca95e2996..5133c2efaab590930b542164c014493071c156ca 100644 (file)
--- a/tests/phpunit/api/v3/ContactTest.php
+++ b/tests/phpunit/api/v3/ContactTest.php
@@ -2836,4 +2836,16 @@ class api_v3_ContactTest extends CiviUnitTestCase {
     $this->assertContains($household['id'], array_keys($result['values']));
   }
 
+  /**
+   * Test merging 2 contacts.
+   */
+  public function testMerge() {
+    $otherContact = $this->callAPISuccess('contact', 'create', $this->_params);
+    $mainContact = $this->callAPISuccess('contact', 'create', $this->_params);
+    $this->callAPISuccess('contact', 'merge', array('main_id' => $mainContact['id'], 'other_id' => $otherContact['id']));
+    $contacts = $this->callAPISuccess('contact', 'get', $this->_params);
+    $this->assertEquals($otherContact['id'], $contacts['id']);
+
+  }
+
 }