Všechno co jsme vyzkoušeli na workshopu v Únoru 20

app/Presenter/BasePresenter.php

@@ -2,21 +2,11 @@
 
 namespace App\Presenter;
 
-use Nette;
-
-
 /**
  * Base presenter for all application presenters.
+ * @method \Nette\Application\UI\ITemplate|\Nette\Bridges\ApplicationLatte\Template getTemplate
  */
-abstract class BasePresenter extends Nette\Application\UI\Presenter
+abstract class BasePresenter extends \Nette\Application\UI\Presenter
 {
 
-	/**
-	 * @return Nette\Application\UI\ITemplate|Nette\Bridges\ApplicationLatte\Template
-	 */
-	public function getTemplate()
-	{
-		return parent::getTemplate();
-	}
-
 }

app/Presenter/ErrorPresenter.php

@@ -25,7 +25,7 @@ public function __construct(ILogger $logger)
 	/**
 	 * @return Nette\Application\IResponse
 	 */
-	public function run(Nette\Application\Request $request)
+	public function run(\Nette\Application\Request $request): \Nette\Application\Response
 	{
 		$e = $request->getParameter('exception');
 

app/ProductModule/Command/ExportToElastic.php

@@ -16,9 +16,9 @@ class ExportToElastic extends \Symfony\Component\Console\Command\Command
 	private $delete;
 
 	/**
-	 * @var \App\ProductModule\Entity\SimpleProductConfig
+	 * @var \App\ProductModule\Entity\WorkshopProductConfig
 	 */
-	private $simpleProductConfig;
+	private $workshopProductConfig;
 
 	/**
 	 * @var \Spameri\Elastic\Model\Indices\Create
@@ -30,14 +30,14 @@ public function __construct(
 		\App\ProductModule\Model\ExportToElastic $exportToElastic
 		, \Spameri\Elastic\Model\Indices\Delete $delete
 		, \Spameri\Elastic\Model\Indices\Create $create
-		, \App\ProductModule\Entity\SimpleProductConfig $simpleProductConfig
+		, \App\ProductModule\Entity\WorkshopProductConfig $workshopProductConfig
 	)
 	{
 		parent::__construct(NULL);
 		$this->exportToElastic = $exportToElastic;
 		$this->delete = $delete;
 		$this->create = $create;
-		$this->simpleProductConfig = $simpleProductConfig;
+		$this->workshopProductConfig = $workshopProductConfig;
 	}
 
 
@@ -56,13 +56,14 @@ public function execute(
 
 		// Clear index
 		try {
-			$this->delete->execute($this->simpleProductConfig->provide()->indexName());
+			$this->delete->execute($this->workshopProductConfig->provide()->indexName());
+
 		} catch (\Spameri\Elastic\Exception\ElasticSearchException $exception) {}
 
 		// Create index
 		$this->create->execute(
-			$this->simpleProductConfig->provide()->indexName(),
-			$this->simpleProductConfig->provide()->toArray()
+			$this->workshopProductConfig->provide()->indexName(),
+			$this->workshopProductConfig->provide()->toArray()
 		);
 
 		// Export

app/ProductModule/Config/ProductModule.neon

@@ -1,6 +1,6 @@
 services:
 	productService:
-		class: App\ProductModule\Model\ProductService(
+		factory: App\ProductModule\Model\ProductService(
 			%spameriElasticSearch.entities.Product.index%,
 			@productFactory,
 			@productCollectionFactory
@@ -15,7 +15,7 @@ services:
 #### SimpleProduct
 
 	simpleProductService:
-		class: App\ProductModule\Model\SimpleProductService(
+		factory: App\ProductModule\Model\SimpleProductService(
 			%spameriElasticSearch.entities.SimpleProduct.index%,
 			@simpleProductFactory,
 			@simpleProductCollectionFactory
@@ -34,10 +34,12 @@ services:
 			- console.command
 
 	simpleProductConfig:
-		class: App\ProductModule\Entity\SimpleProductConfig(%spameriElasticSearch.entities.SimpleProduct.index%)
+		factory: App\ProductModule\Entity\SimpleProductConfig(%spameriElasticSearch.entities.SimpleProduct.index%)
 
 	exportToElastic:
 		class: App\ProductModule\Model\ExportToElastic
+		arguments:
+			logDir: log
 
 	simpleProductDataProvider:
 		class: App\ProductModule\Model\ExportToElastic\DataProvider
@@ -48,3 +50,23 @@ services:
 	simpleProductPrepareImportData:
 		class: App\ProductModule\Model\ExportToElastic\PrepareImportData
 
+### WorkshopProduct
+
+	workshopProductService:
+		factory: App\ProductModule\Model\WorkshopProductService
+		arguments:
+			- %spameriElasticSearch.entities.WorkshopProduct.index%
+			- @workshopProductFactory
+			- @workshopProductCollectionFactory
+
+	workshopProductConfig:
+		factory: App\ProductModule\Entity\WorkshopProductConfig
+		arguments:
+			- %spameriElasticSearch.entities.WorkshopProduct.index%
+
+	workshopProductFactory:
+		factory: App\ProductModule\Factory\WorkshopProductFactory
+
+	workshopProductCollectionFactory:
+		factory: App\ProductModule\Factory\WorkshopProductCollectionFactory
+

app/ProductModule/Config/WorkshopProduct.neon

@@ -0,0 +1,8 @@
+spameriElasticSearch:
+	entities:
+		WorkshopProduct:
+			index: workshop_product
+			dynamic: strict
+			config: @workshopProductConfig
+
+			properties:

app/ProductModule/ElasticQuery/SynonymAnalyzer.php

@@ -0,0 +1,128 @@
+<?php declare(strict_types = 1);
+
+namespace App\ProductModule\ElasticQuery;
+
+class SynonymAnalyzer
+	implements \Spameri\ElasticQuery\Mapping\CustomAnalyzerInterface,
+	\Spameri\ElasticQuery\Collection\Item
+{
+
+	/**
+	 * @var \Spameri\ElasticQuery\Mapping\Settings\Analysis\FilterCollection
+	 */
+	protected $filter;
+
+	/**
+	 * @var \Spameri\ElasticQuery\Mapping\Filter\Stop
+	 */
+	protected $stopFilter;
+
+	/**
+	 * @var array
+	 */
+	private $synonym;
+
+
+	public function __construct(
+		?\Spameri\ElasticQuery\Mapping\Filter\AbstractStop $stopFilter,
+		array $synonym
+	)
+	{
+		$this->stopFilter = $stopFilter;
+		$this->synonym = $synonym;
+	}
+
+
+	public function name(): string
+	{
+		return 'czechSynonym';
+	}
+
+
+	public function filter(): \Spameri\ElasticQuery\Mapping\Settings\Analysis\FilterCollection
+	{
+		if ( ! $this->filter instanceof \Spameri\ElasticQuery\Mapping\Settings\Analysis\FilterCollection) {
+			$this->filter = new \Spameri\ElasticQuery\Mapping\Settings\Analysis\FilterCollection();
+			$this->filter->add(
+				new \Spameri\ElasticQuery\Mapping\Filter\Lowercase()
+			);
+			if ($this->stopFilter) {
+				$this->filter->add($this->stopFilter);
+
+			} else {
+				$this->filter->add(
+					new \Spameri\ElasticQuery\Mapping\Filter\Stop\Czech()
+				);
+			}
+			$this->filter->add(
+				new \Spameri\ElasticQuery\Mapping\Filter\Synonym(
+					$this->synonym
+				)
+			);
+			$this->filter->add(
+				new \Spameri\ElasticQuery\Mapping\Filter\Lowercase()
+			);
+			if ($this->stopFilter) {
+				$this->filter->add($this->stopFilter);
+
+			} else {
+				$this->filter->add(
+					new \Spameri\ElasticQuery\Mapping\Filter\Stop\Czech()
+				);
+			}
+			$this->filter->add(
+				new \Spameri\ElasticQuery\Mapping\Filter\Unique()
+			);
+			$this->filter->add(
+				new \Spameri\ElasticQuery\Mapping\Filter\ASCIIFolding()
+			);
+		}
+
+		return $this->filter;
+	}
+
+	public function key() : string
+	{
+		return $this->name();
+	}
+
+
+	public function getType() : string
+	{
+		return 'custom';
+	}
+
+
+	public function tokenizer() : string
+	{
+		return 'standard';
+	}
+
+
+	public function toArray() : array
+	{
+		$filterArray = [];
+		/** @var \Spameri\ElasticQuery\Mapping\FilterInterface $filter */
+		foreach ($this->filter() as $filter) {
+			if ($filter instanceof \Spameri\ElasticQuery\Mapping\Filter\Synonym) {
+				$filterArray[] = $filter->getName();
+
+			} elseif ($filter instanceof \Spameri\ElasticQuery\Mapping\Filter\Stop) {
+				$filterArray[] = $filter->getName();
+
+			} else {
+				$filterArray[] = $filter->getType();
+			}
+		}
+
+		return [
+			$this->name() => [
+				'type'      => $this->getType(),
+				'tokenizer' => $this->tokenizer(),
+				'filter'    => $filterArray,
+			],
+		];
+	}
+
+
+}

