luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(server): team quota await (#9352)

Browse Source
This commit is contained in:
DarkSky
2024-12-26 20:08:49 +08:00
committed by GitHub
parent 5d27a13e2c
commit 4ae8c2f4ef
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/server/src/core/quota/storage.ts
View File

@@ -104,7 +104,7 @@ export class QuotaManagementService {
} }
async getWorkspaceStorageUsage(workspaceId: string) { async getWorkspaceStorageUsage(workspaceId: string) {
const totalSize = this.storage.totalSize(workspaceId); const totalSize = await this.storage.totalSize(workspaceId);
// ensure that size is within the safe range of gql // ensure that size is within the safe range of gql
if (Number.isSafeInteger(totalSize)) { if (Number.isSafeInteger(totalSize)) {
return totalSize; return totalSize;

34
packages/backend/server/tests/quota.spec.ts
View File

@@ -169,26 +169,44 @@ test('should be able to check with workspace quota', async t => {
const u1 = await auth.signUp('test@affine.pro', '123456'); const u1 = await auth.signUp('test@affine.pro', '123456');
const w1 = await workspace.createWorkspace(u1, null); const w1 = await workspace.createWorkspace(u1, null);
const w2 = await workspace.createWorkspace(u1, null); const w2 = await workspace.createWorkspace(u1, null);
await quotaManager.addTeamWorkspace(w2.id, 'test'); const w3 = await workspace.createWorkspace(u1, null);
await quotaManager.addTeamWorkspace(w3.id, 'test');
{ {
const wq = await quotaManager.getWorkspaceUsage(w1.id); const wq1 = await quotaManager.getWorkspaceUsage(w1.id);
t.is(wq.usedSize, 0, 'should be 0'); t.is(wq1.usedSize, 0, 'should be 0');
const wq2 = await quotaManager.getWorkspaceUsage(w2.id);
t.is(wq2.usedSize, 0, 'should be 0');
const wq3 = await quotaManager.getWorkspaceUsage(w3.id);
t.is(wq3.usedSize, 0, 'should be 0');
} }
{ {
await workspaceBlob.put(w1.id, 'test', Buffer.from([0, 0])); await workspaceBlob.put(w1.id, 'test', Buffer.from([0, 0]));
await workspaceBlob.put(w2.id, 'test', Buffer.from([0, 0]));
// normal workspace
const wq1 = await quotaManager.getWorkspaceUsage(w1.id); const wq1 = await quotaManager.getWorkspaceUsage(w1.id);
t.is(wq1.usedSize, 2, 'should be 2'); t.is(wq1.usedSize, 4, 'should share usage with w2');
const wq2 = await quotaManager.getWorkspaceUsage(w2.id); const wq2 = await quotaManager.getWorkspaceUsage(w2.id);
t.is(wq2.usedSize, 0, 'should be 0'); t.is(wq2.usedSize, 4, 'should share usage with w1');
// workspace with quota
const wq3 = await quotaManager.getWorkspaceUsage(w3.id);
t.is(wq3.usedSize, 0, 'should not share usage with w1 and w2');
} }
{ {
await workspaceBlob.put(w2.id, 'test', Buffer.from([0, 0, 0])); await workspaceBlob.put(w3.id, 'test', Buffer.from([0, 0, 0]));
// normal workspace
const wq1 = await quotaManager.getWorkspaceUsage(w1.id); const wq1 = await quotaManager.getWorkspaceUsage(w1.id);
t.is(wq1.usedSize, 2, 'should be 2'); t.is(wq1.usedSize, 4, 'should not share usage with w3');
const wq2 = await quotaManager.getWorkspaceUsage(w2.id); const wq2 = await quotaManager.getWorkspaceUsage(w2.id);
t.is(wq2.usedSize, 3, 'should be 0'); t.is(wq2.usedSize, 4, 'should not share usage with w3');
// workspace with quota
const wq3 = await quotaManager.getWorkspaceUsage(w3.id);
t.is(wq3.usedSize, 3, 'should not share usage with w1 and w2');
} }
}); });