First update on refactoring based on SearchBackend

Dockerfile

@@ -1,14 +1,14 @@
-FROM brettt89/silverstripe-web:7.1-platform
+FROM brettt89/silverstripe-web:8.1-apache-bullseye
 
 LABEL maintainer="Marco Hermo"
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Debian Jessie Archive sources
-RUN echo "deb http://deb.debian.org/debian/ jessie main contrib non-free" > /etc/apt/sources.list && \
-    echo "deb-src http://deb.debian.org/debian/ jessie main contrib non-free" >> /etc/apt/sources.list && \
-    echo "deb http://security.debian.org/ jessie/updates main contrib non-free" >> /etc/apt/sources.list && \
-    echo "deb-src http://security.debian.org/ jessie/updates main contrib non-free" >> /etc/apt/sources.list
+RUN echo "deb http://deb.debian.org/debian/ bullseye main contrib non-free" > /etc/apt/sources.list && \
+    echo "deb-src http://deb.debian.org/debian/ bullseye main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb http://security.debian.org/ jessbullseyeie/updates main contrib non-free" >> /etc/apt/sources.list && \
+    echo "deb-src http://security.debian.org/ bullseye/updates main contrib non-free" >> /etc/apt/sources.list
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \

_config/extensions.yml

@@ -1,6 +1,3 @@
 SilverStripe\ORM\DataObject:
   extensions:
     - Firesphere\SolrSearch\Extensions\DataObjectExtension
-SilverStripe\Forms\GridField\GridField:
-  extensions:
-    - Firesphere\SolrSearch\Extensions\GridFieldExtension

composer.json

@@ -34,7 +34,8 @@
     "guzzlehttp/guzzle": "^6.3|^7",
     "http-interop/http-factory-guzzle": "^1",
     "symfony/event-dispatcher": "^5.4",
-    "php-http/guzzle7-adapter": "^1.0.0"
+    "php-http/guzzle7-adapter": "^1.0.0",
+    "firesphere/searchbackend": "dev-main"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.7",

src/Extensions/DataObjectExtension.php

@@ -11,8 +11,7 @@
 namespace Firesphere\SolrSearch\Extensions;
 
 use Exception;
-use Firesphere\SolrSearch\Helpers\SolrLogger;
-use Firesphere\SolrSearch\Models\DirtyClass;
+use Firesphere\SearchBackend\Models\DirtyClass;
 use Firesphere\SolrSearch\Services\SolrCoreService;
 use Firesphere\SolrSearch\Tests\DataObjectExtensionTest;
 use Psr\Log\LoggerInterface;
@@ -191,8 +190,6 @@ protected function registerException(array $ids, DirtyClass $record, Exception $
                 $owner->ID
             )
         );
-        $solrLogger = new SolrLogger();
-        $solrLogger->saveSolrLog('Index');
 
         $logger->error($error->getMessage());
     }

src/Factories/DocumentFactory.php

@@ -10,14 +10,16 @@
 namespace Firesphere\SolrSearch\Factories;
 
 use Exception;
+use Firesphere\SearchBackend\Factories\DocumentCoreFactory;
+use Firesphere\SearchBackend\Helpers\DataResolver;
+use Firesphere\SearchBackend\Helpers\Statics;
+use Firesphere\SearchBackend\Queries\BaseQuery;
+use Firesphere\SearchBackend\Traits\LoggerTrait;
 use Firesphere\SolrSearch\Extensions\DataObjectExtension;
-use Firesphere\SolrSearch\Helpers\DataResolver;
-use Firesphere\SolrSearch\Helpers\FieldResolver;
-use Firesphere\SolrSearch\Helpers\Statics;
 use Firesphere\SolrSearch\Indexes\BaseIndex;
 use Firesphere\SolrSearch\Services\SolrCoreService;
 use Firesphere\SolrSearch\Traits\DocumentFactoryTrait;
-use Firesphere\SolrSearch\Traits\LoggerTrait;
+use Psr\Container\NotFoundExceptionInterface;
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Extensible;
@@ -34,12 +36,10 @@
  *
  * @package Firesphere\Solr\Search
  */
-class DocumentFactory
+class DocumentFactory extends DocumentCoreFactory
 {
     use Configurable;
     use Extensible;
-    use DocumentFactoryTrait;
-    use LoggerTrait;
 
     /**
      * @var array Numeral types in Solr
@@ -49,18 +49,6 @@ class DocumentFactory
         'tfloat',
         'tdouble',
     ];
-    /**
-     * @var bool Debug this build
-     */
-    protected $debug = false;
-
-    /**
-     * DocumentFactory constructor, sets up the field resolver
-     */
-    public function __construct()
-    {
-        $this->fieldResolver = Injector::inst()->get(FieldResolver::class);
-    }
 
     /**
      * Note, it can only take one type of class at a time!
@@ -72,7 +60,7 @@ public function __construct()
      * @return array Documents to be pushed
      * @throws Exception
      */
-    public function buildItems($fields, $index, $update): array
+    public function buildItems($fields, $index, $update = null): array
     {
         $this->getFieldResolver()->setIndex($index);
         $boostFields = $index->getBoostedFields();
@@ -100,30 +88,13 @@ public function buildItems($fields, $index, $update): array
         return $docs;
     }
 
-    /**
-     * Show the message about what is being indexed
-     *
-     * @param BaseIndex $index
-     */
-    protected function indexGroupMessage(BaseIndex $index): void
-    {
-        $debugString = sprintf(
-            'Indexing %s on %s (%s items)%s',
-            $this->getClass(),
-            $index->getIndexName(),
-            $this->getItems()->count(),
-            PHP_EOL
-        );
-        $this->getLogger()->info($debugString);
-    }
-
     /**
      * Add fields that should always be included
      *
      * @param Document $doc Solr Document
      * @param DataObject|DataObjectExtension $item Item to get the data from
      */
-    protected function addDefaultFields(Document $doc, DataObject $item)
+    protected function addDefaultFields($doc, $item)
     {
         $doc->setKey(SolrCoreService::ID_FIELD, $item->ClassName . '-' . $item->ID);
         $doc->addField(SolrCoreService::CLASS_ID_FIELD, $item->ID);
@@ -184,59 +155,6 @@ protected function addField($doc, $object, $options): void
         }
     }
 
-    /**
-     * Determine if the given object is one of the given type
-     *
-     * @param string|DataObject $class Class to compare
-     * @param array|string $base Class or list of base classes
-     * @return bool
-     */
-    protected function classIs($class, $base): bool
-    {
-        $base = is_array($base) ? $base : [$base];
-
-        foreach ($base as $nextBase) {
-            if ($this->classEquals($class, $nextBase)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if a base class is an instance of the expected base group
-     *
-     * @param string|DataObject $class Class to compare
-     * @param string $base Base class
-     * @return bool
-     */
-    protected function classEquals($class, $base): bool
-    {
-        return $class === $base || ($class instanceof $base);
-    }
-
-    /**
-     * Use the DataResolver to find the value(s) for a field.
-     * Returns an array of values, and if it's multiple, it becomes a long array
-     *
-     * @param DataObject $object Object to resolve
-     * @param array $options Customised options
-     * @return array
-     */
-    protected function getValuesForField($object, $options): array
-    {
-        try {
-            $valuesForField = [DataResolver::identify($object, $options['fullfield'])];
-        } catch (Exception $error) {
-            // @codeCoverageIgnoreStart
-            $valuesForField = [];
-            // @codeCoverageIgnoreEnd
-        }
-
-        return $valuesForField;
-    }
-
     /**
      * Push field to a document
      *