sam/Catalogger.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't track EFCore objects that don't need to be updated

Browse source
This commit is contained in:
sam 2024-10-25 16:04:01 +02:00
parent d42e73699b
commit f7f88ff98f
Signed by: sam
GPG key ID: 5F3C3C1B3166639D
24 changed files with 50 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Catalogger.Backend/Database/Queries/MessageRepository.cs
View file

@ -94,7 +94,10 @@ public class MessageRepository(
msg.Attachments.Select(a => new Attachment(a.Filename, a.Size, a.ContentType.Value))
);
var dbMsg = await db.Messages.FindAsync(msg.ID.Value);
var dbMsg = await db.Messages.FindAsync(
new object?[] { msg.ID.Value },
cancellationToken: ct
);
if (dbMsg == null)
throw new CataloggerError(
"Message was null despite HasProxyInfoAsync returning true"
@ -127,7 +130,7 @@ public class MessageRepository(
{
_logger.Debug("Retrieving message {MessageId}", id);
var dbMsg = await db.Messages.FindAsync(id);
var dbMsg = await db.Messages.AsNoTracking().FirstOrDefaultAsync(m => m.Id == id, ct);
if (dbMsg == null)
return null;
@ -159,7 +162,8 @@ public class MessageRepository(
_logger.Debug("Checking if message {MessageId} has proxy information", id);
var msg = await db
.Messages.Select(m => new { m.Id, m.OriginalId })
.Messages.AsNoTracking()
.Select(m => new { m.Id, m.OriginalId })
.FirstOrDefaultAsync(m => m.Id == id);
return (msg != null, msg?.OriginalId != null);
}
@ -195,7 +199,8 @@ public class MessageRepository(
public async Task<bool> IsMessageIgnoredAsync(ulong id, CancellationToken ct = default)
{
_logger.Debug("Checking if message {MessageId} is ignored", id);
return await db.IgnoredMessages.FirstOrDefaultAsync(m => m.Id == id, ct) != null;
return await db.IgnoredMessages.AsNoTracking().FirstOrDefaultAsync(m => m.Id == id, ct)
!= null;
}
public const int MaxMessageAgeDays = 15;

20
Catalogger.Backend/Database/Queries/QueryExtensions.cs
View file

@ -15,6 +15,7 @@
using Catalogger.Backend.Database.Models;
using Catalogger.Backend.Extensions;
using Microsoft.EntityFrameworkCore;
using Remora.Rest.Core;
namespace Catalogger.Backend.Database.Queries;
@ -24,22 +25,30 @@ public static class QueryExtensions
public static async ValueTask<Guild> GetGuildAsync(
this DatabaseContext db,
Snowflake id,
bool shouldTrack = true,
CancellationToken ct = default
) => await db.GetGuildAsync(id.ToUlong(), ct);
) => await db.GetGuildAsync(id.ToUlong(), shouldTrack, ct);
public static async ValueTask<Guild> GetGuildAsync(
this DatabaseContext db,
Optional<Snowflake> id,
bool shouldTrack = true,
CancellationToken ct = default
) => await db.GetGuildAsync(id.ToUlong(), ct);
) => await db.GetGuildAsync(id.ToUlong(), shouldTrack, ct);
public static async ValueTask<Guild> GetGuildAsync(
this DatabaseContext db,
ulong id,
bool shouldTrack = true,
CancellationToken ct = default
)
{
var guild = await db.Guilds.FindAsync([id], ct);
Guild? guild;
if (shouldTrack)
guild = await db.Guilds.FindAsync([id], ct);
else
guild = await db.Guilds.AsNoTracking().FirstOrDefaultAsync(g => g.Id == id, ct);
if (guild == null)
throw new CataloggerError("Guild not found, was not initialized during guild create");
return guild;
@ -50,5 +59,8 @@ public static class QueryExtensions
Snowflake guildId,
Snowflake userId,
CancellationToken ct = default
) => await db.Watchlists.FindAsync([guildId.Value, userId.Value], ct);
) =>
await db
.Watchlists.AsNoTracking()
.FirstOrDefaultAsync(w => w.GuildId == guildId.Value && w.UserId == userId.Value, ct);
}