Merge pull request #1830 from nextcloud/revert-1745-fix/noid/remove-caching-for-shares

Revert "remove caching for shares"

Author: sorbaugh

lib/Service/MembershipService.php

@@ -330,6 +330,9 @@ function (Membership $membership): string {
 			if (!in_array($item->getCircleId(), $circleIds)) {
 				$deprecated[] = $item;
 				$this->membershipRequest->delete($item);
+
+				// clearing the getSharedWith() cache for singleId related to the membership
+				$this->shareWrapperService->clearCache($item->getSingleId());
 			}
 		}
 
@@ -359,6 +362,9 @@ private function createNewMemberships(array $memberships, array $known): array {
 				$this->membershipRequest->insert($membership);
 				$new[] = $membership;
 			}
+
+			// clearing the getSharedWith() cache for singleId related to the membership
+			$this->shareWrapperService->clearCache($membership->getSingleId());
 		}
 
 		return $new;

lib/Service/ShareWrapperService.php

@@ -18,10 +18,13 @@
 use OCA\Circles\Model\FederatedUser;
 use OCA\Circles\Model\Probes\CircleProbe;
 use OCA\Circles\Model\ShareWrapper;
+use OCA\Circles\Tools\Exceptions\InvalidItemException;
 use OCA\Circles\Tools\Traits\TDeserialize;
 use OCA\Circles\Tools\Traits\TStringTools;
 use OCP\Files\Folder;
 use OCP\Files\NotFoundException;
+use OCP\ICache;
+use OCP\ICacheFactory;
 use OCP\Share\IShare;
 
 /**
@@ -33,9 +36,26 @@ class ShareWrapperService {
 	use TStringTools;
 	use TDeserialize;
 
-	public function __construct(
-		private ShareWrapperRequest $shareWrapperRequest,
-	) {
+	public const CACHE_SHARED_WITH = 'circles/getSharedWith';
+	public const CACHE_SHARED_WITH_TTL = 900;
+
+
+	/** @var ShareWrapperRequest */
+	private $shareWrapperRequest;
+
+	private ICache $cache;
+
+
+	/**
+	 * ShareWrapperService constructor.
+	 *
+	 * @param ICacheFactory $cacheFactory
+	 * @param ShareWrapperRequest $shareWrapperRequest
+	 */
+	public function __construct(ICacheFactory $cacheFactory, ShareWrapperRequest $shareWrapperRequest) {
+		$this->cache = $cacheFactory->createDistributed(self::CACHE_SHARED_WITH);
+
+		$this->shareWrapperRequest = $shareWrapperRequest;
 	}
 
 
@@ -58,6 +78,7 @@ public function searchShare(string $singleId, int $nodeId): ShareWrapper {
 	 * @throws NotFoundException
 	 */
 	public function save(IShare $share): void {
+		$this->cache->clear('');
 		$this->shareWrapperRequest->save($share);
 	}
 
@@ -66,6 +87,7 @@ public function save(IShare $share): void {
 	 * @param ShareWrapper $shareWrapper
 	 */
 	public function update(ShareWrapper $shareWrapper): void {
+		$this->cache->clear('');
 		$this->shareWrapperRequest->update($shareWrapper);
 	}
 
@@ -74,6 +96,7 @@ public function update(ShareWrapper $shareWrapper): void {
 	 * @param ShareWrapper $shareWrapper
 	 */
 	public function delete(ShareWrapper $shareWrapper): void {
+		$this->cache->clear('');
 		$this->shareWrapperRequest->delete((int)$shareWrapper->getId());
 	}
 
@@ -88,6 +111,7 @@ public function deleteUserSharesToCircle(string $circleId, string $userId): void
 			throw new Exception('$initiator cannot be empty');
 		}
 
+		$this->cache->clear('');
 		$this->shareWrapperRequest->deleteSharesToCircle($circleId, $userId);
 	}
 
@@ -96,6 +120,7 @@ public function deleteUserSharesToCircle(string $circleId, string $userId): void
 	 * @param string $circleId
 	 */
 	public function deleteAllSharesToCircle(string $circleId): void {
+		$this->cache->clear('');
 		$this->shareWrapperRequest->deleteSharesToCircle($circleId, '');
 	}
 
@@ -185,7 +210,22 @@ public function getSharedWith(
 		int $nodeId,
 		?CircleProbe $probe,
 	): array {
-		return $this->shareWrapperRequest->getSharedWith($federatedUser, $nodeId, $probe);
+		$key = $this->generateSharedWithCacheKey($federatedUser, $nodeId, $probe->getChecksum());
+
+		$cachedData = $this->cache->get($key);
+		try {
+			if (!is_string($cachedData)) {
+				throw new InvalidItemException();
+			}
+
+			return $this->deserializeList($cachedData, ShareWrapper::class);
+		} catch (InvalidItemException $e) {
+		}
+
+		$shares = $this->shareWrapperRequest->getSharedWith($federatedUser, $nodeId, $probe);
+		$this->cache->set($key, json_encode($shares), self::CACHE_SHARED_WITH_TTL);
+
+		return $shares;
 	}
 
 
@@ -249,6 +289,11 @@ public function getChild(IShare $share, FederatedUser $federatedUser): ShareWrap
 	}
 
 
+	public function clearCache(string $singleId): void {
+		$this->cache->clear($singleId);
+	}
+
+
 	/**
 	 * @param FederatedUser $federatedUser
 	 * @param IShare $share
@@ -259,6 +304,7 @@ public function getChild(IShare $share, FederatedUser $federatedUser): ShareWrap
 	 * @throws RequestBuilderException
 	 */
 	private function createChild(IShare $share, FederatedUser $federatedUser): ShareWrapper {
+		$this->cache->clear('');
 		$share->setSharedWith($federatedUser->getSingleId());
 		$childId = $this->shareWrapperRequest->save($share, (int)$share->getId());