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

 - restore fixes to branch and fix test

Author: Cari Spruiell

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;
@@ -208,6 +214,7 @@ public function addData(array $data)
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Returns track_number
      *
@@ -408,5 +415,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentTrackExte
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }

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);
             }
         }

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->once())
+        $this->shipmentMock->expects($this->exactly(3))
             ->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,7 +79,6 @@ public function testInvoke()
             'increment_id' => null,
             'created_at' => null,
             'updated_at' => null,
-//            'packages' => null,
             'shipping_label' => null,
             'tracks' => [
                 [
@@ -98,7 +97,10 @@ public function testInvoke()
             'items' => $items,
             'comments' => [
                 [
-                    'comment' => 'Shipment-related comment.'
+                    'comment' => 'Shipment-related comment.',
+                    'is_customer_notified' => null,
+                    'is_visible_on_front' => null,
+                    'parent_id' => null
                 ]
             ],
         ];