fix: Revert change to Tags

Let's keep this for a later refactor

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

lib/private/AppFramework/ORM/EntityManager.php

@@ -64,6 +64,7 @@ public function getRepository(string $entityClass): Repository {
 	 * @template T of object
 	 * @psalm-param T $entity
 	 * @return T
+	 * @throws Exception
 	 */
 	public function insert(object $entity): object {
 		$entityInfo = $this->getEntityInfo($entity::class);

lib/private/Tagging/TagMapper.php

@@ -8,6 +8,7 @@
 
 namespace OC\Tagging;
 
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\ORM\Repository;
 
 /**
@@ -33,4 +34,17 @@ public function loadTags(array $owners, string $type): array {
 			'name' => 'ASC',
 		]));
 	}
+
+	public function tagExists(Tag $tag): bool {
+		try {
+			$this->findOneBy([
+				'owner' => $tag->owner,
+				'type' => $tag->type,
+				'name' => $tag->name,
+			]);
+			return true;
+		} catch (DoesNotExistException) {
+			return false;
+		}
+	}
 }

lib/private/Tags.php

@@ -320,15 +320,8 @@ public function addMultiple(string|array $names, bool $sync = false, ?int $id =
 	 */
 	protected function save(): void {
 		foreach ($this->tags as $tag) {
-			try {
+			if (!$this->mapper->tagExists($tag)) {
 				$this->mapper->insert($tag);
-			} catch (Exception $e) {
-				if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					$this->logger->error($e->getMessage(), [
-						'exception' => $e,
-						'app' => 'core',
-					]);
-				}
 			}
 		}
 

lib/public/AppFramework/ORM/Repository.php

@@ -356,6 +356,7 @@ private function findJoinedEntity(IQueryBuilder $query, array $relations): objec
 	 *
 	 * @psalm-param T $entity
 	 * @return T
+	 * @throws Exception
 	 * @since 35.0.0
 	 */
 	public function insert(object $entity): object {
@@ -379,6 +380,28 @@ public function delete(object $entity): void {
 		$this->entityManager->delete($entity);
 	}
 
+	/**
+	 * Tries to create a new entry in the db from an entity and
+	 * updates an existing entry if duplicate keys are detected
+	 * by the database
+	 *
+	 * @param T $entity the entity that should be created/updated
+	 * @return T the saved entity with the (new) id
+	 * @throws Exception
+	 * @throws \InvalidArgumentException if entity has no id
+	 * @since 15.0.0
+	 */
+	public function insertOrUpdate(object $entity): object {
+		try {
+			return $this->insert($entity);
+		} catch (Exception $ex) {
+			if ($ex->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+				return $this->update($entity);
+			}
+			throw $ex;
+		}
+	}
+
 	/**
 	 * Finds entities by a set of criteria, keyed by property name.
 	 *