refactor lastUpdated for Shares

Signed-off-by: Christian Hartmann <[email protected]>
nextcloud · Sep 12, 2024 · afabe5b · afabe5b
1 parent 12dc3a6
commit afabe5b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 27 deletions.
diff --git a/lib/Controller/ShareApiController.php b/lib/Controller/ShareApiController.php
@@ -194,8 +194,6 @@ public function newShare(int $formId, int $shareType, string $shareWith = '', ar
 		// Create share-notifications (activity)
 		$this->formsService->notifyNewShares($form, $share);
 
-		$this->formMapper->update($form);
-
 		// Append displayName for Frontend
 		$shareData = $share->read();
 		$shareData['displayName'] = $this->formsService->getShareDisplayName($shareData);
@@ -331,9 +329,7 @@ public function deleteShare(int $formId, int $shareId): DataResponse {
 			throw new OCSForbiddenException();
 		}
 
-		$this->shareMapper->deleteById($shareId);
-
-		$this->formMapper->update($form);
+		$this->shareMapper->delete($share);
 
 		return new DataResponse($shareId);
 	}
@@ -462,8 +458,6 @@ public function newShareLegacy(int $formId, int $shareType, string $shareWith =
 		// Create share-notifications (activity)
 		$this->formsService->notifyNewShares($form, $share);
 
-		$this->formMapper->update($form);
-
 		// Append displayName for Frontend
 		$shareData = $share->read();
 		$shareData['displayName'] = $this->formsService->getShareDisplayName($shareData);
@@ -500,9 +494,7 @@ public function deleteShareLegacy(int $id): DataResponse {
 			throw new OCSForbiddenException();
 		}
 
-		$this->shareMapper->deleteById($id);
-
-		$this->formMapper->update($form);
+		$this->shareMapper->delete($share);
 
 		return new DataResponse($id);
 	}

diff --git a/lib/Db/ShareMapper.php b/lib/Db/ShareMapper.php
@@ -27,6 +27,7 @@
 namespace OCA\Forms\Db;
 
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -41,10 +42,46 @@ class ShareMapper extends QBMapper {
 	 * ShareMapper constructor.
 	 * @param IDBConnection $db
 	 */
-	public function __construct(IDBConnection $db) {
+	public function __construct(
+		IDBConnection $db,
+		private FormMapper $formMapper
+	) {
 		parent::__construct($db, 'forms_v2_shares', Share::class);
 	}
 
+	/**
+	 * @param Entity $entity
+	 * @psalm-param Share $entity
+	 * @return Share
+	 * @throws \OCP\DB\Exception
+	 */
+	public function insert(Entity $entity): Share {
+		$this->formMapper->update($this->formMapper->findById($entity->getFormId()));
+		return parent::insert($entity);
+	}
+
+	/**
+	 * @param Entity $entity
+	 * @psalm-param Share $entity
+	 * @return Share
+	 * @throws \OCP\DB\Exception
+	 */
+	public function update(Entity $entity): Share {
+		$this->formMapper->update($this->formMapper->findById($entity->getFormId()));
+		return parent::update($entity);
+	}
+
+	/**
+	 * @param Entity $entity
+	 * @psalm-param Share $entity
+	 * @return Share
+	 * @throws \OCP\DB\Exception
+	 */
+	public function delete(Entity $entity): Share {
+		$this->formMapper->update($this->formMapper->findById($entity->getFormId()));
+		return parent::delete($entity);
+	}
+
 	/**
 	 * Find a Share
 	 * @param int $id
@@ -104,20 +141,6 @@ public function findPublicShareByHash(string $hash): Share {
 		return $this->findEntity($qb);
 	}
 
-	/**
-	 * Delete a share
-	 * @param int $id of the share.
-	 */
-	public function deleteById(int $id): void {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete($this->getTableName())
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT))
-			);
-		$qb->executeStatement();
-	}
-
 	/**
 	 * Delete all Shares of a form.
 	 * @param int $formId

diff --git a/tests/Unit/Controller/ShareApiControllerTest.php b/tests/Unit/Controller/ShareApiControllerTest.php
@@ -547,8 +547,8 @@ public function testDeleteShare() {
 			->willReturn($form);
 
 		$this->shareMapper->expects($this->once())
-			->method('deleteById')
-			->with('8');
+			->method('delete')
+			->with($share);
 
 		$response = new DataResponse(8);
 		$this->assertEquals($response, $this->shareApiController->deleteShare(5, 8));