Skip to content

[FEATURE][IN23-536]Remove old depricated model->load & save #48

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[FEATURE][IN23-536]Remove old depricated model->load & save #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54fdcfd
[FEATURE][IN23-536]Remove old depricated model->load & save
DRdevil27 Sep 19, 2025
2fb3869
[FEATURE][IN23-536]Add Explode to getExcludeList from config function
DRdevil27 Sep 19, 2025
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
4 changes: 3 additions & 1 deletion Helper/Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public function includedParamsInFromUrl()

public function getExcludeList()
{
return $this->scopeConfig->getValue(self::EXCLUDE_LIST,\Magento\Store\Model\ScopeInterface::SCOPE_STORE);
$excludeList = $this->scopeConfig->getValue(self::EXCLUDE_LIST,\Magento\Store\Model\ScopeInterface::SCOPE_STORE);
$excludeList = explode(',', $excludeList);
return $excludeList;
}
}
34 changes: 21 additions & 13 deletions Observer/Controller/ActionPredispatch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
namespace Experius\PageNotFound\Observer\Controller;

use Experius\PageNotFound\Model\PageNotFound;
use Experius\PageNotFound\Api\PageNotFoundRepositoryInterface;
use Magento\Framework\App\ActionInterface;
use Magento\Store\Api\Data\StoreInterface;
use Magento\Framework\Exception\NoSuchEntityException;

class ActionPredispatch implements \Magento\Framework\Event\ObserverInterface
{
Expand Down Expand Up @@ -32,6 +34,8 @@ class ActionPredispatch implements \Magento\Framework\Event\ObserverInterface

private $resultFactory;

private $pageNotFoundRepository;

public function __construct(
\Magento\Framework\UrlInterface $url,
\Experius\PageNotFound\Model\PageNotFoundFactory $pageNotFoundFactory,
Expand All @@ -41,7 +45,8 @@ public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Controller\ResultFactory $resultFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Experius\PageNotFound\Helper\Settings $settings
\Experius\PageNotFound\Helper\Settings $settings,
PageNotFoundRepositoryInterface $pageNotFoundRepository

) {
$this->url = $url;
Expand All @@ -53,6 +58,7 @@ public function __construct(
$this->resultFactory = $resultFactory;
$this->storeManager = $storeManager;
$this->settings = $settings;
$this->pageNotFoundRepository = $pageNotFoundRepository;
}


Expand Down Expand Up @@ -134,38 +140,40 @@ protected function stripFromUrl(){
*/
protected function savePageNotFound($fromUrl, $isGraphql = false, ?StoreInterface $store = null)
{
/* @var $pageNotFoundModel PageNotFound */
$pageNotFoundModel = $this->pageNotFoundFactory->create();

if ($isGraphql) {
// Create full url to return with GraphQL
$baseUrl = $store->getBaseUrl();
/** @var \Magento\Store\Model\Store $storeModel */
$storeModel = $this->storeManager->getStore($store ? $store->getId() : null);
$baseUrl = $storeModel->getBaseUrl();
if (strpos($fromUrl, $baseUrl) === false) {
$fromUrl = $baseUrl . ltrim($fromUrl, '/');
}
}

$pageNotFoundModel->load($fromUrl, 'from_url');
try {
$pageNotFoundModel = $this->pageNotFoundRepository->getByFromUrl($fromUrl);
} catch (NoSuchEntityException $e) {
$pageNotFoundModel = $this->pageNotFoundFactory->create();
$pageNotFoundModel->setFromUrl($fromUrl);
$pageNotFoundModel->setCount(1);
}

$currentDate = date("Y-m-d");
$pageNotFoundModel->setLastVisited($currentDate);

$pageNotFoundModel->setStoreId($this->getStoreId());

if ($pageNotFoundModel->getId() && empty($pageNotFoundModel->getToUrl())) {
if ($pageNotFoundModel->getPageNotFoundId() && empty($pageNotFoundModel->getToUrl())) {
$count = $pageNotFoundModel->getCount();
$pageNotFoundModel->setCount($count + 1);
} elseif ($pageNotFoundModel->getId() && !empty($pageNotFoundModel->getToUrl())) {
} elseif ($pageNotFoundModel->getPageNotFoundId() && !empty($pageNotFoundModel->getToUrl())) {
$count = $pageNotFoundModel->getCount();
} else {
$pageNotFoundModel->setFromUrl($fromUrl);
$pageNotFoundModel->setCount(1);
}

if ($pageNotFoundModel->getToUrl()) {
$pageNotFoundModel->setCountRedirect($pageNotFoundModel->getCountRedirect() + 1);
}

$pageNotFoundModel->save();
$this->pageNotFoundRepository->save($pageNotFoundModel);

if ($pageNotFoundModel->getToUrl()) {
if ($isGraphql) {
Expand Down