Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/Service/MembershipService.php
Original file line number Diff line number Diff line change
Expand Up @@ -354,24 +354,25 @@ private function createNewMemberships(array $memberships, array $known): array {
$new = [];
$clear = [];
foreach ($memberships as $membership) {
$updated = false;
$changed = 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;
$changed = true;
} elseif ($item->getInheritancePath() !== $membership->getInheritancePath()) {
$this->membershipRequest->update($membership);
$updated = true;
$changed = true;
}
} catch (ItemNotFoundException $e) {
$this->membershipRequest->insert($membership);
$new[] = $membership;
$changed = true;
}

if ($updated && !in_array($membership->getSingleId(), $clear, true)) {
if ($changed && !in_array($membership->getSingleId(), $clear, true)) {
$clear[] = $membership->getSingleId();
}
}
Expand Down
14 changes: 7 additions & 7 deletions lib/Service/ShareWrapperService.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,23 @@ public function searchShare(string $singleId, int $nodeId): ShareWrapper {
* @throws NotFoundException
*/
public function save(IShare $share): void {
$this->clearCache($share->getSharedWith());
$this->shareWrapperRequest->save($share);
$this->clearCacheForCircle($share->getSharedWith());
}

public function update(ShareWrapper $shareWrapper): void {
$this->clearCache($shareWrapper->getSharedWith());
$this->shareWrapperRequest->update($shareWrapper);
$this->clearCacheForCircle($shareWrapper->getSharedWith());
}

public function updateChildPermissions(ShareWrapper $shareWrapper): void {
$this->clearCache($shareWrapper->getSharedWith());
$this->shareWrapperRequest->updateChildPermissions($shareWrapper);
$this->clearCacheForCircle($shareWrapper->getSharedWith());
}

public function delete(ShareWrapper $shareWrapper): void {
$this->clearCache($shareWrapper->getSharedWith());
$this->shareWrapperRequest->delete((int)$shareWrapper->getId());
$this->clearCacheForCircle($shareWrapper->getSharedWith());
}

/**
Expand All @@ -86,14 +86,14 @@ public function deleteUserSharesToCircle(string $circleId, string $userId): void
throw new Exception('$initiator cannot be empty');
}

$this->shareWrapperRequest->deleteSharesToCircle($circleId, $userId);
// Clear cache for the entire circle as we don't know all affected users
$this->clearCacheForCircle($circleId);
$this->shareWrapperRequest->deleteSharesToCircle($circleId, $userId);
}

public function deleteAllSharesToCircle(string $circleId): void {
$this->clearCacheForCircle($circleId);
$this->shareWrapperRequest->deleteSharesToCircle($circleId, '');
$this->clearCacheForCircle($circleId);
}

/**
Expand Down Expand Up @@ -370,9 +370,9 @@ public function clearCacheForNode(int $nodeId): void {
* @throws RequestBuilderException
*/
private function createChild(IShare $share, FederatedUser $federatedUser): ShareWrapper {
$this->clearCache($federatedUser->getSingleId());
$share->setSharedWith($federatedUser->getSingleId());
$childId = $this->shareWrapperRequest->save($share, (int)$share->getId());
$this->clearCache($federatedUser->getSingleId());

return $this->getShareById($childId, $federatedUser);
}
Expand Down
82 changes: 82 additions & 0 deletions tests/unit/lib/Service/MembershipServiceTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Circles\Tests\Unit\Service;

use OCA\Circles\Db\CircleRequest;
use OCA\Circles\Db\MemberRequest;
use OCA\Circles\Db\MembershipRequest;
use OCA\Circles\Model\Circle;
use OCA\Circles\Model\Member;
use OCA\Circles\Service\EventService;
use OCA\Circles\Service\MembershipService;
use OCA\Circles\Service\OutputService;
use OCA\Circles\Service\ShareWrapperService;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;

class MembershipServiceTest extends TestCase {
private MemberRequest&MockObject $memberRequest;
private MembershipRequest&MockObject $membershipRequest;
private ShareWrapperService&MockObject $shareWrapperService;
private MembershipService $service;

protected function setUp(): void {
$this->memberRequest = $this->createMock(MemberRequest::class);
$this->membershipRequest = $this->createMock(MembershipRequest::class);
$this->shareWrapperService = $this->createMock(ShareWrapperService::class);
$this->service = new MembershipService(
$this->membershipRequest,
$this->createMock(CircleRequest::class),
$this->memberRequest,
$this->createMock(EventService::class),
$this->shareWrapperService,
$this->createMock(OutputService::class),
);
}

public function testNewMembershipClearsSharedWithCache(): void {
$this->mockGraph([
'user' => [['A', Member::LEVEL_MEMBER]],
]);
$this->membershipRequest->expects(self::once())->method('insert');

$cleared = [];
$this->shareWrapperService->method('clearCacheList')
->willReturnCallback(function (array $clear) use (&$cleared): void {
$cleared = array_merge($cleared, $clear);
});

self::assertSame(1, $this->service->manageMemberships('user'));
self::assertSame(['user'], $cleared);
}

/**
* @param array<string, array<array{string, int}>> $graph single id => [circle id, level] it belongs to
*/
private function mockGraph(array $graph): void {
$membersOf = function (string $singleId) use ($graph): array {
return array_map(function (array $edge) use ($singleId): Member {
$circle = new Circle();
$circle->setSingleId($edge[0]);

$member = new Member();
$member->setSingleId($singleId);
$member->setCircleId($edge[0]);
$member->setLevel($edge[1]);
$member->setCircle($circle);

return $member;
}, $graph[$singleId] ?? []);
};

$this->memberRequest->method('getMembersBySingleId')
->willReturnCallback($membersOf);
}
}
78 changes: 78 additions & 0 deletions tests/unit/lib/Service/ShareWrapperServiceTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Circles\Tests\Unit\Service;

use OCA\Circles\Db\ShareWrapperRequest;
use OCA\Circles\Model\ShareWrapper;
use OCA\Circles\Service\ShareWrapperService;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\Share\IShare;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;

class ShareWrapperServiceTest extends TestCase {
private ICache&MockObject $cache;
private ShareWrapperRequest&MockObject $shareWrapperRequest;
private ShareWrapperService $service;
/** @var string[] */
private array $clearedPrefixes = [];

#[\Override]
protected function setUp(): void {
parent::setUp();

$this->cache = $this->createMock(ICache::class);
$this->cache->method('clear')
->willReturnCallback(function (string $prefix): bool {
$this->clearedPrefixes[] = $prefix;

return true;
});

$cacheFactory = $this->createMock(ICacheFactory::class);
$cacheFactory->method('createDistributed')->willReturn($this->cache);

$this->shareWrapperRequest = $this->createMock(ShareWrapperRequest::class);

$this->service = new ShareWrapperService(
$cacheFactory,
$this->shareWrapperRequest,
);
}

public function testSaveClearsSharedWithCache(): void {
$share = $this->createMock(IShare::class);
$share->method('getSharedWith')->willReturn('circle');
$this->shareWrapperRequest->expects($this->once())->method('save')->with($share)
->willReturnCallback(function (): int {
$this->assertSame([], $this->clearedPrefixes, 'Cache must be cleared after the share is stored');
return 1;
});

$this->service->save($share);

$this->assertSame([''], $this->clearedPrefixes);
}

public function testDeleteClearsSharedWithCache(): void {
$shareWrapper = new ShareWrapper();
$shareWrapper->setId('42');
$shareWrapper->setSharedWith('circle');
$this->shareWrapperRequest->expects($this->once())->method('delete')->with(42)
->willReturnCallback(function (): void {
$this->assertSame([], $this->clearedPrefixes, 'Cache must be cleared after the share is deleted');
});

$this->service->delete($shareWrapper);

$this->assertSame([''], $this->clearedPrefixes);
}
}
Loading