Merge EFCore back into main

GenOnlineService/BackgroundS3Uploader.cs

@@ -3,11 +3,11 @@
 using Amazon.S3;
 using Amazon.S3.Model;
 using GenOnlineService;
+using Microsoft.EntityFrameworkCore;
 using MySqlX.XDevAPI.Common;
 using Sentry.Protocol;
 using System.Collections.Concurrent;
 using System.Net;
-using static Database.Functions.Lobby;
 
 public enum ES3UploadType
 {
@@ -100,7 +100,7 @@ private static async Task DoUpload(S3QueuedUploadEntry entry)
 
             string strPerMatchUserIDKey = Helpers.ComputeMD5Hash(String.Format("{0}_{1}", entry.m_MatchID, entry.m_UserID)); ;
             string strFileName = null;
-            Database.Functions.Lobby.EMetadataFileType fileType = EMetadataFileType.UNKNOWN;
+            EMetadataFileType fileType = EMetadataFileType.UNKNOWN;
 
 
 			if (entry.m_uploadType == ES3UploadType.Screenshot)
@@ -188,8 +188,11 @@ private static async Task DoUpload(S3QueuedUploadEntry entry)
                 var response = await client.PutObjectAsync(putRequest);
                 Console.WriteLine($"SCREENSHOT uploaded successfully. {entry.m_FileData.Count} bytes. HHTTP Status Code: {response.HttpStatusCode}");
 
-                // store in DB
-                await Database.Functions.Lobby.AttachMatchHistoryMetadata(GlobalDatabaseInstance.g_Database, entry.m_MatchID, entry.m_slotIndexInLobby, strFileName, fileType);
+				// store in DB
+				using var scope = ServiceLocator.Services.CreateScope();
+				var factory = scope.ServiceProvider.GetRequiredService<IDbContextFactory<AppDbContext>>();
+				await using var db = await factory.CreateDbContextAsync();
+				await Database.MatchHistory.AttachMatchHistoryMetadata(db, entry.m_MatchID, entry.m_slotIndexInLobby, strFileName, fileType);
             }
             catch (Exception ex)
             {