Skip to content

[PM-39387] fix: Bump AccountRevisionDate when premium status changes #7966

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

Open
cyprain-okeke wants to merge 2 commits into
base: main
Choose a base branch
from
+44 −3
Open

[PM-39387] fix: Bump AccountRevisionDate when premium status changes #7966

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
925fc94
[PM-39387] fix: Bump AccountRevisionDate when premium status changes
cyprain-okeke Jul 13, 2026
cdeb396
Merge branch 'main' into billing/pm-39387/bump-account-revision-date-…
cyprain-okeke Jul 13, 2026
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
4 changes: 3 additions & 1 deletion src/Billing/Services/Implementations/CheckoutSessionCompletedHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ public async Task HandleAsync(Event parsedEvent)
user.PremiumExpirationDate = subscription.GetCurrentPeriodEnd();
user.MaxStorageGb = (short)premiumPlan.Storage.Provided;
user.LicenseKey = string.IsNullOrWhiteSpace(user.LicenseKey) ? CoreHelpers.SecureRandomString(20) : user.LicenseKey;
user.RevisionDate = DateTime.UtcNow;
// Bump AccountRevisionDate so clients' revision-gated syncs pick up the
// premium change even when the one-time push notification is missed.
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;

await userRepository.ReplaceAsync(user);
await pushNotificationAdapter.NotifyPremiumStatusChangedAsync(user);
Expand Down
8 changes: 6 additions & 2 deletions src/Core/Services/Implementations/UserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,9 @@ private async Task EnablePremiumAsync(User user, DateTime? expirationDate)
{
user.Premium = true;
user.PremiumExpirationDate = expirationDate;
user.RevisionDate = DateTime.UtcNow;
// Bump AccountRevisionDate so clients' revision-gated syncs pick up the
// premium change even when the one-time push notification is missed.
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
}
}
Expand All @@ -839,7 +841,9 @@ private async Task DisablePremiumAsync(User user, DateTime? expirationDate)
{
user.Premium = false;
user.PremiumExpirationDate = expirationDate;
user.RevisionDate = DateTime.UtcNow;
// Bump AccountRevisionDate so clients' revision-gated syncs pick up the
// premium change even when the one-time push notification is missed.
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
}
}
Expand Down
35 changes: 35 additions & 0 deletions test/Core.Test/Services/UserServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,41 @@ public async Task SaveUserAsync_SetsNameToNull_WhenNameIsEmpty(SutProvider<UserS
Assert.Null(user.Name);
}

[Theory, BitAutoData]
public async Task EnablePremiumAsync_UserNotPremium_EnablesPremiumAndBumpsAccountRevisionDate(
SutProvider<UserService> sutProvider, User user)
{
user.Premium = false;
user.Gateway = GatewayType.Stripe;
var staleAccountRevisionDate = user.AccountRevisionDate = DateTime.UtcNow.AddDays(-1);
var expirationDate = DateTime.UtcNow.AddDays(30);
sutProvider.GetDependency<IUserRepository>().GetByIdAsync(user.Id).Returns(user);

await sutProvider.Sut.EnablePremiumAsync(user.Id, expirationDate);

await sutProvider.GetDependency<IUserRepository>().Received(1).ReplaceAsync(Arg.Is<User>(u =>
u.Premium &&
u.PremiumExpirationDate == expirationDate &&
u.AccountRevisionDate > staleAccountRevisionDate));
}

[Theory, BitAutoData]
public async Task DisablePremiumAsync_UserPremium_DisablesPremiumAndBumpsAccountRevisionDate(
SutProvider<UserService> sutProvider, User user)
{
user.Premium = true;
var staleAccountRevisionDate = user.AccountRevisionDate = DateTime.UtcNow.AddDays(-1);
var expirationDate = DateTime.UtcNow.AddDays(7);
sutProvider.GetDependency<IUserRepository>().GetByIdAsync(user.Id).Returns(user);

await sutProvider.Sut.DisablePremiumAsync(user.Id, expirationDate);

await sutProvider.GetDependency<IUserRepository>().Received(1).ReplaceAsync(Arg.Is<User>(u =>
!u.Premium &&
u.PremiumExpirationDate == expirationDate &&
u.AccountRevisionDate > staleAccountRevisionDate));
}

[Theory, BitAutoData]
public async Task UpdateLicenseAsync_Success(SutProvider<UserService> sutProvider,
User user, UserLicense userLicense)
Expand Down
Loading