chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

String to Mongo Id conversions

Browse Source 
Cleaned up global class null values
This commit is contained in:
Chomp
2025-07-16 11:40:38 +01:00
parent e27b2b91e3
commit 99c14de7af
13 changed files with 51 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Controllers/BuildController.cs
+2 -5
View File
@@ -176,10 +176,7 @@ public class BuildController(
/// <param name="request"></param>
public void RemoveBuild(MongoId sessionId, RemoveBuildRequestData request)
{
if (request.Id is not null)
{
RemovePlayerBuild(request.Id, sessionId);
}
RemovePlayerBuild(request.Id, sessionId);
}
/// <summary>
@@ -222,7 +219,7 @@ public class BuildController(
/// </summary>
/// <param name="idToRemove"></param>
/// <param name="sessionID">Session/Player id</param>
protected void RemovePlayerBuild(string idToRemove, MongoId sessionID)
protected void RemovePlayerBuild(MongoId idToRemove, MongoId sessionID)
{
var profile = saveServer.GetProfile(sessionID);
var weaponBuilds = profile.UserBuildData.WeaponBuilds;
Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs
+2 -2
View File
@@ -542,7 +542,7 @@ public class InventoryController(
ItemEventRouterResponse output
)
{
string? itemId = null;
MongoId? itemId = null;
if (request.FromOwner is not null)
{
try
@@ -582,7 +582,7 @@ public class InventoryController(
if (itemId is not null)
{
var fullProfile = profileHelper.GetFullProfile(sessionId);
FlagItemsAsInspectedAndRewardXp([itemId], fullProfile);
FlagItemsAsInspectedAndRewardXp([itemId.Value], fullProfile);
}
}
Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs
+5 -5
View File
@@ -11,8 +11,8 @@ namespace SPTarkov.Server.Core.Helpers;
[Injectable(InjectionType.Singleton)]
public class PresetHelper(DatabaseService databaseService, ItemHelper itemHelper, ICloner cloner)
{
protected Dictionary<string, Preset>? _defaultEquipmentPresets;
protected Dictionary<string, Preset>? _defaultWeaponPresets;
protected Dictionary<MongoId, Preset>? _defaultEquipmentPresets;
protected Dictionary<MongoId, Preset>? _defaultWeaponPresets;
/// <summary>
/// Preset cache - key = item tpl, value = preset ids
@@ -28,7 +28,7 @@ public class PresetHelper(DatabaseService databaseService, ItemHelper itemHelper
/// Get weapon and armor default presets, keyed to preset id NOT item tpl
/// </summary>
/// <returns></returns>
public Dictionary<string, Preset> GetDefaultPresets()
public Dictionary<MongoId, Preset> GetDefaultPresets()
{
var weapons = GetDefaultWeaponPresets();
var equipment = GetDefaultEquipmentPresets();
@@ -58,7 +58,7 @@ public class PresetHelper(DatabaseService databaseService, ItemHelper itemHelper
/// Get default weapon presets
/// </summary>
/// <returns></returns>
public Dictionary<string, Preset> GetDefaultWeaponPresets()
public Dictionary<MongoId, Preset> GetDefaultWeaponPresets()
{
if (_defaultWeaponPresets is null)
{
@@ -78,7 +78,7 @@ public class PresetHelper(DatabaseService databaseService, ItemHelper itemHelper
/// Get default equipment presets
/// </summary>
/// <returns>Dictionary</returns>
public Dictionary<string, Preset> GetDefaultEquipmentPresets()
public Dictionary<MongoId, Preset> GetDefaultEquipmentPresets()
{
if (_defaultEquipmentPresets == null)
{
Libraries/SPTarkov.Server.Core/Helpers/RagfairSellHelper.cs
+1 -2
View File
@@ -79,8 +79,7 @@ public class RagfairSellHelper(
var endTime =
startTimestamp
+ timeUtil.GetHoursAsSeconds(
(int)
databaseService.GetGlobals().Configuration.RagFair.OfferDurationTimeInHour.Value
(int)databaseService.GetGlobals().Configuration.RagFair.OfferDurationTimeInHour
);
var sellTimestamp = startTimestamp;
Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using System.Text.Json.Serialization;
using SPTarkov.Server.Core.Models.Common;
using SPTarkov.Server.Core.Models.Eft.Profile;
using SPTarkov.Server.Core.Models.Utils;
@@ -10,7 +11,7 @@ public record SetMagazineRequest : IRequestData
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; }
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs
+28 -28
View File
@@ -12,19 +12,19 @@ public record Globals
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("config")]
public Config? Configuration { get; set; }
public Config Configuration { get; set; }
[JsonPropertyName("LocationInfection")]
public LocationInfection? LocationInfection { get; set; }
public LocationInfection LocationInfection { get; set; }
[JsonPropertyName("bot_presets")]
public List<BotPreset>? BotPresets { get; set; }
public List<BotPreset> BotPresets { get; set; }
[JsonPropertyName("BotWeaponScatterings")]
public List<BotWeaponScattering>? BotWeaponScatterings { get; set; }
public List<BotWeaponScattering> BotWeaponScatterings { get; set; }
[JsonPropertyName("ItemPresets")]
public Dictionary<string, Preset>? ItemPresets { get; set; }
public Dictionary<MongoId, Preset> ItemPresets { get; set; }
}
public record PlayerSettings
@@ -295,7 +295,7 @@ public record ArtilleryShellingAirDropSettings
public XYZ? AirDropPosition { get; set; }
[JsonPropertyName("LootTemplateId")]
public string? LootTemplateId { get; set; }
public MongoId? LootTemplateId { get; set; }
}
public record ProjectileExplosionParams
@@ -532,10 +532,10 @@ public record Config
public Tournament? Tournament { get; set; }
[JsonPropertyName("QuestSettings")]
public QuestSettings? QuestSettings { get; set; }
public QuestSettings QuestSettings { get; set; }
[JsonPropertyName("RagFair")]
public RagFair? RagFair { get; set; }
public RagFair RagFair { get; set; }
[JsonPropertyName("handbook")]
public Handbook? Handbook { get; set; }
@@ -1525,14 +1525,11 @@ public record Mastering
[JsonExtensionData]
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("Id")]
public string? Id { get; set; }
[JsonPropertyName("Name")]
public string? Name { get; set; }
[JsonPropertyName("Templates")]
public List<string>? Templates { get; set; }
public List<MongoId>? Templates { get; set; }
[JsonPropertyName("Progress")]
public double? Progress { get; set; }
@@ -1591,7 +1588,7 @@ public record WildBody
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("body")]
public string? Body { get; set; }
public MongoId? Body { get; set; }
[JsonPropertyName("hands")]
public MongoId? Hands { get; set; }
@@ -2721,10 +2718,10 @@ public record RagFair
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("enabled")]
public bool? Enabled { get; set; }
public bool Enabled { get; set; }
[JsonPropertyName("priceStabilizerEnabled")]
public bool? PriceStabilizerEnabled { get; set; }
public bool PriceStabilizerEnabled { get; set; }
[JsonPropertyName("includePveTraderSales")]
public bool? IncludePveTraderSales { get; set; }
@@ -2734,13 +2731,13 @@ public record RagFair
// Checked in client
[JsonPropertyName("minUserLevel")]
public int? MinUserLevel { get; set; }
public int MinUserLevel { get; set; }
[JsonPropertyName("communityTax")]
public float? CommunityTax { get; set; }
[JsonPropertyName("communityItemTax")]
public float? CommunityItemTax { get; set; }
public float CommunityItemTax { get; set; }
// Checked in client
[JsonPropertyName("communityRequirementTax")]
@@ -2750,7 +2747,7 @@ public record RagFair
public float? OfferPriorityCost { get; set; }
[JsonPropertyName("offerDurationTimeInHour")]
public double? OfferDurationTimeInHour { get; set; }
public double OfferDurationTimeInHour { get; set; }
[JsonPropertyName("offerDurationTimeInHourAfterRemove")]
public double? OfferDurationTimeInHourAfterRemove { get; set; }
@@ -2789,16 +2786,16 @@ public record RagFair
public long? RagfairTurnOnTimestamp { get; set; }
[JsonPropertyName("ratingSumForIncrease")]
public double? RatingSumForIncrease { get; set; }
public double RatingSumForIncrease { get; set; }
[JsonPropertyName("ratingIncreaseCount")]
public double? RatingIncreaseCount { get; set; }
public double RatingIncreaseCount { get; set; }
[JsonPropertyName("ratingSumForDecrease")]
public double? RatingSumForDecrease { get; set; }
[JsonPropertyName("ratingDecreaseCount")]
public double? RatingDecreaseCount { get; set; }
public double RatingDecreaseCount { get; set; }
[JsonPropertyName("maxSumForIncreaseRatingPerOneSale")]
public double? MaxSumForIncreaseRatingPerOneSale { get; set; }
@@ -2825,7 +2822,7 @@ public record RagFair
public double? YouSellOfferMaxStorageTimeInHour { get; set; }
[JsonPropertyName("yourOfferDidNotSellMaxStorageTimeInHour")]
public double? YourOfferDidNotSellMaxStorageTimeInHour { get; set; }
public double YourOfferDidNotSellMaxStorageTimeInHour { get; set; }
[JsonPropertyName("isOnlyFoundInRaidAllowed")]
public bool? IsOnlyFoundInRaidAllowed { get; set; }
@@ -2846,7 +2843,7 @@ public record ItemGlobalRestrictions
public double? MaxFleaStacked { get; set; }
[JsonPropertyName("TemplateId")]
public string? TemplateId { get; set; }
public MongoId? TemplateId { get; set; }
}
public record MaxActiveOfferCount
@@ -3156,7 +3153,7 @@ public record RestrictionsInRaid
public double? MaxInRaid { get; set; }
[JsonPropertyName("TemplateId")]
public string? TemplateId { get; set; }
public MongoId? TemplateId { get; set; }
}
public record FavoriteItemsSettings
@@ -3412,6 +3409,9 @@ public record PathConfig
[JsonPropertyName("active")]
public bool? Active { get; set; }
/// <summary>
/// Not mongoId
/// </summary>
[JsonPropertyName("id")]
public string? Id { get; set; }
@@ -4996,7 +4996,7 @@ public record Preset
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id { get; set; }
public MongoId Id { get; set; }
[JsonPropertyName("_type")]
public string? Type { get; set; }
@@ -5008,7 +5008,7 @@ public record Preset
public string? Name { get; set; }
[JsonPropertyName("_parent")]
public string? Parent { get; set; }
public MongoId Parent { get; set; }
[JsonPropertyName("_items")]
public List<Item>? Items { get; set; }
@@ -5026,8 +5026,8 @@ public record QuestSettings
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("GlobalRewardRepModifierDailyQuestPvE")]
public double? GlobalRewardRepModifierDailyQuestPvE { get; set; }
public double GlobalRewardRepModifierDailyQuestPvE { get; set; }
[JsonPropertyName("GlobalRewardRepModifierQuestPvE")]
public double? GlobalRewardRepModifierQuestPvE { get; set; }
public double GlobalRewardRepModifierQuestPvE { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs
+3
View File
@@ -37,6 +37,9 @@ public record SpawnpointTemplate
private string? _root;
/// <summary>
/// Not a mongoId
/// </summary>
[JsonPropertyName("Id")]
public string? Id { get; set; }
Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using System.Text.Json.Serialization;
using SPTarkov.Server.Core.Models.Common;
namespace SPTarkov.Server.Core.Models.Eft.Inventory;
@@ -8,5 +9,5 @@ public record InventoryReadEncyclopediaRequestData : InventoryBaseActionRequestD
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("ids")]
public List<string> Ids { get; set; }
public List<MongoId> Ids { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
-15
View File
@@ -1,15 +0,0 @@
using System.Text.Json.Serialization;
namespace SPTarkov.Server.Core.Models.Eft.Inventory;
public record InventoryUnbindRequestData : InventoryBaseActionRequestData
{
[JsonExtensionData]
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("item")]
public string? Item { get; set; }
[JsonPropertyName("index")]
public int? Index { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using System.Text.Json.Serialization;
using SPTarkov.Server.Core.Models.Common;
using SPTarkov.Server.Core.Models.Eft.Common.Tables;
using SPTarkov.Server.Core.Models.Utils;
@@ -13,7 +14,7 @@ public record PresetBuildActionRequestData : IRequestData
public string? Action { get; set; }
[JsonPropertyName("Id")]
public string? Id { get; set; }
public MongoId Id { get; set; }
/// <summary>
/// name of preset given by player
Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using System.Text.Json.Serialization;
using SPTarkov.Server.Core.Models.Common;
using SPTarkov.Server.Core.Models.Utils;
namespace SPTarkov.Server.Core.Models.Eft.PresetBuild;
@@ -9,5 +10,5 @@ public record RemoveBuildRequestData : IRequestData
public Dictionary<string, object>? ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id { get; set; }
public MongoId Id { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs
+1 -1
View File
@@ -144,7 +144,7 @@ public record UserBuild
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; }
Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs
+1 -1
View File
@@ -468,7 +468,7 @@ public record UnreasonableModPrices
public bool Enabled { get; set; }
/// <summary>
/// Multipler to start adjusting item values from, e.g. a value of 10 means any value over 10x the handbook price gets adjusted
/// Multiplier to start adjusting item values from, e.g. a value of 10 means any value over 10x the handbook price gets adjusted
/// </summary>
[JsonPropertyName("handbookPriceOverMultiplier")]
public int HandbookPriceOverMultiplier { get; set; }