[Store] optimize Store Context resolving with fallback and admin/non-…

…admin also for area bricks
coreshop · Dec 19, 2024 · 26b32e0 · 26b32e0
1 parent d556fdd
commit 26b32e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/CoreShop/Bundle/StoreBundle/Resources/config/services.yml b/src/CoreShop/Bundle/StoreBundle/Resources/config/services.yml
@@ -50,7 +50,7 @@ services:
     CoreShop\Component\Store\Context\RequestBased\PimcoreAreaBrickRenderResolver:
         public: false
         arguments:
-            - '@coreshop.repository.store'
+            - '@CoreShop\Component\Store\Context\SiteBasedResolverInterface'
         tags:
             - { name: coreshop.context.store.request_based.resolver, priority: 220 }
 

diff --git a/src/CoreShop/Component/Store/Context/RequestBased/PimcoreAreaBrickRenderResolver.php b/src/CoreShop/Component/Store/Context/RequestBased/PimcoreAreaBrickRenderResolver.php
@@ -18,6 +18,7 @@
 
 namespace CoreShop\Component\Store\Context\RequestBased;
 
+use CoreShop\Component\Store\Context\SiteBasedResolverInterface;
 use CoreShop\Component\Store\Context\StoreNotFoundException;
 use CoreShop\Component\Store\Model\StoreInterface;
 use CoreShop\Component\Store\Repository\StoreRepositoryInterface;
@@ -29,7 +30,7 @@
 final class PimcoreAreaBrickRenderResolver implements RequestResolverInterface
 {
     public function __construct(
-        private StoreRepositoryInterface $storeRepository,
+        private SiteBasedResolverInterface $siteBasedResolver,
     ) {
     }
 
@@ -44,9 +45,13 @@ public function findStore(Request $request): ?StoreInterface
                 if ($document) {
                     $site = Frontend::getSiteForDocument($document);
 
-                    if ($site instanceof Site) {
-                        return $this->storeRepository->findOneBySite($site->getId());
+                    $store = $this->siteBasedResolver->resolveSiteWithDefaultForStore($site);
+
+                    if (null === $store) {
+                        throw new StoreNotFoundException();
                     }
+
+                    return $store;
                 }
             }
         }