[ElasticSearch] Define api end point

.travis.yml

@@ -2,7 +2,6 @@ language: php
 
 php:
     - 7.1
-    - 5.6
 
 jdk:
   - oraclejdk8
@@ -13,7 +12,7 @@ addons:
             - elasticsearch-5.x
         packages:
             - elasticsearch
-            - oracle-java8-installer
+            - oracle-java8-set-default
 
 services:
     - elasticsearch

README.md

@@ -1,4 +1,4 @@
-Sylius ElasticSearchBundle
+Sylius ElasticSearchPlugin
 ==========================
 Elastic search for Sylius.
 [![Build status on Linux](https://img.shields.io/travis/Lakion/SyliusElasticSearchBundle/master.svg)](http://travis-ci.org/Lakion/SyliusELasticSearchBundle)
@@ -8,12 +8,12 @@ Elastic search for Sylius.
 1. Install it:
 
     ```bash
-    $ composer require lakion/sylius-elastic-search-bundle
+    $ composer require sylius/elastic-search-plugin
     ```
 2. Install elastic search server:
 
     ```bash
-    $ brew install elasticsearch@2.4
+    $ brew install elasticsearch@5.0
     ```
 
 3. Run elastic search server:
@@ -25,8 +25,8 @@ Elastic search for Sylius.
 4. Add this bundle to `AppKernel.php`:
 
     ```php
-    new \FOS\ElasticaBundle\FOSElasticaBundle(),
-    new \Lakion\SyliusElasticSearchBundle\LakionSyliusElasticSearchBundle(),
+    new \ONGR\ElasticsearchBundle\ONGRElasticsearchBundle(),
+    new \Lakion\SyliusElasticSearchBundle\SyliusElasticSearchPlugin(),
     ```
 
 5. Create/Setup database:
@@ -37,37 +37,16 @@ Elastic search for Sylius.
     $ app/console syl:fix:lo
     ```
 
-6. Populate your elastic search server with command or your custom code:
-
-    ```bash
-    $ app/console fos:elastic:pop
-    ```
-
 7. Import config file in `app/config/config.yml` for default filter set configuration:
 
     ```yaml
     imports:
-       - { resource: "@LakionSyliusElasticSearchBundle/Resources/config/app/config.yml" }
+       - { resource: "@SyliusElasticSearchPlugin/Resources/config/app/config.yml" }
     ```
 
 8. Import routing files in `app/config/routing.yml`:
 
     ```yaml
     sylius_search:
-        resource: "@LakionSyliusElasticSearchBundle/Resources/config/routing.yml"
-    ```
-
-8. Configuration reference:
-
-    ```yaml
-    sylius_elastic_search:
-        filter_sets:
-            mugs:
-                filters:
-                    product_options:
-                        type: option
-                        options:
-                            code: mug_type
-                    product_price:
-                        type: price
+        resource: "@SyliusElasticSearchPlugin/Resources/config/routing.yml"
     ```

composer.json

@@ -16,7 +16,8 @@
         "sylius/sylius": "dev-master",
         "ongr/elasticsearch-dsl": "^5.0",
         "ongr/elasticsearch-bundle": "^5.0",
-        "simple-bus/symfony-bridge": "^4.1"
+        "simple-bus/symfony-bridge": "^4.1",
+        "beberlei/porpaginas": "^1.0"
     },
     "require-dev": {
         "behat/behat": "^3.2",

features/shop/product/searching/filtering_list_of_products_by_taxon.feature

@@ -5,24 +5,24 @@ Feature: Filtering list of products by taxon
     I want to be able to filter the products
 
     Background:
-        Given the store has 40 Mugs, 15 Stickers and 50 Books
+        Given the store has 3 Mugs, 2 Stickers and 5 Books
 
     @domain
     Scenario: Filtering products by book
         When I filter them by "books" taxon
-        Then I should see 50 products on the list
+        Then I should see 5 products on the list
 
     @domain
     Scenario: Filtering product by stickers
         When I filter them by "stickers" taxon
-        Then I should see 15 products on the list
+        Then I should see 2 products on the list
 
     @domain
     Scenario: Filtering product by mugs
         When I filter them by "mugs" taxon
-        Then I should see 40 products on the list
+        Then I should see 3 products on the list
 
     @domain
     Scenario: List of all products without filtering
         When I view the list of the products without filtering
-        Then I should see 105 products on the list
+        Then I should see 10 products on the list

spec/EventListener/ProductPublisherSpec.php

@@ -24,6 +24,7 @@ function it_is_initializable()
 
     function it_publishes_product_event(MessageBus $eventBus, LifecycleEventArgs $event, ProductInterface $product)
     {
+        $product->isSimple()->willReturn(true);
         $event->getEntity()->willReturn($product);
 
         $eventBus->handle(ProductCreated::occur($product->getWrappedObject()))->shouldBeCalled();
@@ -39,4 +40,17 @@ function it_does_not_publish_product_event_if_entity_is_not_a_product(MessageBus
 
         $this->postPersist($event);
     }
+
+    function it_does_not_publish_product_event_if_entity_is_not_a_simple_product(
+        MessageBus $eventBus,
+        LifecycleEventArgs $event,
+        ProductInterface $product
+    ) {
+        $product->isSimple()->willReturn(false);
+        $event->getEntity()->willReturn($product);
+
+        $eventBus->handle(Argument::any())->shouldNotBeCalled();
+
+        $this->postPersist($event);
+    }
 }

spec/Search/Criteria/CriteriaSpec.php

@@ -27,20 +27,20 @@ function it_is_created_from_query_parameters_and_resource_alias()
             'option' => 'red',
         ]]);
 
-        $this->getResourceAlias()->shouldReturn('sylius.product');
-        $this->getFiltering()->shouldBeLike(Filtering::fromQueryParameters([
+        $this->documentClass()->shouldReturn('sylius.product');
+        $this->filtering()->shouldBeLike(Filtering::fromQueryParameters([
             'page' => 2,
             'per_page' => 50,
             'sort' => '-price',
             'option' => 'red',
         ]));
-        $this->getPaginating()->shouldBeLike(Paginating::fromQueryParameters([
+        $this->paginating()->shouldBeLike(Paginating::fromQueryParameters([
             'page' => 2,
             'per_page' => 50,
             'sort' => '-price',
             'option' => 'red',
         ]));
-        $this->getOrdering()->shouldBeLike(Ordering::fromQueryParameters([
+        $this->ordering()->shouldBeLike(Ordering::fromQueryParameters([
             'page' => 2,
             'per_page' => 50,
             'sort' => '-price',

spec/Search/Criteria/FilteringSpec.php

@@ -22,7 +22,7 @@ function it_can_be_created_from_query_parameters()
             'size' => 's',
         ]]);
 
-        $this->getFields()->shouldReturn(['option' => 'red', 'size' => 's',]);
+        $this->fields()->shouldReturn(['option' => 'red', 'size' => 's',]);
     }
 
     function it_removes_page_per_page_and_sort_attributes_from_query_parameters()
@@ -35,6 +35,6 @@ function it_removes_page_per_page_and_sort_attributes_from_query_parameters()
             'limit' => 50,
         ]]);
 
-        $this->getFields()->shouldReturn(['option' => 'blue', 'size' => 'm',]);
+        $this->fields()->shouldReturn(['option' => 'blue', 'size' => 'm',]);
     }
 }

spec/Search/Criteria/OrderingSpec.php

@@ -21,8 +21,8 @@ function it_can_be_created_from_query_parameters_with_default_direction()
             'sort' => 'code',
         ]]);
 
-        $this->getField()->shouldReturn('code.raw');
-        $this->getDirection()->shouldReturn('asc');
+        $this->field()->shouldReturn('code.raw');
+        $this->direction()->shouldReturn('asc');
     }
 
     function it_can_be_created_from_query_parameters()
@@ -31,7 +31,7 @@ function it_can_be_created_from_query_parameters()
             'sort' => '-code',
         ]]);
 
-        $this->getField()->shouldReturn('code.raw');
-        $this->getDirection()->shouldReturn('desc');
+        $this->field()->shouldReturn('code.raw');
+        $this->direction()->shouldReturn('desc');
     }
 }

spec/Search/Criteria/PaginatingSpec.php

@@ -19,9 +19,9 @@ function it_can_be_created_form_query_parameters_with_default_values_if_paramete
     {
         $this->beConstructedThrough('fromQueryParameters', [[]]);
 
-        $this->getCurrentPage()->shouldReturn(1);
-        $this->getItemsPerPage()->shouldReturn(10);
-        $this->getOffset()->shouldReturn(0);
+        $this->currentPage()->shouldReturn(1);
+        $this->itemsPerPage()->shouldReturn(10);
+        $this->offset()->shouldReturn(0);
     }
 
     function it_can_be_created_from_query_parameters_with_default_values_if_parameters_are_not_valid()
@@ -31,9 +31,9 @@ function it_can_be_created_from_query_parameters_with_default_values_if_paramete
             'limit' => -100,
         ]]);
 
-        $this->getCurrentPage()->shouldReturn(1);
-        $this->getItemsPerPage()->shouldReturn(10);
-        $this->getOffset()->shouldReturn(0);
+        $this->currentPage()->shouldReturn(1);
+        $this->itemsPerPage()->shouldReturn(10);
+        $this->offset()->shouldReturn(0);
     }
 
     function it_can_be_created_from_query_parameters()
@@ -43,8 +43,8 @@ function it_can_be_created_from_query_parameters()
             'limit' => 50,
         ]]);
 
-        $this->getCurrentPage()->shouldReturn(2);
-        $this->getItemsPerPage()->shouldReturn(50);
-        $this->getOffset()->shouldReturn(50);
+        $this->currentPage()->shouldReturn(2);
+        $this->itemsPerPage()->shouldReturn(50);
+        $this->offset()->shouldReturn(50);
     }
 }