alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-01 03:42:51 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #17175 from obrenoalvim/fix/use-leftjoin-ef10
Some checks are pending
Tests / run-tests (macos-latest) (push) Waiting to run
Details
Tests / run-tests (windows-latest) (push) Waiting to run
Details
OpenAPI Publish / OpenAPI - Publish Artifact (push) Waiting to run
Details
CodeQL / Analyze (csharp) (push) Waiting to run
Details
Format / format-check (push) Waiting to run
Details
Tests / run-tests (ubuntu-latest) (push) Waiting to run
Details
OpenAPI Publish / OpenAPI - Publish Unstable Spec (push) Blocked by required conditions
Details
OpenAPI Publish / OpenAPI - Publish Stable Spec (push) Blocked by required conditions
Details
Project Automation / Project board (push) Waiting to run
Details
Merge Conflict Labeler / main (push) Waiting to run
Details

Browse Source 
Use Enumerable.LeftJoin for activity log user query
This commit is contained in:
Bond-009
2026-06-30 17:49:15 +02:00
committed by GitHub
parent d3ee1e84b1 f011529388
commit a43fd188dc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Jellyfin.Server.Implementations/Activity/ActivityManager.cs
View File

@@ -56,11 +56,11 @@ public class ActivityManager : IActivityManager
var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false); var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
await using (dbContext.ConfigureAwait(false)) await using (dbContext.ConfigureAwait(false))
{ {
// TODO switch to LeftJoin in .NET 10. var entries = dbContext.ActivityLogs.LeftJoin(
var entries = from a in dbContext.ActivityLogs dbContext.Users,
join u in dbContext.Users on a.UserId equals u.Id into ugj a => a.UserId,
from u in ugj.DefaultIfEmpty() u => u.Id,
select new ExpandedActivityLog { ActivityLog = a, Username = u.Username }; (a, u) => new ExpandedActivityLog { ActivityLog = a, Username = u == null ? null : u.Username });
if (query.HasUserId is not null) if (query.HasUserId is not null)
{ {