Skip to content

Commit f8b47b3

Browse files
committed
graphQl-961: ShippingAddressInput.postcode: String, is not required by Schema
1 parent 694dda4 commit f8b47b3

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
1717
use Magento\Quote\Model\Quote\Address as QuoteAddress;
1818
use Magento\Quote\Model\Quote\AddressFactory as BaseQuoteAddressFactory;
19-
use Magento\Framework\App\ObjectManager;
2019

2120
/**
2221
* Create QuoteAddress
@@ -47,20 +46,19 @@ class QuoteAddressFactory
4746
* @param BaseQuoteAddressFactory $quoteAddressFactory
4847
* @param GetCustomerAddress $getCustomerAddress
4948
* @param AddressHelper $addressHelper
50-
* @param CountryInformationAcquirerInterface|null $countryInformationAcquirer
49+
* @param CountryInformationAcquirerInterface $countryInformationAcquirer
5150
*/
5251
public function __construct(
5352
BaseQuoteAddressFactory $quoteAddressFactory,
5453
GetCustomerAddress $getCustomerAddress,
5554
AddressHelper $addressHelper,
56-
CountryInformationAcquirerInterface $countryInformationAcquirer = null
55+
CountryInformationAcquirerInterface $countryInformationAcquirer
5756
) {
5857
$this->quoteAddressFactory = $quoteAddressFactory;
5958
$this->getCustomerAddress = $getCustomerAddress;
6059
$this->addressHelper = $addressHelper;
6160
$this->countryInformationAcquirer = $countryInformationAcquirer;
62-
$this->countryInformationAcquirer = $countryInformationAcquirer
63-
?: ObjectManager::getInstance()->get(CountryInformationAcquirerInterface::class);
61+
$this->countryInformationAcquirer = $countryInformationAcquirer;
6462
}
6563

6664
/**

app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ private function validateAddress(Address $shippingAddress)
140140
*
141141
* @param array $errors
142142
* @return string
143+
*
144+
* @todo change implementation in https://github.com/magento/graphql-ce/issues/970.
143145
*/
144146
private function getAddressErrors(array $errors): string
145147
{

app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ private function validateAddress(Address $shippingAddress)
8181
*
8282
* @param array $errors
8383
* @return string
84+
*
85+
* @todo change implementation in https://github.com/magento/graphql-ce/issues/970.
8486
*/
8587
private function getAddressErrors(array $errors): string
8688
{

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,22 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
441441
}]',
442442
'"regionId" is required. Enter and try again.'
443443
],
444+
'missed_multiple_fields' => [
445+
'cart_id: "cart_id_value"
446+
shipping_addresses: [{
447+
address: {
448+
firstname: "test firstname"
449+
lastname: "test lastname"
450+
company: "test company"
451+
street: ["test street 1", "test street 2"]
452+
city: "test city"
453+
country_code: "US"
454+
telephone: "88776655"
455+
}
456+
}]',
457+
'"postcode" is required. Enter and try again.
458+
"regionId" is required. Enter and try again.'
459+
],
444460
];
445461
}
446462

0 commit comments

Comments
 (0)