MAGETWO-50202: [GitHub] Couldn't save shipment data #527

Author: Oleksii Korshenko

app/code/Magento/Sales/Model/Order/Shipment/Track.php

@@ -6,7 +6,6 @@
 namespace Magento\Sales\Model\Order\Shipment;
 
 use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\Data\ShipmentTrackInterface;
 use Magento\Sales\Model\AbstractModel;
 
@@ -138,16 +137,11 @@ public function setShipment(\Magento\Sales\Model\Order\Shipment $shipment)
      * Retrieve Shipment instance
      *
      * @return \Magento\Sales\Model\Order\Shipment
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getShipment()
     {
         if (!$this->_shipment instanceof \Magento\Sales\Model\Order\Shipment) {
-            if ($this->getParentId()) {
-                $this->_shipment = $this->shipmentRepository->get($this->getParentId());
-            } else {
-                throw new LocalizedException(__("Parent shipment cannot be loaded for track object."));
-            }
+            $this->_shipment = $this->shipmentRepository->get($this->getParentId());
         }
 
         return $this->_shipment;
@@ -214,7 +208,6 @@ public function addData(array $data)
     }
 
     //@codeCoverageIgnoreStart
-
     /**
      * Returns track_number
      *
@@ -415,6 +408,5 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentTrackExte
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
-
     //@codeCoverageIgnoreEnd
 }

app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php

@@ -64,13 +64,11 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
         }
         if (null !== $object->getTracks()) {
             foreach ($object->getTracks() as $track) {
-                $track->setParentId($object->getId());
                 $this->shipmentTrackResource->save($track);
             }
         }
         if (null !== $object->getComments()) {
             foreach ($object->getComments() as $comment) {
-                $comment->setParentId($object->getId());
                 $this->shipmentCommentResource->save($comment);
             }
         }

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php

@@ -111,7 +111,7 @@ protected function setUp()
 
     public function testProcessRelations()
     {
-        $this->shipmentMock->expects($this->exactly(3))
+        $this->shipmentMock->expects($this->once())
             ->method('getId')
             ->willReturn('shipment-id-value');
         $this->shipmentMock->expects($this->exactly(2))

app/code/Magento/Shipping/Test/Unit/Model/Order/TrackTest.php

@@ -52,7 +52,7 @@ public function testLookup()
             'Magento\Shipping\Model\Order\Track',
             ['carrierFactory' => $carrierFactory, 'shipmentRepository' => $shipmentRepository]
         );
-        $model->setParentId(1);
+
         $this->assertEquals('trackingInfo', $model->getNumberDetail());
     }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php

@@ -79,21 +79,11 @@ public function testInvoke()
             'increment_id' => null,
             'created_at' => null,
             'updated_at' => null,
+//            'packages' => null,
             'shipping_label' => null,
-            'tracks' => [
-                [
-                    'carrier_code' => 'UPS',
-                    'order_id' => $order->getId(),
-                    'title' => 'ground',
-                    'track_number' => '12345678'
-                ]
-            ],
+            'tracks' => [],
             'items' => $items,
-            'comments' => [
-                [
-                    'comment' => 'Shipment-related comment.'
-                ]
-            ],
+            'comments' => [],
         ];
         $result = $this->_webApiCall($serviceInfo, ['entity' => $data]);
         $this->assertNotEmpty($result);