From 2700273de1d89f6f1a822337ac122eadf4541ac8 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Mon, 21 Jul 2025 15:13:47 +0100
Subject: [PATCH] string to mongoId changes

---
 .../Controllers/RagfairController.cs            | 17 +++++++++--------
 .../Eft/Common/Tables/CustomizationItem.cs      |  2 +-
 .../Models/Eft/Ragfair/AddOfferRequestData.cs   |  2 +-
 .../Services/RagfairTaxService.cs               |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs b/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs
index 16be64cb..3d1652ec 100644
--- a/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs
@@ -940,8 +940,9 @@ public class RagfairController(
     )
     {
         // Get tax from cache hydrated earlier by client, if that's missing fall back to server calculation (inaccurate)
+        var requestRootItemId = offerRequest.Items.FirstOrDefault();
         var storedClientTaxValue = ragfairTaxService.GetStoredClientOfferTaxValueById(
-            offerRequest.Items[0]
+            requestRootItemId
         );
         var tax = storedClientTaxValue is not null
             ? storedClientTaxValue.Fee
@@ -960,8 +961,8 @@ public class RagfairController(
             );
         }
 
-        // cleanup of cache now we've used the tax value from it
-        ragfairTaxService.ClearStoredOfferTaxById(offerRequest.Items.First());
+        // Cleanup of cache now we've used the tax value from it
+        ragfairTaxService.ClearStoredOfferTaxById(requestRootItemId);
 
         var buyTradeRequest = CreateBuyTradeRequestObject(CurrencyType.RUB, tax.Value);
         paymentService.PayMoney(pmcData, buyTradeRequest, sessionId, output);
@@ -971,10 +972,10 @@ public class RagfairController(
                 output,
                 localisationService.GetText("ragfair-unable_to_pay_commission_fee", tax)
             );
-            return true;
+            return true; // Fee failed
         }
 
-        return false;
+        return false; // Fee charge didn't fail
     }
 
     /// <summary>
@@ -1062,7 +1063,7 @@ public class RagfairController(
     /// <returns>GetItemsToListOnFleaFromInventoryResult</returns>
     protected GetItemsToListOnFleaFromInventoryResult GetItemsToListOnFleaFromInventory(
         PmcData pmcData,
-        List<string> itemIdsFromFleaOfferRequest
+        List<MongoId> itemIdsFromFleaOfferRequest
     )
     {
         List<List<Item>> itemsToReturn = [];
@@ -1076,7 +1077,7 @@ public class RagfairController(
             {
                 errorMessage = localisationService.GetText(
                     "ragfair-unable_to_find_item_in_inventory",
-                    new { id = itemId }
+                    new { id = itemId.ToString() }
                 );
                 logger.Error(errorMessage);
 
@@ -1253,7 +1254,7 @@ public class RagfairController(
                 new IdWithCount { Id = currency.GetCurrencyTpl(), Count = Math.Round(value) },
             ],
             Type = "",
-            ItemId = "",
+            ItemId = MongoId.Empty(),
             Count = 0,
             SchemeId = 0,
         };
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
index bcc04e89..00672da0 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
@@ -9,7 +9,7 @@ public record CustomizationItem
     public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("_id")]
-    public string Id { get; set; }
+    public MongoId Id { get; set; }
 
     [JsonPropertyName("_name")]
     public string Name { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
index 6c9fa1cf..e4002154 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
@@ -13,7 +13,7 @@ public record AddOfferRequestData : InventoryBaseActionRequestData
     public bool? SellInOnePiece { get; set; }
 
     [JsonPropertyName("items")]
-    public List<string>? Items { get; set; }
+    public List<MongoId>? Items { get; set; }
 
     [JsonPropertyName("requirements")]
     public List<Requirement>? Requirements { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs
index b34e83da..887ec396 100644
--- a/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs
@@ -39,11 +39,11 @@ public class RagfairTaxService(
         _playerOfferTaxCache.Remove(offerIdToRemove);
     }
 
-    public StorePlayerOfferTaxAmountRequestData GetStoredClientOfferTaxValueById(
+    public StorePlayerOfferTaxAmountRequestData? GetStoredClientOfferTaxValueById(
         MongoId offerIdToGet
     )
     {
-        return _playerOfferTaxCache[offerIdToGet];
+        return _playerOfferTaxCache.GetValueOrDefault(offerIdToGet);
     }
 
     /// <summary>