FRW-7477: Fixed store context for OMS (#10865)

FRW-7477 Fixed store context for OMS reservation.
spryker · Mar 7, 2024 · 8d0c3ba · 8d0c3ba
1 parent 9e0631a
commit 8d0c3ba
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/src/Spryker/Zed/Oms/Business/OmsFacade.php b/src/Spryker/Zed/Oms/Business/OmsFacade.php
@@ -570,12 +570,13 @@ public function sendOrderShippedMail(SpySalesOrder $salesOrderEntity)
      * @api
      *
      * @param string $sku
+     * @param \Generated\Shared\Transfer\StoreTransfer|null $storeTransfer
      *
      * @return void
      */
-    public function saveReservationVersion($sku)
+    public function saveReservationVersion($sku, ?StoreTransfer $storeTransfer = null)
     {
-        $this->getFactory()->createReservationVersionHandler()->saveReservationVersion($sku);
+        $this->getFactory()->createReservationVersionHandler()->saveReservationVersion($sku, $storeTransfer);
     }
 
     /**

diff --git a/src/Spryker/Zed/Oms/Business/OmsFacadeInterface.php b/src/Spryker/Zed/Oms/Business/OmsFacadeInterface.php
@@ -538,10 +538,11 @@ public function sendOrderShippedMail(SpySalesOrder $salesOrderEntity);
      * @api
      *
      * @param string $sku
+     * @param \Generated\Shared\Transfer\StoreTransfer|null $storeTransfer
      *
      * @return void
      */
-    public function saveReservationVersion($sku);
+    public function saveReservationVersion($sku, ?StoreTransfer $storeTransfer = null);
 
     /**
      * Specification:

diff --git a/src/Spryker/Zed/Oms/Business/Reservation/ReservationVersionHandler.php b/src/Spryker/Zed/Oms/Business/Reservation/ReservationVersionHandler.php
@@ -7,6 +7,7 @@
 
 namespace Spryker\Zed\Oms\Business\Reservation;
 
+use Generated\Shared\Transfer\StoreTransfer;
 use Orm\Zed\Oms\Persistence\Map\SpyOmsProductReservationTableMap;
 use Orm\Zed\Oms\Persistence\SpyOmsProductReservationChangeVersion;
 use Spryker\Zed\Oms\Dependency\Facade\OmsToStoreFacadeInterface;
@@ -38,12 +39,13 @@ public function __construct(
 
     /**
      * @param string $sku
+     * @param \Generated\Shared\Transfer\StoreTransfer|null $storeTransfer
      *
      * @return void
      */
-    public function saveReservationVersion($sku)
+    public function saveReservationVersion($sku, ?StoreTransfer $storeTransfer = null)
     {
-        $currentStoreTransfer = $this->storeFacade->getCurrentStore();
+        $currentStoreTransfer = $storeTransfer ?? $this->storeFacade->getCurrentStore();
 
         /** @var int|null $idOmsProductReservation */
         $idOmsProductReservation = $this->omsQueryContainer

diff --git a/src/Spryker/Zed/Oms/Business/Reservation/ReservationVersionHandlerInterface.php b/src/Spryker/Zed/Oms/Business/Reservation/ReservationVersionHandlerInterface.php
@@ -7,12 +7,15 @@
 
 namespace Spryker\Zed\Oms\Business\Reservation;
 
+use Generated\Shared\Transfer\StoreTransfer;
+
 interface ReservationVersionHandlerInterface
 {
     /**
      * @param string $sku
+     * @param \Generated\Shared\Transfer\StoreTransfer|null $storeTransfer
      *
      * @return void
      */
-    public function saveReservationVersion($sku);
+    public function saveReservationVersion($sku, ?StoreTransfer $storeTransfer = null);
 }
diff --git a/...lugin/Oms/ReservationHandler/ReservationVersionPostSaveTerminationAwareStrategyPlugin.php b/...lugin/Oms/ReservationHandler/ReservationVersionPostSaveTerminationAwareStrategyPlugin.php
@@ -61,6 +61,6 @@ public function isApplicable(ReservationRequestTransfer $reservationRequestTrans
      */
     public function handle(ReservationRequestTransfer $reservationRequestTransfer): void
     {
-        $this->getFacade()->saveReservationVersion($reservationRequestTransfer->getSku());
+        $this->getFacade()->saveReservationVersion($reservationRequestTransfer->getSku(), $reservationRequestTransfer->getStore());
     }
 }
diff --git a/tests/SprykerTest/Zed/Oms/Business/OmsFacadeReservationsTest.php b/tests/SprykerTest/Zed/Oms/Business/OmsFacadeReservationsTest.php
@@ -107,6 +107,9 @@ public function testImportReservationShouldHaveAmountInReservationTotals(): void
     public function testExportReservationShouldExportAllUnExportedReservations(): void
     {
         $testStateMachineProcessName = 'Test01';
+
+        $storeTransfer = $this->tester->haveStore([StoreTransfer::NAME => static::STORE_NAME_DE], false);
+
         $saveOrderTransfer = $this->tester->haveOrder([
             ItemTransfer::UNIT_PRICE => 100,
             ItemTransfer::SUM_PRICE => 100,
@@ -121,7 +124,7 @@ public function testExportReservationShouldExportAllUnExportedReservations(): vo
         $this->getOmsFacade()->triggerEvent('authorize', $items, []);
         $this->getOmsFacade()->triggerEvent('pay', $items, []);
 
-        $this->getOmsFacade()->saveReservationVersion($items[0]->getSku());
+        $this->getOmsFacade()->saveReservationVersion($items[0]->getSku(), $storeTransfer);
         $this->getOmsFacade()->exportReservation();
 
         $this->assertGreaterThan(0, $this->getOmsFacade()->getLastExportedReservationVersion());