Skip to content

[stable22] generate quick members' memberships during migration #779

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 1 commit into from
Aug 9, 2021
+35 −25
Merged

[stable22] generate quick members' memberships during migration #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
generate quick members' memberships during migration 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot
ArtificialOwl authored and backportbot[bot] committed Aug 9, 2021
commit fa9b1c2c4aea9714fa553db81d83db6d5708d2c0
23 changes: 0 additions & 23 deletions lib/Service/MembershipService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
use OCA\Circles\Model\FederatedUser;
use OCA\Circles\Model\Member;
use OCA\Circles\Model\Membership;
use OCA\Circles\Model\Probes\CircleProbe;

/**
* Class MembershipService
Expand Down Expand Up @@ -124,28 +123,6 @@ public function onUpdate(string $singleId): void {
}


/**
*
*/
public function manageAll(): void {
$probe = new CircleProbe();
$probe->includeSystemCircles();
$circles = $this->circleRequest->getCircles(null, $probe);

$this->outputService->startMigrationProgress(sizeof($circles));

foreach ($circles as $circle) {
$this->outputService->output(
'Caching memberships for \'' . $circle->getDisplayName() . '\'',
true
);
$this->manageMemberships($circle->getSingleId());
}

$this->outputService->finishMigrationProgress();
}


/**
* @param string $singleId
*
Expand Down
37 changes: 35 additions & 2 deletions lib/Service/MigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
use OCA\Circles\Model\Circle;
use OCA\Circles\Model\FederatedUser;
use OCA\Circles\Model\Member;
use OCA\Circles\Model\Probes\CircleProbe;
use OCA\Circles\Model\ShareToken;
use OCA\DAV\CardDAV\ContactsManager;
use OCP\Contacts\IManager;
Expand Down Expand Up @@ -205,7 +206,7 @@ public function migration(bool $force = false): void {


/**
*
* @throws RequestBuilderException
*/
private function migrationTo22(): void {
if ($this->configService->getAppValueBool(ConfigService::MIGRATION_22)) {
Expand All @@ -217,14 +218,46 @@ private function migrationTo22(): void {
$this->migrationTo22_Circles();
$this->migrationTo22_Members();
$this->membershipService->resetMemberships('', true);
$this->membershipService->manageAll();
$this->migrationTo22_Members_Memberships();

$this->migrationTo22_Tokens();

$this->configService->setAppValue(ConfigService::MIGRATION_22, '1');
}


/**
* @throws RequestBuilderException
*/
public function migrationTo22_Members_Memberships(): void {
$probe = new CircleProbe();
$probe->includeSystemCircles();
$circles = $this->circleRequest->getCircles(null, $probe);

$this->outputService->startMigrationProgress(sizeof($circles));

$done = [];
foreach ($circles as $circle) {
$this->outputService->output(
'Caching memberships for Members of \'' . $circle->getDisplayName() . '\'',
true
);

$members = $circle->getMembers();
foreach ($members as $member) {
if (in_array($member->getSingleId(), $done)) {
continue;
}

$this->membershipService->manageMemberships($member->getSingleId());
$done[] = $member->getSingleId();
}
}

$this->outputService->finishMigrationProgress();
}


/**
*
*/
Expand Down