Merge branch 'develop' into feature/dotnet-10

Author: hhvrc

.github/dependabot.yml

@@ -18,4 +18,4 @@ updates:
     directory: /
     patterns:
       - '*'
-    multi-ecosystem-group: maintenance
+    multi-ecosystem-group: maintenance

API.IntegrationTests/Tests/LcgAssignmentTests.cs

@@ -88,7 +88,7 @@ public async Task CheckBasicAssignments(string requesterCountry, string expected
 
         var data = await response.Content.ReadFromJsonAsync<LcgNodeResponseV2>();
         await Assert.That(data).IsNotNull();
-        await Assert.That(data.Host).IsEqualTo(expectedHost);
+        await Assert.That(data!.Host).IsEqualTo(expectedHost);
     }
 
     [Test]
@@ -107,7 +107,7 @@ public async Task CheckAnyGateway(string? requesterCountry)
 
         var data = await response.Content.ReadFromJsonAsync<LcgNodeResponseV2>();
         await Assert.That(data).IsNotNull();
-        await Assert.That(data.Host).IsNotNullOrWhiteSpace();
+        await Assert.That(data!.Host).IsNotNullOrWhiteSpace();
     }
 
     [Test]

API/Controller/Device/Pair.cs

@@ -44,7 +44,7 @@ public async Task<IActionResult> PairDeprecated([FromRoute] string pairCode)
         return await PairInternal(pairCode);
     }
 
-    public async Task<IActionResult> PairInternal(string pairCode)
+    private async Task<IActionResult> PairInternal(string pairCode)
     {
         var devicePairs = _redis.RedisCollection<DevicePair>();
 

API/Controller/Public/_ApiController.cs

@@ -10,13 +10,11 @@ namespace OpenShock.API.Controller.Public;
 public sealed partial class PublicController : OpenShockControllerBase
 {
     private readonly OpenShockContext _db;
-    private readonly IRedisConnectionProvider _redis;
     private readonly ILogger<PublicController> _logger;
 
     public PublicController(OpenShockContext db, IRedisConnectionProvider redis, ILogger<PublicController> logger)
     {
         _db = db;
-        _redis = redis;
         _logger = logger;
     }
 }

API/Controller/Users/_ApiController.cs

@@ -2,8 +2,6 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.Common.Authentication;
 using OpenShock.Common.Authentication.ControllerBase;
-using OpenShock.Common.OpenShockDb;
-using Redis.OM.Contracts;
 
 namespace OpenShock.API.Controller.Users;
 
@@ -13,14 +11,10 @@ namespace OpenShock.API.Controller.Users;
 [Authorize(AuthenticationSchemes = OpenShockAuthSchemes.UserSessionApiTokenCombo)]
 public sealed partial class UsersController : AuthenticatedSessionControllerBase
 {
-    private readonly OpenShockContext _db;
-    private readonly IRedisConnectionProvider _redis;
     private readonly ILogger<UsersController> _logger;
 
-    public UsersController(OpenShockContext db, IRedisConnectionProvider redis, ILogger<UsersController> logger)
+    public UsersController(ILogger<UsersController> logger)
     {
-        _db = db;
-        _redis = redis;
         _logger = logger;
     }
 }

Common.Tests/Query/ExpressionBuilderTests.cs

@@ -25,13 +25,13 @@ public enum TestEnum
         Inactive
     }
 
-    private readonly TestClass[] TestArray;
+    private readonly TestClass[] _testArray;
 
     public ExpressionBuilderTests()
     {
         var faker = new Faker<TestClass>()
             .UseSeed(12345)
-            .RuleFor(t => t.Id, f => Guid.CreateVersion7())
+            .RuleFor(t => t.Id, f => f.Random.Guid())
             .RuleFor(t => t.Name, f => f.Name.FullName())
             .RuleFor(t => t.Age, f => f.Random.Int(18, 99))
             .RuleFor(t => t.Height, f => f.Random.UInt())
@@ -41,7 +41,7 @@ public ExpressionBuilderTests()
             .RuleFor(t => t.Score, f => f.Random.Float(0, 100))
             .RuleFor(t => t.Precision, f => f.Random.Double(0, 100));
 
-        TestArray = faker.Generate(100).ToArray();
+        _testArray = faker.Generate(100).ToArray();
     }
 
     [Test]
