Merge pull request #23610 from eileenmcnaughton/import_dupe

[Import] [Ref] Trivial - fold function contents back into parent
civicrm · May 30, 2022 · 049f56c · 049f56c
2 parents 5c732bc + e77978b
commit 049f56c
Showing 1 changed file with 17 additions and 43 deletions.
diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
@@ -1154,18 +1154,25 @@ public function createContact(&$formatted, &$contactFields, $onDuplicate, $conta
     //get the prefix id etc if exists
     CRM_Contact_BAO_Contact::resolveDefaults($formatted, TRUE);
 
-    //@todo direct call to API function not supported.
-    // setting required check to false, CRM-2839
-    // plus we do our own required check in import
-    try {
-      $error = $this->deprecated_contact_check_params($formatted, $dupeCheck, $dedupeRuleGroupID);
-      if ($error) {
-        return $error;
+    if ($dupeCheck) {
+      // @todo this is already done in lookupContactID
+      // the differences are that a couple of functions are callled in between
+      // and that call doesn't error out if multiple are found. - once
+      // those 2 things are fixed this can go entirely.
+      $ids = CRM_Contact_BAO_Contact::getDuplicateContacts($formatted, $formatted['contact_type'], 'Unsupervised', [], FALSE, $dedupeRuleGroupID);
+
+      if ($ids != NULL) {
+        return [
+          'is_error' => 1,
+          'error_message' => [
+            'code' => CRM_Core_Error::DUPLICATE_CONTACT,
+            'params' => $ids,
+            'level' => 'Fatal',
+            'message' => 'Found matching contacts: ' . implode(',', $ids),
+          ],
+        ];
       }
     }
-    catch (CRM_Core_Exception $e) {
-      return ['error_message' => $e->getMessage(), 'is_error' => 1, 'code' => $e->getCode()];
-    }
 
     if ($contactId) {
       $this->formatParams($formatted, $onDuplicate, (int) $contactId);
@@ -1806,39 +1813,6 @@ private function handleDuplicateError(array $newContact, array $values, int $onD
     return $this->processMessage($values, CRM_Import_Parser::VALID);
   }
 
-  /**
-   * @param array $params
-   * @param bool $dupeCheck
-   * @param null|int $dedupeRuleGroupID
-   *
-   * @return ?array
-   * @throws \CRM_Core_Exception
-   */
-  public function deprecated_contact_check_params(
-    $params,
-    $dupeCheck = TRUE,
-    $dedupeRuleGroupID = NULL) {
-
-    if ($dupeCheck) {
-      // @todo switch to using api version
-      // $dupes = civicrm_api3('Contact', 'duplicatecheck', (array('match' => $params, 'dedupe_rule_id' => $dedupeRuleGroupID)));
-      // $ids = $dupes['count'] ? implode(',', array_keys($dupes['values'])) : NULL;
-      $ids = CRM_Contact_BAO_Contact::getDuplicateContacts($params, $params['contact_type'], 'Unsupervised', [], CRM_Utils_Array::value('check_permissions', $params), $dedupeRuleGroupID);
-
-      if ($ids != NULL) {
-        return [
-          'is_error' => 1,
-          'error_message' => [
-            'code' => CRM_Core_Error::DUPLICATE_CONTACT,
-            'params' => $ids,
-            'level' => 'Fatal',
-            'message' => 'Found matching contacts: ' . implode(',', $ids),
-          ],
-        ];
-      }
-    }
-  }
-
   /**
    * Run import.
    *