From e35c252c7325d2eba0e4b6e2d8e5e074ed7d846f Mon Sep 17 00:00:00 2001 From: Chomp Date: Sat, 15 Jan 2022 15:02:37 +0000 Subject: [PATCH] refactor --- AssortUpdater/AssortMerger.cs | 17 +++++++++++++++++ AssortUpdater/Program.cs | 19 +------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/AssortUpdater/AssortMerger.cs b/AssortUpdater/AssortMerger.cs index 1e5cfbb..063645a 100644 --- a/AssortUpdater/AssortMerger.cs +++ b/AssortUpdater/AssortMerger.cs @@ -152,5 +152,22 @@ namespace AssortUpdater return null; } + + public static void ListDuplicatesInMergedAssorts(List flatAssorts) + { + foreach (var item in flatAssorts) + { + var dupes = flatAssorts.Where(x => x.ItemId == item.ItemId && x.Level == item.Level && x.IsMoney == item.IsMoney && x.AssortId != item.AssortId); + + if (dupes.Any()) + { + LoggingHelpers.LogError($"{dupes.Count()} Dupes found for assort {item.AssortId} item: {item.ItemName} id:{item.ItemId} level: {item.Level} isMoney: {item.IsMoney}"); + foreach (var dupeItem in dupes) + { + LoggingHelpers.LogError($"Dupe assort{dupeItem.AssortId}: {dupeItem.ItemId} - {dupeItem.ItemName} id:{item.ItemId} level: {dupeItem.Level} isMoney:{dupeItem.IsMoney}"); + } + } + } + } } } diff --git a/AssortUpdater/Program.cs b/AssortUpdater/Program.cs index 7812dd8..3b5f18b 100644 --- a/AssortUpdater/Program.cs +++ b/AssortUpdater/Program.cs @@ -37,7 +37,7 @@ class Program var flatAssorts = AssortMerger.CreateMergedFlattenedAssorts(trader.Key.ToString(), flattenedLiveAssorts, flattenedExistingAssorts); LoggingHelpers.LogInfo($"trader: {TraderHelper.GetTraderIdByName(trader.Key)}"); - ListDuplicatesInMergedAssorts(flatAssorts); + AssortMerger.ListDuplicatesInMergedAssorts(flatAssorts); Assort unflattenedAssorts = AssortFlattener.UnFlatten(flatAssorts); JsonWriter.WriteJson(unflattenedAssorts, traderId, Directory.GetCurrentDirectory(), "assort"); @@ -61,23 +61,6 @@ class Program } } - private static void ListDuplicatesInMergedAssorts(List flatAssorts) - { - foreach (var item in flatAssorts) - { - var dupes = flatAssorts.Where(x=>x.ItemId == item.ItemId && x.Level == item.Level && x.IsMoney == item.IsMoney && x.AssortId != item.AssortId); - - if (dupes.Any()) - { - LoggingHelpers.LogError($"{dupes.Count()} Dupes found for assort {item.AssortId} item: {item.ItemName} id:{item.ItemId} level: {item.Level} isMoney: {item.IsMoney}"); - foreach (var dupeItem in dupes) - { - LoggingHelpers.LogError($"Dupe assort{dupeItem.AssortId}: {dupeItem.ItemId} - {dupeItem.ItemName} id:{item.ItemId} level: {dupeItem.Level} isMoney:{dupeItem.IsMoney}"); - } - } - } - } - private static void LogItemsMissingInExistingAssorts(string traderName, List flattenedExistingAssorts, List flattenedLiveAssorts) { foreach (var liveAssort in flattenedLiveAssorts)