MC-6420: Ship Order API. Two bundle products with ship bundle items set to separately in order

Author: ameysar

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

@@ -236,7 +236,6 @@ public function testPartialShipOrderWithBundleShippedSeparately()
      */
     public function testPartialShipOrderWithTwoBundleShippedSeparatelyContainsSameSimple()
     {
-        /** @var Order $order */
         $order = $this->getOrder('order_bundle_separately_shipped');
 
         $requestData = [
@@ -246,7 +245,7 @@ public function testPartialShipOrderWithTwoBundleShippedSeparatelyContainsSameSi
                 'comment' => 'Test Comment',
                 'is_visible_on_front' => 1,
             ],
-            'tracks' => []
+            'tracks' => [],
         ];
 
         $shippedItemId = null;
@@ -274,7 +273,6 @@ public function testPartialShipOrderWithTwoBundleShippedSeparatelyContainsSameSi
 
         $this->assertEquals(1, $shipment->getTotalQty());
 
-        /** @var Order $existingOrder */
         $order = $this->getOrder('order_bundle_separately_shipped');
 
         foreach ($order->getAllItems() as $item) {

dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_2_bundles_shipping_separately.php

@@ -5,23 +5,35 @@
  */
 declare(strict_types=1);
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\Product\Type as BundleProductType;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Checkout\Model\Cart;
+use Magento\Checkout\Model\Session;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Payment;
+use Magento\Quote\Model\QuoteManagement;
+use Magento\TestFramework\Helper\Bootstrap;
 
 require __DIR__ . '/two_bundle_products_with_separate_shipping.php';
 $addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
 
-$billingAddress = $objectManager->create(\Magento\Quote\Model\Quote\Address::class, ['data' => $addressData]);
+$objectManager = Bootstrap::getObjectManager();
+$billingAddress = $objectManager->create(Address::class, ['data' => $addressData]);
 $billingAddress->setAddressType('billing');
 
 $shippingAddress = clone $billingAddress;
-$shippingAddress->setId(null)->setAddressType('shipping')->setShippingMethod('flatrate_flatrate');
+$shippingAddress->setId(null)
+    ->setAddressType('shipping')
+    ->setShippingMethod('flatrate_flatrate');
 
-/** @var \Magento\Quote\Model\Quote\Payment $payment */
-$payment = $objectManager->create(\Magento\Quote\Model\Quote\Payment::class);
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
 $payment->setMethod('checkmo');
 
-/** @var \Magento\Catalog\Model\ProductRepository $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
 
 $bundleProduct = $productRepository->get('bundle-product-separate-shipping-1');
 $bundleProduct2 = $productRepository->get('bundle-product-separate-shipping-2');
@@ -30,21 +42,22 @@
     $bundleProduct2->getId() => [11, 13],
 ];
 
-/** @var $cart \Magento\Checkout\Model\Cart */
-$cart = $objectManager->create(\Magento\Checkout\Model\Cart::class);
+/** @var Cart $cart */
+$cart = $objectManager->create(Cart::class);
 
 foreach ([$bundleProduct, $bundleProduct2] as $product) {
 
-    /** @var $typeInstance \Magento\Bundle\Model\Product\Type */
+    /** @var BundleProductType $typeInstance */
     $typeInstance = $product->getTypeInstance();
     $typeInstance->setStoreFilter($product->getStoreId(), $product);
     $optionCollection = $typeInstance->getOptionsCollection($product);
 
     $bundleOptions = [];
     $bundleOptionsQty = [];
     $optionsData = [];
+
+    /** @var Option $option */
     foreach ($optionCollection as $option) {
-        /** @var $option \Magento\Bundle\Model\Option */
         $selectionsCollection = $typeInstance->getSelectionsCollection([$option->getId()], $product);
         $selectionIds = $selectionProducts[$product->getId()];
         $selectionsCollection->addIdFilter($selectionIds);
@@ -73,12 +86,12 @@
     ->setReservedOrderId('order_bundle_separately_shipped')
     ->setBillingAddress($billingAddress)
     ->setShippingAddress($shippingAddress)
-    ->setCheckoutMethod(\Magento\Quote\Api\CartManagementInterface::METHOD_GUEST)
+    ->setCheckoutMethod(CartManagementInterface::METHOD_GUEST)
     ->setPayment($payment);
 $cart->save();
 
-/** @var \Magento\Quote\Model\QuoteManagement $quoteManager */
-$quoteManager = $objectManager->get(\Magento\Quote\Model\QuoteManagement::class);
+/** @var QuoteManagement $quoteManager */
+$quoteManager = $objectManager->get(QuoteManagement::class);
 $orderId = $quoteManager->placeOrder($cart->getQuote()->getId());
 
-$objectManager->removeSharedInstance(\Magento\Checkout\Model\Session::class);
+$objectManager->removeSharedInstance(Session::class);

dev/tests/integration/testsuite/Magento/Bundle/_files/two_bundle_products_with_separate_shipping.php

@@ -5,31 +5,44 @@
  */
 declare(strict_types=1);
 
+use Magento\Bundle\Api\Data\LinkInterfaceFactory;
+use Magento\Bundle\Api\Data\OptionInterfaceFactory;
+use Magento\Bundle\Model\Product\Price as BundlePrice;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type as BundleProductType;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
 require __DIR__ . '/multiple_products.php';
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->create(ProductFactory::class);
+
+/** @var OptionInterfaceFactory $bundleOptionFactory */
+$bundleOptionFactory = $objectManager->create(OptionInterfaceFactory::class);
 
-/** @var \Magento\Catalog\Model\ProductRepository $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-/** @var \Magento\Catalog\Model\ProductFactory $productFactory */
-$productFactory = $objectManager->create(\Magento\Catalog\Model\ProductFactory::class);
-/** @var \Magento\Bundle\Api\Data\OptionInterfaceFactory $bundleOptionFactory */
-$bundleOptionFactory = $objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class);
-/** @var \Magento\Bundle\Api\Data\LinkInterfaceFactory $bundleLinkFactory */
-$bundleLinkFactory = $objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class);
+/** @var LinkInterfaceFactory $bundleLinkFactory */
+$bundleLinkFactory = $objectManager->create(LinkInterfaceFactory::class);
 
-/** @var $bundleProduct \Magento\Catalog\Model\Product */
 $bundleProduct = $productFactory->create();
-$bundleProduct->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
-    ->setAttributeSetId(4)
+$attributeSetId = $bundleProduct->getDefaultAttributeSetId();
+$bundleProduct->setTypeId(BundleProductType::TYPE_BUNDLE)
+    ->setAttributeSetId($attributeSetId)
     ->setWebsiteIds([1])
     ->setName('Bundle Product With Separate Items Shipping')
     ->setSku('bundle-product-separate-shipping-1')
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setPriceView(1)
-    ->setPriceType(1)
+    ->setPriceType(BundlePrice::PRICE_TYPE_FIXED)
     ->setPrice(10.0)
     ->setShipmentType(1)
     ->setBundleOptionsData(

dev/tests/integration/testsuite/Magento/Bundle/_files/two_bundle_products_with_separate_shipping_rollback.php

@@ -5,21 +5,26 @@
  */
 declare(strict_types=1);
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
 
-/** @var \Magento\Framework\Registry $registry */
-$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 try {
     $productRepository->deleteById('bundle-product-separate-shipping-1');
     $productRepository->deleteById('bundle-product-separate-shipping-2');
-} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+} catch (NoSuchEntityException $exception) {
     // When DbIsolation is used products can be already removed by rollback main transaction
 }