Optimize EF Core queries and remove unnecessary AsQueryable calls

Jellyfin.Server.Implementations/Activity/ActivityManager.cs

@@ -48,18 +48,10 @@ namespace Jellyfin.Server.Implementations.Activity
             var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
             await using (dbContext.ConfigureAwait(false))
             {
-                IQueryable<ActivityLog> entries = dbContext.ActivityLogs
+                var entries = dbContext.ActivityLogs
-                    .OrderByDescending(entry => entry.DateCreated);
+                    .OrderByDescending(entry => entry.DateCreated)
-
+                    .Where(entry => query.MinDate == null || entry.DateCreated >= query.MinDate)
-                if (query.MinDate.HasValue)
+                    .Where(entry => !query.HasUserId.HasValue || entry.UserId.Equals(default) != query.HasUserId.Value);
-                {
-                    entries = entries.Where(entry => entry.DateCreated >= query.MinDate);
-                }
-
-                if (query.HasUserId.HasValue)
-                {
-                    entries = entries.Where(entry => (!entry.UserId.Equals(default)) == query.HasUserId.Value);
-                }
 
                 return new QueryResult<ActivityLogEntry>(
                     query.Skip,
@@ -67,8 +59,16 @@ namespace Jellyfin.Server.Implementations.Activity
                     await entries
                         .Skip(query.Skip ?? 0)
                         .Take(query.Limit ?? 100)
-                        .AsAsyncEnumerable()
+                        .Select(entity => new ActivityLogEntry(entity.Name, entity.Type, entity.UserId)
-                        .Select(ConvertToOldModel)
+                        {
+                            Id = entity.Id,
+                            Overview = entity.Overview,
+                            ShortOverview = entity.ShortOverview,
+                            ItemId = entity.ItemId,
+                            Date = entity.DateCreated,
+                            Severity = entity.LogSeverity
+                        })
+                        .AsQueryable()
                         .ToListAsync()
                         .ConfigureAwait(false));
             }

Jellyfin.Server.Implementations/Devices/DeviceManager.cs

@@ -54,7 +54,7 @@ namespace Jellyfin.Server.Implementations.Devices
             var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
             await using (dbContext.ConfigureAwait(false))
             {
-                deviceOptions = await dbContext.DeviceOptions.AsQueryable().FirstOrDefaultAsync(dev => dev.DeviceId == deviceId).ConfigureAwait(false);
+                deviceOptions = await dbContext.DeviceOptions.FirstOrDefaultAsync(dev => dev.DeviceId == deviceId).ConfigureAwait(false);
                 if (deviceOptions is null)
                 {
                     deviceOptions = new DeviceOptions(deviceId);
@@ -132,22 +132,11 @@ namespace Jellyfin.Server.Implementations.Devices
             var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
             await using (dbContext.ConfigureAwait(false))
             {
-                var devices = dbContext.Devices.AsQueryable();
+                var devices = dbContext.Devices
-
+                    .OrderBy(d => d.Id)
-                if (query.UserId.HasValue)
+                    .Where(device => !query.UserId.HasValue || device.UserId.Equals(query.UserId.Value))
-                {
+                    .Where(device => query.DeviceId == null || device.DeviceId == query.DeviceId)
-                    devices = devices.Where(device => device.UserId.Equals(query.UserId.Value));
+                    .Where(device => query.AccessToken == null || device.AccessToken == query.AccessToken);
-                }
-
-                if (query.DeviceId is not null)
-                {
-                    devices = devices.Where(device => device.DeviceId == query.DeviceId);
-                }
-
-                if (query.AccessToken is not null)
-                {
-                    devices = devices.Where(device => device.AccessToken == query.AccessToken);
-                }
 
                 var count = await devices.CountAsync().ConfigureAwait(false);
 
@@ -179,11 +168,10 @@ namespace Jellyfin.Server.Implementations.Devices
         /// <inheritdoc />
         public async Task<QueryResult<DeviceInfo>> GetDevicesForUser(Guid? userId, bool? supportsSync)
         {
-            IAsyncEnumerable<Device> sessions;
             var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
             await using (dbContext.ConfigureAwait(false))
             {
-                sessions = dbContext.Devices
+                IAsyncEnumerable<Device> sessions = dbContext.Devices
                     .Include(d => d.User)
                     .OrderByDescending(d => d.DateLastActivity)
                     .ThenBy(d => d.DeviceId)

Jellyfin.Server.Implementations/Security/AuthenticationManager.cs

@@ -40,7 +40,6 @@ namespace Jellyfin.Server.Implementations.Security
             await using (dbContext.ConfigureAwait(false))
             {
                 return await dbContext.ApiKeys
-                    .AsAsyncEnumerable()
                     .Select(key => new AuthenticationInfo
                     {
                         AppName = key.Name,
@@ -60,7 +59,6 @@ namespace Jellyfin.Server.Implementations.Security
             await using (dbContext.ConfigureAwait(false))
             {
                 var key = await dbContext.ApiKeys
-                    .AsQueryable()
                     .Where(apiKey => apiKey.AccessToken == accessToken)
                     .FirstOrDefaultAsync()
                     .ConfigureAwait(false);

Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs

@@ -62,7 +62,6 @@ namespace Jellyfin.Server.Implementations.Users
         public IList<ItemDisplayPreferences> ListItemDisplayPreferences(Guid userId, string client)
         {
             return _dbContext.ItemDisplayPreferences
-                .AsQueryable()
                 .Where(prefs => prefs.UserId.Equals(userId) && !prefs.ItemId.Equals(default) && string.Equals(prefs.Client, client))
                 .ToList();
         }
@@ -71,7 +70,6 @@ namespace Jellyfin.Server.Implementations.Users
         public Dictionary<string, string?> ListCustomItemDisplayPreferences(Guid userId, Guid itemId, string client)
         {
             return _dbContext.CustomItemDisplayPreferences
-                .AsQueryable()
                 .Where(prefs => prefs.UserId.Equals(userId)
                                 && prefs.ItemId.Equals(itemId)
                                 && string.Equals(prefs.Client, client))
@@ -82,7 +80,6 @@ namespace Jellyfin.Server.Implementations.Users
         public void SetCustomItemDisplayPreferences(Guid userId, Guid itemId, string client, Dictionary<string, string?> customPreferences)
         {
             var existingPrefs = _dbContext.CustomItemDisplayPreferences
-                .AsQueryable()
                 .Where(prefs => prefs.UserId.Equals(userId)
                                 && prefs.ItemId.Equals(itemId)
                                 && string.Equals(prefs.Client, client));

Jellyfin.Server.Implementations/Users/UserManager.cs

@@ -143,7 +143,6 @@ namespace Jellyfin.Server.Implementations.Users
             await using (dbContext.ConfigureAwait(false))
             {
                 if (await dbContext.Users
-                        .AsQueryable()
                         .AnyAsync(u => u.Username == newName && !u.Id.Equals(user.Id))
                         .ConfigureAwait(false))
                 {