Remove dead and redundant code

Author: hhvrc

API.IntegrationTests/Tests/AccountTests.cs

@@ -35,7 +35,7 @@ public async Task CreateAccount_ShouldAdd_NewUserToDatabase()
 
         var user = await db.Users.FirstOrDefaultAsync(u => u.Email == "bob@example.com");
 
-        await Assert.That(user is not null).IsTrue();
+        await Assert.That(user).IsNotNull();
     }
 
     [Test, DependsOn(nameof(CreateAccount_ShouldAdd_NewUserToDatabase))]

API/Controller/Shares/DeleteShareCode.cs

@@ -24,8 +24,8 @@ public sealed partial class SharesController
     [MapToApiVersion("1")]
     public async Task<IActionResult> DeleteShareCode([FromRoute] Guid shareCodeId)
     {
-        var affected = await Queryable
-            .Where<ShockerShareCode>(_db.ShockerShareCodes, x => x.Id == shareCodeId)
+        var affected = await _db.ShockerShareCodes
+            .Where(x => x.Id == shareCodeId)
             .WhereIsUserOrPrivileged(x => x.Shocker.Device.Owner, CurrentUser)
             .ExecuteDeleteAsync();
         if (affected <= 0)

API/Controller/Shares/LinkShareCode.cs

@@ -31,13 +31,13 @@ public async Task<IActionResult> LinkShareCode(
         [FromServices] IDeviceUpdateService deviceUpdateService
     )
     {
-        var shareCode = await Queryable.Where<ShockerShareCode>(_db.ShockerShareCodes, x => x.Id == shareCodeId && x.Shocker.Device.Owner.UserDeactivation == null).Select(x => new
+        var shareCode = await _db.ShockerShareCodes.Where(x => x.Id == shareCodeId && x.Shocker.Device.Owner.UserDeactivation == null).Select(x => new
         {
             Share = x, x.Shocker.Device.OwnerId, x.Shocker.DeviceId
         }).FirstOrDefaultAsync();
         if (shareCode is null) return Problem(ShareCodeError.ShareCodeNotFound);
         if (shareCode.OwnerId == CurrentUser.Id) return Problem(ShareCodeError.CantLinkOwnShareCode);
-        if (await EntityFrameworkQueryableExtensions.AnyAsync<UserShare>(_db.UserShares, x => x.ShockerId == shareCode.Share.ShockerId && x.SharedWithUserId == CurrentUser.Id))
+        if (await _db.UserShares.AnyAsync(x => x.ShockerId == shareCode.Share.ShockerId && x.SharedWithUserId == CurrentUser.Id))
             return Problem(ShareCodeError.ShockerAlreadyLinked);
 
         _db.UserShares.Add(new UserShare

API/Controller/Shares/UserShares/Invites.cs

@@ -159,7 +159,6 @@ public async Task<IActionResult> RedeemInvite([FromRoute] Guid inviteId, [FromSe
         }
 
         _db.UserShareInvites.Remove(shareRequest);
-        var a = _db.ChangeTracker.ToDebugString();
 
         if (await _db.SaveChangesAsync() < 1) throw new Exception("Error while linking share code to your account");
 

API/Services/Account/IAccountService.cs

@@ -125,7 +125,6 @@ public interface IAccountService
     Task<bool> TryVerifyEmailAsync(string token, CancellationToken cancellationToken = default);
 }
 
-public sealed record CreateUserLoginSessionSuccess(User User, string Token);
 public readonly struct AccountIsOAuthOnly;
 public readonly struct AccountNotActivated;
 public readonly struct AccountDeactivated;

API/Services/Account/LoginContext.cs

@@ -145,7 +145,7 @@ public async Task Boolean_TrueMatches()
         var result = TestArray.AsQueryable().Where(expression).ToArray();
 
         // Assert
-        await Assert.That(result).ContainsOnly(x => x.IsActive == true);
+        await Assert.That(result).ContainsOnly(x => x.IsActive);
     }
 
     [Test]

Common.Tests/Query/ExpressionBuilderTests.cs

@@ -51,7 +51,7 @@ private static bool IsValidValueFormat(ConfigurationValueType type, string value
     {
         return type switch
         {
-            ConfigurationValueType.String => value is not null,
+            ConfigurationValueType.String => true,
             ConfigurationValueType.Bool => bool.TryParse(value, out _),
             ConfigurationValueType.Int => int.TryParse(value, CultureInfo.InvariantCulture, out _),
             ConfigurationValueType.Float => float.TryParse(value, CultureInfo.InvariantCulture, out float f) && (float.IsNormal(f) || f == 0f),

Common/Services/Configuration/ConfigurationService.cs

@@ -22,11 +22,9 @@ public static class JsonWebSocketUtils
         {
             ValueWebSocketReceiveResult result;
             await using var message = RecyclableMemory.GetStream();
-            var bytes = 0;
             do
             {
                 result = await socket.ReceiveAsync(new Memory<byte>(buffer), cancellationToken);
-                bytes += result.Count;
                 if (result.MessageType == WebSocketMessageType.Close)
                 {
                     return new WebsocketClosure();

Common/Utils/JsonWebSocketUtils.cs

@@ -208,7 +208,7 @@ private async Task DeviceMessage(DeviceMessage message)
                 await OtaInstall(version);
                 break;
             default:
-                _logger.LogError("Got DeviceMessage with unknown payload type: {PayloadType}", message.Payload?.GetType().Name);
+                _logger.LogError("Got DeviceMessage with unknown payload type: {PayloadType}", message.Payload.GetType().Name);
                 break;
         }
     }