Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Page.php #11

Merged
merged 2 commits into from
Dec 11, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions src/Model/Resolver/Page.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
/**
* ScandiPWA_CmsGraphQl
*
* @category Scandiweb
* @package ScandiPWA_CmsGraphQl
* @author Kriss Andrejevs <[email protected]>
* @copyright Copyright (c) 2018 Scandiweb, Ltd (https://scandiweb.com)
* @category Scandiweb
* @package ScandiPWA_CmsGraphQl
* @author Kriss Andrejevs <[email protected]>
* @copyright Copyright (c) 2018 Scandiweb, Ltd (https://scandiweb.com)
*/

namespace ScandiPWA\CmsGraphQl\Model\Resolver;
Expand All @@ -19,28 +19,30 @@
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
use Magento\Cms\Model\PageFactory;
use Magento\Store\Model\StoreManagerInterface;

/**
* Class Page
* @package ScandiPWA\CmsGraphQl\Model\Resolver
*/
class Page extends \Magento\CmsGraphQl\Model\Resolver\Page
{

/**
* @var PageDataProvider
*/
private $pageDataProvider;

/**
* @var ValueFactory
*/
private $valueFactory;

/**
* @var PageFactory
*/
private $pageFactory;
/**
* @var StoreManagerInterface
*/
private $storeManager;

/**
* @param PageDataProvider $pageDataProvider
Expand All @@ -49,14 +51,16 @@ class Page extends \Magento\CmsGraphQl\Model\Resolver\Page
public function __construct(
PageDataProvider $pageDataProvider,
ValueFactory $valueFactory,
PageFactory $pageFactory
PageFactory $pageFactory,
StoreManagerInterface $storeManager
) {
parent::__construct(
$pageDataProvider
);
$this->pageDataProvider = $pageDataProvider;
$this->valueFactory = $valueFactory;
$this->pageFactory = $pageFactory;
$this->storeManager = $storeManager;
}

/**
Expand All @@ -68,14 +72,14 @@ public function resolve(
ResolveInfo $info,
array $value = null,
array $args = null
) : Value {

): Value {
$result = function () use ($args) {
$pageId = $this->getPageId($args);
$pageData = $this->getPageData($pageId);

return $pageData;
};

return $this->valueFactory->create($result);
}

Expand All @@ -86,16 +90,18 @@ public function resolve(
*/
private function getPageId(array $args): int
{
$storeId = $this->storeManager->getStore()->getId();
if (isset($args['id'])) {
return (int)$args['id'];
}

if (isset($args['url_key'])) {
return (int)$this->pageFactory->create()->load($args['url_key'])->getId();
return (int)$this->pageFactory->create()
->setStoreId($storeId)
->load($args['url_key'])
->setStoreId($storeId)
->getId();
}

throw new GraphQlInputException(__('Page id should be specified'));

}

/**
Expand All @@ -110,7 +116,7 @@ private function getPageData(int $pageId): array
} catch (NoSuchEntityException $e) {
throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
}

return $pageData;
}

}