Solar/Swarm
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix wrong counting usage

Browse Source
This commit is contained in:
LittleSheep
2025-07-29 14:43:40 +08:00
parent 28f6893c68
commit 83059374e9
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DysonNetwork.Drive/Billing/QuotaService.cs
View File

@@ -17,7 +17,7 @@ public class QuotaService(
{ {
// The billable unit is MiB // The billable unit is MiB
var billableUnit = (long)Math.Ceiling(newFileSize / 1024.0 / 1024.0 * costMultiplier); var billableUnit = (long)Math.Ceiling(newFileSize / 1024.0 / 1024.0 * costMultiplier);
var totalBillableUsage = await usage.GetTotalBillableUsage(); var totalBillableUsage = await usage.GetTotalBillableUsage(accountId);
var quota = await GetQuota(accountId); var quota = await GetQuota(accountId);
return (totalBillableUsage + billableUnit <= quota, billableUnit, quota); return (totalBillableUsage + billableUnit <= quota, billableUnit, quota);
} }

5
DysonNetwork.Drive/Billing/UsageService.cs
View File

@@ -60,7 +60,7 @@ public class UsageService(AppDatabase db)
PoolUsages = poolUsages, PoolUsages = poolUsages,
TotalUsageBytes = totalUsage, TotalUsageBytes = totalUsage,
TotalFileCount = totalFileCount, TotalFileCount = totalFileCount,
UsedQuota = await GetTotalBillableUsage() UsedQuota = await GetTotalBillableUsage(accountId)
}; };
} }
@@ -98,10 +98,11 @@ public class UsageService(AppDatabase db)
}; };
} }
public async Task<long> GetTotalBillableUsage() public async Task<long> GetTotalBillableUsage(Guid accountId)
{ {
var now = SystemClock.Instance.GetCurrentInstant(); var now = SystemClock.Instance.GetCurrentInstant();
var files = await db.Files var files = await db.Files
.Where(f => f.AccountId == accountId)
.Where(f => f.PoolId.HasValue) .Where(f => f.PoolId.HasValue)
.Where(f => !f.IsMarkedRecycle) .Where(f => !f.IsMarkedRecycle)
.Include(f => f.Pool) .Include(f => f.Pool)

2
DysonNetwork.Drive/Storage/TusService.cs
View File

@@ -262,7 +262,7 @@ public abstract class TusService
{ {
eventContext.FailRequest( eventContext.FailRequest(
HttpStatusCode.Forbidden, HttpStatusCode.Forbidden,
$"File size {billableUnit} MiB is exceed than the user's quota {quota} MiB" $"File size {billableUnit} MiB is exceeded the user's quota {quota} MiB"
); );
rejected = true; rejected = true;
} }