TE-10886 Dynamic store. (#9457)

TE-10886 Release Dynamic Store

Author: demkos

architecture-baseline.json

@@ -55,6 +55,13 @@
         "ruleset": "Spryker",
         "priority": "2"
     },
+    {
+        "fileName": "src/Spryker/Zed/Sales/Dependency/Facade/SalesToCountryInterface.php",
+        "description": "Bridges: The bridge interface has incorrect method signature for `getCountryByIso2Code()`. Got `$iso2Code` but expected to be `string $iso2Code`. That violates the rule \"All bridge interface methods must have exactly the same or more strict signature as their parent\"",
+        "rule": "BridgeMethodsInterfaceRule",
+        "ruleset": "Spryker",
+        "priority": "2"
+    },
     {
         "fileName": "src/Spryker/Zed/Sales/Dependency/Facade/SalesToCustomerBridge.php",
         "description": "Bridges: Type should be defined for param `customerReference` in method `Spryker\\Zed\\Sales\\Dependency\\Facade\\SalesToCustomerBridge::findByReference()`.",

composer.json

@@ -8,11 +8,11 @@
         "spryker/acl-merchant-portal-extension": "^1.0.0",
         "spryker/calculation": "^4.0.0",
         "spryker/checkout-extension": "^1.2.0",
-        "spryker/country": "^3.1.0",
+        "spryker/country": "^3.1.0 || ^4.0.0",
         "spryker/customer": "^6.5.0 || ^7.0.0",
         "spryker/gui": "^3.39.0",
         "spryker/kernel": "^3.33.0",
-        "spryker/locale": "^3.0.0",
+        "spryker/locale": "^3.0.0 || ^4.0.0",
         "spryker/money": "^2.0.0",
         "spryker/oms": "^10.3.0 || ^11.0.0",
         "spryker/propel": "^3.0.0",
@@ -35,6 +35,7 @@
         "spryker/checkout": "*",
         "spryker/code-sniffer": "*",
         "spryker/config": "*",
+        "spryker/container": "*",
         "spryker/price": "*",
         "spryker/product": "*",
         "spryker/shipment": "*",

src/Spryker/Zed/Sales/Business/Model/Order/SalesOrderSaver.php

@@ -14,11 +14,11 @@
 use Generated\Shared\Transfer\SaveOrderTransfer;
 use Generated\Shared\Transfer\SpySalesOrderEntityTransfer;
 use Generated\Shared\Transfer\SpySalesOrderItemEntityTransfer;
+use Orm\Zed\Locale\Persistence\SpyLocaleQuery;
 use Orm\Zed\Sales\Persistence\SpySalesOrder;
 use Orm\Zed\Sales\Persistence\SpySalesOrderAddress;
 use Orm\Zed\Sales\Persistence\SpySalesOrderItem;
 use Orm\Zed\Sales\Persistence\SpySalesOrderTotals;
-use Spryker\Zed\Locale\Persistence\LocaleQueryContainerInterface;
 use Spryker\Zed\PropelOrm\Business\Transaction\DatabaseTransactionHandlerTrait;
 use Spryker\Zed\Sales\Business\StateMachineResolver\OrderStateMachineResolverInterface;
 use Spryker\Zed\Sales\Dependency\Facade\SalesToCountryInterface;
@@ -56,9 +56,9 @@ class SalesOrderSaver implements SalesOrderSaverInterface
     protected $salesConfiguration;
 
     /**
-     * @var \Spryker\Zed\Locale\Persistence\LocaleQueryContainerInterface
+     * @var \Orm\Zed\Locale\Persistence\SpyLocaleQuery
      */
-    protected $localeQueryContainer;
+    protected $localePropelQuery;
 
     /**
      * @var array<\Spryker\Zed\Sales\Dependency\Plugin\OrderExpanderPreSavePluginInterface>
@@ -100,7 +100,7 @@ class SalesOrderSaver implements SalesOrderSaverInterface
      * @param \Spryker\Zed\Sales\Dependency\Facade\SalesToOmsInterface $omsFacade
      * @param \Spryker\Zed\Sales\Business\Model\Order\OrderReferenceGeneratorInterface $orderReferenceGenerator
      * @param \Spryker\Zed\Sales\SalesConfig $salesConfiguration
-     * @param \Spryker\Zed\Locale\Persistence\LocaleQueryContainerInterface $localeQueryContainer
+     * @param \Orm\Zed\Locale\Persistence\SpyLocaleQuery $localePropelQuery
      * @param array<\Spryker\Zed\Sales\Dependency\Plugin\OrderExpanderPreSavePluginInterface> $orderExpanderPreSavePlugins
      * @param \Spryker\Zed\Sales\Business\Model\Order\SalesOrderSaverPluginExecutorInterface $salesOrderSaverPluginExecutor
      * @param \Spryker\Zed\Sales\Persistence\Propel\Mapper\SalesOrderItemMapperInterface $salesOrderItemMapper
@@ -114,7 +114,7 @@ public function __construct(
         SalesToOmsInterface $omsFacade,
         OrderReferenceGeneratorInterface $orderReferenceGenerator,
         SalesConfig $salesConfiguration,
-        LocaleQueryContainerInterface $localeQueryContainer,
+        SpyLocaleQuery $localePropelQuery,
         $orderExpanderPreSavePlugins,
         SalesOrderSaverPluginExecutorInterface $salesOrderSaverPluginExecutor,
         SalesOrderItemMapperInterface $salesOrderItemMapper,
@@ -127,7 +127,7 @@ public function __construct(
         $this->omsFacade = $omsFacade;
         $this->orderReferenceGenerator = $orderReferenceGenerator;
         $this->salesConfiguration = $salesConfiguration;
-        $this->localeQueryContainer = $localeQueryContainer;
+        $this->localePropelQuery = $localePropelQuery;
         $this->orderExpanderPreSavePlugins = $orderExpanderPreSavePlugins;
         $this->salesOrderSaverPluginExecutor = $salesOrderSaverPluginExecutor;
         $this->salesOrderItemMapper = $salesOrderItemMapper;
@@ -247,8 +247,8 @@ protected function hydrateAddresses(QuoteTransfer $quoteTransfer, SpySalesOrder
     protected function addLocale(SpySalesOrder $salesOrderEntity)
     {
         $localeTransfer = $this->localeFacade->getCurrentLocale();
-        $localeEntity = $this->localeQueryContainer
-            ->queryLocaleByName($localeTransfer->getLocaleNameOrFail())
+        $localeEntity = $this->localePropelQuery
+            ->filterByLocaleName($localeTransfer->getLocaleNameOrFail())
             ->findOne();
 
         if ($localeEntity) {

src/Spryker/Zed/Sales/Business/SalesBusinessFactory.php

@@ -7,6 +7,7 @@
 
 namespace Spryker\Zed\Sales\Business;
 
+use Orm\Zed\Locale\Persistence\SpyLocaleQuery;
 use Spryker\Zed\Kernel\Business\AbstractBusinessFactory;
 use Spryker\Zed\Sales\Business\Address\OrderAddressWriter;
 use Spryker\Zed\Sales\Business\Address\OrderAddressWriterInterface;
@@ -154,7 +155,7 @@ public function createOrderSaver()
             $this->getOmsFacade(),
             $this->createReferenceGenerator(),
             $this->getConfig(),
-            $this->getLocaleQueryContainer(),
+            $this->getLocalePropelQuery(),
             $this->getOrderExpanderPreSavePlugins(),
             $this->createSalesOrderSaverPluginExecutor(),
             $this->createSalesOrderItemMapper(),
@@ -175,7 +176,7 @@ public function createSalesOrderSaver()
             $this->getOmsFacade(),
             $this->createReferenceGenerator(),
             $this->getConfig(),
-            $this->getLocaleQueryContainer(),
+            $this->getLocalePropelQuery(),
             $this->getOrderExpanderPreSavePlugins(),
             $this->createSalesOrderSaverPluginExecutor(),
             $this->createSalesOrderItemMapper(),
@@ -490,11 +491,11 @@ protected function getCountryFacade()
     }
 
     /**
-     * @return \Spryker\Zed\Locale\Persistence\LocaleQueryContainerInterface
+     * @return \Orm\Zed\Locale\Persistence\SpyLocaleQuery
      */
-    public function getLocaleQueryContainer()
+    public function getLocalePropelQuery(): SpyLocaleQuery
     {
-        return $this->getProvidedDependency(SalesDependencyProvider::QUERY_CONTAINER_LOCALE);
+        return $this->getProvidedDependency(SalesDependencyProvider::PROPEL_QUERY_LOCALE);
     }
 
     /**

src/Spryker/Zed/Sales/SalesDependencyProvider.php

@@ -7,6 +7,7 @@
 
 namespace Spryker\Zed\Sales;
 
+use Orm\Zed\Locale\Persistence\SpyLocaleQuery;
 use Spryker\Zed\Kernel\AbstractBundleDependencyProvider;
 use Spryker\Zed\Kernel\Container;
 use Spryker\Zed\Sales\Dependency\Facade\SalesToCalculationBridge;
@@ -73,7 +74,7 @@ class SalesDependencyProvider extends AbstractBundleDependencyProvider
     /**
      * @var string
      */
-    public const QUERY_CONTAINER_LOCALE = 'QUERY_CONTAINER_LOCALE';
+    public const PROPEL_QUERY_LOCALE = 'PROPEL_QUERY_LOCALE';
 
     /**
      * @var string
@@ -170,7 +171,7 @@ public function provideBusinessLayerDependencies(Container $container): Containe
         $container = $this->addStoreFacade($container);
         $container = $this->addSequenceNumberFacade($container);
         $container = $this->addOmsFacade($container);
-        $container = $this->addLocaleQueryContainer($container);
+        $container = $this->addLocalePropelQuery($container);
         $container = $this->addOrderExpanderPreSavePlugins($container);
         $container = $this->addHydrateOrderPlugins($container);
         $container = $this->addCalculationFacade($container);
@@ -411,11 +412,11 @@ protected function addDateTimeFormatter(Container $container)
      *
      * @return \Spryker\Zed\Kernel\Container
      */
-    protected function addLocaleQueryContainer(Container $container)
+    protected function addLocalePropelQuery(Container $container)
     {
-        $container->set(static::QUERY_CONTAINER_LOCALE, function (Container $container) {
-            return $container->getLocator()->locale()->queryContainer();
-        });
+        $container->set(static::PROPEL_QUERY_LOCALE, $container->factory(function (Container $container) {
+            return SpyLocaleQuery::create();
+        }));
 
         return $container;
     }

tests/SprykerTest/Zed/Sales/Business/SalesFacadeSaveOrderTest.php

@@ -24,6 +24,7 @@
 use Generated\Shared\Transfer\TaxTotalTransfer;
 use Generated\Shared\Transfer\TotalsTransfer;
 use Orm\Zed\Country\Persistence\SpyCountry;
+use Orm\Zed\Locale\Persistence\SpyLocaleQuery;
 use Orm\Zed\Oms\Persistence\SpyOmsOrderItemStateQuery;
 use Orm\Zed\Oms\Persistence\SpyOmsOrderProcess;
 use Orm\Zed\Oms\Persistence\SpyOmsOrderProcessQuery;
@@ -34,7 +35,6 @@
 use Spryker\Shared\Price\PriceMode;
 use Spryker\Zed\Kernel\Container;
 use Spryker\Zed\Locale\Business\LocaleFacade;
-use Spryker\Zed\Locale\Persistence\LocaleQueryContainer;
 use Spryker\Zed\Oms\OmsConfig;
 use Spryker\Zed\Sales\Business\SalesBusinessFactory;
 use Spryker\Zed\Sales\Business\SalesFacade;
@@ -118,7 +118,7 @@ protected function setUp(): void
         $container[SalesDependencyProvider::FACADE_COUNTRY] = new SalesToCountryBridge($countryFacadeMock);
         $container[SalesDependencyProvider::FACADE_OMS] = new SalesToOmsBridge($omsFacadeMock);
         $container[SalesDependencyProvider::FACADE_SEQUENCE_NUMBER] = new SalesToSequenceNumberBridge($sequenceNumberFacade);
-        $container[SalesDependencyProvider::QUERY_CONTAINER_LOCALE] = new LocaleQueryContainer();
+        $container[SalesDependencyProvider::PROPEL_QUERY_LOCALE] = new SpyLocaleQuery();
         $container[SalesDependencyProvider::FACADE_STORE] = new SalesToStoreBridge(new StoreFacade());
         $container[SalesDependencyProvider::FACADE_LOCALE] = new SalesToLocaleBridge(new LocaleFacade());
         $container[SalesDependencyProvider::ORDER_EXPANDER_PRE_SAVE_PLUGINS] = [];

tests/SprykerTest/Zed/Sales/codeception.yml

@@ -31,6 +31,8 @@ suites:
                 - \SprykerTest\Zed\Sales\Helper\BusinessHelper
                 - \SprykerTest\Shared\Sales\Helper\SalesDataHelper
                 - \SprykerTest\Shared\Customer\Helper\CustomerDataHelper
+                - \SprykerTest\Service\Container\Helper\ContainerHelper
+                - \SprykerTest\Shared\Store\Helper\StoreDependencyHelper
                 - \SprykerTest\Shared\Store\Helper\StoreDataHelper
 
     Communication: