#39146: Image resize queue error due to .tmp file handling when deleting unsaved product images

KrasnoshchokBohdan · KrasnoshchokBohdan · commit 331dc7407bce · 2025-05-12T12:37:08.000+03:00
- add new service class with unit test
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Catalog\Service\SpecialPriceService;
 
 /**
  * Bundle product type price model
@@ -51,6 +52,12 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      */
     private $serializer;
 
+
+    /**
+     * @var SpecialPriceService
+     */
+    protected SpecialPriceService $specialPriceService;
+
     /**
      * Constructor
      *
@@ -66,6 +73,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
+     * @param SpecialPriceService|null $specialPriceService
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -80,11 +88,14 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Catalog\Helper\Data $catalogData,
         ?\Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        ?ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
+        ?ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null,
+        ?SpecialPriceService $specialPriceService = null
     ) {
         $this->_catalogData = $catalogData;
         $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->specialPriceService = $specialPriceService ?: ObjectManager::getInstance()
+            ->get(SpecialPriceService::class);
         parent::__construct(
             $ruleFactory,
             $storeManager,
@@ -630,12 +641,7 @@ public function calculateSpecialPrice(
     ) {
         if ($specialPrice !== null && $specialPrice != false) {
 
-            if ($specialPriceTo
-                && strtotime($specialPriceTo) !== false
-                && date('H:i:s', strtotime($specialPriceTo)) !== '00:00:00') {
-                $dateToTimestamp = strtotime($specialPriceTo);
-                $specialPriceTo = date('Y-m-d H:i:s', $dateToTimestamp - 86400);
-            }
+            $specialPriceTo = $this->specialPriceService->execute($specialPriceTo);
 
             if ($this->_localeDate->isScopeDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
                 $specialPrice = $finalPrice * ($specialPrice / 100);
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -15,6 +15,7 @@
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Catalog\Service\SpecialPriceService;
 
 /**
  * Product type price model
@@ -88,6 +89,11 @@ class Price implements ResetAfterRequestInterface
      */
     private $tierPriceExtensionFactory;
 
+    /**
+     * @var SpecialPriceService
+     */
+    protected SpecialPriceService $specialPriceService;
+
     /**
      * Constructor
      *
@@ -101,6 +107,7 @@ class Price implements ResetAfterRequestInterface
      * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
+     * @param SpecialPriceService|null $specialPriceService
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -113,7 +120,8 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        ?ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
+        ?ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null,
+        ?SpecialPriceService $specialPriceService = null
     ) {
         $this->_ruleFactory = $ruleFactory;
         $this->_storeManager = $storeManager;
@@ -126,6 +134,8 @@ public function __construct(
         $this->config = $config;
         $this->tierPriceExtensionFactory = $tierPriceExtensionFactory ?: ObjectManager::getInstance()
             ->get(ProductTierPriceExtensionFactory::class);
+        $this->specialPriceService = $specialPriceService ?: ObjectManager::getInstance()
+            ->get(SpecialPriceService::class);
     }
 
     /**
@@ -643,12 +653,7 @@ public function calculateSpecialPrice(
     ) {
         if ($specialPrice !== null && $specialPrice != false) {
 
-            if ($specialPriceTo
-                && strtotime($specialPriceTo) !== false
-                && date('H:i:s', strtotime($specialPriceTo)) !== '00:00:00') {
-                $dateToTimestamp = strtotime($specialPriceTo);
-                $specialPriceTo = date('Y-m-d H:i:s', $dateToTimestamp - 86400);
-            }
+            $specialPriceTo = $this->specialPriceService->execute($specialPriceTo);
 
             if ($this->_localeDate->isScopeDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
                 $finalPrice = min($finalPrice, (float) $specialPrice);
diff --git a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
@@ -7,11 +7,13 @@
 namespace Magento\Catalog\Pricing\Price;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Price\AbstractPrice;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Catalog\Service\SpecialPriceService;
 
 /**
  * Special price model
@@ -28,22 +30,31 @@ class SpecialPrice extends AbstractPrice implements SpecialPriceInterface, BaseP
      */
     protected $localeDate;
 
