String to MongoId changes + Updated nullability of trader helper methods

Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs

@@ -102,11 +102,11 @@ public class TraderHelper(
     /// </summary>
     /// <param name="traderId">Trader to get assorts for</param>
     /// <returns>TraderAssort</returns>
-    public TraderAssort GetTraderAssortsByTraderId(MongoId traderId)
+    public TraderAssort? GetTraderAssortsByTraderId(MongoId traderId)
     {
         return traderId == Traders.FENCE
             ? fenceService.GetRawFenceAssorts()
-            : databaseService.GetTrader(traderId).Assort;
+            : databaseService.GetTrader(traderId)?.Assort;
     }
 
     /// <summary>
@@ -151,7 +151,6 @@ public class TraderHelper(
     /// <param name="traderID">trader id to reset</param>
     public void ResetTrader(MongoId sessionID, MongoId traderID)
     {
-        var profiles = databaseService.GetProfileTemplates();
         var trader = databaseService.GetTrader(traderID);
 
         var fullProfile = profileHelper.GetFullProfile(sessionID);

Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs

@@ -52,7 +52,7 @@ public record ProfileTraderTemplate
     public Dictionary<string, object>? ExtensionData { get; set; }
 
     [JsonPropertyName("initialLoyaltyLevel")]
-    public Dictionary<string, int?>? InitialLoyaltyLevel { get; set; }
+    public Dictionary<MongoId, int?>? InitialLoyaltyLevel { get; set; }
 
     [JsonPropertyName("initialStanding")]
     public Dictionary<string, double?>? InitialStanding { get; set; }
@@ -79,11 +79,11 @@ public record ProfileTraderTemplate
     ///     What traders default to being locked on profile creation
     /// </summary>
     [JsonPropertyName("lockedByDefaultOverride")]
-    public List<string>? LockedByDefaultOverride { get; set; }
+    public List<MongoId>? LockedByDefaultOverride { get; set; }
 
     /// <summary>
     ///     What traders should have their clothing unlocked/purchased on creation
     /// </summary>
     [JsonPropertyName("purchaseAllClothingByDefaultForTrader")]
-    public List<string>? PurchaseAllClothingByDefaultForTrader { get; set; }
+    public List<MongoId>? PurchaseAllClothingByDefaultForTrader { get; set; }
 }