Implements saving referenced items too

aimeos · Apr 21, 2018 · 246d8b6 · 246d8b6
1 parent f6505ae
commit 246d8b6
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 18 deletions.
diff --git a/lib/mshoplib/src/MShop/Attribute/Manager/Standard.php b/lib/mshoplib/src/MShop/Attribute/Manager/Standard.php
@@ -247,7 +247,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 		}
 
 		if( !$item->isModified() ) {
-			return $item;
+			return $this->saveRefItems( $item, 'attribute' );
 		}
 
 		$context = $this->getContext();
@@ -408,7 +408,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'attribute' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Catalog/Manager/Standard.php b/lib/mshoplib/src/MShop/Catalog/Manager/Standard.php
@@ -406,7 +406,7 @@ public function insertItem( \Aimeos\MShop\Catalog\Item\Iface $item, $parentId =
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'catalog' );
 	}
 
 
@@ -453,6 +453,10 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw new \Aimeos\MShop\Catalog\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
 		}
 
+		if( !$item->isModified() ) {
+			return $this->saveRefItems( $item, 'catalog' );
+		}
+
 		$siteid = $this->getContext()->getLocale()->getSiteId();
 		$node = $item->getNode();
 		$this->begin();
@@ -469,7 +473,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'catalog' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Common/Manager/ListRef/Base.php b/lib/mshoplib/src/MShop/Common/Manager/ListRef/Base.php
@@ -212,4 +212,57 @@ protected function getRefItems( array $refIdMap )
 
 		return $items;
 	}
+
+
+	/**
+	 * Adds new, updates existing and deletes removed referenced items
+	 *
+	 * @param \Aimeos\MShop\Common\Item\ListRef\Iface $item Item with referenced items
+	 * @return \Aimeos\MShop\Common\Item\ListRef\Iface $item with updated referenced items
+	 */
+	protected function saveRefItems( \Aimeos\MShop\Common\Item\ListRef\Iface $item, $domain )
+	{
+		$rmListIds = $rmIds = [];
+		$context = $this->getContext();
+		$listManager = \Aimeos\MShop\Factory::createManager( $context, $domain . '/lists' );
+
+		foreach( $item->getDeletedItems() as $listItem )
+		{
+			$rmListIds[] = $listItem->getId();
+
+			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
+				$rmIds[$listItem->getDomain()][] = $refItem->getId();
+			}
+		}
+
+		foreach( $rmIds as $refDomain => $ids ) {
+			\Aimeos\MShop\Factory::createManager( $context, $refDomain )->deleteItems( $ids );
+		}
+
+		$listManager->deleteItems( $rmListIds );
+
+		foreach( $item->getListItems( null, null, null, false ) as $listItem )
+		{
+			if( ( $refItem = $listItem->getRefItem() ) !== null )
+			{
+				if( $refItem instanceof \Aimeos\MShop\Common\Item\Domain\Iface ) {
+					$refItem->setDomain( $domain );
+				}
+
+				$manager = \Aimeos\MShop\Factory::createManager( $context, $listItem->getDomain() );
+				$refItem = $manager->saveItem( $refItem );
+
+				$listItem->setRefId( $refItem->getId() );
+			}
+
+			if( $listItem->getParentId() != $item->getId() ) {
+				$listItem->setId( null ); //create new list item if copied
+			}
+
+			$listItem->setParentId( $item->getId() );
+			$listManager->saveItem( $listItem );
+		}
+
+		return $item;
+	}
 }
diff --git a/lib/mshoplib/src/MShop/Customer/Manager/Standard.php b/lib/mshoplib/src/MShop/Customer/Manager/Standard.php
@@ -376,7 +376,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 		}
 
 		if( !$item->isModified() ) {
-			return $item;
+			return $this->saveRefItems( $item, 'customer' );
 		}
 
 		$context = $this->getContext();
@@ -561,7 +561,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 
 		$this->addGroups( $item );
 
-		return $item;
+		return $this->saveRefItems( $item, 'customer' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Media/Manager/Standard.php b/lib/mshoplib/src/MShop/Media/Manager/Standard.php
@@ -283,7 +283,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 		}
 
 		if( !$item->isModified() ) {
-			return $item;
+			return $this->saveRefItems( $item, 'media' );
 		}
 
 		$context = $this->getContext();
