From 7abb94d8a20072d451d6f58a0daa427efb5a93bf Mon Sep 17 00:00:00 2001
From: Lampan-git <22211983+Lampan-git@users.noreply.github.com>
Date: Wed, 5 Mar 2025 22:37:18 +0100
Subject: [PATCH] Move mapping assignment to Map

---
 .../Item/PeopleRepository.cs                      | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
index 28909cea78..1396f1c6f8 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -43,18 +43,6 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
         if (!filter.ItemId.IsEmpty())
         {
             dbQuery = dbQuery.Include(p => p.BaseItems!.Where(m => m.ItemId == filter.ItemId));
-
-            return dbQuery
-                .AsEnumerable()
-                .Select(p =>
-                {
-                    var personInfo = Map(p);
-                    var mapping = p.BaseItems?.FirstOrDefault();
-                    personInfo.Role = mapping?.Role;
-                    personInfo.SortOrder = mapping?.SortOrder;
-                    return personInfo;
-                })
-                .ToArray();
         }
 
         return dbQuery.AsEnumerable().Select(Map).ToArray();
@@ -111,10 +99,13 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
 
     private PersonInfo Map(People people)
     {
+        var mapping = people.BaseItems?.FirstOrDefault();
         var personInfo = new PersonInfo()
         {
             Id = people.Id,
             Name = people.Name,
+            Role = mapping?.Role,
+            SortOrder = mapping?.SortOrder
         };
         if (Enum.TryParse<PersonKind>(people.PersonType, out var kind))
         {