Turns out you can Include() lists of related entities

Author: Toastbrot236

Refresh.Core/Extensions/PhotoExtensions.cs

@@ -22,7 +22,7 @@ public static SerializedPhoto FromGamePhoto(GamePhoto photo, DataContext dataCon
             PhotoSubjects = [],
         };
 
-        foreach (GamePhotoSubject subject in dataContext.Database.GetSubjectsInPhoto(photo).ToList())
+        foreach (GamePhotoSubject subject in photo.Subjects)
         {
             SerializedPhotoSubject newSubject = new()
             {

Refresh.Database/GameDatabaseContext.Photos.cs

@@ -19,7 +19,8 @@ public partial class GameDatabaseContext // Photos
         .Include(p => p.Publisher.Statistics)
         .Include(p => p.Level)
         .Include(p => p.Level!.Publisher)
-        .Include(p => p.Level!.Publisher!.Statistics);
+        .Include(p => p.Level!.Publisher!.Statistics)
+        .Include(p => p.Subjects);
 
     private IQueryable<GamePhotoSubject> GamePhotoSubjectsIncluded => this.GamePhotoSubjects
         .Include(p => p.User)
@@ -32,7 +33,8 @@ public partial class GameDatabaseContext // Photos
         .Include(p => p.Photo!.Level!.Publisher!.Statistics)
         .Include(p => p.Photo!.LargeAsset)
         .Include(p => p.Photo!.MediumAsset)
-        .Include(p => p.Photo!.SmallAsset);
+        .Include(p => p.Photo!.SmallAsset)
+        .Include(p => p.Photo!.Subjects);
 
     public GamePhoto UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject> subjects, GameUser publisher, GameLevel? level)
     {

Refresh.Database/Models/Photos/GamePhoto.cs

@@ -43,6 +43,10 @@ public partial class GamePhoto : ISequentialId
     public string PlanHash { get; set; }
 
     #region Subjects
+    /// <summary>
+    /// A list of subjects, initialized using Include()
+    /// </summary>
+    public List<GamePhotoSubject> Subjects { get; set; }
 
     #nullable restore
 

Refresh.Interfaces.APIv3/Endpoints/DataTypes/Response/Users/Photos/ApiGamePhotoResponse.cs

@@ -47,7 +47,7 @@ public class ApiGamePhotoResponse : IApiResponse, IDataConvertableFrom<ApiGamePh
             LargeHash = old.LargeAsset.IsPSP ? $"psp/{old.LargeAsset.AssetHash}" : old.LargeAsset.AssetHash,
             PlanHash = old.PlanHash,
 
-            Subjects = ApiGamePhotoSubjectResponse.FromOldList(dataContext.Database.GetSubjectsInPhoto(old), dataContext),
+            Subjects = ApiGamePhotoSubjectResponse.FromOldList(old.Subjects, dataContext),
         };
     }
 

Refresh.Interfaces.Game/Types/Activity/SerializedEvents/SerializedEvent.cs

@@ -77,7 +77,7 @@ public abstract class SerializedEvent : IDataConvertableFrom<SerializedEvent, Ev
             case EventType.LevelPlay:
                 return SerializedLevelPlayEvent.FromSerializedLevelEvent(FromOldLevelEvent(old, level!));
             case EventType.PhotoUpload:
-                return SerializedPhotoUploadEvent.FromSerializedLevelEvent(FromOldLevelEvent(old, level!), photo!, dataContext);
+                return SerializedPhotoUploadEvent.FromSerializedLevelEvent(FromOldLevelEvent(old, level!), photo!);
             case EventType.LevelScore:
                 return SerializedScoreSubmitEvent.FromSerializedLevelEvent(FromOldLevelEvent(old, level!), score!);
             case EventType.NewsPost:

Refresh.Interfaces.Game/Types/Activity/SerializedEvents/SerializedPhotoUploadEvent.cs

@@ -1,5 +1,4 @@
 using System.Xml.Serialization;
-using Refresh.Core.Types.Data;
 using Refresh.Database.Models.Photos;
 
 namespace Refresh.Interfaces.Game.Types.Activity.SerializedEvents;
@@ -9,7 +8,7 @@ public class SerializedPhotoUploadEvent : SerializedLevelEvent
     [XmlElement("photo_id")] public int PhotoId { get; set; }
     [XmlElement("user_in_photo")] public List<string> UsersInPhoto = [];
 
-    public static SerializedPhotoUploadEvent? FromSerializedLevelEvent(SerializedLevelEvent? e, GamePhoto? photo, DataContext dataContext)
+    public static SerializedPhotoUploadEvent? FromSerializedLevelEvent(SerializedLevelEvent? e, GamePhoto? photo)
     {
         if (e == null || photo == null)
             return null;
@@ -22,7 +21,7 @@ public class SerializedPhotoUploadEvent : SerializedLevelEvent
             Type = e.Type,
 
             PhotoId = photo.PhotoId,
-            UsersInPhoto = dataContext.Database.GetSubjectsInPhoto(photo).Select(s => s.DisplayName).ToList(),
+            UsersInPhoto = photo.Subjects.Select(s => s.DisplayName).ToList(),
         };
     }
 }