app/ProductModule/Entity/Product.php

@@ -3,11 +3,11 @@
 namespace App\ProductModule\Entity;
 
 
-class Product implements \Spameri\Elastic\Entity\IElasticEntity
+class Product implements \Spameri\Elastic\Entity\ElasticEntityInterface
 {
 
 	/**
-	 * @var \Spameri\Elastic\Entity\Property\IElasticId
+	 * @var \Spameri\Elastic\Entity\Property\ElasticIdInterface
 	 */
 	private $id;
 
@@ -43,7 +43,7 @@ class Product implements \Spameri\Elastic\Entity\IElasticEntity
 
 
 	public function __construct(
-		\Spameri\Elastic\Entity\Property\IElasticId $id
+		\Spameri\Elastic\Entity\Property\ElasticIdInterface $id
 		, \App\ProductModule\Entity\Product\IsPublic $isPublic
 		, \App\ProductModule\Entity\Product\Name $name
 		, \App\ProductModule\Entity\Product\Content $content
@@ -62,7 +62,7 @@ public function __construct(
 	}
 
 
-	public function id(): \Spameri\Elastic\Entity\Property\IElasticId
+	public function id(): \Spameri\Elastic\Entity\Property\ElasticIdInterface
 	{
 		return $this->id;
 	}

app/ProductModule/Entity/Product/Content.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product;
 
 
-class Content implements \Spameri\Elastic\Entity\IValue
+class Content implements \Spameri\Elastic\Entity\ValueInterface
 {
 
 	/**

app/ProductModule/Entity/Product/Details.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product;
 
 
-class Details implements \Spameri\Elastic\Entity\IEntity
+class Details implements \Spameri\Elastic\Entity\EntityInterface
 {
 
 	/**

app/ProductModule/Entity/Product/Details/Accessories.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product\Details;
 
 
-class Accessories extends \Spameri\Elastic\Entity\Collection\ElasticEntityCollection
+class Accessories extends \Spameri\Elastic\Entity\Collection\AbstractElasticEntityCollection
 {
 
 }

app/ProductModule/Entity/Product/Details/Tag.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product\Details;
 
 
-class Tag implements \Spameri\Elastic\Entity\IValue
+class Tag implements \Spameri\Elastic\Entity\ValueInterface
 {
 
 	/**

app/ProductModule/Entity/Product/Details/TagCollection.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product\Details;
 
 
-class TagCollection implements \Spameri\Elastic\Entity\IValueCollection
+class TagCollection implements \Spameri\Elastic\Entity\ValueCollectionInterface
 {
 
 	/**

app/ProductModule/Entity/Product/IsPublic.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product;
 
 
-class IsPublic implements \Spameri\Elastic\Entity\IValue
+class IsPublic implements \Spameri\Elastic\Entity\ValueInterface
 {
 
 	/**

app/ProductModule/Entity/Product/Name.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product;
 
 
-class Name implements \Spameri\Elastic\Entity\IValue
+class Name implements \Spameri\Elastic\Entity\ValueInterface
 {
 
 	/**

app/ProductModule/Entity/Product/ParameterValue.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product;
 
 
-class ParameterValue implements \Spameri\Elastic\Entity\IEntity
+class ParameterValue implements \Spameri\Elastic\Entity\EntityInterface
 {
 
 	/**

app/ProductModule/Entity/Product/ParameterValuesCollection.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product;
 
 
-class ParameterValuesCollection extends \Spameri\Elastic\Entity\Collection\EntityCollection
+class ParameterValuesCollection extends \Spameri\Elastic\Entity\Collection\AbstractEntityCollection
 {
 
 

app/ProductModule/Entity/Product/Price.php

@@ -3,7 +3,7 @@
 namespace App\ProductModule\Entity\Product;
 
 
-class Price implements \Spameri\Elastic\Entity\IValue
+class Price implements \Spameri\Elastic\Entity\ValueInterface
 {
 
 	/**