From 8ba498a4bc2bb242600373fd1bf6119f52d2b70e Mon Sep 17 00:00:00 2001
From: CWX <cwxdev@outlook.com>
Date: Tue, 22 Apr 2025 14:36:28 +0100
Subject: [PATCH] Removed `TraderAssortService` use
 `TraderHelper.GetTraderAssortsByTraderId`

---
 .../Controllers/TraderController.cs           |  8 -----
 .../Helpers/TraderAssortHelper.cs             |  3 +-
 .../Services/TraderAssortService.cs           | 31 -------------------
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 Libraries/SPTarkov.Server.Core/Services/TraderAssortService.cs

diff --git a/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs b/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs
index dab6cad9..4c10831e 100644
--- a/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs
@@ -19,7 +19,6 @@ public class TraderController(
     TimeUtil _timeUtil,
     DatabaseService _databaseService,
     TraderAssortHelper _traderAssortHelper,
-    TraderAssortService _traderAssortService,
     ProfileHelper _profileHelper,
     TraderHelper _traderHelper,
     PaymentHelper _paymentHelper,
@@ -65,13 +64,6 @@ public class TraderController(
                 AdjustTraderItemPrices(trader, _traderConfig.TraderPriceMultiplier);
             }
 
-            // Create dict of pristine trader assorts on server start
-            if (_traderAssortService.GetPristineTraderAssort(traderId) == null)
-            {
-                var assortsClone = _cloner.Clone(trader.Assort);
-                _traderAssortService.SetPristineTraderAssort(traderId, assortsClone);
-            }
-
             _traderPurchasePersisterService.RemoveStalePurchasesFromProfiles(traderId);
 
             // Set to next hour on clock or current time + 60 minutes
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs
index 06fb3621..40cfb70a 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs
@@ -23,7 +23,6 @@ public class TraderAssortHelper(
     PaymentHelper _paymentHelper,
     RagfairAssortGenerator _ragfairAssortGenerator,
     RagfairOfferGenerator _ragfairOfferGenerator,
-    TraderAssortService _traderAssortService,
     LocalisationService _localisationService,
     TraderPurchasePersisterService _traderPurchasePersisterService,
     TraderHelper _traderHelper,
@@ -225,6 +224,6 @@ public class TraderAssortHelper(
     /// <returns>array of Items</returns>
     protected List<Item> GetPristineTraderAssorts(string traderId)
     {
-        return _cloner.Clone(_traderAssortService.GetPristineTraderAssort(traderId).Items);
+        return _cloner.Clone(_traderHelper.GetTraderAssortsByTraderId(traderId).Items);
     }
 }
diff --git a/Libraries/SPTarkov.Server.Core/Services/TraderAssortService.cs b/Libraries/SPTarkov.Server.Core/Services/TraderAssortService.cs
deleted file mode 100644
index 4dad7472..00000000
--- a/Libraries/SPTarkov.Server.Core/Services/TraderAssortService.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using SPTarkov.Server.Core.Helpers;
-using SPTarkov.Server.Core.Models.Eft.Common.Tables;
-using SPTarkov.Common.Annotations;
-
-namespace SPTarkov.Server.Core.Services;
-
-[Injectable(InjectionType.Singleton)]
-public class TraderAssortService(
-    TraderHelper _traderHelper)
-{
-    protected readonly Dictionary<string, TraderAssort> _pristineTraderAssorts = new();
-
-    public TraderAssort? GetPristineTraderAssort(string traderId)
-    {
-        return _traderHelper.GetTraderAssortsByTraderId(traderId);
-        _pristineTraderAssorts.TryGetValue(traderId, out var result);
-
-        return result;
-    }
-
-    /// <summary>
-    ///     Store trader assorts inside a class property
-    /// </summary>
-    /// <param name="traderId">Trader id to store assorts against</param>
-    /// <param name="assort">Assorts to store</param>
-    public void SetPristineTraderAssort(string traderId, TraderAssort assort)
-    {
-        // TODO: remove
-        //_pristineTraderAssorts[traderId] = assort;
-    }
-}