Merge pull request Lakion#26 from mbabker/FOSElasticaBundle-4-Support

Bump to ElasticSearch 2.0
Arminek · May 4, 2017 · cdd4d12 · cdd4d12
2 parents 75dfd06 + ff40eba
commit cdd4d12
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ php:
 addons:
     apt:
         sources:
-            - elasticsearch-1.7
+            - elasticsearch-2.x
         packages:
             - elasticsearch
 

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Elastic search for Sylius.
 2. Install elastic search server:
 
     ```bash
-    $ brew install elasticsearch@1.7
+    $ brew install elasticsearch@2.4
     ```
 
 3. Run elastic search server:

diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
 
         "sylius/sylius": "dev-master",
 
-        "friendsofsymfony/elastica-bundle": "^3.2",
-        "ongr/elasticsearch-dsl": "^1.0"
+        "friendsofsymfony/elastica-bundle": "^4.0",
+        "ongr/elasticsearch-dsl": "^2.0"
     },
     "require-dev": {
         "behat/behat": "^3.2",

diff --git a/src/Form/Type/OptionCodeFilterType.php b/src/Form/Type/OptionCodeFilterType.php
@@ -20,7 +20,6 @@
 use Lakion\SyliusElasticSearchBundle\Search\Elastic\Factory\Search\SearchFactoryInterface;
 use ONGR\ElasticsearchDSL\Aggregation\FiltersAggregation;
 use ONGR\ElasticsearchDSL\Search;
-use Sylius\Component\Core\Model\Product;
 use Sylius\Component\Product\Model\ProductOptionValue;
 use Sylius\Component\Product\Model\ProductOptionValueInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -44,6 +43,11 @@ final class OptionCodeFilterType extends AbstractType implements DataTransformer
      */
     private $productHasOptionCodeQueryFactory;
 
+    /**
+     * @var string
+     */
+    private $productModelClass;
+
     /**
      * @var SearchFactoryInterface
      */
@@ -57,11 +61,13 @@ final class OptionCodeFilterType extends AbstractType implements DataTransformer
     public function __construct(
         RepositoryManagerInterface $repositoryManager,
         QueryFactoryInterface $productHasOptionCodeQueryFactory,
-        SearchFactoryInterface $searchFactory
+        SearchFactoryInterface $searchFactory,
+        $productModelClass
     ) {
         $this->repositoryManager = $repositoryManager;
         $this->productHasOptionCodeQueryFactory = $productHasOptionCodeQueryFactory;
         $this->searchFactory = $searchFactory;
+        $this->productModelClass = $productModelClass;
     }
 
     /**
@@ -85,11 +91,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'choice_label' => function (ProductOptionValue $productOptionValue) use ($options) {
 
                 /** @var Repository $repository */
-                $repository = $this->repositoryManager->getRepository(Product::class);
+                $repository = $this->repositoryManager->getRepository($this->productModelClass);
                 $query = $this->buildAggregation($productOptionValue->getCode())->toArray();
                 $result = $repository->createPaginatorAdapter($query);
                 $aggregation = $result->getAggregations();
-                $count = $aggregation['agg_'.$productOptionValue->getCode()]['buckets'][$productOptionValue->getCode()]['doc_count'];
+                $count = $aggregation[$productOptionValue->getCode()]['buckets'][$productOptionValue->getCode()]['doc_count'];
 
                 return sprintf('%s (%s)', $productOptionValue->getValue(), $count);
             },

diff --git a/src/Resources/config/app/config.yml b/src/Resources/config/app/config.yml
@@ -35,19 +35,14 @@ fos_elastica:
                             type: "nested"
                             properties:
                                 code: { type: string }
-                                availableOn: { type: date }
-                                availableUntil: { type: date }
                                 name: { type: string }
                                 onHand: { type: integer }
                                 onHold: { type: integer }
                                 channelPricings:
                                     type: "nested"
                                     properties:
                                         price: { type: integer }
