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

Author: Alexander Paliarush

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

@@ -6,6 +6,7 @@
 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;
 
@@ -137,11 +138,16 @@ 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) {
-            $this->_shipment = $this->shipmentRepository->get($this->getParentId());
+            if ($this->getParentId()) {
+                $this->_shipment = $this->shipmentRepository->get($this->getParentId());
+            } else {
+                throw new LocalizedException(__("Parent shipment cannot be loaded for track object."));
+            }
         }
 
         return $this->_shipment;

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

@@ -64,11 +64,13 @@ 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);
             }
         }

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

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