diff --git a/Libraries/SPTarkov.Server.Core/Models/Trader/ITrader.cs b/Libraries/SPTarkov.Server.Core/Models/Trader/ITrader.cs index fa3566ef..5d004f03 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Trader/ITrader.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Trader/ITrader.cs @@ -1,4 +1,5 @@ -using SPTarkov.Server.Core.Models.Eft.Common.Tables; +using SPTarkov.Server.Core.Models.Common; +using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Spt.Services; namespace SPTarkov.Server.Core.Models; @@ -6,13 +7,13 @@ namespace SPTarkov.Server.Core.Models; public interface ITrader { public string Name { get; } - public string Id { get; } + public MongoId Id { get; } } public abstract record ICustomTrader : ITrader { public abstract string Name { get; } - public abstract string Id { get; } + public abstract MongoId Id { get; } public abstract TraderAssort? GetAssort(); diff --git a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs index be64728a..3d2a98b2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs @@ -1,5 +1,6 @@ using System.Text.Json.Serialization; using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Models; @@ -11,7 +12,7 @@ public record Prapor() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Prapor"; - public string Id { get; } = Traders.PRAPOR; + public MongoId Id { get; } = Traders.PRAPOR; } [Injectable] @@ -21,7 +22,7 @@ public record Therapist() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Therapist"; - public string Id { get; } = Traders.THERAPIST; + public MongoId Id { get; } = Traders.THERAPIST; } [Injectable] @@ -31,7 +32,7 @@ public record Fence() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Fence"; - public string Id { get; } = Traders.FENCE; + public MongoId Id { get; } = Traders.FENCE; } [Injectable] @@ -41,7 +42,7 @@ public record Skier() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Skier"; - public string Id { get; } = Traders.SKIER; + public MongoId Id { get; } = Traders.SKIER; } [Injectable] @@ -51,7 +52,7 @@ public record Peacekeeper() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Peacekeeper"; - public string Id { get; } = Traders.PEACEKEEPER; + public MongoId Id { get; } = Traders.PEACEKEEPER; } [Injectable] @@ -61,7 +62,7 @@ public record Mechanic() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Mechanic"; - public string Id { get; } = Traders.MECHANIC; + public MongoId Id { get; } = Traders.MECHANIC; } [Injectable] @@ -71,7 +72,7 @@ public record Ragman() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Ragman"; - public string Id { get; } = Traders.RAGMAN; + public MongoId Id { get; } = Traders.RAGMAN; } [Injectable] @@ -81,7 +82,7 @@ public record Jaeger() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Jaeger"; - public string Id { get; } = Traders.JAEGER; + public MongoId Id { get; } = Traders.JAEGER; } [Injectable] @@ -91,7 +92,7 @@ public record LighthouseKeeper() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "LighthouseKeeper"; - public string Id { get; } = Traders.LIGHTHOUSEKEEPER; + public MongoId Id { get; } = Traders.LIGHTHOUSEKEEPER; } [Injectable] @@ -101,7 +102,7 @@ public record Btr() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Btr"; - public string Id { get; } = Traders.BTR; + public MongoId Id { get; } = Traders.BTR; } [Injectable] @@ -111,5 +112,5 @@ public record Ref() : ITrader public Dictionary? ExtensionData { get; set; } public string Name { get; } = "Ref"; - public string Id { get; } = Traders.REF; + public MongoId Id { get; } = Traders.REF; }