+    /**
+     * @var SpecialPriceService
+     */
+    protected SpecialPriceService $specialPriceService;
+
     /**
      * @param Product $saleableItem
      * @param float $quantity
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param TimezoneInterface $localeDate
+     * @param SpecialPriceService|null $specialPriceService
      */
     public function __construct(
         Product $saleableItem,
         $quantity,
         CalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        TimezoneInterface $localeDate
+        TimezoneInterface $localeDate,
+        ?SpecialPriceService $specialPriceService = null
     ) {
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->localeDate = $localeDate;
+        $this->specialPriceService = $specialPriceService ?: ObjectManager::getInstance()
+            ->get(SpecialPriceService::class);
     }
 
     /**
@@ -103,13 +114,7 @@ public function getSpecialToDate()
      */
     public function isScopeDateInInterval()
     {
-        $dateTo = $this->getSpecialToDate();
-        if ($dateTo
-            && strtotime($dateTo) !== false
-            && date('H:i:s', strtotime($dateTo)) !== '00:00:00') {
-            $dateToTimestamp = strtotime($dateTo);
-            $dateTo = date('Y-m-d H:i:s', $dateToTimestamp - 86400);
-        }
+        $dateTo = $this->specialPriceService->execute($this->getSpecialToDate());
 
         return $this->localeDate->isScopeDateInInterval(
             WebsiteInterface::ADMIN_CODE,
diff --git a/app/code/Magento/Catalog/Service/SpecialPriceService.php b/app/code/Magento/Catalog/Service/SpecialPriceService.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Service;
+
+/**
+ * This class provides functionality to normalize the end date/time of special prices
+ */
+class SpecialPriceService
+{
+    /**
+     * This class subtracts one day from $dateTo if it contains a specific time (hours, minutes, seconds)
+     * because \Magento\Framework\Stdlib\DateTime\Timezone::isScopeDateInInterval adds one day.
+     * This ensures that the special price expires exactly at the specified time
+     *
+     * For example,
+     * - If $dateTo is "2025-05-12 17:00:00", it will be converted to "2025-05-11 17:00:00"
+     * - If $dateTo is "2024-05-12 00:00:00", it will remain unchanged
+     *
+     * @param mixed $dateTo
+     * @return mixed|string
+     */
+    public function execute(mixed $dateTo): mixed
+    {
+        if ($dateTo
+            && strtotime($dateTo) !== false
+            && date('H:i:s', strtotime($dateTo)) !== '00:00:00') {
+            $dateToTimestamp = strtotime($dateTo);
+            $dateTo = date('Y-m-d H:i:s', $dateToTimestamp - 86400);
+        }
+
+        return $dateTo;
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Service/SpecialPriceServiceTest.php b/app/code/Magento/Catalog/Test/Unit/Service/SpecialPriceServiceTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Service;
+
+use Magento\Catalog\Service\SpecialPriceService;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for SpecialPriceService
+ */
+class SpecialPriceServiceTest extends TestCase
+{
+    /**
+     * @var SpecialPriceService
+     */
+    private SpecialPriceService $specialPriceService;
+
+    /**
+     * Set up a test environment
+     */
+    protected function setUp(): void
+    {
+        $this->specialPriceService = new SpecialPriceService();
+    }
+
+    /**
+     * Data provider for execute method test
+     *
+     * @return array
+     */
+    public static function executeDataProvider(): array
+    {
+        return [
+            'invalid_date' => [
+                'dateTo' => 'some date to',
+                'expected' => 'some date to'
+            ],
+            'date_without_time' => [
+                'dateTo' => '2025-05-12 00:00:00',
+                'expected' => '2025-05-12 00:00:00'
+            ],
+            'date_with_specific_time' => [
+                'dateTo' => '2025-05-12 17:00:00',
+                'expected' => '2025-05-11 17:00:00'
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider executeDataProvider
+     * @param mixed $dateTo
+     * @param mixed $expected
+     */
+    public function testExecute(mixed $dateTo, mixed $expected): void
+    {
+        $result = $this->specialPriceService->execute($dateTo);
+        $this->assertEquals($expected, $result);
+    }
+}
