From 527b95a271317968e4f0b5f87bf5247c78b56707 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Tue, 17 Oct 2023 23:18:59 +0200
Subject: [PATCH] reuse dbcontext where applicable

---
 .../MareSynchronosServer/Hubs/MareHub.Functions.cs          | 4 ++--
 .../MareSynchronosServer/Hubs/MareHub.Groups.cs             | 6 +++---
 .../MareSynchronosServer/Hubs/MareHub.User.cs               | 4 ++--
 .../MareSynchronosServer/Services/UserPairCacheService.cs   | 3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
index 89673d6..0346a52 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
@@ -81,7 +81,7 @@ public partial class MareHub
     {
         uid ??= UserUID;
 
-        return (await _cacheService.GetAllPairs(UserUID).ConfigureAwait(false))
+        return (await _cacheService.GetAllPairs(UserUID, _dbContext).ConfigureAwait(false))
             .Where(u => !u.Value.OwnPermissions.IsPaused && u.Value.OtherPermissions != null && !u.Value.OtherPermissions.IsPaused)
             .Select(u => u.Key).ToList();
     }
@@ -175,7 +175,7 @@ public partial class MareHub
     private async Task UserGroupLeave(GroupPair groupUserPair, string userIdent, string? uid = null)
     {
         uid ??= UserUID;
-        var allUserPairs = await _cacheService.GetAllPairs(uid).ConfigureAwait(false);
+        var allUserPairs = await _cacheService.GetAllPairs(uid, _dbContext).ConfigureAwait(false);
         if (!allUserPairs.TryGetValue(groupUserPair.GroupUserUID, out var info) || !info.IsSynced)
         {
             var groupUserIdent = await GetUserIdent(groupUserPair.GroupUserUID).ConfigureAwait(false);
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
index b7b8ce0..e1911f2 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
@@ -81,7 +81,7 @@ public partial class MareHub
         groupPreferredPermissions.DisableVFX = dto.GroupPairPermissions.IsDisableVFX();
 
         // set the permissions for every group pair that is not sticky
-        var allPairs = (await _cacheService.GetAllPairs(UserUID).ConfigureAwait(false))
+        var allPairs = (await _cacheService.GetAllPairs(UserUID, _dbContext).ConfigureAwait(false))
             .Where(u => !u.Value.OwnPermissions.Sticky)
             .ToDictionary(d => d.Key, d => d.Value, StringComparer.Ordinal);
 
@@ -431,7 +431,7 @@ public partial class MareHub
             return false;
 
         // get all pairs before we join
-        var allUserPairs = (await _cacheService.GetAllPairs(UserUID).ConfigureAwait(false))
+        var allUserPairs = (await _cacheService.GetAllPairs(UserUID, _dbContext).ConfigureAwait(false))
             .ToDictionary(u => u.Key, u => u.Value, StringComparer.Ordinal);
 
         if (oneTimeInvite != null)
@@ -491,7 +491,7 @@ public partial class MareHub
             _cacheService.MarkAsStale(UserUID, pair.GroupUserUID);
         }
 
-        var userPairsAfterJoin = await _cacheService.GetAllPairs(UserUID).ConfigureAwait(false);
+        var userPairsAfterJoin = await _cacheService.GetAllPairs(UserUID, _dbContext).ConfigureAwait(false);
 
         foreach (var pair in groupPairs)
         {
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
index 6fc2b05..13811ec 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
@@ -171,7 +171,7 @@ public partial class MareHub
     {
         _logger.LogCallInfo();
 
-        var pairs = await _cacheService.GetAllPairs(UserUID).ConfigureAwait(false);
+        var pairs = await _cacheService.GetAllPairs(UserUID, _dbContext).ConfigureAwait(false);
         return pairs.Select(p =>
         {
             return new UserFullPairDto(new UserData(p.Key, p.Value.Alias),
@@ -263,7 +263,7 @@ public partial class MareHub
             + string.Join(Environment.NewLine, invalidFileSwapPaths.Select(p => "Invalid FileSwap Path: " + p)));
         }
 
-        var allPairs = await _cacheService.GetAllPairs(UserUID).ConfigureAwait(false);
+        var allPairs = await _cacheService.GetAllPairs(UserUID, _dbContext).ConfigureAwait(false);
         allPairs.Where(p => !p.Value.OwnPermissions.IsPaused && p.Value.OtherPermissions != null && !p.Value.OtherPermissions.IsPaused).ToList();
 
         var allPairedUsers = await GetAllPairedUnpausedUsers().ConfigureAwait(false);
diff --git a/MareSynchronosServer/MareSynchronosServer/Services/UserPairCacheService.cs b/MareSynchronosServer/MareSynchronosServer/Services/UserPairCacheService.cs
index 361ccc5..12678ce 100644
--- a/MareSynchronosServer/MareSynchronosServer/Services/UserPairCacheService.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Services/UserPairCacheService.cs
@@ -25,7 +25,7 @@ public class UserPairCacheService : IHostedService
         _cache.TryRemove(uid, out _);
     }
 
-    public async Task<Dictionary<string, UserInfo>> GetAllPairs(string uid)
+    public async Task<Dictionary<string, UserInfo>> GetAllPairs(string uid, MareDbContext dbContext)
     {
         await WaitForProcessing(uid).ConfigureAwait(false);
 
@@ -33,7 +33,6 @@ public class UserPairCacheService : IHostedService
         {
             _logger.LogDebug("Building full cache: Did not find PairData for {uid}", uid);
 
-            using var dbContext = await _dbContextFactory.CreateDbContextAsync().ConfigureAwait(false);
             _cache[uid] = await BuildFullCache(dbContext, uid).ConfigureAwait(false);
         }