code review

Author: degami

app/base/abstracts/Controllers/BaseHtmlPage.php

@@ -57,6 +57,8 @@ abstract class BaseHtmlPage extends BasePage implements HtmlPageInterface
      */
     protected ?Template $template = null;
 
+    protected ?Rewrite $rewriteObject = null;
+
     /**
      * BasePage constructor.
      *
@@ -253,6 +255,10 @@ public function getFpcCacheKey() : string
      */
     public function getRewriteObject() : ?Rewrite
     {
+        if ($this->rewriteObject instanceof Rewrite) {
+            return $this->rewriteObject;
+        }
+
         if ($this->getRouteInfo()->getRewrite()) {
             return $this->containerCall([Rewrite::class, 'load'], ['id' => $this->getRouteInfo()->getRewrite()]);
         }

app/base/controllers/Admin/Blocks.php

@@ -73,7 +73,7 @@ public function __construct(
                 /** @var Block $new_block */
                 $new_block = $this->containerMake(Block::class);
                 $new_block->setRegion(null);
-                $new_block->setTitle(str_replace("App\\Site\\Blocks\\", "", $blockClass));
+                $new_block->setTitle(static::getClassBasename($blockClass));
                 $new_block->setLocale(null);
                 $new_block->setInstanceClass($blockClass);
                 $new_block->setContent(null);

app/base/migrations/CreateProductStockTableMigration.php

@@ -42,7 +42,7 @@ public function addDBTableDefinition(Table $table): Table
             ->addColumn('updated_at', 'TIMESTAMP', null, [], false, 'CURRENT_TIMESTAMP()')
             ->addIndex(null, 'id', Index::TYPE_PRIMARY)
             ->addForeignKey('fk_stock_website_id', ['website_id'], 'website', ['id'])
-            ->addForeignKey('fk_stock_owner_id', ['user_id'], 'user', ['id'])
+//            ->addForeignKey('fk_stock_owner_id', ['user_id'], 'user', ['id'])
             ->setAutoIncrementColumn('id');
 
         return $table;

app/base/routers/Web.php

@@ -185,7 +185,18 @@ protected function checkRewrites(string $uri): ?Rewrite
             $domain = $website->getDomain();
             $website_id = $website->getId();
 
-            $rewrite = Rewrite::getCollection()->where(['url' => $uri, 'website_id' => $website_id])->getFirst();
+            if (isset($cached_routes[$domain][$uri])) {
+                // create a Rewrite with cached data
+                return $this->containerCall([Rewrite::class, 'new'], ['initial_data' => $cached_routes[$domain][$uri]]);
+            }
+
+//            $rewrite = Rewrite::getCollection()->where(['url' => $uri, 'website_id' => [$website_id, null]])->getFirst();
+            $rewrite = Rewrite::getCollection()
+                ->where(['url' => $uri, 'website_id' => [$website_id, null]])
+                ->addSelect('*')->addSelect('IF(website_id = ' . $website_id . ', 1, 0) AS is_current_website')
+                ->addOrder(['is_current_website' => 'DESC'], 'start')
+                ->getFirst();
+
             if ($rewrite instanceof Rewrite) {
                 $cached_routes[$domain][$uri] = $rewrite->getData();
                 $this->setCachedRoutes($cached_routes);

app/base/tools/Utils/HtmlPartsRenderer.php

@@ -33,6 +33,7 @@
 use App\Base\Abstracts\Controllers\AdminManageFrontendModelsPage;
 use App\Base\Abstracts\Controllers\AdminManageModelsPage;
 use App\Base\Abstracts\Controllers\AdminPage;
+use App\Base\Abstracts\Controllers\BaseHtmlPage;
 use App\Base\Abstracts\Models\BaseCollection;
 use App\Base\Controllers\Admin\Login;
 use App\Base\Models\Block;
@@ -368,8 +369,12 @@ public function renderBlocks(string $region, ?string $locale = null, ?BasePage $
             return $this->getCache()->get($cache_key);
         }
 
-        if ($current_rewrite == null && ($route_info instanceof RouteInfo) && is_numeric($route_info->getRewrite())) {
-            $current_rewrite = $this->containerCall([Rewrite::class, 'load'], ['id' => $route_info->getRewrite()]);
+        if ($current_page instanceof BaseHtmlPage) {
+            $current_rewrite = $current_page->getRewriteObject();
+
+            if ($current_rewrite == null && ($route_info instanceof RouteInfo) && is_numeric($route_info->getRewrite())) {
+                $current_rewrite = $this->containerCall([Rewrite::class, 'load'], ['id' => $route_info->getRewrite()]);
+            }
         }
 
         if (is_null($pageBlocks)) {