@@ -446,7 +446,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'media' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Price/Manager/Standard.php b/lib/mshoplib/src/MShop/Price/Manager/Standard.php
@@ -316,7 +316,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 		}
 
 		if( !$item->isModified() ) {
-			return $item;
+			return $this->saveRefItems( $item, 'price' );
 		}
 
 		$context = $this->getContext();
@@ -481,7 +481,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'price' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Product/Manager/Standard.php b/lib/mshoplib/src/MShop/Product/Manager/Standard.php
@@ -215,7 +215,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 		}
 
 		if( !$item->isModified() ) {
-			return $item;
+			return $this->saveRefItems( $item, 'product' );
 		}
 
 		$context = $this->getContext();
@@ -378,7 +378,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'product' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Service/Manager/Standard.php b/lib/mshoplib/src/MShop/Service/Manager/Standard.php
@@ -308,7 +308,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 		}
 
 		if( !$item->isModified() ) {
-			return $item;
+			return $this->saveRefItems( $item, 'service' );
 		}
 
 		$context = $this->getContext();
@@ -472,7 +472,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'service' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Supplier/Manager/Standard.php b/lib/mshoplib/src/MShop/Supplier/Manager/Standard.php
@@ -260,7 +260,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 		}
 
 		if( !$item->isModified() ) {
-			return $item;
+			return $this->saveRefItems( $item, 'supplier' );
 		}
 
 		$context = $this->getContext();
@@ -418,7 +418,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'supplier' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Text/Manager/Standard.php b/lib/mshoplib/src/MShop/Text/Manager/Standard.php
@@ -169,7 +169,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 		}
 
 		if( !$item->isModified() ) {
-			return $item;
+			return $this->saveRefItems( $item, 'text' );
 		}
 
 		$context = $this->getContext();
@@ -330,7 +330,7 @@ public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 			throw $e;
 		}
 
-		return $item;
+		return $this->saveRefItems( $item, 'text' );
 	}
 
 

diff --git a/lib/mshoplib/tests/MShop/Product/Manager/StandardTest.php b/lib/mshoplib/tests/MShop/Product/Manager/StandardTest.php
@@ -170,6 +170,49 @@ public function testSaveUpdateDeleteItem()
 	}
 
 
+	public function testSaveItemRefItems()
+	{
+		$context = \TestHelperMShop::getContext();
+
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $context );
+		$typeManager = $manager->getSubManager( 'type' );
+
+		$item = $manager->createItem();
+		$item->setTypeId( $typeManager->findItem( 'default', [], 'product' )->getId() );
+		$item->setCode( 'unitreftest' );
+
+		$listManager = $manager->getSubManager( 'lists' );
+		$listTypeManager = $listManager->getSubManager( 'type' );
+
+		$listItem = $listManager->createItem();
+		$listItem->setTypeId( $listTypeManager->findItem( 'default', [], 'product' )->getId() );
+
+		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager( $context );
+		$textTypeManager = $textManager->getSubManager( 'type' );
+
+		$textItem = $textManager->createItem();
+		$textItem->setTypeId( $textTypeManager->findItem( 'name', [], 'product' )->getId() );
+
+
+		$item->addRefItem( 'text', $listItem, $textItem );
+
+		$item = $manager->saveItem( $item );
+		$item2 = $manager->getItem( $item->getId(), ['text'] );
+
+		$item->deleteRefItem( 'text', $listItem, $textItem );
+
+		$item = $manager->saveItem( $item );
+		$item3 = $manager->getItem( $item->getId(), ['text'] );
+
+		$manager->deleteItem( $item->getId() );
+
+
+		$this->assertEquals( 0, count( $item->getRefItems( 'text', 'name', 'default', false ) ) );
+		$this->assertEquals( 1, count( $item2->getRefItems( 'text', 'name', 'default', false ) ) );
+		$this->assertEquals( 0, count( $item3->getRefItems( 'text', 'name', 'default', false ) ) );
+	}
+
+
 	public function testSaveItemSitecheck()
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperMShop::getContext() );