From dc65b1dd0b65621f60c88f315485b712facbe636 Mon Sep 17 00:00:00 2001
From: Arminek <arkadiusz.k.e@gmail.com>
Date: Mon, 5 Jun 2017 15:18:24 +0200
Subject: [PATCH] [ElasticSearch] Tweaks for attribute responses

---
 composer.json                                 |  2 +-
 src/Controller/ProductAttributeView.php       | 21 ++++++++++
 src/Controller/TaxonItemView.php              | 38 -------------------
 src/Factory/ProductListViewFactory.php        | 22 ++++++++++-
 tests/Responses/Expected/mugs_list_page.json  | 24 ++++--------
 .../Responses/Expected/product_list_page.json | 24 ++++--------
 .../product_list_page_by_en_gb_channel.json   | 24 ++++--------
 7 files changed, 67 insertions(+), 88 deletions(-)
 create mode 100644 src/Controller/ProductAttributeView.php
 delete mode 100644 src/Controller/TaxonItemView.php

diff --git a/composer.json b/composer.json
index 446e4a5..1c44e1d 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     "require": {
         "php": "^5.6|^7.0",
 
-        "sylius/sylius": "dev-master",
+        "sylius/sylius": "^1.0@beta",
         "ongr/elasticsearch-dsl": "^5.0",
         "ongr/elasticsearch-bundle": "^5.0",
         "simple-bus/symfony-bridge": "^4.1",
diff --git a/src/Controller/ProductAttributeView.php b/src/Controller/ProductAttributeView.php
new file mode 100644
index 0000000..95a46a6
--- /dev/null
+++ b/src/Controller/ProductAttributeView.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Sylius\ElasticSearchPlugin\Controller;
+
+final class ProductAttributeView
+{
+    /**
+     * @var string
+     */
+    public $code;
+
+    /**
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @var mixed
+     */
+    public $value;
+}
diff --git a/src/Controller/TaxonItemView.php b/src/Controller/TaxonItemView.php
deleted file mode 100644
index 3be4b52..0000000
--- a/src/Controller/TaxonItemView.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Sylius\ElasticSearchPlugin\Controller;
-
-final class TaxonItemView
-{
-    /**
-     * @var string
-     */
-    public $code;
-
-    /**
-     * @var string
-     */
-    public $slug;
-
-    /**
-     * @var string
-     */
-    public $description;
-
-    /**
-     * @var int
-     */
-    public $position;
-
-    /**
-     * @var TaxonItemView[]
-     */
-    public $children;
-
-    /**
-     * @var ImageItemView[]
-     */
-    public $image;
-}
diff --git a/src/Factory/ProductListViewFactory.php b/src/Factory/ProductListViewFactory.php
index c2b33d0..d4fa9e4 100644
--- a/src/Factory/ProductListViewFactory.php
+++ b/src/Factory/ProductListViewFactory.php
@@ -7,9 +7,12 @@
 use Porpaginas\Arrays\ArrayResult;
 use Porpaginas\Result;
 use Sylius\ElasticSearchPlugin\Controller\PriceView;
+use Sylius\ElasticSearchPlugin\Controller\ProductAttributeView;
 use Sylius\ElasticSearchPlugin\Controller\ProductListItemView;
 use Sylius\ElasticSearchPlugin\Controller\ProductListView;
 use Sylius\ElasticSearchPlugin\Controller\ProductVariantItemView;
+use Sylius\ElasticSearchPlugin\Controller\TaxonItemView;
+use Sylius\ElasticSearchPlugin\Document\AttributeValue;
 use Sylius\ElasticSearchPlugin\Exception\UnsupportedFactoryMethodException;
 use Sylius\ElasticSearchPlugin\Search\Criteria\Paginating;
 
@@ -55,7 +58,24 @@ private function fromArrayResult(ArrayResult $result, Paginating $paginating)
             $productListItemView->channelCode = $this->provideAttribute('channel_code', $item, null);
             $productListItemView->mainTaxon = $this->provideAttribute('main_taxon', $item, null);
 
-            $productListItemView->attributes = $this->provideAttribute('attribute_values', $item, []);
+            $productAttributeValues = $this->provideAttribute('attribute_values', $item, []);
+
+            $productListItemView->attributes = array_map(function ($attributeValue) {
+                $productAttributeView = new ProductAttributeView();
+                $productAttributeView->value = $this->provideAttribute('value', $attributeValue, null);
+                $productAttributeView->code = $this->provideAttribute(
+                    'code',
+                    $this->provideAttribute('attribute', $attributeValue, []),
+                    null
+                );
+                $productAttributeView->name = $this->provideAttribute(
+                    'name',
+                    $this->provideAttribute('attribute', $attributeValue, []),
+                    null
+                );
+
+                return $productAttributeView;
+            }, $productAttributeValues);
 
             $priceView = new PriceView();
             $priceView->current = $this->provideAttribute(
diff --git a/tests/Responses/Expected/mugs_list_page.json b/tests/Responses/Expected/mugs_list_page.json
index 39e9fa6..a744123 100644
--- a/tests/Responses/Expected/mugs_list_page.json
+++ b/tests/Responses/Expected/mugs_list_page.json
@@ -31,17 +31,13 @@
             "attributes": [
                 {
                     "value": "FEIERTAGSKOLLEKTION",
-                    "attribute": {
-                        "code": "MUG_COLLECTION_CODE",
-                        "name": "Mug collection"
-                    }
+                    "code": "MUG_COLLECTION_CODE",
+                    "name": "Mug collection"
                 },
                 {
                     "value": "Holz",
-                    "attribute": {
-                        "code": "MUG_MATERIAL_CODE",
-                        "name": "Mug material"
-                    }
+                    "code": "MUG_MATERIAL_CODE",
+                    "name": "Mug material"
                 }
             ],
             "images": [],
@@ -81,17 +77,13 @@
             "attributes": [
                 {
                     "value": "HOLIDAY COLLECTION",
-                    "attribute": {
-                        "code": "MUG_COLLECTION_CODE",
-                        "name": "Mug collection"
-                    }
+                    "code": "MUG_COLLECTION_CODE",
+                    "name": "Mug collection"
                 },
                 {
                     "value": "Wood",
-                    "attribute": {
-                        "code": "MUG_MATERIAL_CODE",
-                        "name": "Mug material"
-                    }
+                    "code": "MUG_MATERIAL_CODE",
+                    "name": "Mug material"
                 }
             ],
             "images": [],
diff --git a/tests/Responses/Expected/product_list_page.json b/tests/Responses/Expected/product_list_page.json
index dbf80fd..d5bf088 100644
--- a/tests/Responses/Expected/product_list_page.json
+++ b/tests/Responses/Expected/product_list_page.json
@@ -31,17 +31,13 @@
             "attributes": [
                 {
                     "value": "FEIERTAGSKOLLEKTION",
-                    "attribute": {
-                        "code": "MUG_COLLECTION_CODE",
-                        "name": "Mug collection"
-                    }
+                    "code": "MUG_COLLECTION_CODE",
+                    "name": "Mug collection"
                 },
                 {
                     "value": "Holz",
-                    "attribute": {
-                        "code": "MUG_MATERIAL_CODE",
-                        "name": "Mug material"
-                    }
+                    "code": "MUG_MATERIAL_CODE",
+                    "name": "Mug material"
                 }
             ],
             "images": [],
@@ -81,17 +77,13 @@
             "attributes": [
                 {
                     "value": "HOLIDAY COLLECTION",
-                    "attribute": {
-                        "code": "MUG_COLLECTION_CODE",
-                        "name": "Mug collection"
-                    }
+                    "code": "MUG_COLLECTION_CODE",
+                    "name": "Mug collection"
                 },
                 {
                     "value": "Wood",
-                    "attribute": {
-                        "code": "MUG_MATERIAL_CODE",
-                        "name": "Mug material"
-                    }
+                    "code": "MUG_MATERIAL_CODE",
+                    "name": "Mug material"
                 }
             ],
             "images": [],
diff --git a/tests/Responses/Expected/product_list_page_by_en_gb_channel.json b/tests/Responses/Expected/product_list_page_by_en_gb_channel.json
index dbf80fd..d5bf088 100644
--- a/tests/Responses/Expected/product_list_page_by_en_gb_channel.json
+++ b/tests/Responses/Expected/product_list_page_by_en_gb_channel.json
@@ -31,17 +31,13 @@
             "attributes": [
                 {
                     "value": "FEIERTAGSKOLLEKTION",
-                    "attribute": {
-                        "code": "MUG_COLLECTION_CODE",
-                        "name": "Mug collection"
-                    }
+                    "code": "MUG_COLLECTION_CODE",
+                    "name": "Mug collection"
                 },
                 {
                     "value": "Holz",
-                    "attribute": {
-                        "code": "MUG_MATERIAL_CODE",
-                        "name": "Mug material"
-                    }
+                    "code": "MUG_MATERIAL_CODE",
+                    "name": "Mug material"
                 }
             ],
             "images": [],
@@ -81,17 +77,13 @@
             "attributes": [
                 {
                     "value": "HOLIDAY COLLECTION",
-                    "attribute": {
-                        "code": "MUG_COLLECTION_CODE",
-                        "name": "Mug collection"
-                    }
+                    "code": "MUG_COLLECTION_CODE",
+                    "name": "Mug collection"
                 },
                 {
                     "value": "Wood",
-                    "attribute": {
-                        "code": "MUG_MATERIAL_CODE",
-                        "name": "Mug material"
-                    }
+                    "code": "MUG_MATERIAL_CODE",
+                    "name": "Mug material"
                 }
             ],
             "images": [],