Merge pull request #235 from Novactive/feat-menu-load-exception

feat: add exception throwing to menu service

Author: erdnaxelaweb

components/MenuManagerBundle/src/lib/Exception/MenuNotFoundException.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Novactive\EzMenuManager\Exception;
+
+use Exception;
+use Throwable;
+
+class MenuNotFoundException extends Exception
+{
+    public function __construct($identifier, Throwable $previous = null)
+    {
+        $message = sprintf("Could not find menu with identifier '%s'", $identifier);
+        parent::__construct($message, 404, $previous);
+    }
+}

components/MenuManagerBundle/src/lib/Service/MenuService.php

@@ -17,6 +17,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Novactive\EzMenuManager\Exception\MenuNotFoundException;
 use Novactive\EzMenuManager\MenuItem\MenuItemTypeRegistry;
 use Novactive\EzMenuManagerBundle\Entity\Menu;
 use Novactive\EzMenuManagerBundle\Entity\MenuItem;
@@ -80,18 +81,32 @@ public function getLocationMenuItemsInMenu(Location $location, Menu $menu)
     /**
      * @param $menuId
      *
+     * @throws \Novactive\EzMenuManager\Exception\MenuNotFoundException
+     *
      * @return Menu|object|null
      */
     public function loadMenu($menuId)
     {
-        return $this->em->getRepository(Menu::class)->find($menuId);
+        $menu = $this->em->getRepository(Menu::class)->find($menuId);
+        if (!$menu) {
+            throw new MenuNotFoundException($menuId);
+        }
+
+        return $menu;
     }
 
     /**
+     * @throws \Novactive\EzMenuManager\Exception\MenuNotFoundException
+     *
      * @return Menu|object|null
      */
     public function loadMenuByRemoteId(string $remoteId)
     {
-        return $this->em->getRepository(Menu::class)->findOneBy(['remoteId' => $remoteId]);
+        $menu = $this->em->getRepository(Menu::class)->findOneBy(['remoteId' => $remoteId]);
+        if (!$menu) {
+            throw new MenuNotFoundException($remoteId);
+        }
+
+        return $menu;
     }
 }