Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-08-05 11:30:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(server): improve migration compatibility (#15014)

Browse Source 
#### PR Dependency Tree


* **PR #15014** 👈

This tree was auto-generated by
[Charcoal](https://github.com/danerwilliams/charcoal)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Bug Fixes**
* Remove orphaned legacy subscription and entitlement records during
backfill.
* Repair workspaces missing active owners by promoting eligible members
and cleaning up empty workspaces.
* Skip cloud subscription backfill when target user/workspace no longer
exists to avoid dangling data.

* **Tests**
  * Added tests verifying legacy data cleanup during backfill.
* Added tests verifying workspace ownership repair and migration
behavior.

<!-- review_stack_entry_start -->

[![Review Change
Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/toeverything/AFFiNE/pull/15014?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)

<!-- review_stack_entry_end -->
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
DarkSky
2026-05-21 15:28:51 +08:00
committed by GitHub
parent d20dbfd6a2
commit dd1cd77ca0
4 changed files with 324 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/server/src/core/entitlement/__tests__/projection.spec.ts
+46
View File
@@ -250,6 +250,52 @@ test('backfill marks selfhost team subscriptions as needing license revalidation
);
});
test('backfill removes dangling legacy subscriptions and entitlements', async t => {
await t.context.db.subscription.createMany({
data: [
{
targetId: randomUUID(),
plan: SubscriptionPlan.Pro,
recurring: SubscriptionRecurring.Yearly,
status: SubscriptionStatus.Active,
start: new Date(),
},
{
targetId: randomUUID(),
plan: SubscriptionPlan.Team,
recurring: SubscriptionRecurring.Yearly,
status: SubscriptionStatus.Active,
start: new Date(),
},
],
});
await t.context.db.entitlement.createMany({
data: [
{
targetType: 'user',
targetId: randomUUID(),
source: 'cloud_subscription',
plan: 'pro',
status: 'active',
subjectId: randomUUID(),
},
{
targetType: 'workspace',
targetId: randomUUID(),
source: 'cloud_subscription',
plan: 'team',
status: 'active',
subjectId: randomUUID(),
},
],
});
await t.context.projection.backfillEntitlementsAndQuotaStates();
t.is(await t.context.db.subscription.count(), 0);
t.is(await t.context.db.entitlement.count(), 0);
});
test('key based selfhost entitlements without raw payload need reupload', async t => {
const owner = await t.context.models.user.create({
email: `${randomUUID()}@affine.pro`,
packages/backend/server/src/core/entitlement/projection.ts
+104 -31
View File
@@ -34,13 +34,13 @@ export class LegacyEntitlementProjectionService {
targetId,
}: Events['entitlement.changed']) {
if (targetType === 'user') {
await this.projectCloudSubscriptions('user', targetId);
await this.projectUserFeatures(targetId);
await this.#projectCloudSubscriptions('user', targetId);
await this.#projectUserFeatures(targetId);
} else if (targetType === 'workspace') {
await this.projectCloudSubscriptions('workspace', targetId);
await this.#projectCloudSubscriptions('workspace', targetId);
await Promise.all([
this.projectWorkspaceFeatures(targetId),
this.projectInstalledLicense(targetId),
this.#projectWorkspaceFeatures(targetId),
this.#projectInstalledLicense(targetId),
]);
}
}
@@ -49,7 +49,7 @@ export class LegacyEntitlementProjectionService {
async onWorkspaceQuotaStateChanged({
workspaceId,
}: Events['workspace.quota_state.changed']) {
await this.projectReadonlyFeature(workspaceId);
await this.#projectReadonlyFeature(workspaceId);
}
async scanInstalledLicenses() {
@@ -88,6 +88,8 @@ export class LegacyEntitlementProjectionService {
}
async backfillEntitlementsAndQuotaStates() {
await this.#cleanupDanglingLegacyEntitlements();
const [subscriptions, users, workspaces] = await Promise.all([
this.db.subscription.findMany(),
this.db.user.findMany({ select: { id: true } }),
@@ -95,6 +97,9 @@ export class LegacyEntitlementProjectionService {
]);
for (const subscription of subscriptions) {
if (!(await this.#subscriptionTargetExists(subscription))) {
continue;
}
if (subscription.plan === SubscriptionPlan.SelfHostedTeam) {
await this.entitlement.markSelfhostLicenseNeedsReupload({
licenseKey: subscription.targetId,
@@ -148,8 +153,74 @@ export class LegacyEntitlementProjectionService {
]);
}
private async projectUserFeatures(userId: string) {
const entitlements = await this.activeEntitlements('user', userId);
async #cleanupDanglingLegacyEntitlements() {
await this.db.$executeRaw`
DELETE FROM entitlements entitlement
WHERE (
entitlement.target_type = 'user'
AND NOT EXISTS (
SELECT 1
FROM users
WHERE users.id = entitlement.target_id
)
)
OR (
entitlement.target_type = 'workspace'
AND NOT EXISTS (
SELECT 1
FROM workspaces
WHERE workspaces.id = entitlement.target_id
)
)
`;
await this.db.$executeRaw`
DELETE FROM subscriptions subscription
WHERE (
subscription.plan IN (${SubscriptionPlan.Pro}, ${SubscriptionPlan.AI})
AND NOT EXISTS (
SELECT 1
FROM users
WHERE users.id = subscription.target_id
)
)
OR (
subscription.plan = ${SubscriptionPlan.Team}
AND NOT EXISTS (
SELECT 1
FROM workspaces
WHERE workspaces.id = subscription.target_id
)
)
`;
}
async #subscriptionTargetExists(subscription: {
targetId: string;
plan: string;
}) {
if (
subscription.plan === SubscriptionPlan.Pro ||
subscription.plan === SubscriptionPlan.AI
) {
return !!(await this.db.user.findUnique({
where: { id: subscription.targetId },
select: { id: true },
}));
}
if (subscription.plan === SubscriptionPlan.Team) {
return !!(await this.db.workspace.findUnique({
where: { id: subscription.targetId },
select: { id: true },
}));
}
return true;
}
async #projectUserFeatures(userId: string) {
const entitlements = await this.#activeEntitlements('user', userId);
const quotaEntitlement = entitlements.find(entitlement =>
['lifetime_pro', 'pro'].includes(entitlement.plan)
);
@@ -190,7 +261,7 @@ export class LegacyEntitlementProjectionService {
}
}
private async projectWorkspaceFeatures(workspaceId: string) {
async #projectWorkspaceFeatures(workspaceId: string) {
const [entitlement, resolved] = await Promise.all([
this.entitlement.getBestEntitlement('workspace', workspaceId),
this.entitlement.resolveWorkspaceEntitlement(workspaceId),
@@ -215,7 +286,7 @@ export class LegacyEntitlementProjectionService {
}
}
private async projectCloudSubscriptions(
async #projectCloudSubscriptions(
targetType: 'user' | 'workspace',
targetId: string
) {
@@ -229,13 +300,15 @@ export class LegacyEntitlementProjectionService {
orderBy: { updatedAt: 'asc' },
});
for (const entitlement of this.projectableCloudEntitlements(entitlements)) {
for (const entitlement of this.#projectableCloudEntitlements(
entitlements
)) {
const metadata = entitlement.metadata as Metadata;
await this.db.subscription.upsert({
where: {
targetId_plan: {
targetId,
plan: this.subscriptionPlan(entitlement.plan),
plan: this.#subscriptionPlan(entitlement.plan),
},
},
update: {
@@ -243,21 +316,21 @@ export class LegacyEntitlementProjectionService {
variant: metadata.variant ?? null,
quantity: entitlement.quantity ?? 1,
stripeSubscriptionId: metadata.stripeSubscriptionId ?? null,
provider: this.provider(metadata.provider),
status: this.subscriptionStatus(entitlement.status),
provider: this.#provider(metadata.provider),
status: this.#subscriptionStatus(entitlement.status),
start: entitlement.startsAt ?? entitlement.createdAt,
end: entitlement.expiresAt,
trialEnd: entitlement.graceUntil,
},
create: {
targetId,
plan: this.subscriptionPlan(entitlement.plan),
plan: this.#subscriptionPlan(entitlement.plan),
recurring: metadata.recurring ?? SubscriptionRecurring.Monthly,
variant: metadata.variant ?? null,
quantity: entitlement.quantity ?? 1,
stripeSubscriptionId: metadata.stripeSubscriptionId ?? null,
provider: this.provider(metadata.provider),
status: this.subscriptionStatus(entitlement.status),
provider: this.#provider(metadata.provider),
status: this.#subscriptionStatus(entitlement.status),
start: entitlement.startsAt ?? entitlement.createdAt,
end: entitlement.expiresAt,
trialEnd: entitlement.graceUntil,
@@ -277,17 +350,17 @@ export class LegacyEntitlementProjectionService {
}
}
private *projectableCloudEntitlements(entitlements: Entitlement[]) {
*#projectableCloudEntitlements(entitlements: Entitlement[]) {
const byPlan = new Map<string, Entitlement>();
for (const entitlement of entitlements) {
const plan = this.subscriptionPlan(entitlement.plan);
const plan = this.#subscriptionPlan(entitlement.plan);
const current = byPlan.get(plan);
if (
!current ||
this.subscriptionProjectionPriority(entitlement) >
this.subscriptionProjectionPriority(current)
this.#subscriptionProjectionPriority(entitlement) >
this.#subscriptionProjectionPriority(current)
) {
byPlan.set(plan, entitlement);
}
@@ -296,7 +369,7 @@ export class LegacyEntitlementProjectionService {
yield* byPlan.values();
}
private subscriptionProjectionPriority(entitlement: {
#subscriptionProjectionPriority(entitlement: {
status: string;
updatedAt: Date;
}) {
@@ -312,7 +385,7 @@ export class LegacyEntitlementProjectionService {
);
}
private async projectInstalledLicense(workspaceId: string) {
async #projectInstalledLicense(workspaceId: string) {
const [entitlements, resolved] = await Promise.all([
this.db.entitlement.findMany({
where: {
@@ -326,8 +399,8 @@ export class LegacyEntitlementProjectionService {
]);
const entitlement = entitlements.sort(
(left, right) =>
this.installedLicenseStatusPriority(right.status) -
this.installedLicenseStatusPriority(left.status) ||
this.#installedLicenseStatusPriority(right.status) -
this.#installedLicenseStatusPriority(left.status) ||
Number(!!right.signedPayload) - Number(!!left.signedPayload) ||
right.updatedAt.getTime() - left.updatedAt.getTime()
)[0];
@@ -386,7 +459,7 @@ export class LegacyEntitlementProjectionService {
});
}
private installedLicenseStatusPriority(status: string) {
#installedLicenseStatusPriority(status: string) {
if (status === 'active' || status === 'grace') {
return 3;
}
@@ -399,7 +472,7 @@ export class LegacyEntitlementProjectionService {
return 0;
}
private async projectReadonlyFeature(workspaceId: string) {
async #projectReadonlyFeature(workspaceId: string) {
const state = await this.db.effectiveWorkspaceQuotaState.findUnique({
where: {
workspaceId,
@@ -420,7 +493,7 @@ export class LegacyEntitlementProjectionService {
}
}
private async activeEntitlements(
async #activeEntitlements(
targetType: 'user' | 'workspace',
targetId: string
) {
@@ -439,7 +512,7 @@ export class LegacyEntitlementProjectionService {
return count > 0;
}
private subscriptionPlan(plan: string) {
#subscriptionPlan(plan: string) {
if (plan === 'lifetime_pro') {
return SubscriptionPlan.Pro;
}
@@ -449,7 +522,7 @@ export class LegacyEntitlementProjectionService {
return plan;
}
private subscriptionStatus(status: string) {
#subscriptionStatus(status: string) {
if (status === 'active') {
return SubscriptionStatus.Active;
}
@@ -459,7 +532,7 @@ export class LegacyEntitlementProjectionService {
return SubscriptionStatus.Canceled;
}
private provider(provider: string | null | undefined) {
#provider(provider: string | null | undefined) {
return provider === 'revenuecat' ? 'revenuecat' : 'stripe';
}
}