🐛 Fix file reference created with wrong date
This commit is contained in:
@@ -6,7 +6,6 @@ using DysonNetwork.Shared.Data;
|
|||||||
using DysonNetwork.Shared.Models;
|
using DysonNetwork.Shared.Models;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.EntityFrameworkCore.Design;
|
using Microsoft.EntityFrameworkCore.Design;
|
||||||
using Microsoft.EntityFrameworkCore.Query;
|
|
||||||
using NodaTime;
|
using NodaTime;
|
||||||
using Quartz;
|
using Quartz;
|
||||||
using TaskStatus = DysonNetwork.Drive.Storage.Model.TaskStatus;
|
using TaskStatus = DysonNetwork.Drive.Storage.Model.TaskStatus;
|
||||||
|
|||||||
@@ -58,12 +58,15 @@ public class FileReferenceService(AppDatabase db, FileService fileService, ICach
|
|||||||
Duration? duration = null
|
Duration? duration = null
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
var now = SystemClock.Instance.GetCurrentInstant();
|
||||||
var data = fileId.Select(id => new SnCloudFileReference
|
var data = fileId.Select(id => new SnCloudFileReference
|
||||||
{
|
{
|
||||||
FileId = id,
|
FileId = id,
|
||||||
Usage = usage,
|
Usage = usage,
|
||||||
ResourceId = resourceId,
|
ResourceId = resourceId,
|
||||||
ExpiredAt = expiredAt ?? SystemClock.Instance.GetCurrentInstant() + duration
|
ExpiredAt = expiredAt ?? now + duration,
|
||||||
|
CreatedAt = now,
|
||||||
|
UpdatedAt = now
|
||||||
}).ToList();
|
}).ToList();
|
||||||
await db.BulkInsertAsync(data);
|
await db.BulkInsertAsync(data);
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -13,9 +13,10 @@ public class ActionLogFlushHandler(IServiceProvider serviceProvider) : IFlushHan
|
|||||||
using var scope = serviceProvider.CreateScope();
|
using var scope = serviceProvider.CreateScope();
|
||||||
var db = scope.ServiceProvider.GetRequiredService<AppDatabase>();
|
var db = scope.ServiceProvider.GetRequiredService<AppDatabase>();
|
||||||
|
|
||||||
|
var now = SystemClock.Instance.GetCurrentInstant();
|
||||||
await db.BulkInsertAsync(items.Select(x =>
|
await db.BulkInsertAsync(items.Select(x =>
|
||||||
{
|
{
|
||||||
x.CreatedAt = SystemClock.Instance.GetCurrentInstant();
|
x.CreatedAt = now;
|
||||||
x.UpdatedAt = x.CreatedAt;
|
x.UpdatedAt = x.CreatedAt;
|
||||||
return x;
|
return x;
|
||||||
}), config => config.ConflictOption = ConflictOption.Ignore);
|
}), config => config.ConflictOption = ConflictOption.Ignore);
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public static class SoftDeleteExtension
|
|||||||
var method = typeof(SoftDeleteExtension)
|
var method = typeof(SoftDeleteExtension)
|
||||||
.GetMethod(nameof(SetSoftDeleteFilter), BindingFlags.NonPublic | BindingFlags.Static)!
|
.GetMethod(nameof(SetSoftDeleteFilter), BindingFlags.NonPublic | BindingFlags.Static)!
|
||||||
.MakeGenericMethod(entityType.ClrType);
|
.MakeGenericMethod(entityType.ClrType);
|
||||||
method.Invoke(null, new object[] { modelBuilder });
|
method.Invoke(null, [modelBuilder]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ public class SnCloudFileReference : ModelBase
|
|||||||
/// <returns>The protobuf message representation of this object</returns>
|
/// <returns>The protobuf message representation of this object</returns>
|
||||||
public CloudFileReference ToProtoValue()
|
public CloudFileReference ToProtoValue()
|
||||||
{
|
{
|
||||||
return new Proto.CloudFileReference
|
return new CloudFileReference
|
||||||
{
|
{
|
||||||
Id = Id.ToString(),
|
Id = Id.ToString(),
|
||||||
FileId = FileId,
|
FileId = FileId,
|
||||||
|
|||||||
Reference in New Issue
Block a user