Merge pull request #24062 from eileenmcnaughton/api_query

Remove legacy `apiquery` call from `isContactInGroup`
civicrm · Aug 2, 2022 · 539eb78 · 539eb78
2 parents 18c69c6 + 92b99d9
commit 539eb78
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/CRM/Contact/BAO/GroupContact.php b/CRM/Contact/BAO/GroupContact.php
@@ -9,6 +9,7 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Contact;
 use Civi\Api4\SubscriptionHistory;
 use Civi\Core\Event\PostEvent;
 use Civi\Core\HookInterface;
@@ -502,28 +503,19 @@ public static function create(array $params) {
   }
 
   /**
+   * Function that doesn't do much.
+   *
    * @param int $contactID
    * @param int $groupID
    *
+   * @deprecated
    * @return bool
    */
-  public static function isContactInGroup($contactID, $groupID) {
-    if (!CRM_Utils_Rule::positiveInteger($contactID) ||
-      !CRM_Utils_Rule::positiveInteger($groupID)
-    ) {
-      return FALSE;
-    }
-
-    $params = [
-      ['group', 'IN', [$groupID], 0, 0],
-      ['contact_id', '=', $contactID, 0, 0],
-    ];
-    [$contacts] = CRM_Contact_BAO_Query::apiQuery($params, ['contact_id']);
-
-    if (!empty($contacts)) {
-      return TRUE;
-    }
-    return FALSE;
+  public static function isContactInGroup(int $contactID, int $groupID) {
+    return (bool) Contact::get(FALSE)
+      ->addWhere('id', '=', $contactID)
+      ->addWhere('groups', 'IN', [$groupID])
+      ->selectRowCount()->execute()->count();
   }
 
   /**

diff --git a/tests/phpunit/CRM/Contact/BAO/ContactTest.php b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
@@ -648,12 +648,12 @@ public function testDeleteContact() {
   /**
    * Test case for createProfileContact.
    */
-  public function testCreateProfileContact() {
+  public function testCreateProfileContact(): void {
     //Create 3 groups.
     foreach (['group1', 'group2', 'group3'] as $key => $title) {
       $this->groups["id{$key}"] = $this->callAPISuccess('Group', 'create', [
         'title' => $title,
-        'visibility' => "Public Pages",
+        'visibility' => 'Public Pages',
       ])['id'];
     }