From 2f0655cdc5480405ee087386f38faae71c97dd0a Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 31 Jul 2024 17:17:29 -0400
Subject: [PATCH] Remove `Z.EntityFramework.Plus`

Switch to using `RelationalQueryableExtensions.ExecuteDeleteAsync` for async deletes
---
 .../Components/Session/SessionPersistor.cs                  | 6 ++----
 src/Tgstation.Server.Host/Controllers/ChatController.cs     | 4 +---
 .../Controllers/InstancePermissionSetController.cs          | 4 +---
 .../Controllers/UserGroupController.cs                      | 4 +---
 src/Tgstation.Server.Host/Database/DatabaseSeeder.cs        | 2 --
 src/Tgstation.Server.Host/Tgstation.Server.Host.csproj      | 2 --
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs b/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs
index 5c87bfda5f..edfc6a5145 100644
--- a/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs
+++ b/src/Tgstation.Server.Host/Components/Session/SessionPersistor.cs
@@ -11,8 +11,6 @@ using Tgstation.Server.Host.Database;
 using Tgstation.Server.Host.Models;
 using Tgstation.Server.Host.System;
 
-using Z.EntityFramework.Plus;
-
 namespace Tgstation.Server.Host.Components.Session
 {
 	/// <inheritdoc />
@@ -221,7 +219,7 @@ namespace Tgstation.Server.Host.Components.Session
 						.ReattachInformations
 						.AsQueryable()
 						.Where(x => x.Id == result.Id)
-						.DeleteAsync(cancellationToken);
+						.ExecuteDeleteAsync(cancellationToken);
 				});
 				return null;
 			}
@@ -271,7 +269,7 @@ namespace Tgstation.Server.Host.Components.Session
 
 			if (instant)
 				await baseQuery
-					.DeleteAsync(cancellationToken);
+					.ExecuteDeleteAsync(cancellationToken);
 			else
 			{
 				var results = await baseQuery.ToListAsync(cancellationToken);
diff --git a/src/Tgstation.Server.Host/Controllers/ChatController.cs b/src/Tgstation.Server.Host/Controllers/ChatController.cs
index 9ea7f4f5a7..fd6cf80e1d 100644
--- a/src/Tgstation.Server.Host/Controllers/ChatController.cs
+++ b/src/Tgstation.Server.Host/Controllers/ChatController.cs
@@ -26,8 +26,6 @@ using Tgstation.Server.Host.Models;
 using Tgstation.Server.Host.Security;
 using Tgstation.Server.Host.Utils;
 
-using Z.EntityFramework.Plus;
-
 namespace Tgstation.Server.Host.Controllers
 {
 	/// <summary>
@@ -189,7 +187,7 @@ namespace Tgstation.Server.Host.Controllers
 							.ChatBots
 							.AsQueryable()
 							.Where(x => x.Id == id)
-							.DeleteAsync(cancellationToken));
+							.ExecuteDeleteAsync(cancellationToken));
 					return null;
 				})
 
diff --git a/src/Tgstation.Server.Host/Controllers/InstancePermissionSetController.cs b/src/Tgstation.Server.Host/Controllers/InstancePermissionSetController.cs
index d86f0b7877..58b0170ad4 100644
--- a/src/Tgstation.Server.Host/Controllers/InstancePermissionSetController.cs
+++ b/src/Tgstation.Server.Host/Controllers/InstancePermissionSetController.cs
@@ -20,8 +20,6 @@ using Tgstation.Server.Host.Models;
 using Tgstation.Server.Host.Security;
 using Tgstation.Server.Host.Utils;
 
-using Z.EntityFramework.Plus;
-
 namespace Tgstation.Server.Host.Controllers
 {
 	/// <summary>
@@ -259,7 +257,7 @@ namespace Tgstation.Server.Host.Controllers
 				.Where(x => x.Id == Instance.Id)
 				.SelectMany(x => x.InstancePermissionSets)
 				.Where(x => x.PermissionSetId == id)
-				.DeleteAsync(cancellationToken);
+				.ExecuteDeleteAsync(cancellationToken);
 
 			return numDeleted > 0 ? NoContent() : this.Gone();
 		}
diff --git a/src/Tgstation.Server.Host/Controllers/UserGroupController.cs b/src/Tgstation.Server.Host/Controllers/UserGroupController.cs
index b6f48b8197..838b7a1bcf 100644
--- a/src/Tgstation.Server.Host/Controllers/UserGroupController.cs
+++ b/src/Tgstation.Server.Host/Controllers/UserGroupController.cs
@@ -21,8 +21,6 @@ using Tgstation.Server.Host.Models;
 using Tgstation.Server.Host.Security;
 using Tgstation.Server.Host.Utils;
 
-using Z.EntityFramework.Plus;
-
 namespace Tgstation.Server.Host.Controllers
 {
 	/// <summary>
@@ -221,7 +219,7 @@ namespace Tgstation.Server.Host.Controllers
 				.Groups
 				.AsQueryable()
 				.Where(x => x.Id == id && x.Users!.Count == 0)
-				.DeleteAsync(cancellationToken);
+				.ExecuteDeleteAsync(cancellationToken);
 
 			if (numDeleted > 0)
 				return NoContent();
diff --git a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs
index 694fff0c9c..4eaf4e21b9 100644
--- a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs
+++ b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs
@@ -14,8 +14,6 @@ using Tgstation.Server.Host.Models;
 using Tgstation.Server.Host.Security;
 using Tgstation.Server.Host.System;
 
-using Z.EntityFramework.Plus;
-
 namespace Tgstation.Server.Host.Database
 {
 	/// <inheritdoc />
diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index 197583214f..cf412dc3ce 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -124,8 +124,6 @@
     <PackageReference Include="System.Management" Version="8.0.0" />
     <!-- Usage: Temporary resolution to compatibility issues with EFCore 7 and .NET 8 -->
     <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
-    <!-- Usage: .DeleteAsync() support for IQueryable<T>s -->
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.103.1" />
   </ItemGroup>
 
   <ItemGroup>