fix(pm): fix crash when reading private messages (#191)

* fix(pm): fix crash when reading private messages * fix(pm): re-enable DBContext pooling
eurofurence · Aug 29, 2024 · 33e41d9 · 33e41d9
1 parent d6895ef
commit 33e41d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Eurofurence.App.Server.Services/Communication/PrivateMessageService.cs b/src/Eurofurence.App.Server.Services/Communication/PrivateMessageService.cs
@@ -18,8 +18,7 @@ public class PrivateMessageService : EntityServiceBase<PrivateMessageRecord>, IP
         private readonly AppDbContext _appDbContext;
         private readonly IFirebaseChannelManager _firebaseChannelManager;
 
-        private readonly ConcurrentQueue<QueuedNotificationParameters> _notificationQueue =
-            new ConcurrentQueue<QueuedNotificationParameters>();
+        private readonly ConcurrentQueue<QueuedNotificationParameters> _notificationQueue = new();
 
         public PrivateMessageService(
             AppDbContext appDbContext,
@@ -37,7 +36,7 @@ public async Task<List<PrivateMessageRecord>> GetPrivateMessagesForRecipientAsyn
             string identityId,
             CancellationToken cancellationToken = default)
         {
-            var messages = await _appDbContext.PrivateMessages.AsNoTracking()
+            var messages = await _appDbContext.PrivateMessages
                 .Where(msg =>
                     (regSysIds.Contains(msg.RecipientRegSysId) || msg.RecipientIdentityId == identityId) &&
                     msg.IsDeleted == 0)
@@ -51,10 +50,11 @@ public async Task<List<PrivateMessageRecord>> GetPrivateMessagesForRecipientAsyn
             foreach (var message in messages.Where(a => !a.ReceivedDateTimeUtc.HasValue))
             {
                 message.ReceivedDateTimeUtc = DateTime.UtcNow;
+                message.Touch();
             }
 
-            await ReplaceMultipleAsync(messages, cancellationToken);
-
+            await _appDbContext.SaveChangesAsync(cancellationToken);
+            
             return messages;
         }
 
@@ -185,6 +185,7 @@ public async Task<List<PrivateMessageRecord>> GetPrivateMessagesForSenderAsync(
             CancellationToken cancellationToken = default)
         {
             return await _appDbContext.PrivateMessages
+                .AsNoTracking()
                 .Where(a => a.SenderUid == senderUid)
                 .ToListAsync(cancellationToken);
         }

diff --git a/src/Eurofurence.App.Server.Web/Identity/RolesClaimsTransformation.cs b/src/Eurofurence.App.Server.Web/Identity/RolesClaimsTransformation.cs
@@ -249,6 +249,7 @@ private async Task UpdateRegSysIdsInDb(List<string> ids, string identityId)
         var newIds = new HashSet<string>(ids);
 
         var existingIds = await db.RegistrationIdentities
+            .AsNoTracking()
             .Where(x => newIds.Contains(x.RegSysId))
             .Select(x => x.RegSysId)
             .ToListAsync();