remove ES-to-Pimcore methods, resolve #35

valantic · Apr 7, 2023 · f844029 · f844029
1 parent 3dfcd11
commit f844029
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 153 deletions.
diff --git a/docs/example/src/AppBundle/Elasticsearch/Document/CategoryDocument.php b/docs/example/src/AppBundle/Elasticsearch/Document/CategoryDocument.php
@@ -4,7 +4,6 @@
 
 namespace AppBundle\Elasticsearch\Document;
 
-use Elastica\Document;
 use Pimcore\Model\DataObject\Category;
 use Valantic\ElasticaBridgeBundle\DocumentType\AbstractDocument;
 use Valantic\ElasticaBridgeBundle\DocumentType\DocumentInterface;
@@ -25,15 +24,4 @@ public function treatObjectVariantsAsDocuments(): bool
     {
         return false;
     }
-
-    public function getPimcoreElement(Document $document): Category
-    {
-        $el = parent::getPimcoreElement($document);
-
-        if (!($el instanceof Category)) {
-            throw new \InvalidArgumentException();
-        }
-
-        return $el;
-    }
 }
diff --git a/docs/example/src/AppBundle/Elasticsearch/Document/NewsArticleDocument.php b/docs/example/src/AppBundle/Elasticsearch/Document/NewsArticleDocument.php
@@ -4,7 +4,6 @@
 
 namespace AppBundle\Elasticsearch\Document;
 
-use Elastica\Document;
 use Pimcore\Model\DataObject\NewsArticle;
 use Valantic\ElasticaBridgeBundle\DocumentType\AbstractDocument;
 use Valantic\ElasticaBridgeBundle\DocumentType\DocumentInterface;
@@ -25,15 +24,4 @@ public function treatObjectVariantsAsDocuments(): bool
     {
         return false;
     }
-
-    public function getPimcoreElement(Document $document): NewsArticle
-    {
-        $el = parent::getPimcoreElement($document);
-
-        if (!($el instanceof NewsArticle)) {
-            throw new \InvalidArgumentException();
-        }
-
-        return $el;
-    }
 }
diff --git a/docs/example/src/AppBundle/Elasticsearch/Document/PageDocument.php b/docs/example/src/AppBundle/Elasticsearch/Document/PageDocument.php
@@ -4,7 +4,6 @@
 
 namespace AppBundle\Elasticsearch\Document;
 
-use Elastica\Document;
 use Pimcore\Model\Document\Page;
 use Valantic\ElasticaBridgeBundle\DocumentType\AbstractDocument;
 use Valantic\ElasticaBridgeBundle\DocumentType\DocumentInterface;
@@ -25,15 +24,4 @@ public function treatObjectVariantsAsDocuments(): bool
     {
         return false;
     }
-
-    public function getPimcoreElement(Document $document): Page
-    {
-        $el = parent::getPimcoreElement($document);
-
-        if (!($el instanceof Page)) {
-            throw new \InvalidArgumentException();
-        }
-
-        return $el;
-    }
 }
diff --git a/docs/example/src/AppBundle/Elasticsearch/Document/ProductDocument.php b/docs/example/src/AppBundle/Elasticsearch/Document/ProductDocument.php
@@ -4,7 +4,6 @@
 
 namespace AppBundle\Elasticsearch\Document;
 
-use Elastica\Document;
 use Pimcore\Model\DataObject\Product;
 use Valantic\ElasticaBridgeBundle\DocumentType\AbstractDocument;
 use Valantic\ElasticaBridgeBundle\DocumentType\DocumentInterface;
@@ -25,15 +24,4 @@ public function treatObjectVariantsAsDocuments(): bool
     {
         return false;
     }
-
-    public function getPimcoreElement(Document $document): Product
-    {
-        $el = parent::getPimcoreElement($document);
-
-        if (!($el instanceof Product)) {
-            throw new \InvalidArgumentException();
-        }
-
-        return $el;
-    }
 }
diff --git a/src/DocumentType/AbstractDocument.php b/src/DocumentType/AbstractDocument.php
@@ -6,13 +6,11 @@
 
 use Elastica\Document as ElasticaDocument;
 use Pimcore\Model\Asset;
-use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\Document as PimcoreDocument;
 use Pimcore\Model\Document\Listing as DocumentListing;
 use Pimcore\Model\Asset\Listing as AssetListing;
 use Pimcore\Model\Element\AbstractElement;
 use Valantic\ElasticaBridgeBundle\Exception\DocumentType\ElasticsearchDocumentNotFoundException;
-use Valantic\ElasticaBridgeBundle\Exception\DocumentType\PimcoreElementNotFoundException;
 use Valantic\ElasticaBridgeBundle\Exception\DocumentType\UnknownPimcoreElementType;
 
 abstract class AbstractDocument implements DocumentInterface
@@ -109,33 +107,4 @@ public function getListingClass(): string
 
         throw new UnknownPimcoreElementType($this->getType());
     }
