MC-17460: Coupon's expiration date and time do not match staging update end_date after creating a staging update

Author: dyushkin

app/code/Magento/SalesRule/Api/Data/CouponInterface.php

@@ -108,6 +108,7 @@ public function setTimesUsed($timesUsed);
      * Get expiration date
      *
      * @return string|null
+     * @deprecated Coupon expiration must follow sales rule expiration date.
      */
     public function getExpirationDate();
 
@@ -116,6 +117,7 @@ public function getExpirationDate();
      *
      * @param string $expirationDate
      * @return $this
+     * @deprecated Coupon expiration must follow sales rule expiration date.
      */
     public function setExpirationDate($expirationDate);
 

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

@@ -20,6 +20,9 @@ class Coupon extends \Magento\Framework\Model\AbstractExtensibleModel implements
     const KEY_USAGE_LIMIT = 'usage_limit';
     const KEY_USAGE_PER_CUSTOMER = 'usage_per_customer';
     const KEY_TIMES_USED = 'times_used';
+    /**
+     * @deprecated Coupon expiration must follow sales rule expiration date.
+     */
     const KEY_EXPIRATION_DATE = 'expiration_date';
     const KEY_IS_PRIMARY = 'is_primary';
     const KEY_CREATED_AT = 'created_at';
@@ -204,6 +207,7 @@ public function setTimesUsed($timesUsed)
      * Get expiration date
      *
      * @return string|null
+     * @deprecated Coupon expiration must follow sales rule expiration date.
      */
     public function getExpirationDate()
     {
@@ -215,6 +219,7 @@ public function getExpirationDate()
      *
      * @param string $expirationDate
      * @return $this
+     * @deprecated Coupon expiration must follow sales rule expiration date.
      */
     public function setExpirationDate($expirationDate)
     {

app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php

@@ -168,16 +168,10 @@ public function generatePool()
                 ++$attempt;
             } while ($this->getResource()->exists($code));
 
-            $expirationDate = $this->getToDate();
-            if ($expirationDate instanceof \DateTimeInterface) {
-                $expirationDate = $expirationDate->format('Y-m-d H:i:s');
-            }
-
             $coupon->setId(null)
                 ->setRuleId($this->getRuleId())
                 ->setUsageLimit($this->getUsesPerCoupon())
                 ->setUsagePerCustomer($this->getUsagePerCustomer())
-                ->setExpirationDate($expirationDate)
                 ->setCreatedAt($nowTimestamp)
                 ->setType(\Magento\SalesRule\Helper\Coupon::COUPON_TYPE_SPECIFIC_AUTOGENERATED)
                 ->setCode($code)

app/code/Magento/SalesRule/Model/CouponRepository.php

@@ -118,7 +118,6 @@ public function save(\Magento\SalesRule\Api\Data\CouponInterface $coupon)
                     __('Specified rule does not allow auto generated coupons')
                 );
             }
-            $coupon->setExpirationDate($rule->getToDate());
             $coupon->setUsageLimit($rule->getUsesPerCoupon());
             $coupon->setUsagePerCustomer($rule->getUsesPerCustomer());
         } catch (\Exception $e) {

app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php

@@ -34,14 +34,6 @@ protected function _construct()
      */
     public function _beforeSave(AbstractModel $object)
     {
-        if (!$object->getExpirationDate()) {
-            $object->setExpirationDate(null);
-        } elseif ($object->getExpirationDate() instanceof \DateTimeInterface) {
-            $object->setExpirationDate(
-                $object->getExpirationDate()->format('Y-m-d H:i:s')
-            );
-        }
-
         // maintain single primary coupon per rule
         $object->setIsPrimary($object->getIsPrimary() ? 1 : null);
 
@@ -126,13 +118,6 @@ public function updateSpecificCoupons(\Magento\SalesRule\Model\Rule $rule)
             $updateArray['usage_per_customer'] = $rule->getUsesPerCustomer();
         }
 
-        $ruleNewDate = new \DateTime($rule->getToDate());
-        $ruleOldDate = new \DateTime($rule->getOrigData('to_date'));
-
-        if ($ruleNewDate != $ruleOldDate) {
-            $updateArray['expiration_date'] = $rule->getToDate();
-        }
-
         if (!empty($updateArray)) {
             $this->getConnection()->update(
                 $this->getTable('salesrule_coupon'),

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

@@ -231,11 +231,6 @@ private function getCouponCodeSelect($couponCode)
 
         $this->joinCouponTable($couponCode, $couponSelect);
 
-        $notExpired = $this->getConnection()->quoteInto(
-            '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
-            $this->_date->date()->format('Y-m-d')
-        );
-
         $isAutogenerated =
             $this->getConnection()->quoteInto('main_table.coupon_type = ?', Rule::COUPON_TYPE_AUTO)
             . ' AND ' .
@@ -250,7 +245,7 @@ private function getCouponCodeSelect($couponCode)
             . ')';
 
         $couponSelect->where(
-            "$notExpired AND ($isAutogenerated OR $isValidSpecific)",
+            "$isAutogenerated OR $isValidSpecific",
             null,
             Select::TYPE_CONDITION
         );

app/code/Magento/SalesRule/Model/Rule.php

@@ -296,8 +296,6 @@ public function afterSave()
                 $this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null
             )->setUsagePerCustomer(
                 $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
-            )->setExpirationDate(
-                $this->getToDate()
             )->save();
         } else {
             $this->getPrimaryCoupon()->delete();
@@ -498,8 +496,6 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
             $this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null
         )->setUsagePerCustomer(
             $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
-        )->setExpirationDate(
-            $this->getToDate()
         )->setType(
             \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
         );

app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php

@@ -109,7 +109,6 @@ public function testGeneratePool()
                 'setRuleId',
                 'setUsageLimit',
                 'setUsagePerCustomer',
-                'setExpirationDate',
                 'setCreatedAt',
                 'setType',
                 'setCode',
@@ -120,7 +119,6 @@ public function testGeneratePool()
         $couponMock->expects($this->any())->method('setRuleId')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setUsageLimit')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setUsagePerCustomer')->will($this->returnSelf());
-        $couponMock->expects($this->any())->method('setExpirationDate')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setCreatedAt')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setType')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setCode')->will($this->returnSelf());