🐛 Fix error caused by EF BulkOperations rc by removing it.

This commit is contained in:
2025-12-27 16:19:14 +08:00
parent 677d9761f9
commit a3e13d1581
6 changed files with 24 additions and 20 deletions

View File

@@ -34,7 +34,6 @@
<PackageReference Include="Quartz" Version="3.15.1" /> <PackageReference Include="Quartz" Version="3.15.1" />
<PackageReference Include="Quartz.AspNetCore" Version="3.15.1" /> <PackageReference Include="Quartz.AspNetCore" Version="3.15.1" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.1" /> <PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.1" />
<PackageReference Include="EFCore.BulkExtensions.PostgreSql" Version="10.0.0-rc.2" />
<!-- Pin the SkiaSharp version at the 2.88.9 due to the BlurHash need this specific version --> <!-- Pin the SkiaSharp version at the 2.88.9 due to the BlurHash need this specific version -->
<PackageReference Include="SkiaSharp" Version="2.88.9" /> <PackageReference Include="SkiaSharp" Version="2.88.9" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" /> <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />

View File

@@ -1,7 +1,6 @@
using DysonNetwork.Shared.Cache; using DysonNetwork.Shared.Cache;
using DysonNetwork.Shared.Data; using DysonNetwork.Shared.Data;
using DysonNetwork.Shared.Models; using DysonNetwork.Shared.Models;
using EFCore.BulkExtensions;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using NodaTime; using NodaTime;
@@ -59,16 +58,25 @@ public class FileReferenceService(AppDatabase db, FileService fileService, ICach
) )
{ {
var now = SystemClock.Instance.GetCurrentInstant(); var now = SystemClock.Instance.GetCurrentInstant();
var data = fileId.Select(id => new SnCloudFileReference var finalExpiredAt = expiredAt;
if (finalExpiredAt == null && duration.HasValue)
{ {
FileId = id, finalExpiredAt = now + duration.Value;
Usage = usage, }
ResourceId = resourceId,
ExpiredAt = expiredAt ?? now + duration, var data = fileId.Select(id => new SnCloudFileReference
CreatedAt = now, {
UpdatedAt = now FileId = id,
}).ToList(); Usage = usage,
await db.BulkInsertAsync(data); ResourceId = resourceId,
ExpiredAt = finalExpiredAt,
CreatedAt = now,
UpdatedAt = now
})
.ToList();
db.FileReferences.AddRange(data);
await db.SaveChangesAsync();
return data; return data;
} }

View File

@@ -24,7 +24,6 @@
<PackageReference Include="Quartz.AspNetCore" Version="3.15.1" /> <PackageReference Include="Quartz.AspNetCore" Version="3.15.1" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.1" /> <PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.1" />
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" /> <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
<PackageReference Include="EFCore.BulkExtensions.PostgreSql" Version="10.0.0-rc.2" />
<PackageReference Include="SpotifyAPI.Web" Version="7.2.1" /> <PackageReference Include="SpotifyAPI.Web" Version="7.2.1" />
<PackageReference Include="SteamWebAPI2" Version="5.0.0" /> <PackageReference Include="SteamWebAPI2" Version="5.0.0" />
</ItemGroup> </ItemGroup>

View File

@@ -1,6 +1,5 @@
using DysonNetwork.Shared.Cache; using DysonNetwork.Shared.Cache;
using DysonNetwork.Shared.Models; using DysonNetwork.Shared.Models;
using EFCore.BulkExtensions;
using NodaTime; using NodaTime;
using Quartz; using Quartz;
@@ -14,12 +13,13 @@ public class ActionLogFlushHandler(IServiceProvider sp) : IFlushHandler<SnAction
var db = scope.ServiceProvider.GetRequiredService<AppDatabase>(); var db = scope.ServiceProvider.GetRequiredService<AppDatabase>();
var now = SystemClock.Instance.GetCurrentInstant(); var now = SystemClock.Instance.GetCurrentInstant();
await db.BulkInsertAsync(items.Select(x => foreach (var item in items)
{ {
x.CreatedAt = now; item.CreatedAt = now;
x.UpdatedAt = x.CreatedAt; item.UpdatedAt = now;
return x; }
}), config => config.ConflictOption = ConflictOption.Ignore); db.ActionLogs.AddRange(items);
await db.SaveChangesAsync();
} }
} }

View File

@@ -10,7 +10,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="CorePush" Version="4.4.0" /> <PackageReference Include="CorePush" Version="4.4.0" />
<PackageReference Include="EFCore.BulkExtensions.PostgreSql" Version="10.0.0-rc.2" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.76.0" /> <PackageReference Include="Grpc.AspNetCore.Server" Version="2.76.0" />
<PackageReference Include="MailKit" Version="4.14.1" /> <PackageReference Include="MailKit" Version="4.14.1" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" /> <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />

View File

@@ -12,7 +12,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AngleSharp" Version="1.4.0" /> <PackageReference Include="AngleSharp" Version="1.4.0" />
<PackageReference Include="EFCore.BulkExtensions.PostgreSql" Version="10.0.0-rc.2" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.76.0" /> <PackageReference Include="Grpc.AspNetCore.Server" Version="2.76.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.12.4" /> <PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
<PackageReference Include="jieba.NET" Version="0.42.2" /> <PackageReference Include="jieba.NET" Version="0.42.2" />