Get menu row_id for import and export actions

SnowdogApps · Feb 8, 2024 · 87c8b21 · 87c8b21
1 parent f3f6fcd
commit 87c8b21
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/Model/ImportExport/Processor/Export.php b/Model/ImportExport/Processor/Export.php
@@ -4,6 +4,7 @@
 
 namespace Snowdog\Menu\Model\ImportExport\Processor;
 
+use Snowdog\Menu\Helper\MenuHelper;
 use Snowdog\Menu\Model\ImportExport\Processor\Export\Menu;
 use Snowdog\Menu\Model\ImportExport\Processor\Export\Node;
 use Snowdog\Menu\Model\ImportExport\Processor\ExtendedFields;
@@ -20,16 +21,22 @@ class Export
      */
     private $node;
 
-    public function __construct(Menu $menu, Node $node)
+    /**
+     * @var MenuHelper
+     */
+    private $menuHelper;
+
+    public function __construct(Menu $menu, Node $node, MenuHelper $menuHelper)
     {
         $this->menu = $menu;
         $this->node = $node;
+        $this->menuHelper = $menuHelper;
     }
 
     public function getExportData(int $menuId): array
     {
         $data = $this->menu->getData($menuId);
-        $nodes = $this->node->getList($menuId);
+        $nodes = $this->node->getList((int) $data[$this->menuHelper->getLinkField()]);
 
         if ($nodes) {
             $data[ExtendedFields::NODES] = $nodes;

diff --git a/Model/ImportExport/Processor/Import.php b/Model/ImportExport/Processor/Import.php
@@ -6,6 +6,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Snowdog\Menu\Api\Data\MenuInterface;
+use Snowdog\Menu\Helper\MenuHelper;
 use Snowdog\Menu\Model\ImportExport\Processor\Import\InvalidNodes as InvalidNodesProcessor;
 use Snowdog\Menu\Model\ImportExport\Processor\Import\Menu as MenuProcessor;
 use Snowdog\Menu\Model\ImportExport\Processor\Import\Node as NodeProcessor;
@@ -33,23 +34,31 @@ class Import
      * @var InvalidNodesProcessor
      */
     private $invalidNodesProcessor;
+
     /**
      * @var ScopeConfigInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var MenuHelper
+     */
+    private $menuHelper;
+
     public function __construct(
         MenuProcessor $menuProcessor,
         NodeProcessor $nodeProcessor,
         ValidationAggregateError $validationAggregateError,
         InvalidNodesProcessor $invalidNodesProcessor,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        MenuHelper $menuHelper
     ) {
         $this->menuProcessor = $menuProcessor;
         $this->nodeProcessor = $nodeProcessor;
         $this->validationAggregateError = $validationAggregateError;
         $this->invalidNodesProcessor = $invalidNodesProcessor;
         $this->scopeConfig = $scopeConfig;
+        $this->menuHelper = $menuHelper;
     }
 
     /**
@@ -60,10 +69,9 @@ public function importData(array $data): string
         $this->validateData($data);
 
         $menu = $this->createMenu($data);
-        $menuId = $menu->getId();
-
+        $menuId = $menu->getData($this->menuHelper->getLinkField());
         if (isset($data[ExtendedFields::NODES])) {
-            $this->nodeProcessor->createNodes($data[ExtendedFields::NODES], (int) $menu->getId());
+            $this->nodeProcessor->createNodes($data[ExtendedFields::NODES], (int) $menuId);
         }
 
         return $menu->getIdentifier();