Use interfaces as params for UploadPhoto()

Author: Toastbrot236

Refresh.Database/GameDatabaseContext.Photos.cs

@@ -3,6 +3,8 @@
 using Refresh.Database.Models.Users;
 using Refresh.Database.Models.Levels;
 using Refresh.Database.Models.Photos;
+using Refresh.Database.Query;
+using Refresh.Database.Helpers;
 
 namespace Refresh.Database;
 
@@ -26,7 +28,7 @@ public partial class GameDatabaseContext // Photos
         .Include(p => p.Subject4User)
         .Include(p => p.Subject4User!.Statistics);
 
-    public void UploadPhoto(SerializedPhoto photo, GameUser publisher)
+    public void UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject> subjects, GameUser publisher, GameLevel? level)
     {
         GamePhoto newPhoto = new()
         {
@@ -36,33 +38,26 @@ public void UploadPhoto(SerializedPhoto photo, GameUser publisher)
             PlanHash = photo.PlanHash,
 
             Publisher = publisher,
-            LevelType = photo.Level?.Type ?? "",
-            OriginalLevelId = photo.Level?.LevelId ?? 0,
-            OriginalLevelName = photo.Level?.Title ?? "",
+            Level = level,
+            LevelType = photo.LevelSlotType,
+            OriginalLevelId = photo.LevelId,
+            OriginalLevelName = photo.LevelTitle,
 
             TakenAt = DateTimeOffset.FromUnixTimeSeconds(Math.Clamp(photo.Timestamp, this._time.EarliestDate, this._time.TimestampSeconds)),
             PublishedAt = this._time.Now,
         };
 
-        GameLevel? level = null;
+        float[] bounds = new float[PhotoHelper.SubjectBoundCount];
 
-        if (photo.Level?.Type is "user" or "developer") 
-        {
-            level = this.GetLevelByIdAndType(photo.Level.Type, photo.Level.LevelId);
-            newPhoto.Level = level;
-        }
-
-        float[] bounds = new float[SerializedPhotoSubject.FloatCount];
-
-        List<GamePhotoSubject> gameSubjects = new(photo.PhotoSubjects.Count);
-        foreach (SerializedPhotoSubject subject in photo.PhotoSubjects)
+        List<GamePhotoSubject> gameSubjects = new(subjects.Count());
+        foreach (IPhotoUploadSubject subject in subjects)
         {
             GameUser? subjectUser = null;
 
             if (!string.IsNullOrEmpty(subject.Username)) 
                 subjectUser = this.GetUserByUsername(subject.Username);
 
-            SerializedPhotoSubject.ParseBoundsList(subject.BoundsList, bounds);
+            PhotoHelper.ParseBoundsList(subject.BoundsList, bounds);
 
             gameSubjects.Add(new GamePhotoSubject(subjectUser, subject.DisplayName, bounds));
 

Refresh.Database/Models/Photos/SerializedPhoto.cs

@@ -1,12 +1,13 @@
 using System.Xml.Serialization;
+using Refresh.Database.Query;
 
 namespace Refresh.Database.Models.Photos;
 
 #nullable disable
 
 [XmlRoot("photo")]
 [XmlType("photo")]
-public class SerializedPhoto
+public class SerializedPhoto : IPhotoUpload
 {
     [XmlAttribute("timestamp")]
     public long Timestamp { get; set; }
@@ -23,6 +24,9 @@ public class SerializedPhoto
     [XmlElement("plan")] public string PlanHash { get; set; }
 
     [XmlElement("slot")] public SerializedPhotoLevel Level { get; set; }
+    [XmlIgnore] public int LevelId => this.Level.LevelId;
+    [XmlIgnore] public string LevelType => this.Level.Type;
+    [XmlIgnore] public string LevelTitle => this.Level.Title;
 
-    [XmlArray("subjects")] public List<SerializedPhotoSubject> PhotoSubjects { get; set; }
+    [XmlArray("subjects")] public List<SerializedPhotoSubject> PhotoSubjects { get; set; } = [];
 }

Refresh.Database/Models/Photos/SerializedPhotoSubject.cs

@@ -1,12 +1,13 @@
 using System.Xml.Serialization;
+using Refresh.Database.Query;
 
 namespace Refresh.Database.Models.Photos;
 
 #nullable disable
 
 [XmlRoot("subject")]
 [XmlType("subject")]
-public class SerializedPhotoSubject
+public class SerializedPhotoSubject : IPhotoUploadSubject
 {
     [XmlElement("npHandle")]
     public string Username { get; set; }

Refresh.Database/Query/IPhotoUpload.cs

@@ -0,0 +1,13 @@
+namespace Refresh.Database.Query;
+
+public interface IPhotoUpload
+{
+    int LevelId { get; }
+    string LevelType { get; }
+    string LevelTitle { get; }
+    string SmallHash { get; }
+    string MediumHash { get;}
+    string LargeHash { get; }
+    string PlanHash { get; }
+    long Timestamp { get; }
+}

Refresh.Database/Query/IPhotoUploadSubject.cs

@@ -0,0 +1,8 @@
+namespace Refresh.Database.Query;
+
+public interface IPhotoUploadSubject
+{
+    string Username { get; }
+    string DisplayName { get; }
+    string BoundsList { get; }
+}

Refresh.Interfaces.Game/Endpoints/PhotoEndpoints.cs

@@ -58,7 +58,9 @@ public Response UploadPhoto(RequestContext context, SerializedPhoto body, GameDa
                 return Unauthorized;
         }
 
-        database.UploadPhoto(body, user);
+        GameLevel? level = database.GetLevelByIdAndType(body.Level.Type, body.Level.LevelId);
+
+        database.UploadPhoto(body, body.PhotoSubjects, user, level);
 
         return OK;
     }