-                                        channel:
-                                            type: "object"
-                                            properties:
-                                                code: { type: string }
+                                        channelCode: { type: string }
                                 optionValues:
                                     type: "nested"
                                     properties:

diff --git a/src/Resources/config/routing.yml b/src/Resources/config/routing.yml
@@ -5,7 +5,7 @@ lakion_elastic_search_shop_product_index:
         _controller: lakion_sylius_elastic_search.controller.search:filterAction
         _sylius:
             template: "@LakionSyliusElasticSearch/Product/index.html.twig"
-            resource_class: Sylius\Component\Core\Model\Product
+            resource_class: "%sylius.model.product.class%"
             filter_set: mug_type_and_stickers_set
     requirements:
         slug: .+
@@ -17,7 +17,7 @@ lakion_elastic_search_shop_global_search:
         _controller: lakion_sylius_elastic_search.controller.search:renderFilterSetAction
         _sylius:
             template: "@LakionSyliusElasticSearch/Product/_globalSearch.html.twig"
-            resource_class: Sylius\Component\Core\Model\Product
+            resource_class: "%sylius.model.product.class%"
     requirements:
         slug: .+
 
@@ -28,7 +28,7 @@ sylius_shop_product_index:
         _controller: lakion_sylius_elastic_search.controller.search:filterByTaxonAction
         _sylius:
             template: "@LakionSyliusElasticSearch/Product/indexByTaxon.html.twig"
-            resource_class: Sylius\Component\Core\Model\Product
+            resource_class: "%sylius.model.product.class%"
             filter_set: mug_type_and_stickers_set
     requirements:
         slug: .+
diff --git a/src/Resources/config/services/form.xml b/src/Resources/config/services/form.xml
@@ -20,6 +20,7 @@
             <argument type="service" id="fos_elastica.manager.orm" />
             <argument type="service" id="lakion_sylius_elastic_search.query_factory.product_has_option_code" />
             <argument type="service" id="lakion_sylius_elastic_search.factory.search" />
+            <argument>%sylius.model.product.class%</argument>
             <tag name="form.type" />
             <tag name="filter.type" type="option" />
         </service>

diff --git a/tests/Application/app/AppKernel.php b/tests/Application/app/AppKernel.php
@@ -16,8 +16,8 @@ public function registerBundles()
             new \Sylius\Bundle\AdminBundle\SyliusAdminBundle(),
             new \Sylius\Bundle\ShopBundle\SyliusShopBundle(),
 
-            new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusApiBundle
-            new \Sylius\Bundle\ApiBundle\SyliusApiBundle(),
+            new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusAdminApiBundle
+            new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(),
             new \FOS\ElasticaBundle\FOSElasticaBundle(),
         ]);
     }

diff --git a/tests/Application/app/config/config.yml b/tests/Application/app/config/config.yml
@@ -6,7 +6,7 @@ imports:
     - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusApiBundle/Resources/config/app/config.yml" }
+    - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
     - { resource: "@LakionSyliusElasticSearchBundle/Resources/config/app/config.yml" }
 
     - { resource: "security.yml" }
@@ -33,6 +33,18 @@ doctrine:
         path: "%kernel.cache_dir%/db.sql"
         charset: UTF8
 
+fos_rest:
+    exception: ~
+    view:
+        formats:
+            json: true
+            xml:  true
+        empty_content: 204
+    format_listener:
+        rules:
+            - { path: '^/api', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
+            - { path: '^/', stop: true }
+
 sylius_resource:
     drivers:
         - doctrine/orm

diff --git a/tests/Application/app/config/routing.yml b/tests/Application/app/config/routing.yml
@@ -13,7 +13,7 @@ sylius_admin:
     prefix: /admin
 
 sylius_api:
-    resource: "@SyliusApiBundle/Resources/config/routing/main.yml"
+    resource: "@SyliusAdminApiBundle/Resources/config/routing/main.yml"
     prefix: /api
 
 sylius_search: