From 048afa859cea0e9d4b0873f113b9cf11de70fb83 Mon Sep 17 00:00:00 2001
From: Michael McAndrew <michaelmcandrew@thirdsectordesign.org>
Date: Tue, 19 Dec 2023 17:03:32 +0100
Subject: [PATCH] Allow joins via EntityRef fields in multivalue custom data

---
 ext/search_kit/Civi/Search/Admin.php | 56 +++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/ext/search_kit/Civi/Search/Admin.php b/ext/search_kit/Civi/Search/Admin.php
index bb4535b6ee..44fd79ba40 100644
--- a/ext/search_kit/Civi/Search/Admin.php
+++ b/ext/search_kit/Civi/Search/Admin.php
@@ -308,6 +308,27 @@ class Admin {
           'alias' => $alias,
           'multi' => TRUE,
         ];
+
+        // Allow joins via EntityRef fields in multi-value custom data
+        foreach ($entity['fields'] as $field) {
+          // Note: we skip entity_id field since it is handled below.
+          if ($field['input_type'] === 'EntityRef' && $field['name'] !== 'entity_id') {
+
+            // Join from the custom data entity to the referenced entity
+            $joins[$entity['name']][] = self::getEntityRefJoins($entity, $field);
+
+            // Join from referenced entity to the custom data entity
+            $joins[$field['fk_entity']][] = [
+              'label' => $entity["title_plural"],
+              'description' => $entity["description"],
+              'entity' => $entity["name"],
+              'conditions' => [],
+              'defaults' => [],
+              'alias' => $entity['name'],
+              'multi' => TRUE,
+            ];
+          }
+        }
       }
       // Non-custom DAO entities
       elseif (!empty($entity['dao'])) {
@@ -425,19 +446,7 @@ class Admin {
         // Custom EntityRef joins
         foreach ($fields as $field) {
           if ($field['type'] === 'Custom' && $field['input_type'] === 'EntityRef') {
-            $targetEntity = $allowedEntities[$field['fk_entity']];
-            // Add the EntityRef join
-            [, $bareFieldName] = explode('.', $field['name']);
-            $alias = $entity['name'] . '_' . $field['fk_entity'] . '_' . $bareFieldName;
-            $joins[$entity['name']][] = [
-              'label' => $entity['title'] . ' ' . $field['title'],
-              'description' => $field['description'],
-              'entity' => $field['fk_entity'],
-              'conditions' => self::getJoinConditions($field['name'], $alias . '.id'),
-              'defaults' => [],
-              'alias' => $alias,
-              'multi' => FALSE,
-            ];
+            $joins[$entity['name']][] = self::getEntityRefJoins($entity, $field);
           }
         }
       }
@@ -445,6 +454,27 @@ class Admin {
     return $joins;
   }
 
+  /**
+   * Get a join for an entity reference
+   *
+   * @return void
+   */
+  public static function getEntityRefJoins($entity, $field) {
+    $exploded = explode('.', $field['name']);
+    $bareFieldName = array_reverse($exploded)[0];
+    $alias = $entity['name'] . '_' . $field['fk_entity'] . '_' . $bareFieldName;
+    $join = [
+      'label' => $entity['title'] . ' ' . $field['title'],
+      'description' => $field['description'],
+      'entity' => $field['fk_entity'],
+      'conditions' => self::getJoinConditions($field['name'], $alias . '.id'),
+      'defaults' => [],
+      'alias' => $alias,
+      'multi' => FALSE,
+    ];
+    return $join;
+  }
+
   /**
    * Find the reference for a given fieldName.
    *
-- 
2.25.1