-
-    public function getPimcoreElement(ElasticaDocument $document): AbstractElement
-    {
-        if (in_array($this->getType(), [DocumentInterface::TYPE_OBJECT, DocumentInterface::TYPE_VARIANT], true)) {
-            $pimcoreId = $this->getPimcoreId($document);
-            $element = Concrete::getById($pimcoreId);
-
-            if (!$element instanceof Concrete) {
-                throw new PimcoreElementNotFoundException($pimcoreId);
-            }
-
-            return $element;
-        }
-
-        if ($this->getType() === DocumentInterface::TYPE_DOCUMENT) {
-            /** @var PimcoreDocument $documentTypeClass */
-            $documentTypeClass = $this->getSubType();
-            $pimcoreId = $this->getPimcoreId($document);
-            $element = $documentTypeClass::getById($pimcoreId);
-
-            if (!$element instanceof PimcoreDocument) {
-                throw new PimcoreElementNotFoundException($pimcoreId);
-            }
-
-            return $element;
-        }
-
-        throw new UnknownPimcoreElementType($this->getType());
-    }
 }
diff --git a/src/DocumentType/DocumentInterface.php b/src/DocumentType/DocumentInterface.php
@@ -92,14 +92,4 @@ public function getPimcoreId(Document $document): int;
      * @internal
      */
     public function getListingClass(): string;
-
-    /**
-     * Given an Elasticsearch document, return the corresponding Pimcore element.
-     * This method can be overridden to use the correct return type for that instance.
-     *
-     * @param Document $document
-     *
-     * @return AbstractElement
-     */
-    public function getPimcoreElement(Document $document): AbstractElement;
 }
diff --git a/src/Index/AbstractIndex.php b/src/Index/AbstractIndex.php
@@ -6,10 +6,7 @@
 
 use Elastica\Document;
 use Elastica\Index;
-use Elastica\Query;
-use Elastica\ResultSet;
 use Pimcore\Model\Element\AbstractElement;
-use RuntimeException;
 use Valantic\ElasticaBridgeBundle\DocumentType\DocumentInterface;
 use Valantic\ElasticaBridgeBundle\DocumentType\Index\IndexDocumentInterface;
 use Valantic\ElasticaBridgeBundle\Elastica\Client\ElasticsearchClient;
@@ -93,21 +90,6 @@ public function getIndexDocumentInstance(Document $document): ?IndexDocumentInte
         return null;
     }
 
-    public function getDocumentFromElement(AbstractElement $element): ?Document
-    {
-        $documentInstance = $this->findIndexDocumentInstanceByPimcore($element);
-
-        if (!$documentInstance instanceof IndexDocumentInterface) {
-            return null;
-        }
-
-        try {
-            return $this->getElasticaIndex()->getDocument($documentInstance->getElasticsearchId($element));
-        } catch (RuntimeException) {
-            return null;
-        }
-    }
-
     public function findIndexDocumentInstanceByPimcore(AbstractElement $element): ?IndexDocumentInterface
     {
         foreach ($this->getAllowedDocuments() as $allowedDocument) {
@@ -125,43 +107,6 @@ public function findIndexDocumentInstanceByPimcore(AbstractElement $element): ?I
         return null;
     }
 
-    /**
-     * @param int $size Max number of elements to be retrieved aka limit
-     * @param int $from Number of elements to skip from the beginning aka offset
-     *
-     * @return AbstractElement[]
-     */
-    public function searchForElements(Query\AbstractQuery $query, int $size = 10, int $from = 0): array
-    {
-        return $this->documentResultToElements(
-            $this->getElasticaIndex()
-                ->search(
-                    (new Query($query))
-                        ->setSize($size)
-                        ->setFrom($from)
-                )
-        );
-    }
-
-    /**
-     * @return AbstractElement[]
-     */
-    public function documentResultToElements(ResultSet $result): array
-    {
-        $elements = [];
-        foreach ($result->getDocuments() as $esDoc) {
-            $instance = $this->getIndexDocumentInstance($esDoc);
-
-            if (!$instance instanceof IndexDocumentInterface) {
-                continue;
-            }
-
-            $elements[] = $instance->getPimcoreElement($esDoc);
-        }
-
-        return $elements;
-    }
-
     public function subscribedDocuments(): array
     {
         return $this->getAllowedDocuments();

diff --git a/src/Index/IndexInterface.php b/src/Index/IndexInterface.php
@@ -139,15 +139,6 @@ public function getIndexDocumentInstance(Document $document): ?IndexDocumentInte
      */
     public function getElasticaIndex(): Index;
 
-    /**
-     * Given a Pimcore element, returns the corresponding Elasticsearch document (if available).
-     *
-     * @param AbstractElement $element
-     *
-     * @return Document|null
-     */
-    public function getDocumentFromElement(AbstractElement $element): ?Document;
-
     /**
      * Given a Pimcore element, returns the corresponding IndexDocumentInterface.
      *