[stable23] Fix loosing memberships in low depth

lib/FederatedItems/MemberLevel.php

@@ -151,6 +151,7 @@ public function manage(FederatedEvent $event): void {
 			$oldOwner = clone $event->getCircle()->getOwner();
 			$oldOwner->setLevel(Member::LEVEL_ADMIN);
 			$this->memberRequest->updateLevel($oldOwner);
+			$this->membershipService->onUpdate($oldOwner->getSingleId());
 		}
 
 		$this->membershipService->onUpdate($member->getSingleId());

lib/Model/Membership.php

@@ -95,7 +95,7 @@ public function __construct(
 		$this->setSingleId($singleId);
 		$this->setCircleId($circle->getSingleId());
 		$this->setInheritanceFirst($member->getSingleId());
-		$this->setInheritanceLast($inheritanceLast === '' ? $member->getCircleId() : $inheritanceLast);
+		$this->setInheritanceLast($inheritanceLast ?: $member->getCircleId());
 		$this->setLevel($member->getLevel());
 	}
 

lib/Service/MaintenanceService.php

@@ -76,6 +76,9 @@ class MaintenanceService {
 	/** @var FederatedUserService */
 	private $federatedUserService;
 
+	/** @var MembershipService */
+	private $membershipService;
+
 	/** @var EventWrapperService */
 	private $eventWrapperService;
 
@@ -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
@@ -110,6 +114,7 @@ public function __construct(
 		ShareWrapperRequest $shareWrapperRequest,
 		SyncService $syncService,
 		FederatedUserService $federatedUserService,
+		MembershipService $membershipService,
 		EventWrapperService $eventWrapperService,
 		CircleService $circleService,
 		ConfigService $configService
@@ -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;
 	}
@@ -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();
@@ -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

lib/Service/MembershipService.php

@@ -358,6 +358,8 @@ private function createNewMemberships(array $memberships, array $known): array {
 				if ($item->getLevel() !== $membership->getLevel()) {
 					$this->membershipRequest->update($membership);
 					$new[] = $item;
+				} elseif ($item->getInheritancePath() !== $membership->getInheritancePath()) {
+					$this->membershipRequest->update($membership);
 				}
 			} catch (ItemNotFoundException $e) {
 				$this->membershipRequest->insert($membership);