Merge branch 'ACP2E-3501' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-Tier4-VK-2025-01-09

Author: vkolesny

app/code/Magento/Customer/Model/Validator/Dob.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Validator;
+
+use DateTimeZone;
+use Magento\Customer\Model\Customer;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Validator\AbstractValidator;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Customer dob field validator.
+ */
+class Dob extends AbstractValidator
+{
+    /**
+     * @var TimezoneInterface
+     */
+    private $timezone;
+
+    /**
+     * @param TimezoneInterface $timezone
+     */
+    public function __construct(TimezoneInterface $timezone)
+    {
+        $this->timezone = $timezone;
+    }
+
+    /**
+     * Validate dob field.
+     *
+     * @param Customer $customer
+     * @return bool
+     */
+    public function isValid($customer): bool
+    {
+        $storeId = (int)$customer->getStoreId();
+        $timezone = new DateTimeZone($this->timezone->getConfigTimezone(ScopeInterface::SCOPE_STORE, $storeId));
+
+        if (!$this->isValidDob($customer->getDob(), $timezone)) {
+            $this->_addMessages([['dob' => 'The Date of Birth should not be greater than today.']]);
+        }
+
+        return count($this->_messages) === 0;
+    }
+
+    /**
+     * Check if specified dob is not in the future
+     *
+     * @param string|null $dobValue
+     * @param DateTimeZone $timezone
+     * @return bool
+     */
+    private function isValidDob(?string $dobValue, DateTimeZone $timezone): bool
+    {
+        if ($dobValue) {
+
+            // Get the date of birth and set the time to 00:00:00
+            $dobDate = new \DateTime($dobValue, $timezone);
+            $dobDate->setTime(0, 0, 0);
+
+            // Get the timestamp of the date of birth and the current date
+            $dobTimestamp = $dobDate->getTimestamp();
+            $currentTimestamp = time();
+
+            // If the date's of birth first minute is in the future, return false - the day has not started yet
+            return ($dobTimestamp <= $currentTimestamp);
+        }
+
+        return true;
+    }
+}

app/code/Magento/Customer/etc/validation.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 -->
 <validation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Validator/etc/validation.xsd">
@@ -23,12 +23,18 @@
                     <constraint alias="name_validator" class="Magento\Customer\Model\Validator\Name" />
                 </entity_constraints>
             </rule>
+            <rule name="check_dob">
+                <entity_constraints>
+                    <constraint alias="dob_validator" class="Magento\Customer\Model\Validator\Dob" />
+                </entity_constraints>
+            </rule>
         </rules>
         <groups>
             <group name="save">
                 <uses>
                     <use rule="check_eav"/>
                     <use rule="check_name"/>
+                    <use rule="check_dob"/>
                 </uses>
             </group>
             <group name="form">

dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Customer\Api;
@@ -223,6 +223,52 @@ public function testCreateCustomerWithErrors()
         }
     }
 
+    public function testCreateCustomerWithDateOfBirthInFuture()
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST, ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'CreateAccount',
+            ],
+        ];
+
+        $customerDataArray = $this->dataObjectProcessor->buildOutputDataArray(
+            $this->customerHelper->createSampleCustomerDataObject(),
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $date = new \DateTime();
+        $date->modify('+1 month');
+        $futureDob = $date->format('Y-m-d');
+        $customerDataArray['dob'] = $futureDob;
+        $requestData = ['customer' => $customerDataArray, 'password' => CustomerHelper::PASSWORD];
+        try {
+            $this->_webApiCall($serviceInfo, $requestData);
+            $this->fail('Expected exception did not occur.');
+        } catch (\Exception $e) {
+            if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
+                $expectedException = new InputException();
+                $expectedException->addError(__('The Date of Birth should not be greater than today.'));
+                $this->assertInstanceOf('SoapFault', $e);
+                $this->checkSoapFault(
+                    $e,
+                    $expectedException->getRawMessage(),
+                    'env:Sender',
+                    $expectedException->getParameters() // expected error parameters
+                );
+            } else {
+                $this->assertEquals(HTTPExceptionCodes::HTTP_BAD_REQUEST, $e->getCode());
+                $exceptionData = $this->processRestExceptionResult($e);
+                $expectedExceptionData = [
+                    'message' => 'The Date of Birth should not be greater than today.',
+                ];
+                $this->assertEquals($expectedExceptionData, $exceptionData);
+            }
+        }
+    }
     public function testCreateCustomerWithoutOptionalFields()
     {
         $serviceInfo = [