Load attribute translations (sulu#62)

* Load attribute translations

* Fix newest sulu dev

* Fix newest sulu dev

* Fix PHP-CS

Author: trickreich

Admin/SyliusConsumerAdmin.php

@@ -65,29 +65,29 @@ function (Localization $localization) {
 
         return [
             (new Route('sulu_sylius_product.products_datagrid', '/products/:locale', 'sulu_admin.datagrid'))
-                ->addOption('title', 'sulu_sylius_product.products')
-                ->addOption('adapters', ['table'])
-                ->addOption('resourceKey', ProductInterface::RESOURCE_KEY)
-                ->addOption('editRoute', 'sulu_sylius_product.product_edit_form.detail')
-                ->addOption('locales', $locales)
-                ->addAttributeDefault('locale', $locales[0]),
+                ->setOption('title', 'sulu_sylius_product.products')
+                ->setOption('adapters', ['table'])
+                ->setOption('resourceKey', ProductInterface::RESOURCE_KEY)
+                ->setOption('editRoute', 'sulu_sylius_product.product_edit_form.detail')
+                ->setOption('locales', $locales)
+                ->setAttributeDefault('locale', $locales[0]),
             (new Route('sulu_sylius_product.product_edit_form', '/products/:locale/:id', 'sulu_admin.resource_tabs'))
-                ->addOption('resourceKey', ProductInterface::RESOURCE_KEY)
-                ->addOption('toolbarActions', [])
-                ->addOption('locales', $locales)
-                ->addAttributeDefault('locale', $locales[0]),
+                ->setOption('resourceKey', ProductInterface::RESOURCE_KEY)
+                ->setOption('toolbarActions', [])
+                ->setOption('locales', $locales)
+                ->setAttributeDefault('locale', $locales[0]),
             (new Route('sulu_sylius_product.product_edit_form.detail', '/details', 'sulu_admin.form'))
-                ->addOption('tabTitle', 'sulu_sylius_product.details')
-                ->addOption('backRoute', 'sulu_sylius_product.products_datagrid')
-                ->addOption('formKey', 'product_details')
-                ->addOption('toolbarActions', ['sulu_admin.save'])
+                ->setOption('tabTitle', 'sulu_sylius_product.details')
+                ->setOption('backRoute', 'sulu_sylius_product.products_datagrid')
+                ->setOption('formKey', 'product_details')
+                ->setOption('toolbarActions', ['sulu_admin.save'])
                 ->setParent('sulu_sylius_product.product_edit_form'),
             (new Route('sulu_sylius_product.product_edit_form.content', '/content', 'sulu_admin.form'))
-                ->addOption('tabTitle', 'sulu_sylius_product.content')
-                ->addOption('backRoute', 'sulu_sylius_product.products_datagrid')
-                ->addOption('resourceKey', ProductInterface::CONTENT_RESOURCE_KEY)
-                ->addOption('formKey', ProductInterface::CONTENT_RESOURCE_KEY)
-                ->addOption('toolbarActions', $formToolbarActions)
+                ->setOption('tabTitle', 'sulu_sylius_product.content')
+                ->setOption('backRoute', 'sulu_sylius_product.products_datagrid')
+                ->setOption('resourceKey', ProductInterface::CONTENT_RESOURCE_KEY)
+                ->setOption('formKey', ProductInterface::CONTENT_RESOURCE_KEY)
+                ->setOption('toolbarActions', $formToolbarActions)
                 ->setParent('sulu_sylius_product.product_edit_form'),
         ];
     }

Controller/Product/WebsiteProductController.php

@@ -15,13 +15,15 @@
 
 use JMS\Serializer\SerializerInterface;
 use Sulu\Bundle\HttpCacheBundle\Cache\SuluHttpCache;
+use Sulu\Bundle\SyliusConsumerBundle\Model\Attribute\Query\FindAttributeTranslationsByCodesQuery;
 use Sulu\Bundle\SyliusConsumerBundle\Model\Product\ProductViewInterface;
 use Sulu\Bundle\WebsiteBundle\Resolver\TemplateAttributeResolverInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 class WebsiteProductController implements ContainerAwareInterface
 {
@@ -44,14 +46,32 @@ protected function renderProduct(
 
         return $this->render(
             $viewTemplate,
-            $this->getAttributes($attributes, $object),
+            $this->getAttributes($attributes, $object, $request->getLocale()),
             $this->createResponse($request)
         );
     }
 
-    protected function getAttributes(array $attributes, ProductViewInterface $object): array
+    protected function getAttributes(array $attributes, ProductViewInterface $object, string $locale): array
     {
-        return $this->getAttributeResolver()->resolve(array_merge($this->serialize($object), $attributes));
+        $attributes = $this->getAttributeResolver()->resolve(array_merge($this->serialize($object), $attributes));
+
+        return array_merge($attributes, $this->resolveProductAttributes($object, $locale));
+    }
+
+    protected function resolveProductAttributes(ProductViewInterface $object, string $locale): array
+    {
+        $attributeValueCodes = $object->getProductInformation()->getAttributeValueCodes();
+        if (!$attributeValueCodes) {
+            return [];
+        }
+
+        $attributeTranslations = $this->getMessageBus()->dispatch(
+            new FindAttributeTranslationsByCodesQuery($locale, $attributeValueCodes)
+        );
+
+        return [
+            'productAttributeTranslations' => $attributeTranslations,
+        ];
     }
 
     protected function serialize(ProductViewInterface $object): array
@@ -95,4 +115,12 @@ protected function getSerializer(): SerializerInterface
 
         return $serializer;
     }
+
+    protected function getMessageBus(): MessageBusInterface
+    {
+        /** @var MessageBusInterface $messageBus */
+        $messageBus = $this->get('message_bus');
+
+        return $messageBus;
+    }
 }

