Fix UploadPhoto() calls in tests, return GamePhoto with UploadPhoto()

Author: Toastbrot236

Refresh.Database/GameDatabaseContext.Photos.cs

@@ -28,7 +28,7 @@ public partial class GameDatabaseContext // Photos
         .Include(p => p.Subject4User)
         .Include(p => p.Subject4User!.Statistics);
 
-    public void UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject> subjects, GameUser publisher, GameLevel? level)
+    public GamePhoto UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject> subjects, GameUser publisher, GameLevel? level)
     {
         GamePhoto newPhoto = new()
         {
@@ -39,7 +39,7 @@ public void UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject> sub
 
             Publisher = publisher,
             Level = level,
-            LevelType = photo.LevelSlotType,
+            LevelType = photo.LevelType,
             OriginalLevelId = photo.LevelId,
             OriginalLevelName = photo.LevelTitle,
 
@@ -91,6 +91,7 @@ public void UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject> sub
         }
 
         this.CreatePhotoUploadEvent(publisher, newPhoto);
+        return newPhoto;
     }
 
     public void RemovePhoto(GamePhoto photo)

RefreshTests.GameServer/TestContext.cs

@@ -16,6 +16,7 @@
 using Refresh.Interfaces.Game.Endpoints.DataTypes.Request;
 using Refresh.Database.Models.Playlists;
 using Refresh.Interfaces.APIv3.Endpoints.DataTypes.Request;
+using Refresh.Database.Models.Photos;
 
 namespace RefreshTests.GameServer;
 
@@ -144,7 +145,7 @@ public GameLevel CreateLevel(GameUser author, string title, string description,
         return level;
     }
 
-    public void CreatePhotoWithSubject(GameUser author, string imageHash)
+    public GamePhoto CreatePhotoWithSubject(GameUser author, string imageHash, GameLevel? level = null)
     {
         // TODO: Return newly created GamePhoto
         if (this.Database.GetAssetFromHash(imageHash) == null)
@@ -155,22 +156,25 @@ public void CreatePhotoWithSubject(GameUser author, string imageHash)
             });
         }
 
-        this.Database.UploadPhoto(new()
+        SerializedPhoto photo = new()
         {
             AuthorName = author.Username,
             SmallHash = imageHash,
             MediumHash = imageHash,
             LargeHash = imageHash,
-            PhotoSubjects = 
-            [
-                new()
-                {
-                    Username = author.Username,
-                    DisplayName = author.Username,
-                    BoundsList = "10,10,10,10"
-                }
-            ]
-        }, author);
+            
+        };
+        IEnumerable<SerializedPhotoSubject> subjects = 
+        [
+            new()
+            {
+                Username = author.Username,
+                DisplayName = author.Username,
+                BoundsList = "10,10,10,10"
+            }
+        ];
+
+        return this.Database.UploadPhoto(photo, subjects, author, level);
     }
 
     public void FillLeaderboard(GameLevel level, int count, byte type)

RefreshTests.GameServer/Tests/Levels/LevelDeletionTests.cs

@@ -73,7 +73,7 @@ public void DeletesLevelWithPhotos()
             ],
         };
 
-        context.Database.UploadPhoto(photo, author);
+        context.Database.UploadPhoto(photo, photo.PhotoSubjects, author, level);
         context.Database.Refresh();
 
         level = context.Database.GetLevelById(level.LevelId);