From 7ccb388030096338cc87e1477ff330c40995c845 Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 7 Jul 2025 11:47:08 +0100 Subject: [PATCH] Converted sessionIds to MongoId and renamed property to reflect what type of value it holds --- .../Controllers/HideoutController.cs | 2 +- .../Controllers/InventoryController.cs | 36 +++++++++---------- .../Inventory/InventoryExamineRequestData.cs | 3 +- .../Eft/ItemEvent/ItemEventRouterBase.cs | 3 +- .../Spt/Services/InsuranceEquipmentPkg.cs | 3 +- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs b/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs index 2d198f7b..959b4928 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs @@ -1606,7 +1606,7 @@ public class HideoutController( } public ItemEventRouterResponse CircleOfCultistProductionStart( - string sessionId, + MongoId sessionId, PmcData pmcData, HideoutCircleOfCultistProductionStartRequestData request ) diff --git a/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs index 1ed9b03d..0571cc8a 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs @@ -447,7 +447,7 @@ public class InventoryController( public void DeleteMapMarker( PmcData pmcData, InventoryDeleteMarkerRequestData request, - string sessionId, + MongoId sessionId, ItemEventRouterResponse output ) { @@ -460,7 +460,7 @@ public class InventoryController( public void CreateMapMarker( PmcData pmcData, InventoryCreateMarkerRequestData request, - string sessionId, + MongoId sessionId, ItemEventRouterResponse output ) { @@ -561,7 +561,7 @@ public class InventoryController( logger.Error( serverLocalisationService.GetText( "inventory-examine_item_does_not_exist", - request.Item + request.ItemId ) ); } @@ -570,16 +570,16 @@ public class InventoryController( if (itemId is null) // item template { - if (databaseService.GetItems().ContainsKey(request.Item)) + if (databaseService.GetItems().ContainsKey(request.ItemId)) { - itemId = request.Item; + itemId = request.ItemId; } } if (itemId is null) { // Player inventory - var target = pmcData.Inventory.Items.FirstOrDefault(item => item.Id == request.Item); + var target = pmcData.Inventory.Items.FirstOrDefault(item => item.Id == request.ItemId); if (target is not null) { itemId = target.Template; @@ -594,16 +594,16 @@ public class InventoryController( } /// - /// Get the tplid of an item from the examine request object + /// Get the tpl of an item from the examine request object /// /// /// Session/Player id /// Item tpl protected MongoId? GetExaminedItemTpl(InventoryExamineRequestData request, MongoId sessionId) { - if (presetHelper.IsPreset(request.Item)) + if (presetHelper.IsPreset(request.ItemId)) { - return presetHelper.GetBaseItemTpl(request.Item); + return presetHelper.GetBaseItemTpl(request.ItemId); } if (request.FromOwner.Id == Traders.FENCE) @@ -611,7 +611,7 @@ public class InventoryController( { return fenceService .GetRawFenceAssorts() - .Items.FirstOrDefault(x => x.Id == request.Item) + .Items.FirstOrDefault(x => x.Id == request.ItemId) ?.Template; } @@ -621,14 +621,14 @@ public class InventoryController( { return databaseService .GetTrader(request.FromOwner.Id) - .Assort.Items.FirstOrDefault(item => item.Id == request.Item) + .Assort.Items.FirstOrDefault(item => item.Id == request.ItemId) ?.Template; } if (request.FromOwner.Type == "RagFair") { // Try to get tplId from items.json first - var item = itemHelper.GetItem(request.Item); + var item = itemHelper.GetItem(request.ItemId); if (item.Key) { return item.Value.Id; @@ -636,12 +636,12 @@ public class InventoryController( // Try alternate way of getting offer if first approach fails var offer = - ragfairOfferService.GetOfferByOfferId(request.Item) + ragfairOfferService.GetOfferByOfferId(request.ItemId) ?? ragfairOfferService.GetOfferByOfferId(request.FromOwner.Id); // Try find examine item inside offer items array var matchingItem = offer.Items.FirstOrDefault(offerItem => - offerItem.Id == request.Item + offerItem.Id == request.ItemId ); if (matchingItem is not null) { @@ -650,14 +650,14 @@ public class InventoryController( // Unable to find item in database or ragfair logger.Warning( - serverLocalisationService.GetText("inventory-unable_to_find_item", request.Item) + serverLocalisationService.GetText("inventory-unable_to_find_item", request.ItemId) ); } // get hideout item if (request.FromOwner.Type == "HideoutProduction") { - return request.Item; + return request.ItemId; } if (request.FromOwner.Type == "Mail") @@ -672,7 +672,7 @@ public class InventoryController( // check each message from that trader/person for messages that match the ID we got var message = dialogue.Value.Messages.FirstOrDefault(m => m.Id == request.FromOwner.Id); // get the Id given and get the Template ID from that - var item = message.Items.Data.FirstOrDefault(item => item.Id == request.Item); + var item = message.Items.Data.FirstOrDefault(item => item.Id == request.ItemId); if (item is not null) { @@ -680,7 +680,7 @@ public class InventoryController( } } - logger.Error($"Unable to get item with id: {request.Item}"); + logger.Error($"Unable to get item with id: {request.ItemId}"); return null; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs index 5ce72365..5e82913d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs @@ -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 InventoryExamineRequestData : InventoryBaseActionRequestData public Dictionary? ExtensionData { get; set; } [JsonPropertyName("item")] - public string? Item { get; set; } + public MongoId ItemId { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs index be612025..6a768d8a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs @@ -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.Eft.Ragfair; using SPTarkov.Server.Core.Models.Enums; @@ -15,7 +16,7 @@ public record ItemEventRouterBase public List? Warnings { get; set; } [JsonPropertyName("profileChanges")] - public Dictionary ProfileChanges { get; set; } + public Dictionary ProfileChanges { get; set; } } public record Warning diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs index 0c7a0501..9f27b52f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; @@ -10,7 +11,7 @@ public record InsuranceEquipmentPkg public Dictionary? ExtensionData { get; set; } [JsonPropertyName("sessionID")] - public string? SessionId { get; set; } + public MongoId SessionId { get; set; } [JsonPropertyName("pmcData")] public PmcData? PmcData { get; set; }