Merge branch 'ACP2E-3737' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-03-17-2025

Author: chittima

app/code/Magento/SalesRule/Model/Coupon/Usage/Processor.php

@@ -115,7 +115,8 @@ public function updateCouponUsages(UpdateInfo $updateInfo): void
     private function lockLoadedCoupon(Coupon $coupon, UpdateInfo $updateInfo, array $incrementedCouponIds): void
     {
         $isIncrement = $updateInfo->isIncrement();
-        $lockName = self::LOCK_NAME . $coupon->getCode();
+        // Lock name based on coupon id, rather than coupon code that may contain illegal symbols for file based lock
+        $lockName = self::LOCK_NAME . $coupon->getId();
         if ($this->lockManager->lock($lockName, self::LOCK_TIMEOUT)) {
             try {
                 $coupon = $this->couponRepository->getById($coupon->getId());

app/code/Magento/SalesRule/Test/Unit/Model/Coupon/Usage/ProcessorTest.php

@@ -120,7 +120,7 @@ public function testProcess($isIncrement, $timesUsed): void
         $searchResult->method('getItems')
             ->willReturn([$couponMock]);
         $this->couponRepository->method('getList')->willReturn($searchResult);
-        $couponMock->expects($this->atLeastOnce())->method('getId')->willReturn($couponId);
+        $couponMock->expects($this->exactly(4))->method('getId')->willReturn($couponId);
         $this->couponRepository->method('getById')->with($couponId)->willReturn($couponMock);
         $couponMock->expects($this->atLeastOnce())->method('getTimesUsed')->willReturn($timesUsed);
         $couponMock->expects($this->any())->method('setTimesUsed')->with($setTimesUsed)->willReturnSelf();