Merge pull request #5361 from magento-borg/borg-2.3

[CIA] Bug fixes

Author: nathanjosiah

app/code/Magento/Ups/Model/Carrier.php

@@ -782,20 +782,26 @@ protected function _getXmlQuotes()
 XMLRequest;
 
         $xmlRequest .= $xmlParams;
-
+        $debugData = ['request' => $xmlParams];
         $httpResponse = $this->asyncHttpClient->request(
             new Request($url, Request::METHOD_POST, ['Content-Type' => 'application/xml'], $xmlRequest)
         );
 
         return $this->deferredProxyFactory->create(
             [
                 'deferred' => new CallbackDeferred(
-                    function () use ($httpResponse) {
+                    function () use ($httpResponse, $debugData) {
                         if ($httpResponse->get()->getStatusCode() >= 400) {
                             $xmlResponse = '';
+                            $debugData['result'] = [
+                                'error' => $httpResponse->get()->getBody(),
+                                'code' => $httpResponse->get()->getStatusCode()
+                            ];
                         } else {
                             $xmlResponse = $httpResponse->get()->getBody();
+                            $debugData['result'] = $xmlResponse;
                         }
+                        $this->_debug($debugData);
 
                         return $this->_parseXmlResponse($xmlResponse);
                     }
@@ -1098,6 +1104,7 @@ protected function _getXmlTracking($trackings)
 
         /** @var HttpResponseDeferredInterface[] $trackingResponses */
         $trackingResponses = [];
+        $debugTrackingData = [];
         foreach ($trackings as $tracking) {
             /**
              * RequestOption==>'1' to request all activities
@@ -1115,6 +1122,7 @@ protected function _getXmlTracking($trackings)
 </TrackRequest>
 XMLAuth;
 
+            $debugTrackingData[] = ['request' => $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest];
             $trackingResponses[] = $this->asyncHttpClient->request(
                 new Request(
                     $url,
@@ -1124,14 +1132,20 @@ protected function _getXmlTracking($trackings)
                 )
             );
         }
-        foreach ($trackingResponses as $response) {
+        foreach ($trackingResponses as $i => $response) {
             $httpResponse = $response->get();
             if ($httpResponse->getStatusCode() >= 400) {
                 $xmlResponse = '';
+                $debugTrackingData[$i]['result'] = [
+                    'error' => $httpResponse->getBody(),
+                    'code' => $httpResponse->getStatusCode()
+                ];
             } else {
                 $xmlResponse = $httpResponse->getBody();
+                $debugTrackingData[$i]['result'] = $httpResponse->getBody();
             }
 
+            $this->_debug($debugTrackingData[$i]);
             $this->_parseXmlTrackingResponse($tracking, $xmlResponse);
         }
 

dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php

@@ -15,8 +15,10 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Quote\Model\Quote\Address\RateRequestFactory;
 use Magento\TestFramework\HTTP\AsyncClientInterfaceMock;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Magento\Shipping\Model\Shipment\Request;
+use Psr\Log\LoggerInterface;
 
 /**
  * Integration tests for Carrier model class
@@ -38,12 +40,30 @@ class CarrierTest extends TestCase
      */
     private $config;
 
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var string[]
+     */
+    private $logs = [];
+
     /**
      * @inheritDoc
      */
     protected function setUp()
     {
-        $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class);
+        $this->logs = [];
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->loggerMock->method('debug')
+            ->willReturnCallback(
+                function (string $message) {
+                    $this->logs[] = $message;
+                }
+            );
+        $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class, ['logger' => $this->loggerMock]);
         $this->httpClient = Bootstrap::getObjectManager()->get(AsyncClientInterface::class);
         $this->config = Bootstrap::getObjectManager()->get(ReinitableConfigInterface::class);
     }
@@ -131,6 +151,7 @@ public function testCollectFreeRates()
      * @magentoConfigFixture default_store carriers/ups/username user
      * @magentoConfigFixture default_store carriers/ups/password pass
      * @magentoConfigFixture default_store carriers/ups/access_license_number acn
+     * @magentoConfigFixture current_store carriers/ups/debug 1
      * @magentoConfigFixture default_store currency/options/allow GBP,USD,EUR
      * @magentoConfigFixture default_store currency/options/base GBP
      */
@@ -167,6 +188,17 @@ public function testCollectRates(int $negotiable, int $tax, int $responseId, str
         $rates = $this->carrier->collectRates($request)->getAllRates();
         $this->assertEquals($price, $rates[0]->getPrice());
         $this->assertEquals($method, $rates[0]->getMethod());
+        //Checking that both request and response from the carrier have been logged.
+        $requestFound = false;
+        foreach ($this->logs as $logged) {
+            if (mb_stripos($logged, 'RatingServiceSelectionRequest')
+                && mb_stripos($logged, 'RatingServiceSelectionResponse')
+            ) {
+                $requestFound = true;
+                break;
+            }
+        }
+        $this->assertTrue($requestFound);
     }
 
     /**