Model/Cart/Message/CreateCartMessage.php

@@ -18,7 +18,7 @@
 class CreateCartMessage
 {
     /**
-     * @var null|Customer
+     * @var Customer|null
      */
     private $customer;
 
@@ -28,7 +28,7 @@ class CreateCartMessage
     private $locale;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $channel;
 

Model/Category/Category.php

@@ -18,7 +18,7 @@
 class Category extends BaseCategory implements CategoryInterface
 {
     /**
-     * @var null|int
+     * @var int|null
      */
     private $syliusId;
 

Model/Customer/Customer.php

@@ -38,12 +38,12 @@ class Customer
     private $gender;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $firstName;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $lastName;
 

Model/Product/Handler/Query/ListProductViewsQueryHandler.php

@@ -13,6 +13,7 @@
 
 namespace Sulu\Bundle\SyliusConsumerBundle\Model\Product\Handler\Query;
 
+use Sulu\Bundle\SyliusConsumerBundle\Model\Attribute\Query\FindAttributeTranslationsByCodesQuery;
 use Sulu\Bundle\SyliusConsumerBundle\Model\Dimension\DimensionInterface;
 use Sulu\Bundle\SyliusConsumerBundle\Model\Dimension\DimensionRepositoryInterface;
 use Sulu\Bundle\SyliusConsumerBundle\Model\Product\ProductInformationAttributeValueRepositoryInterface;
@@ -21,12 +22,18 @@
 use Sulu\Bundle\SyliusConsumerBundle\Model\Product\ProductViewListInterface;
 use Sulu\Bundle\SyliusConsumerBundle\Model\Product\Query\ListProductViewsQuery;
 use Sulu\Bundle\SyliusConsumerBundle\Model\Product\View\ProductViewFactoryInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 class ListProductViewsQueryHandler
 {
     const DEFAULT_LIMIT = 10;
     const DEFAULT_QUERY_FIELDS = ['product.code', 'productInformation.name'];
 
+    /**
+     * @var MessageBusInterface
+     */
+    private $messageBus;
+
     /**
      * @var DimensionRepositoryInterface
      */
@@ -48,11 +55,13 @@ class ListProductViewsQueryHandler
     private $productViewFactory;
 
     public function __construct(
+        MessageBusInterface $messageBus,
         DimensionRepositoryInterface $dimensionRepository,
         ProductRepositoryInterface $productRepository,
         ProductInformationAttributeValueRepositoryInterface $productInformationAttributeValueRepository,
         ProductViewFactoryInterface $productViewFactory
     ) {
+        $this->messageBus = $messageBus;
         $this->dimensionRepository = $dimensionRepository;
         $this->productRepository = $productRepository;
         $this->productInformationAttributeValueRepository = $productInformationAttributeValueRepository;
@@ -61,13 +70,15 @@ public function __construct(
 
     public function __invoke(ListProductViewsQuery $query): ProductViewListInterface
     {
+        $locale = $query->getLocale();
+
         $liveDimension = $this->dimensionRepository->findOrCreateByAttributes(
             [DimensionInterface::ATTRIBUTE_KEY_STAGE => DimensionInterface::ATTRIBUTE_VALUE_LIVE]
         );
         $localizedLiveDimension = $this->dimensionRepository->findOrCreateByAttributes(
             [
                 DimensionInterface::ATTRIBUTE_KEY_STAGE => DimensionInterface::ATTRIBUTE_VALUE_LIVE,
-                DimensionInterface::ATTRIBUTE_KEY_LOCALE => $query->getLocale(),
+                DimensionInterface::ATTRIBUTE_KEY_LOCALE => $locale,
             ]
         );
 
@@ -97,15 +108,31 @@ public function __invoke(ListProductViewsQuery $query): ProductViewListInterface
         );
 
         $productViews = [];
+        $attributeCodes = [];
         foreach ($products as $product) {
-            $productViews[] = $this->productViewFactory->create($product, [$liveDimension, $localizedLiveDimension]);
+            $productView = $this->productViewFactory->create($product, [$liveDimension, $localizedLiveDimension]);
+
+            $attributeCodes = array_merge(
+                $attributeCodes,
+                $productView->getProductInformation()->getAttributeValueCodes()
+            );
+
+            $productViews[] = $productView;
+        }
+
+        $productAttributeTranslations = [];
+        if ($query->loadAttributeTranslations() && $attributeCodes) {
+            $productAttributeTranslations = $this->messageBus->dispatch(
+                new FindAttributeTranslationsByCodesQuery($locale, $attributeCodes)
+            );
         }
 
         return new ProductViewList(
             $page,
             $limit,
             $total,
-            $productViews
+            $productViews,
+            $productAttributeTranslations
         );
     }
 

Model/Product/ProductInformationAttributeValue.php

@@ -31,42 +31,42 @@ class ProductInformationAttributeValue implements ProductInformationAttributeVal
     private $type;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $textValue;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $textAreaValue;
 
     /**
-     * @var null|bool
+     * @var bool|null
      */
     private $booleanValue;
 
     /**
-     * @var null|int
+     * @var int|null
      */
     private $integerValue;
 
     /**
-     * @var null|float
+     * @var float|null
      */
     private $floatValue;
 
     /**
-     * @var null|\DateTimeInterface
+     * @var \DateTimeInterface|null
      */
     private $dateTimeValue;
 
     /**
-     * @var null|\DateTimeInterface
+     * @var \DateTimeInterface|null
      */
     private $dateValue;
 
     /**
-     * @var null|array
+     * @var array|null
      */
     private $selectValue;
 

Model/Product/ProductMediaReference.php

@@ -33,7 +33,7 @@ class ProductMediaReference
     private $sorting;
 
     /**
-     * @var null|int
+     * @var int|null
      */
     private $syliusId;
 

Model/Product/ProductView.php

@@ -41,7 +41,7 @@ class ProductView implements ProductViewInterface
     private $productInformation;
 
     /**
-     * @var null|Category
+     * @var Category|null
      */
     private $mainCategory;
 
@@ -56,7 +56,7 @@ class ProductView implements ProductViewInterface
     private $media;
 
     /**
-     * @var null|ContentViewInterface
+     * @var ContentViewInterface|null
      */
     private $content;
 

Model/Product/ProductViewList.php

@@ -40,17 +40,24 @@ class ProductViewList implements ProductViewListInterface
      */
     private $productViews;
 
+    /**
+     * @var array[]
+     */
+    private $productAttributeTranslations;
+
     public function __construct(
         int $page,
         int $limit,
         int $total,
-        array $productViews
+        array $productViews,
+        array $productAttributeTranslations = []
     ) {
         $this->page = $page;
         $this->limit = $limit;
         $this->pages = intval(ceil($total / $limit));
         $this->total = $total;
         $this->productViews = $productViews;
+        $this->productAttributeTranslations = $productAttributeTranslations;
     }
 
     public function getPage(): int
@@ -77,4 +84,9 @@ public function getProductViews(): array
     {
         return $this->productViews;
     }
+
+    public function getProductAttributeTranslations(): array
+    {
+        return $this->productAttributeTranslations;
+    }
 }