[stable34] avoid duplicate purge on inheritance

lib/Service/MembershipService.php

@@ -326,16 +326,20 @@ function (Membership $membership): string {
 		);
 
 		$deprecated = [];
+		$clear = [];
 		foreach ($known as $item) {
 			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());
+				if (!in_array($item->getSingleId(), $clear, true)) {
+					$clear[] = $item->getSingleId();
+				}
 			}
 		}
 
+		$this->shareWrapperService->clearCacheList($clear);
+
 		return $deprecated;
 	}
 
@@ -348,25 +352,32 @@ function (Membership $membership): string {
 	 */
 	private function createNewMemberships(array $memberships, array $known): array {
 		$new = [];
+		$clear = [];
 		foreach ($memberships as $membership) {
+			$updated = false;
 			try {
 				$item = $this->getMembershipsFromList($known, $membership->getCircleId());
 				if ($item->getLevel() !== $membership->getLevel()
 					|| $item->getInheritanceDepth() !== $membership->getInheritanceDepth()) {
 					$this->membershipRequest->update($membership);
 					$new[] = $item;
+					$updated = true;
 				} elseif ($item->getInheritancePath() !== $membership->getInheritancePath()) {
 					$this->membershipRequest->update($membership);
+					$updated = true;
 				}
 			} catch (ItemNotFoundException $e) {
 				$this->membershipRequest->insert($membership);
 				$new[] = $membership;
 			}
 
-			// clearing the getSharedWith() cache for singleId related to the membership
-			$this->shareWrapperService->clearCache($membership->getSingleId());
+			if ($updated && !in_array($membership->getSingleId(), $clear, true)) {
+				$clear[] = $membership->getSingleId();
+			}
 		}
 
+		$this->shareWrapperService->clearCacheList($clear);
+
 		return $new;
 	}
 

lib/Service/ShareWrapperService.php

@@ -275,6 +275,15 @@ public function clearCache(string $singleId): void {
 		$this->cache->clear($singleId . '#');
 	}
 
+	/**
+	 * @param list<string> $clear
+	 */
+	public function clearCacheList(array $clear): void {
+		foreach ($clear as $item) {
+			$this->cache->clear($item);
+		}
+	}
+
 	/**
 	 * Clear cache for all members of a circle
 	 * This is a fallback when we can't determine specific affected users