Merge pull request #2 from experius/feature/graphql-support-new-features

[FEATURE][JIRA-123]switch to using base function from experius/module…

Author: DRdevil27

Plugin/Graphql/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php

@@ -7,28 +7,14 @@
 
 namespace Experius\PageNotFoundGraphQl\Plugin\Graphql\Magento\UrlRewriteGraphQl\Model\Resolver;
 
-use Magento\Store\Api\Data\StoreInterface;
+use Experius\PageNotFound\Observer\Controller\ActionPredispatch;
+use Magento\UrlRewriteGraphQl\Model\Resolver\EntityUrl;
+use Magento\UrlRewriteGraphQl\Model\Resolver\Route as MagentoRoute;
 
-class Route
+class Route extends ActionPredispatch
 {
     /**
-     * @var \Experius\PageNotFound\Model\PageNotFoundFactory
-     */
-    private $pageNotFoundFactory;
-
-    /**
-     * EntityUrl constructor.
-     *
-     * @param \Experius\PageNotFound\Model\PageNotFoundFactory $pageNotFoundFactory
-     */
-    public function __construct(
-        \Experius\PageNotFound\Model\PageNotFoundFactory $pageNotFoundFactory
-    ) {
-        $this->pageNotFoundFactory = $pageNotFoundFactory;
-    }
-
-    /**
-     * @param \Magento\UrlRewriteGraphQl\Model\Resolver\EntityUrl $subject
+     * @param EntityUrl $subject
      * @param $result
      * @param $field
      * @param $context
@@ -39,17 +25,18 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundResolve(
-        \Magento\UrlRewriteGraphQl\Model\Resolver\Route $subject,
-        $proceed,
-        $field,
-        $context,
-        $info,
+        MagentoRoute $subject,
+              $proceed,
+              $field,
+              $context,
+              $info,
         array $value = null,
         array $args = null
-    ) {
+    )
+    {
         $result = $proceed($field, $context, $info, $value, $args);
         if (is_null($result) && $args['url'] != '/') {
-            $args['url'] = $this->savePageNotFound($args['url'], $context->getExtensionAttributes()->getStore()) ?: $args['url'];
+            $args['url'] = $this->savePageNotFound($args['url'], true, $context->getExtensionAttributes()->getStore()) ?: $args['url'];
             $result = $proceed($field, $context, $info, $value, $args);
             if (!is_null($result)) {
                 $result['redirect_code'] = 301;
@@ -58,41 +45,4 @@ public function aroundResolve(
         return $result;
     }
 
-    /**
-     * @param $fromUrl
-     * @param StoreInterface $store
-     * @return string|null
-     * @throws \Exception
-     */
-    protected function savePageNotFound(
-        $fromUrl,
-        StoreInterface $store
-    ) {
-        /* @var $pageNotFoundModel \Experius\PageNotFound\Model\PageNotFound */
-        $pageNotFoundModel = $this->pageNotFoundFactory->create();
-        $baseUrl = $store->getBaseUrl();
-        if (strpos($fromUrl, $baseUrl) === false) {
-            $fromUrl = $baseUrl . ltrim($fromUrl, '/');
-        }
-        $pageNotFoundModel->load($fromUrl,'from_url');
-
-        if($pageNotFoundModel->getId()){
-            $count = $pageNotFoundModel->getCount();
-            $pageNotFoundModel->setCount($count+1);
-        } else {
-            $pageNotFoundModel->setFromUrl($fromUrl);
-            $pageNotFoundModel->setCount(1);
-        }
-
-        if($pageNotFoundModel->getToUrl()) {
-            $pageNotFoundModel->setCountRedirect($pageNotFoundModel->getCountRedirect()+1);
-        }
-
-        $pageNotFoundModel->save();
-        if($pageNotFoundModel->getToUrl()) {
-            return str_replace($baseUrl, '', $pageNotFoundModel->getToUrl());
-        }
-        return null;
-    }
 }
-

composer.json

@@ -11,6 +11,10 @@
         {
             "name": "Lewis Voncken",
             "email": "[email protected]"
+        },
+        {
+            "name": "Simon Vianen",
+            "email": "[email protected]"
         }
     ],
     "minimum-stability": "dev",
@@ -25,4 +29,4 @@
             "registration.php"
         ]
     }
-}
+}

etc/module.xml

@@ -3,6 +3,7 @@
 	<module name="Experius_PageNotFoundGraphQl">
 		<sequence>
 			<module name="Magento_UrlRewriteGraphQl"/>
+			<module name="Experius_PageNotFound"/>
 		</sequence>
 	</module>
 </config>