@@ -75,9 +75,9 @@ await Assert
     public async Task Guid_ExactMatch()
     {
         // Act
-        var testGuid = TestArray.First().Id; // Grab a Guid from the test data
+        var testGuid = _testArray.First().Id; // Grab a Guid from the test data
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>($"id eq {testGuid}");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.Id == testGuid);
@@ -88,7 +88,7 @@ public async Task Integer_GreaterThanOrEquals()
     {
         // Act
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>("age gte 42");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.Age >= 42);
@@ -99,7 +99,7 @@ public async Task Integer_LessThanOrEquals()
     {
         // Act
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>("age lte 51");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.Age <= 51);
@@ -110,7 +110,7 @@ public async Task Enum_Equals_ChecksValidValues()
     {
         // Act
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>("status eq Active");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.Status == TestEnum.Active);
@@ -121,7 +121,7 @@ public async Task Enum_NotEquals_ChecksValidValues()
     {
         // Act
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>("status != Active");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).DoesNotContain(x => x.Status == TestEnum.Active);
@@ -141,7 +141,7 @@ public async Task Boolean_TrueMatches()
     {
         // Act
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>("isActive eq true");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.IsActive);
@@ -152,7 +152,7 @@ public async Task Boolean_FalseMatches()
     {
         // Act
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>("isActive eq false");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.IsActive == false);
@@ -162,9 +162,9 @@ public async Task Boolean_FalseMatches()
     public async Task DateTime_ExactMatch()
     {
         // Act
-        var testDate = TestArray[20].CreatedAt;
+        var testDate = _testArray[20].CreatedAt;
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>($"createdAt eq {testDate:O}");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.CreatedAt == testDate);
@@ -176,7 +176,7 @@ public async Task DateTime_LessThan()
         // Act
         var referenceDate = DateTime.UtcNow.AddMonths(-6);
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>($"createdAt lt {referenceDate:O}");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.CreatedAt < referenceDate);
@@ -187,7 +187,7 @@ public async Task Float_GreaterThan()
     {
         // Act
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>("score gt 50");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.Score > 50f);
@@ -198,7 +198,7 @@ public async Task Double_LessThan()
     {
         // Act
         var expression = DBExpressionBuilder.GetFilterExpression<TestClass>("precision lt 50");
-        var result = TestArray.AsQueryable().Where(expression).ToArray();
+        var result = _testArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
         await Assert.That(result).ContainsOnly(x => x.Precision < 50f);
@@ -211,7 +211,7 @@ public async Task Double_LessThan()
     public async Task OrderByAscending_SortsCorrectly(string query)
     {
         // Arrange
-        var queryable = TestArray.AsQueryable();
+        var queryable = _testArray.AsQueryable();
 
         // Act
         var result = queryable.ApplyOrderBy(query).ToArray();
@@ -226,7 +226,7 @@ public async Task OrderByAscending_SortsCorrectly(string query)
     public async Task OrderByDescending_SortsCorrectly(string query)
     {
         // Arrange
-        var queryable = TestArray.AsQueryable();
+        var queryable = _testArray.AsQueryable();
 
         // Act
         var result = queryable.ApplyOrderBy(query).ToArray();
@@ -241,13 +241,13 @@ public async Task OrderByDescending_SortsCorrectly(string query)
     public async Task ThenByAscending_SortsCorrectly(string query)
     {
         // Arrange
-        var queryable = TestArray.AsQueryable();
+        var queryable = _testArray.AsQueryable();
 
         // Act
         var result = queryable.ApplyOrderBy(query).ToArray();
 
         // Assert
-        var expected = TestArray.OrderBy(x => x.Age).ThenBy(x => x.CreatedAt).ToArray();
+        var expected = _testArray.OrderBy(x => x.Age).ThenBy(x => x.CreatedAt).ToArray();
         await Assert.That(result).IsEquivalentTo(expected);
     }
 
@@ -256,13 +256,13 @@ public async Task ThenByAscending_SortsCorrectly(string query)
     public async Task ThenByDescending_SortsCorrectly(string query)
     {
         // Arrange
-        var queryable = TestArray.AsQueryable();
+        var queryable = _testArray.AsQueryable();
 
         // Act
         var result = queryable.ApplyOrderBy(query).ToArray();
 
         // Assert
-        var expected = TestArray.OrderBy(x => x.Age).ThenByDescending(x => x.Name).ToArray();
+        var expected = _testArray.OrderBy(x => x.Age).ThenByDescending(x => x.Name).ToArray();
         await Assert.That(result).IsEquivalentTo(expected);
     }
 }

Common.Tests/Utils/LatencyEmulatorTests.cs

@@ -1,4 +1,5 @@
 using OpenShock.Common.Utils;
+// ReSharper disable ObjectCreationAsStatement
 
 namespace OpenShock.Common.Tests.Utils;
 

Common.Tests/Validation/CharsetMatchersTests.cs

@@ -4,19 +4,13 @@ namespace OpenShock.Common.Tests.Validation;
 
 internal class CharsetMatchersTests
 {
-    private readonly string[] whitelist;
-    private readonly string[] blacklist;
-
-    public CharsetMatchersTests()
-    {
-        whitelist = File.ReadAllLines("Validation/DataSets/WhiteList.txt");
-        blacklist = File.ReadAllLines("Validation/DataSets/BlackList.txt");
-    }
+    private readonly string[] _whitelist = File.ReadAllLines("Validation/DataSets/WhiteList.txt");
+    private readonly string[] _blacklist = File.ReadAllLines("Validation/DataSets/BlackList.txt");
 
     [Test]
     public async Task ContainsUnwanted_Whitelist_ReturnsFalse()
     {
-        foreach (var line in whitelist)
+        foreach (var line in _whitelist)
         {
             // Skip empty lines
             if (string.IsNullOrEmpty(line)) continue;
@@ -32,7 +26,7 @@ public async Task ContainsUnwanted_Whitelist_ReturnsFalse()
     [Test]
     public async Task ContainsUnwanted_BlackList_AllReturnTrue()
     {
-        foreach (var line in blacklist)
+        foreach (var line in _blacklist)
         {
             // Skip empty lines
             if (string.IsNullOrEmpty(line)) continue;

Common/Authentication/AuthenticationHandlers/ApiTokenAuthentication.cs

@@ -18,7 +18,7 @@ public sealed class ApiTokenAuthentication : AuthenticationHandler<Authenticatio
     private readonly IUserReferenceService _userReferenceService;
     private readonly IBatchUpdateService _batchUpdateService;
     private readonly OpenShockContext _db;
-    private OpenShockProblem? _authResultError = null;
+    private OpenShockProblem? _authResultError;
 
     public ApiTokenAuthentication(
         IOptionsMonitor<AuthenticationSchemeOptions> options,

Common/Authentication/AuthenticationHandlers/HubAuthentication.cs

@@ -17,7 +17,7 @@ public sealed class HubAuthentication : AuthenticationHandler<AuthenticationSche
 {
     private readonly OpenShockContext _db;
 
-    private OpenShockProblem? _authResultError = null;
+    private OpenShockProblem? _authResultError;
 
 
     public HubAuthentication(