Skip to content

[stable22] Fix loosing memberships in low depth #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 3 commits into from
Jan 27, 2022
Merged

[stable22] Fix loosing memberships in low depth #915

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ff67c6
silently update entry if path changed
ArtificialOwl Jan 22, 2022
0bb72e4
update old owner membership on ownership tranfer
ArtificialOwl Jan 22, 2022
ebc0f99
maintain memberships once a week
ArtificialOwl Jan 22, 2022
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
Prev Previous commit
maintain memberships once a week 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot
ArtificialOwl authored and backportbot[bot] committed Jan 25, 2022
commit ebc0f99c771b2aa8081d6cb70089f1dbedb4a22d
27 changes: 27 additions & 0 deletions lib/Service/MaintenanceService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ class MaintenanceService {
/** @var FederatedUserService */
private $federatedUserService;

/** @var MembershipService */
private $membershipService;

/** @var EventWrapperService */
private $eventWrapperService;

Expand All @@ -99,6 +102,7 @@ class MaintenanceService {
* @param ShareWrapperRequest $shareWrapperRequest
* @param SyncService $syncService
* @param FederatedUserService $federatedUserService
* @param MembershipService $membershipService
* @param EventWrapperService $eventWrapperService
* @param CircleService $circleService
* @param ConfigService $configService
Expand All @@ -110,6 +114,7 @@ public function __construct(
ShareWrapperRequest $shareWrapperRequest,
SyncService $syncService,
FederatedUserService $federatedUserService,
MembershipService $membershipService,
EventWrapperService $eventWrapperService,
CircleService $circleService,
ConfigService $configService
Expand All @@ -121,6 +126,7 @@ public function __construct(
$this->syncService = $syncService;
$this->federatedUserService = $federatedUserService;
$this->eventWrapperService = $eventWrapperService;
$this->membershipService = $membershipService;
$this->circleService = $circleService;
$this->configService = $configService;
}
Expand Down Expand Up @@ -257,6 +263,12 @@ private function runMaintenance4(): void {
* every week
*/
private function runMaintenance5(): void {
try {
$this->output('Update memberships');
$this->updateAllMemberships();
} catch (Exception $e) {
}

// try {
// $this->output('refresh displayNames older than 7d');
// // $this->refreshOldDisplayNames();
Expand Down Expand Up @@ -329,6 +341,21 @@ function (ShareWrapper $share) {
}


/**
* @throws InitiatorNotFoundException
* @throws RequestBuilderException
*/
private function updateAllMemberships(): void {
$probe = new CircleProbe();
$probe->includeSystemCircles()
->includeSingleCircles()
->includePersonalCircles();

foreach ($this->circleService->getCircles($probe) as $circle) {
$this->membershipService->manageMemberships($circle->getSingleId());
}
}

/**
* @throws RequestBuilderException
* @throws InitiatorNotFoundException
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/MembershipService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ private function createNewMemberships(array $memberships, array $known): array {
if ($item->getLevel() !== $membership->getLevel()) {
$this->membershipRequest->update($membership);
$new[] = $item;
} else if ($item->getInheritancePath() !== $membership->getInheritancePath()) {
} elseif ($item->getInheritancePath() !== $membership->getInheritancePath()) {
$this->membershipRequest->update($membership);
}
} catch (ItemNotFoundException $e) {
Expand Down