Add support for non-db object attributes

wilr · May 19, 2021 · dee6673 · dee6673
1 parent 08ea9db
commit dee6673
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/Service/AlgoliaIndexer.php b/src/Service/AlgoliaIndexer.php
@@ -4,6 +4,7 @@
 
 use Algolia\AlgoliaSearch\Exceptions\NotFoundException;
 use Exception;
+use LogicException;
 use Psr\Log\LoggerInterface;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\ClassInfo;
@@ -136,15 +137,28 @@ public function exportAttributesFromObject($item)
         $specs = $item->config()->get('algolia_index_fields');
 
         if ($specs) {
+            $maxFieldSize = $this->config()->get('max_field_size_bytes');
+
             foreach ($specs as $attributeName) {
                 if (in_array($attributeName, $this->config()->get('attributes_blacklisted'))) {
                     continue;
                 }
 
-                $dbField = $item->relObject($attributeName);
-                $maxFieldSize = $this->config()->get('max_field_size_bytes');
+                // fetch the db object, or fallback to the getters but prefer
+                // the db object
+                try {
+                    $dbField = $item->relObject($attributeName);
+                } catch (LogicException $e) {
+                    $dbField = $item->{$attributeName};
+                }
+
+                if (!$dbField) {
+                    continue;
+                }
 
-                if ($dbField && ($dbField->exists() || $dbField instanceof DBBoolean)) {
+                if (is_string($dbField) || is_array($dbField)) {
+                    $attributes->push($attributeName, $dbField);
+                } elseif ($dbField->exists() || $dbField instanceof DBBoolean) {
                     if ($dbField instanceof RelationList || $dbField instanceof DataObject) {
                         // has-many, many-many, has-one
                         $this->exportAttributesFromRelationship($item, $attributeName, $attributes);