refactor getByIds method and use object manager into constructor class

Author: sarron93

app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php

@@ -37,28 +37,15 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
 
     /**
-     * Remove the product assignment from the category by category id and array of sku
+     * Remove the product assignment from the category by category id and array or string of sku
      *
      * @param int $categoryId
-     * @param array $sku
+     * @param string|array $sku
      * @return bool will returned True if products successfully deleted
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
      */
     public function deleteByIds($categoryId, $sku);
-
-    /**
-     * Remove the product assignment from the category by category id and sku
-     *
-     * @param int $categoryId
-     * @param string $sku
-     * @return bool will returned True if products successfully deleted
-     *
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @throws \Magento\Framework\Exception\StateException
-     * @throws \Magento\Framework\Exception\InputException
-     */
-    public function deleteById($categoryId, $sku);
 }

app/code/Magento/Catalog/Model/CategoryLinkManagement.php

@@ -93,7 +93,7 @@ public function assignProductToCategories($productSku, array $categoryIds)
         $product = $this->getProductRepository()->get($productSku);
         $assignedCategories = $this->getProductResource()->getCategoryIds($product);
         foreach (array_diff($assignedCategories, $categoryIds) as $categoryId) {
-            $this->getCategoryLinkRepository()->deleteById($categoryId, $productSku);
+            $this->getCategoryLinkRepository()->deleteByIds($categoryId, $productSku);
         }
 
         foreach (array_diff($categoryIds, $assignedCategories) as $categoryId) {

app/code/Magento/Catalog/Model/CategoryLinkRepository.php

@@ -29,16 +29,14 @@ class CategoryLinkRepository implements \Magento\Catalog\Api\CategoryLinkReposit
     /**
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @param \Magento\Catalog\Model\ResourceModel\Product $productResource
      */
     public function __construct(
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
-        \Magento\Catalog\Model\ResourceModel\Product $productResource
+        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
     ) {
         $this->categoryRepository = $categoryRepository;
         $this->productRepository = $productRepository;
-        $this->productResource = $productResource;
+        $this->productResource = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Catalog\Model\ResourceModel\Product::class);
     }
 
     /**
@@ -72,17 +70,24 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink)
     {
-        return $this->deleteById($productLink->getCategoryId(), $productLink->getSku());
+        return $this->deleteByIds($productLink->getCategoryId(), $productLink->getSku());
     }
 
     /**
      * {@inheritdoc}
      */
     public function deleteByIds($categoryId, $sku)
     {
+        if (!is_array($sku)) {
+            $sku = [$sku];
+        }
         $category = $this->categoryRepository->get($categoryId);
         $products = $this->productResource->getProductsIdsBySkus($sku);
 
+        if (!$products) {
+            throw new InputException(__("The category doesn't contain the specified products."));
+        }
+
         $productPositions = $category->getProductsPosition();
 
         foreach ($products as $productSku => $productId) {
@@ -108,39 +113,4 @@ public function deleteByIds($categoryId, $sku)
         }
         return true;
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function deleteById($categoryId, $sku)
-    {
-        $category = $this->categoryRepository->get($categoryId);
-        $product = $this->productRepository->get($sku);
-        $productPositions = $category->getProductsPosition();
-
-        $productID = $product->getId();
-        if (!isset($productPositions[$productID])) {
-            throw new InputException(__("The category doesn't contain the specified product."));
-        }
-        $backupPosition = $productPositions[$productID];
-        unset($productPositions[$productID]);
-
-        $category->setPostedProducts($productPositions);
-        try {
-            $category->save();
-        } catch (\Exception $e) {
-            throw new CouldNotSaveException(
-                __(
-                    'Could not save product "%product" with position %position to category %category',
-                    [
-                        "product" => $product->getId(),
-                        "position" => $backupPosition,
-                        "category" => $category->getId()
-                    ]
-                ),
-                $e
-            );
-        }
-        return true;
-    }
 }

app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php

@@ -113,7 +113,7 @@ public function testDeleteByIds()
         $productMock->expects($this->once())->method('getId')->willReturn($productId);
         $categoryMock->expects($this->once())->method('setPostedProducts')->with([]);
         $categoryMock->expects($this->once())->method('save');
-        $this->assertTrue($this->model->deleteById($categoryId, $productSku));
+        $this->assertTrue($this->model->deleteByIds($categoryId, $productSku));
     }
 
     /**
@@ -140,7 +140,7 @@ public function testDeleteByIdsWithCouldNotSaveException()
         $categoryMock->expects($this->once())->method('setPostedProducts')->with([]);
         $categoryMock->expects($this->once())->method('getId')->willReturn($categoryId);
         $categoryMock->expects($this->once())->method('save')->willThrowException(new \Exception());
-        $this->model->deleteById($categoryId, $productSku);
+        $this->model->deleteByIds($categoryId, $productSku);
     }
 
     /**

app/code/Magento/Catalog/etc/webapi.xml

@@ -457,7 +457,7 @@
         </resources>
     </route>
     <route url="/V1/categories/:categoryId/products/:sku" method="DELETE">
-        <service class="Magento\Catalog\Api\CategoryLinkRepositoryInterface" method="deleteById" />
+        <service class="Magento\Catalog\Api\CategoryLinkRepositoryInterface" method="deleteByIds" />
         <resources>
             <resource ref="Magento_Catalog::categories" />
         </resources>