Update order shipment data after the draft has been created

ISSUE: CS-763
packlink-dev · Mar 26, 2020 · 715f42c · 715f42c
1 parent e70736e
commit 715f42c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/BusinessLogic/Tasks/SendDraftTask.php b/src/BusinessLogic/Tasks/SendDraftTask.php
@@ -109,6 +109,7 @@ public function unserialize($serialized)
      * @throws \Logeecom\Infrastructure\Http\Exceptions\HttpRequestException
      * @throws \Packlink\BusinessLogic\Http\Exceptions\DraftNotCreatedException
      * @throws \Packlink\BusinessLogic\Order\Exceptions\OrderNotFound
+     * @throws \Packlink\BusinessLogic\OrderShipmentDetails\Exceptions\OrderShipmentDetailsNotFound
      */
     public function execute()
     {
@@ -134,6 +135,12 @@ public function execute()
         $this->reportProgress(85);
 
         $this->getOrderService()->setReference($this->orderId, $reference);
+        $shipment = $this->getProxy()->getShipment($reference);
+
+        if ($shipment) {
+            $this->getOrderService()->updateShipmentData($shipment);
+        }
+
         $this->reportProgress(100);
     }
 

diff --git a/tests/BusinessLogic/Common/ApiResponses/draftResponse.json b/tests/BusinessLogic/Common/ApiResponses/draftResponse.json
@@ -1,3 +1,3 @@
 {
-  "reference": "DE00019732CF"
+  "reference": "test"
 }
diff --git a/tests/BusinessLogic/Order/ShipmentDraftServiceTest.php b/tests/BusinessLogic/Order/ShipmentDraftServiceTest.php
@@ -304,6 +304,10 @@ private function getMockResponses()
             new HttpResponse(
                 200, array(), '{}'
             ),
+            // send shipment response
+            new HttpResponse(
+                200, array(), file_get_contents(__DIR__ . '/../Common/ApiResponses/shipment.json')
+            ),
         );
     }
 }
diff --git a/tests/BusinessLogic/Tasks/SendDraftTaskTest.php b/tests/BusinessLogic/Tasks/SendDraftTaskTest.php
@@ -27,6 +27,7 @@
 use Packlink\BusinessLogic\ShippingMethod\Models\ShippingMethod;
 use Packlink\BusinessLogic\ShippingMethod\PackageTransformer;
 use Packlink\BusinessLogic\ShippingMethod\ShippingMethodService;
+use Packlink\BusinessLogic\ShippingMethod\Utility\ShipmentStatus;
 use Packlink\BusinessLogic\Tasks\SendDraftTask;
 
 /**
@@ -134,6 +135,7 @@ protected function tearDown()
      * @throws \Logeecom\Infrastructure\Http\Exceptions\HttpRequestException
      * @throws \Packlink\BusinessLogic\Order\Exceptions\OrderNotFound
      * @throws \Packlink\BusinessLogic\Http\Exceptions\DraftNotCreatedException
+     * @throws \Packlink\BusinessLogic\OrderShipmentDetails\Exceptions\OrderShipmentDetailsNotFound
      */
     public function testExecute()
     {
@@ -144,9 +146,11 @@ public function testExecute()
         $shopOrderService = TestServiceRegister::getService(OrderShipmentDetailsService::CLASS_NAME);
         $shipmentDetails = $shopOrderService->getDetailsByOrderId('test');
 
-        $this->assertEquals('DE00019732CF', $shipmentDetails->getReference());
+        $this->assertEquals('test', $shipmentDetails->getReference());
+        $this->assertEquals(15.85, $shipmentDetails->getShippingCost());
+        $this->assertEquals(ShipmentStatus::STATUS_PENDING, ShipmentStatus::getStatus($shipmentDetails->getStatus()));
         // there should be an info message that draft is created.
-        $this->assertCount(1, $this->shopLogger->loggedMessages);
+        $this->assertCount(2, $this->shopLogger->loggedMessages);
 
         /** @var OrderSendDraftTaskMapService $taskMapService */
         $taskMapService = ServiceRegister::getService(OrderSendDraftTaskMapService::CLASS_NAME);
@@ -209,6 +213,10 @@ private function getMockResponses()
             new HttpResponse(
                 200, array(), '{}'
             ),
+            // send shipment response
+            new HttpResponse(
+                200, array(), file_get_contents(__DIR__ . '/../Common/ApiResponses/shipment.json')
+            ),
         );
     }
 }