Skip to content
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

Jump to bottom

[PM-13834] Skip providers that have no clients during migration #4913

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −15
Open

[PM-13834] Skip providers that have no clients during migration #4913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4597afd
Skip providers that have no clients during migration
amorask-bitwarden Oct 18, 2024
3a2a7b9
Merge branch 'main' into billing/PM-13834/provider-migration-no-clients
amorask-bitwarden Oct 18, 2024
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
19 changes: 8 additions & 11 deletions src/Core/Billing/Migration/Models/ProviderMigrationTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@
public enum ProviderMigrationProgress
{
Started = 1,
ClientsMigrated = 2,
TeamsPlanConfigured = 3,
EnterprisePlanConfigured = 4,
CustomerSetup = 5,
SubscriptionSetup = 6,
CreditApplied = 7,
Completed = 8,

Reversing = 9,
ReversedClientMigrations = 10,
RemovedProviderPlans = 11
NoClients = 2,
ClientsMigrated = 3,
TeamsPlanConfigured = 4,
EnterprisePlanConfigured = 5,
CustomerSetup = 6,
SubscriptionSetup = 7,
CreditApplied = 8,
Completed = 9,
}

public class ProviderMigrationTracker
Expand Down
27 changes: 23 additions & 4 deletions src/Core/Billing/Migration/Services/Implementations/ProviderMigrator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,18 @@ public async Task Migrate(Guid providerId)

await migrationTrackerCache.StartTracker(provider);

await MigrateClientsAsync(providerId);
var organizations = await GetEnabledClientsAsync(provider.Id);

if (organizations.Count == 0)
{
logger.LogInformation("CB: Skipping migration for provider ({ProviderID}) with no clients", providerId);

await migrationTrackerCache.UpdateTrackingStatus(providerId, ProviderMigrationProgress.NoClients);

return;
}

await MigrateClientsAsync(providerId, organizations);

await ConfigureTeamsPlanAsync(providerId);

Expand All @@ -65,6 +76,16 @@ public async Task<ProviderMigrationResult> GetResult(Guid providerId)
return null;
}

if (providerTracker.Progress == ProviderMigrationProgress.NoClients)
{
return new ProviderMigrationResult
{
ProviderId = providerTracker.ProviderId,
ProviderName = providerTracker.ProviderName,
Result = providerTracker.Progress.ToString()
};
}

var clientTrackers = await Task.WhenAll(providerTracker.OrganizationIds.Select(organizationId =>
migrationTrackerCache.GetTracker(providerId, organizationId)));

Expand Down Expand Up @@ -99,12 +120,10 @@ public async Task<ProviderMigrationResult> GetResult(Guid providerId)

#region Steps

private async Task MigrateClientsAsync(Guid providerId)
private async Task MigrateClientsAsync(Guid providerId, List<Organization> organizations)
{
logger.LogInformation("CB: Migrating clients for provider ({ProviderID})", providerId);

var organizations = await GetEnabledClientsAsync(providerId);

var organizationIds = organizations.Select(organization => organization.Id);

await migrationTrackerCache.SetOrganizationIds(providerId, organizationIds);
Expand Down
Loading