Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workshop pd ddd #7

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions app/ProductModule/Command/ExportToElastic.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}


Expand All @@ -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
Expand Down
20 changes: 20 additions & 0 deletions app/ProductModule/Config/ProductModule.neon
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,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

8 changes: 8 additions & 0 deletions app/ProductModule/Config/WorkshopProduct.neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
spameriElasticSearch:
entities:
WorkshopProduct:
index: workshop_product
dynamic: strict
config: @workshopProductConfig

properties:
128 changes: 128 additions & 0 deletions app/ProductModule/ElasticQuery/SynonymAnalyzer.php
Original file line number Diff line number Diff line change
@@ -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\Stop $stopFilter = NULL,
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,
],
];
}


}
8 changes: 4 additions & 4 deletions app/ProductModule/Entity/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/Content.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity\Product;


class Content implements \Spameri\Elastic\Entity\IValue
class Content implements \Spameri\Elastic\Entity\ValueInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/Details.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity\Product;


class Details implements \Spameri\Elastic\Entity\IEntity
class Details implements \Spameri\Elastic\Entity\EntityInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/Details/Accessories.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{

}
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/Details/Tag.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity\Product\Details;


class Tag implements \Spameri\Elastic\Entity\IValue
class Tag implements \Spameri\Elastic\Entity\ValueInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/Details/TagCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity\Product\Details;


class TagCollection implements \Spameri\Elastic\Entity\IValueCollection
class TagCollection implements \Spameri\Elastic\Entity\ValueCollectionInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/IsPublic.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity\Product;


class IsPublic implements \Spameri\Elastic\Entity\IValue
class IsPublic implements \Spameri\Elastic\Entity\ValueInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/Name.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity\Product;


class Name implements \Spameri\Elastic\Entity\IValue
class Name implements \Spameri\Elastic\Entity\ValueInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/ParameterValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity\Product;


class ParameterValue implements \Spameri\Elastic\Entity\IEntity
class ParameterValue implements \Spameri\Elastic\Entity\EntityInterface
{

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{


Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/Product/Price.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity\Product;


class Price implements \Spameri\Elastic\Entity\IValue
class Price implements \Spameri\Elastic\Entity\ValueInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion app/ProductModule/Entity/ProductCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\ProductModule\Entity;


class ProductCollection extends \Spameri\Elastic\Entity\Collection\ElasticEntityCollection
class ProductCollection extends \Spameri\Elastic\Entity\Collection\AbstractElasticEntityCollection
{

}
10 changes: 5 additions & 5 deletions app/ProductModule/Entity/SimpleProduct.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace App\ProductModule\Entity;

class SimpleProduct extends \Spameri\Elastic\Entity\AbstractImport implements \Spameri\Elastic\Entity\IElasticEntity
class SimpleProduct extends \Spameri\Elastic\Entity\AbstractImport implements \Spameri\Elastic\Entity\ElasticEntityInterface
{

/**
* @var \Spameri\Elastic\Entity\Property\IElasticId
* @var \Spameri\Elastic\Entity\Property\ElasticIdInterface
*/
private $id;

Expand Down Expand Up @@ -72,7 +72,7 @@ class SimpleProduct extends \Spameri\Elastic\Entity\AbstractImport implements \S


public function __construct(
\Spameri\Elastic\Entity\Property\IElasticId $id,
\Spameri\Elastic\Entity\Property\ElasticIdInterface $id,
int $databaseId,
string $name,
?string $content,
Expand Down Expand Up @@ -103,7 +103,7 @@ public function __construct(
}


public function id(): \Spameri\Elastic\Entity\Property\IElasticId
public function id(): \Spameri\Elastic\Entity\Property\ElasticIdInterface
{
return $this->id;
}
Expand All @@ -115,7 +115,7 @@ public function entityVariables(): array
}


public function getId(): \Spameri\Elastic\Entity\Property\IElasticId
public function getId(): \Spameri\Elastic\Entity\Property\ElasticIdInterface
{
return $this->id;
}
Expand Down
8 changes: 6 additions & 2 deletions app/ProductModule/Entity/SimpleProductConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,14 @@ public function provide(): \Spameri\ElasticQuery\Mapping\Settings
);
$settings->addAnalyzer($edgeNgram);

$worldSplit = new \Spameri\ElasticQuery\Mapping\Analyzer\Custom\WordDelimiter($stopFilter);
$worldSplit = new \Spameri\ElasticQuery\Mapping\Analyzer\Custom\WordDelimiter(
$stopFilter
);
$settings->addAnalyzer($worldSplit);

$worldJoin = new \Spameri\ElasticQuery\Mapping\Analyzer\Custom\CommonGrams($stopWords);
$worldJoin = new \Spameri\ElasticQuery\Mapping\Analyzer\Custom\CommonGrams(
$stopWords
);
$settings->addAnalyzer($worldJoin);

// ===== FIELDS =====
Expand Down
Loading