Merge remote-tracking branch 'origin/dev' into add-details-sqlite

specklesystems · Jan 8, 2025 · 5f21d50 · 5f21d50
2 parents 60c2072 + ed5bdc9
commit 5f21d50
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Speckle.Sdk/Credentials/AccountManager.cs b/src/Speckle.Sdk/Credentials/AccountManager.cs
@@ -330,7 +330,7 @@ public IEnumerable<Account> GetAccounts()
   {
     static bool IsInvalid(Account ac) => ac.userInfo == null || ac.serverInfo == null;
 
-    var sqlAccounts = _accountStorage.GetAllObjects().Select(x => JsonConvert.DeserializeObject<Account>(x.Item2));
+    var sqlAccounts = _accountStorage.GetAllObjects().Select(x => JsonConvert.DeserializeObject<Account>(x.Json));
     var localAccounts = GetLocalAccounts();
 
     foreach (var acc in sqlAccounts)
@@ -651,7 +651,7 @@ private void TryLockAccountAddFlow(TimeSpan timespan)
     }
 
     // this uses the SQLite transport to store locks
-    var lockIds = _accountAddLockStorage.GetAllObjects().Select(x => x.Item2).OrderByDescending(d => d).ToList();
+    var lockIds = _accountAddLockStorage.GetAllObjects().Select(x => x.Id).OrderByDescending(d => d).ToList();
     var now = DateTime.Now;
     foreach (var l in lockIds)
     {

diff --git a/src/Speckle.Sdk/SQLite/CacheDbCommandPool.cs b/src/Speckle.Sdk/SQLite/CacheDbCommandPool.cs
@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using Microsoft.Data.Sqlite;
 
 namespace Speckle.Sdk.SQLite;

diff --git a/src/Speckle.Sdk/SQLite/SQLiteJsonCacheManager.cs b/src/Speckle.Sdk/SQLite/SQLiteJsonCacheManager.cs
@@ -69,7 +69,7 @@ content TEXT
     c.Close();
   }
 
-  public IReadOnlyCollection<(string, string)> GetAllObjects() =>
+  public IReadOnlyCollection<(string Id, string Json)> GetAllObjects() =>
     _pool.Use(
       CacheOperation.GetAll,
       command =>