From 281ee7f6b06b0a92058b08564808943d90308da9 Mon Sep 17 00:00:00 2001
From: Alfreds Genkins <alfreds@scandiweb.com>
Date: Mon, 9 Dec 2019 17:12:34 +0200
Subject: [PATCH] Fixed menu to respect store id.

---
 src/Model/Resolver/Menu.php | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Model/Resolver/Menu.php b/src/Model/Resolver/Menu.php
index 3442505..952f64e 100644
--- a/src/Model/Resolver/Menu.php
+++ b/src/Model/Resolver/Menu.php
@@ -12,9 +12,12 @@
 namespace ScandiPWA\MenuOrganizer\Model\Resolver;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Store\Model\StoreManagerInterface;
 use ScandiPWA\MenuOrganizer\Model\MenuFactory;
 use ScandiPWA\MenuOrganizer\Model\ResourceModel\Item\CollectionFactory as ItemCollectionFactory;
 use ScandiPWA\MenuOrganizer\Model\ResourceModel\Menu as MenuResourceModel;
@@ -48,19 +51,27 @@ class Menu implements ResolverInterface
      */
     protected $categoryRepository;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    protected $storeManager;
+
     /**
      * Menu constructor.
+     * @param StoreManagerInterface $storeManager
      * @param MenuFactory $menuFactory
+     * @param MenuResourceModel $menuResourceModel
      * @param ItemCollectionFactory $itemCollectionFactory
      * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
+        StoreManagerInterface $storeManager,
         MenuFactory $menuFactory,
         MenuResourceModel $menuResourceModel,
         ItemCollectionFactory $itemCollectionFactory,
         CategoryRepositoryInterface $categoryRepository
-    )
-    {
+    ) {
+        $this->storeManager = $storeManager;
         $this->menuFactory = $menuFactory;
         $this->menuResourceModel = $menuResourceModel;
         $this->itemCollectionFactory = $itemCollectionFactory;
@@ -71,11 +82,13 @@ public function __construct(
      * Menu organizer resolver (lines concerning menu id are changed from core scandipwa menumanager)
      *
      * @param Field $field
-     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context
+     * @param ContextInterface $context
      * @param ResolveInfo $info
      * @param array|null $value
      * @param array|null $args
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @return array
+     *
+     * @throws NoSuchEntityException
      */
     public function resolve(
         Field $field,
@@ -83,11 +96,13 @@ public function resolve(
         ResolveInfo $info,
         array $value = null,
         array $args = null
-    )
-    {
+    ) {
         $identifier = $args['identifier'];
 
-        $menu = $this->menuFactory->create();
+        $menu = $this->menuFactory->create()->setStoreId(
+            $this->storeManager->getStore()->getId()
+        );
+
         $this->menuResourceModel->load($menu, $identifier);
 
         if ($menu->getId() === null) {
@@ -98,7 +113,8 @@ public function resolve(
             $menu->getData(),
             [
                 'items' => $this->getMenuItems($menu['menu_id'])
-            ]);
+            ]
+        );
     }
 
     /**