Skip to content

MSI: Fix Validation Exception #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 15, 2017
Merged

MSI: Fix Validation Exception #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d2fa69
MSI: Fix Validation Exception
Sep 15, 2017
cc46a86
MSI: Fix Validation Exception
Sep 15, 2017
bfbac37
MSI: Fix Validation Exception
Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ public function execute()
$this->messageManager->addErrorMessage(__('The Source does not exist.'));
$this->processRedirectAfterFailureSave($resultRedirect);
} catch (ValidationException $e) {
$this->messageManager->addErrorMessage($e->getMessage());
foreach ($e->getErrors() as $localizedError) {
$this->messageManager->addErrorMessage($localizedError->getMessage());
}
$this->processRedirectAfterFailureSave($resultRedirect, $sourceId);
} catch (CouldNotSaveException $e) {
$this->messageManager->addErrorMessage($e->getMessage());
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ public function execute()
$this->messageManager->addErrorMessage(__('The Stock does not exist.'));
$this->processRedirectAfterFailureSave($resultRedirect);
} catch (ValidationException $e) {
$this->messageManager->addErrorMessage($e->getMessage());
foreach ($e->getErrors() as $localizedError) {
$this->messageManager->addErrorMessage($localizedError->getMessage());
}
$this->processRedirectAfterFailureSave($resultRedirect, $stockId);
} catch (CouldNotSaveException $e) {
$this->messageManager->addErrorMessage($e->getMessage());
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Inventory/Model/Reservation/ReservationBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function build(): ReservationInterface

$validationResult = $this->reservationValidator->validate($reservation);
if (!$validationResult->isValid()) {
throw new ValidationException($validationResult);
throw new ValidationException(__('Validation Failed'), null, 0, $validationResult);
}
return $reservation;
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Inventory/Model/Source/Command/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function execute(SourceInterface $source)
$validationResult = $this->sourceValidator->validate($source);

if (!$validationResult->isValid()) {
throw new ValidationException($validationResult);
throw new ValidationException(__('Validation Failed'), null, 0, $validationResult);
}

try {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Inventory/Model/Stock/Command/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function execute(StockInterface $stock)
{
$validationResult = $this->stockValidator->validate($stock);
if (!$validationResult->isValid()) {
throw new ValidationException($validationResult);
throw new ValidationException(__('Validation Failed'), null, 0, $validationResult);
}

try {
Expand Down
26 changes: 15 additions & 11 deletions app/code/Magento/InventoryApi/Test/Api/SourceRepository/CarrierLinkManagementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,14 @@ public function testAssignCarrierLinksIfUseGlobalConfigurationChosen()
];

$expectedErrorData = [
'message' => 'You can\'t configure "%field" because you have chosen Global Shipping configuration.',
'parameters' => [
'field' => SourceInterface::CARRIER_LINKS,
'message' => 'Validation Failed',
'errors' => [
[
'message' => 'You can\'t configure "%field" because you have chosen Global Shipping configuration.',
'parameters' => [
'field' => SourceInterface::CARRIER_LINKS,
],
],
],
];

Expand All @@ -128,17 +133,16 @@ public function testAssignCarrierLinksIfUseGlobalConfigurationChosen()
$this->fail('Expected throwing exception');
} catch (\Exception $e) {
if (TESTS_WEB_API_ADAPTER == self::ADAPTER_REST) {
$errorData = $this->processRestExceptionResult($e);
self::assertEquals($expectedErrorData, $errorData);
self::assertEquals($expectedErrorData, $this->processRestExceptionResult($e));
self::assertEquals(Exception::HTTP_BAD_REQUEST, $e->getCode());
} elseif (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
$this->assertInstanceOf('SoapFault', $e);
$this->checkSoapFault(
$e,
$expectedErrorData['message'],
'env:Sender',
$expectedErrorData['parameters']
);
// @see \Magento\TestFramework\TestCase\WebapiAbstract::getActualWrappedErrors()
$expectedWrappedErrors = $expectedErrorData['errors'];
$expectedWrappedErrors[0]['params'] = $expectedWrappedErrors[0]['parameters'];
unset($expectedWrappedErrors[0]['parameters']);

$this->checkSoapFault($e, $expectedErrorData['message'], 'env:Sender', [], $expectedWrappedErrors);
} else {
throw $e;
}
Expand Down
128 changes: 86 additions & 42 deletions app/code/Magento/InventoryApi/Test/Api/SourceRepository/ValidationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,11 @@ public function testCreateWithMissedRequiredFields($field, array $expectedErrorD
$this->fail('Expected throwing exception');
} catch (\Exception $e) {
if (TESTS_WEB_API_ADAPTER == self::ADAPTER_REST) {
$errorData = $this->processRestExceptionResult($e);
self::assertEquals($expectedErrorData['rest_message'], $errorData['message']);
self::assertEquals($expectedErrorData['parameters'], $errorData['parameters']);
self::assertEquals($expectedErrorData['rest'], $this->processRestExceptionResult($e));
self::assertEquals(Exception::HTTP_BAD_REQUEST, $e->getCode());
} elseif (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
$this->assertInstanceOf('SoapFault', $e);
$this->checkSoapFault(
$e,
$expectedErrorData['soap_message'],
'Sender'
);
$this->checkSoapFault($e, $expectedErrorData['soap']['message'], 'Sender');
} else {
throw $e;
}
Expand All @@ -80,20 +74,38 @@ public function dataProviderRequiredFields()
'without_' . SourceInterface::NAME => [
SourceInterface::NAME,
[
'rest_message' => '"%field" can not be empty.',
'soap_message' => sprintf('object has no \'%s\' property', SourceInterface::NAME),
'parameters' => [
'field' => SourceInterface::NAME,
'rest' => [
'message' => 'Validation Failed',
'errors' => [
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::NAME,
],
],
],
],
'soap' => [
'message' => 'object has no \'' . SourceInterface::NAME . '\' property',
],
],
],
'without_' . SourceInterface::POSTCODE => [
SourceInterface::POSTCODE,
[
'rest_message' => '"%field" can not be empty.',
'soap_message' => sprintf('object has no \'%s\' property', SourceInterface::POSTCODE),
'parameters' => [
'field' => SourceInterface::POSTCODE,
'rest' => [
'message' => 'Validation Failed',
'errors' => [
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::POSTCODE,
],
],
],
],
'soap' => [
'message' => 'object has no \'' . SourceInterface::POSTCODE . '\' property',
],
],
],
Expand Down Expand Up @@ -160,59 +172,89 @@ public function failedValidationDataProvider()
SourceInterface::NAME,
null,
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::NAME,
'message' => 'Validation Failed',
'errors' => [
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::NAME,
],
],
],
],
],
'whitespaces_' . SourceInterface::NAME => [
SourceInterface::NAME,
' ',
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::NAME,
'message' => 'Validation Failed',
'errors' => [
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::NAME,
],
],
],
],
],
'empty_' . SourceInterface::POSTCODE => [
SourceInterface::POSTCODE,
null,
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::POSTCODE,
'message' => 'Validation Failed',
'errors' => [
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::POSTCODE,
],
],
],
],
],
'whitespaces_' . SourceInterface::POSTCODE => [
SourceInterface::POSTCODE,
' ',
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::POSTCODE,
'message' => 'Validation Failed',
'errors' => [
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::POSTCODE,
],
],
],
],
],
'empty_' . SourceInterface::COUNTRY_ID => [
SourceInterface::COUNTRY_ID,
null,
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::COUNTRY_ID,
'message' => 'Validation Failed',
'errors' => [
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::COUNTRY_ID,
],
],
],
],
],
'whitespaces_' . SourceInterface::COUNTRY_ID => [
SourceInterface::COUNTRY_ID,
' ',
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::COUNTRY_ID,
'message' => 'Validation Failed',
'errors' => [
[
'message' => '"%field" can not be empty.',
'parameters' => [
'field' => SourceInterface::COUNTRY_ID,
],
],
],
],
],
Expand All @@ -232,17 +274,19 @@ private function webApiCall(array $serviceInfo, array $data, array $expectedErro
$this->fail('Expected throwing exception');
} catch (\Exception $e) {
if (TESTS_WEB_API_ADAPTER == self::ADAPTER_REST) {
$errorData = $this->processRestExceptionResult($e);
self::assertEquals($expectedErrorData, $errorData);
self::assertEquals($expectedErrorData, $this->processRestExceptionResult($e));
self::assertEquals(Exception::HTTP_BAD_REQUEST, $e->getCode());
} elseif (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
$this->assertInstanceOf('SoapFault', $e);
$this->checkSoapFault(
$e,
$expectedErrorData['message'],
'env:Sender',
$expectedErrorData['parameters']
);
$expectedWrappedErrors = [];
foreach ($expectedErrorData['errors'] as $error) {
// @see \Magento\TestFramework\TestCase\WebapiAbstract::getActualWrappedErrors()
$expectedWrappedErrors[] = [
'message' => $error['message'],
'params' => $error['parameters'],
];
}
$this->checkSoapFault($e, $expectedErrorData['message'], 'env:Sender', [], $expectedWrappedErrors);
} else {
throw $e;
}
Expand Down
Loading