From fa8f5662084dedc41ff54e68b0b166c5def03935 Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Tue, 10 Sep 2019 16:38:17 +0300 Subject: [PATCH 1/8] [Customer] Rename dob to date_of_birth #911 --- app/code/Magento/CustomerGraphQl/etc/schema.graphqls | 6 ++++-- .../Magento/GraphQl/Customer/UpdateCustomerTest.php | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index d27debdc39c6..73d33f5bf01d 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -61,7 +61,8 @@ input CustomerInput { lastname: String @doc(description: "The customer's family name") suffix: String @doc(description: "A value such as Sr., Jr., or III") email: String @doc(description: "The customer's email address. Required") - dob: String @doc(description: "The customer's date of birth") + dob: @deprecated(reason: "The `dob` is deprecated. Use `date_of_birth` instead.") String @doc(description: "The customer's date of birth") + date_of_birth: String @doc(description: "The customer's date of birth") taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)") gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)") password: String @doc(description: "The customer's password") @@ -87,7 +88,8 @@ type Customer @doc(description: "Customer defines the customer name and address email: String @doc(description: "The customer's email address. Required") default_billing: String @doc(description: "The ID assigned to the billing address") default_shipping: String @doc(description: "The ID assigned to the shipping address") - dob: String @doc(description: "The customer's date of birth") + dob: @deprecated(reason: "The `dob` is deprecated. Use `date_of_birth` instead.") String @doc(description: "The customer's date of birth") + date_of_birth: String @doc(description: "The customer's date of birth") taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)") id: Int @doc(description: "The ID assigned to the customer") is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\IsSubscribed") diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php index 178d10b3c35a..d1c6638e8d5f 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php @@ -69,7 +69,7 @@ public function testUpdateCustomer() middlename: "{$newMiddlename}" lastname: "{$newLastname}" suffix: "{$newSuffix}" - dob: "{$newDob}" + date_of_birth: "{$newDob}" taxvat: "{$newTaxVat}" email: "{$newEmail}" password: "{$currentPassword}" @@ -82,7 +82,7 @@ public function testUpdateCustomer() middlename lastname suffix - dob + date_of_birth taxvat email gender @@ -102,7 +102,7 @@ public function testUpdateCustomer() $this->assertEquals($newMiddlename, $response['updateCustomer']['customer']['middlename']); $this->assertEquals($newLastname, $response['updateCustomer']['customer']['lastname']); $this->assertEquals($newSuffix, $response['updateCustomer']['customer']['suffix']); - $this->assertEquals($newDob, $response['updateCustomer']['customer']['dob']); + $this->assertEquals($newDob, $response['updateCustomer']['customer']['date_of_birth']); $this->assertEquals($newTaxVat, $response['updateCustomer']['customer']['taxvat']); $this->assertEquals($newEmail, $response['updateCustomer']['customer']['email']); $this->assertEquals($newGender, $response['updateCustomer']['customer']['gender']); From aaee0c8ae2322dae5c7626a8566865bf714e54a3 Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Thu, 12 Sep 2019 11:56:22 +0300 Subject: [PATCH 2/8] [Customer] Rename dob to date_of_birth #911 --- app/code/Magento/CustomerGraphQl/etc/schema.graphqls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index 73d33f5bf01d..c06c84a3bdd1 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -61,7 +61,7 @@ input CustomerInput { lastname: String @doc(description: "The customer's family name") suffix: String @doc(description: "A value such as Sr., Jr., or III") email: String @doc(description: "The customer's email address. Required") - dob: @deprecated(reason: "The `dob` is deprecated. Use `date_of_birth` instead.") String @doc(description: "The customer's date of birth") + dob: String @doc(description: "The customer's date of birth") # deprecated(reason: "The `dob` is deprecated. Use `date_of_birth` instead.") date_of_birth: String @doc(description: "The customer's date of birth") taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)") gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)") @@ -88,7 +88,7 @@ type Customer @doc(description: "Customer defines the customer name and address email: String @doc(description: "The customer's email address. Required") default_billing: String @doc(description: "The ID assigned to the billing address") default_shipping: String @doc(description: "The ID assigned to the shipping address") - dob: @deprecated(reason: "The `dob` is deprecated. Use `date_of_birth` instead.") String @doc(description: "The customer's date of birth") + dob: String @doc(description: "The customer's date of birth") # deprecated(reason: "The `dob` is deprecated. Use `date_of_birth` instead.") date_of_birth: String @doc(description: "The customer's date of birth") taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)") id: Int @doc(description: "The ID assigned to the customer") From e9879d142bac70dbe5ffc9e90578a88152fccf5f Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Tue, 17 Sep 2019 12:49:29 +0300 Subject: [PATCH 3/8] [Customer] Rename dob to date_of_birth #911 --- .../testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php index d1c6638e8d5f..c57b456cf9e3 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php @@ -102,7 +102,7 @@ public function testUpdateCustomer() $this->assertEquals($newMiddlename, $response['updateCustomer']['customer']['middlename']); $this->assertEquals($newLastname, $response['updateCustomer']['customer']['lastname']); $this->assertEquals($newSuffix, $response['updateCustomer']['customer']['suffix']); - $this->assertEquals($newDob, $response['updateCustomer']['customer']['date_of_birth']); + $this->assertEquals($newDob, $response['updateCustomer']['customer']['dob']); $this->assertEquals($newTaxVat, $response['updateCustomer']['customer']['taxvat']); $this->assertEquals($newEmail, $response['updateCustomer']['customer']['email']); $this->assertEquals($newGender, $response['updateCustomer']['customer']['gender']); From da62bd1da9804056882b08f3c3dcb2ae6d69dc3b Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Tue, 17 Sep 2019 14:05:56 +0300 Subject: [PATCH 4/8] [Customer] Rename dob to date_of_birth #911 --- .../testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php index c57b456cf9e3..64f9afff81d1 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php @@ -82,7 +82,7 @@ public function testUpdateCustomer() middlename lastname suffix - date_of_birth + dob taxvat email gender From 2c4adbf63b0c108cd45be7df2c335b0dbad8adff Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Fri, 20 Sep 2019 12:47:00 -0500 Subject: [PATCH 5/8] magento/graphql-ce#911: [Customer] Rename dob to date_of_birth --- app/code/Magento/CustomerGraphQl/etc/schema.graphqls | 4 ++-- .../testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls index c06c84a3bdd1..360b7f14f38e 100644 --- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls +++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls @@ -61,7 +61,7 @@ input CustomerInput { lastname: String @doc(description: "The customer's family name") suffix: String @doc(description: "A value such as Sr., Jr., or III") email: String @doc(description: "The customer's email address. Required") - dob: String @doc(description: "The customer's date of birth") # deprecated(reason: "The `dob` is deprecated. Use `date_of_birth` instead.") + dob: String @doc(description: "Deprecated: Use `date_of_birth` instead") date_of_birth: String @doc(description: "The customer's date of birth") taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)") gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)") @@ -88,7 +88,7 @@ type Customer @doc(description: "Customer defines the customer name and address email: String @doc(description: "The customer's email address. Required") default_billing: String @doc(description: "The ID assigned to the billing address") default_shipping: String @doc(description: "The ID assigned to the shipping address") - dob: String @doc(description: "The customer's date of birth") # deprecated(reason: "The `dob` is deprecated. Use `date_of_birth` instead.") + dob: String @doc(description: "The customer's date of birth") @deprecated(reason: "Use `date_of_birth` instead") date_of_birth: String @doc(description: "The customer's date of birth") taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)") id: Int @doc(description: "The ID assigned to the customer") diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php index 64f9afff81d1..d1c6638e8d5f 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php @@ -82,7 +82,7 @@ public function testUpdateCustomer() middlename lastname suffix - dob + date_of_birth taxvat email gender @@ -102,7 +102,7 @@ public function testUpdateCustomer() $this->assertEquals($newMiddlename, $response['updateCustomer']['customer']['middlename']); $this->assertEquals($newLastname, $response['updateCustomer']['customer']['lastname']); $this->assertEquals($newSuffix, $response['updateCustomer']['customer']['suffix']); - $this->assertEquals($newDob, $response['updateCustomer']['customer']['dob']); + $this->assertEquals($newDob, $response['updateCustomer']['customer']['date_of_birth']); $this->assertEquals($newTaxVat, $response['updateCustomer']['customer']['taxvat']); $this->assertEquals($newEmail, $response['updateCustomer']['customer']['email']); $this->assertEquals($newGender, $response['updateCustomer']['customer']['gender']); From 33d81489258c765ba6d5f4c6e4f8c5f78c835f21 Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Fri, 27 Sep 2019 12:34:18 +0300 Subject: [PATCH 6/8] [Customer] Rename dob to date_of_birth #911 --- .../CustomerGraphQl/Model/Customer/ExtractCustomerData.php | 2 +- .../Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php | 4 +++- .../Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php index 542165b49dc1..32813d44b2d4 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php +++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php @@ -105,7 +105,7 @@ public function execute(CustomerInterface $customer): array $customerData['group_id'] = null; $customerData['model'] = $customer; $customerData['id'] = null; - + $customerData['date_of_birth'] = $customerData['dob']; return $customerData; } } diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php index 6d33dea35835..c690e11bd494 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php @@ -70,7 +70,9 @@ public function resolve( if (!$this->newsLetterConfig->isActive(ScopeInterface::SCOPE_STORE)) { $args['input']['is_subscribed'] = false; } - + if (isset($args['input']['date_of_birth'])) { + $args['input']['dob'] = $args['input']['date_of_birth']; + } $customer = $this->createCustomerAccount->execute( $args['input'], $context->getExtensionAttributes()->getStore() diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php index b2ef03fc40e5..f2b0d0e2a049 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php +++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php @@ -70,6 +70,9 @@ public function resolve( if (empty($args['input']) || !is_array($args['input'])) { throw new GraphQlInputException(__('"input" value should be specified')); } + if (isset($args['input']['date_of_birth'])) { + $args['input']['dob'] = $args['input']['date_of_birth']; + } $customer = $this->getCustomer->execute($context); $this->updateCustomerAccount->execute( From adb6517d6db8e16671664c0c26b6a9770d872a7f Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Fri, 27 Sep 2019 13:58:17 +0300 Subject: [PATCH 7/8] [Customer] Rename dob to date_of_birth #911 --- .../CustomerGraphQl/Model/Customer/ExtractCustomerData.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php index 32813d44b2d4..ac074d543fec 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php +++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php @@ -105,7 +105,9 @@ public function execute(CustomerInterface $customer): array $customerData['group_id'] = null; $customerData['model'] = $customer; $customerData['id'] = null; - $customerData['date_of_birth'] = $customerData['dob']; + if (!empty($customerData['dob'])) { + $customerData['date_of_birth'] = $customerData['dob']; + } return $customerData; } } From f52ba88cf0ba26ae8b30eb6257a80dd2afb9958c Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Tue, 1 Oct 2019 15:19:18 +0300 Subject: [PATCH 8/8] magento/graphql-ce#911: [Customer] Rename dob to date_of_birth --- .../CustomerGraphQl/Model/Customer/ExtractCustomerData.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php index ac074d543fec..c62a93180964 100644 --- a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php +++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php @@ -101,10 +101,13 @@ public function execute(CustomerInterface $customer): array } } $customerData = array_merge($customerData, $customAttributes); - //Field is deprecated and should not be exposed on storefront. + //Fields are deprecated and should not be exposed on storefront. $customerData['group_id'] = null; - $customerData['model'] = $customer; $customerData['id'] = null; + + $customerData['model'] = $customer; + + //'dob' is deprecated, 'date_of_birth' is used instead. if (!empty($customerData['dob'])) { $customerData['date_of_birth'] = $customerData['dob']; }