Merge pull request #251 from Sidekick-Poe/feature/equipment-filters

leMicin · web-flow · commit 5451df425b99 · 2024-12-12T17:22:33.000-05:00
Added support for equipment filters in PoE2
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/ArmorFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/ArmorFilterGroup.cs
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/ArmourFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/ArmourFilterGroup.cs
@@ -0,0 +1,7 @@
+namespace Sidekick.Apis.Poe.Trade.Requests.Filters
+{
+    internal class ArmourFilterGroup
+    {
+        public ArmourFilters Filters { get; set; } = new();
+    }
+}
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/ArmourFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/ArmourFilters.cs
@@ -2,7 +2,7 @@
 
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class ArmorFilter
+    internal class ArmourFilters
     {
         [JsonPropertyName("ar")]
         public SearchFilterValue? Armor { get; set; }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/EquipmentFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/EquipmentFilterGroup.cs
@@ -0,0 +1,7 @@
+namespace Sidekick.Apis.Poe.Trade.Requests.Filters
+{
+    internal class EquipmentFilterGroup
+    {
+        public EquipmentFilters Filters { get; set; } = new();
+    }
+}
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/EquipmentFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/EquipmentFilters.cs
@@ -0,0 +1,34 @@
+using System.Text.Json.Serialization;
+
+namespace Sidekick.Apis.Poe.Trade.Requests.Filters
+{
+    internal class EquipmentFilters
+    {
+        [JsonPropertyName("ar")]
+        public SearchFilterValue? Armor { get; set; }
+
+        [JsonPropertyName("es")]
+        public SearchFilterValue? EnergyShield { get; set; }
+
+        [JsonPropertyName("ev")]
+        public SearchFilterValue? Evasion { get; set; }
+
+        [JsonPropertyName("block")]
+        public SearchFilterValue? Block { get; set; }
+
+        [JsonPropertyName("crit")]
+        public SearchFilterValue? CriticalStrikeChance { get; set; }
+
+        [JsonPropertyName("aps")]
+        public SearchFilterValue? AttacksPerSecond { get; set; }
+
+        [JsonPropertyName("dps")]
+        public SearchFilterValue? DamagePerSecond { get; set; }
+
+        [JsonPropertyName("edps")]
+        public SearchFilterValue? ElementalDps { get; set; }
+
+        [JsonPropertyName("pdps")]
+        public SearchFilterValue? PhysicalDps { get; set; }
+    }
+}
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/MapFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/MapFilterGroup.cs
@@ -2,6 +2,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
     internal class MapFilterGroup
     {
-        public MapFilter Filters { get; set; } = new();
+        public MapFilters Filters { get; set; } = new();
     }
 }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/MapFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/MapFilters.cs
@@ -2,7 +2,7 @@
 
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class MapFilter
+    internal class MapFilters
     {
         [JsonPropertyName("map_iiq")]
         public SearchFilterValue? ItemQuantity { get; set; }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/MiscFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/MiscFilterGroup.cs
@@ -2,6 +2,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
     internal class MiscFilterGroup
     {
-        public MiscFilter Filters { get; set; } = new();
+        public MiscFilters Filters { get; set; } = new();
     }
 }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/MiscFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/MiscFilters.cs
@@ -2,7 +2,7 @@
 
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class MiscFilter
+    internal class MiscFilters
     {
         public SearchFilterValue? Quality { get; set; }
 
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/RequirementFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/RequirementFilterGroup.cs
@@ -2,6 +2,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
     internal class RequirementFilterGroup
     {
-        public RequirementFilter Filters { get; set; } = new();
+        public RequirementFilters Filters { get; set; } = new();
     }
 }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/RequirementFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/RequirementFilters.cs
@@ -2,7 +2,7 @@
 
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class RequirementFilter
+    internal class RequirementFilters
     {
         [JsonPropertyName("lvl")]
         public SearchFilterValue? Level { get; set; }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/SearchFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/SearchFilters.cs
@@ -17,7 +17,10 @@ internal class SearchFilters
         public WeaponFilterGroup? WeaponFilters { get; set; }
 
         [JsonPropertyName("armour_filters")]
-        public ArmorFilterGroup? ArmourFilters { get; set; }
+        public ArmourFilterGroup? ArmourFilters { get; set; }
+
+        [JsonPropertyName("equipment_filters")]
+        public EquipmentFilterGroup? EquipmentFilters { get; set; }
 
         [JsonPropertyName("socket_filters")]
         public SocketFilterGroup? SocketFilters { get; set; }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/SocketFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/SocketFilterGroup.cs
@@ -2,6 +2,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
     internal class SocketFilterGroup
     {
-        public SocketFilter Filters { get; set; } = new();
+        public SocketFilters Filters { get; set; } = new();
     }
 }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/SocketFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/SocketFilters.cs
@@ -1,6 +1,6 @@
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class SocketFilter
+    internal class SocketFilters
     {
         public SocketFilterOption? Sockets { get; set; }
         public SocketFilterOption? Links { get; set; }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/StatFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/StatFilterGroup.cs
@@ -11,7 +11,7 @@ internal class StatFilterGroup
         [JsonPropertyName("type")]
         public string? TypeAsString => Type.GetValueAttribute() ?? StatType.And.GetValueAttribute();
 
-        public List<StatFilter> Filters { get; set; } = new();
+        public List<StatFilters> Filters { get; set; } = new();
 
         public SearchFilterValue? Value { get; set; }
     }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/StatFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/StatFilters.cs
@@ -1,6 +1,6 @@
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class StatFilter
+    internal class StatFilters
     {
         public string? Id { get; set; }
         public SearchFilterValue? Value { get; set; }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/TradeFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/TradeFilterGroup.cs
@@ -3,6 +3,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters
     internal class TradeFilterGroup
     {
         public bool Disabled { get; set; }
-        public TradeFilter Filters { get; set; } = new();
+        public TradeFilters Filters { get; set; } = new();
     }
 }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/TradeFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/TradeFilters.cs
@@ -1,6 +1,6 @@
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class TradeFilter
+    internal class TradeFilters
     {
         public SearchFilterValue Price { get; set; } = new();
     }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/TypeFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/TypeFilterGroup.cs
@@ -3,6 +3,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters
     internal class TypeFilterGroup
     {
         public bool Disabled { get; set; }
-        public TypeFilter Filters { get; set; } = new();
+        public TypeFilters Filters { get; set; } = new();
     }
 }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/TypeFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/TypeFilters.cs
@@ -1,6 +1,6 @@
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class TypeFilter
+    internal class TypeFilters
     {
         public SearchFilterOption? Category { get; set; }
         public SearchFilterOption? Rarity { get; set; }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/WeaponFilterGroup.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/WeaponFilterGroup.cs
@@ -2,6 +2,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
     internal class WeaponFilterGroup
     {
-        public WeaponFilter Filters { get; set; } = new();
+        public WeaponFilters Filters { get; set; } = new();
     }
 }
diff --git a/src/Sidekick.Apis.Poe/Trade/Requests/Filters/WeaponFilters.cs b/src/Sidekick.Apis.Poe/Trade/Requests/Filters/WeaponFilters.cs
@@ -2,7 +2,7 @@
 
 namespace Sidekick.Apis.Poe.Trade.Requests.Filters
 {
-    internal class WeaponFilter
+    internal class WeaponFilters
     {
         [JsonPropertyName("crit")]
         public SearchFilterValue? CriticalStrikeChance { get; set; }
diff --git a/src/Sidekick.Apis.Poe/Trade/TradeSearchService.cs b/src/Sidekick.Apis.Poe/Trade/TradeSearchService.cs
@@ -79,8 +79,9 @@ public async Task<TradeSearchResult<string>> Search(Item item, TradeCurrency cur
             if (propertyFilters != null)
             {
                 query.Filters.TypeFilters.Filters.Category = GetCategoryFilter(propertyFilters.ItemCategory);
-                query.Filters.WeaponFilters = GetWeaponFilters(propertyFilters.Weapon);
-                query.Filters.ArmourFilters = GetArmourFilters(propertyFilters.Armour);
+                query.Filters.EquipmentFilters = GetEquipmentFilters(item, propertyFilters.Weapon);
+                query.Filters.WeaponFilters = GetWeaponFilters(item, propertyFilters.Weapon);
+                query.Filters.ArmourFilters = GetArmourFilters(item, propertyFilters.Armour);
                 query.Filters.MapFilters = GetMapFilters(propertyFilters.Map);
                 query.Filters.MiscFilters = GetMiscFilters(item, propertyFilters.Misc);
             }
@@ -133,8 +134,13 @@ public async Task<TradeSearchResult<string>> Search(Item item, TradeCurrency cur
         return new SearchFilterOption(itemCategory);
     }
 
-    private WeaponFilterGroup? GetWeaponFilters(List<PropertyFilter> propertyFilters)
+    private WeaponFilterGroup? GetWeaponFilters(Item item, List<PropertyFilter> propertyFilters)
     {
+        if (item.Metadata.Game == GameType.PathOfExile2)
+        {
+            return null;
+        }
+
         var filters = new WeaponFilterGroup();
         var hasValue = false;
 
@@ -177,9 +183,58 @@ public async Task<TradeSearchResult<string>> Search(Item item, TradeCurrency cur
         return hasValue ? filters : null;
     }
 
-    private ArmorFilterGroup? GetArmourFilters(List<PropertyFilter> propertyFilters)
+    private ArmourFilterGroup? GetArmourFilters(Item item, List<PropertyFilter> propertyFilters)
+    {
+        if (item.Metadata.Game == GameType.PathOfExile2)
+        {
+            return null;
+        }
+
+        var filters = new ArmourFilterGroup();
+        var hasValue = false;
+
+        foreach (var propertyFilter in propertyFilters)
+        {
+            if (!propertyFilter.Enabled == true)
+            {
+                continue;
+            }
+
+            switch (propertyFilter.Type)
+            {
+                case PropertyFilterType.Armour_Armour:
+                    filters.Filters.Armor = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+
+                case PropertyFilterType.Armour_Block:
+                    filters.Filters.Block = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+
+                case PropertyFilterType.Armour_EnergyShield:
+                    filters.Filters.EnergyShield = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+
+                case PropertyFilterType.Armour_Evasion:
+                    filters.Filters.Evasion = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+            }
+        }
+
+        return hasValue ? filters : null;
+    }
+
+    private EquipmentFilterGroup? GetEquipmentFilters(Item item, List<PropertyFilter> propertyFilters)
     {
-        var filters = new ArmorFilterGroup();
+        if (item.Metadata.Game == GameType.PathOfExile)
+        {
+            return null;
+        }
+
+        var filters = new EquipmentFilterGroup();
         var hasValue = false;
 
         foreach (var propertyFilter in propertyFilters)
@@ -191,6 +246,31 @@ public async Task<TradeSearchResult<string>> Search(Item item, TradeCurrency cur
 
             switch (propertyFilter.Type)
             {
+                case PropertyFilterType.Weapon_PhysicalDps:
+                    filters.Filters.PhysicalDps = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+
+                case PropertyFilterType.Weapon_ElementalDps:
+                    filters.Filters.ElementalDps = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+
+                case PropertyFilterType.Weapon_Dps:
+                    filters.Filters.DamagePerSecond = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+
+                case PropertyFilterType.Weapon_AttacksPerSecond:
+                    filters.Filters.AttacksPerSecond = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+
+                case PropertyFilterType.Weapon_CriticalStrikeChance:
+                    filters.Filters.CriticalStrikeChance = new SearchFilterValue(propertyFilter);
+                    hasValue = true;
+                    break;
+
                 case PropertyFilterType.Armour_Armour:
                     filters.Filters.Armor = new SearchFilterValue(propertyFilter);
                     hasValue = true;
@@ -410,7 +490,7 @@ private static void SetModifierFilters(List<StatFilterGroup> stats, List<Modifie
                     continue;
                 }
 
-                andGroup.Filters.Add(new StatFilter()
+                andGroup.Filters.Add(new StatFilters()
                 {
                     Id = modifier.Id,
                     Value = new SearchFilterValue(filter),
@@ -430,7 +510,7 @@ private static void SetModifierFilters(List<StatFilterGroup> stats, List<Modifie
 
             foreach (var modifier in modifiers)
             {
-                countGroup.Filters.Add(new StatFilter()
+                countGroup.Filters.Add(new StatFilters()
                 {
                     Id = modifier.Id,
                     Value = new SearchFilterValue(filter),
@@ -468,7 +548,7 @@ private static void SetPseudoModifierFilters(List<StatFilterGroup> stats, List<P
                 continue;
             }
 
-            andGroup.Filters.Add(new StatFilter()
+            andGroup.Filters.Add(new StatFilters()
             {
                 Id = filter.Modifier.Id,
                 Value = new SearchFilterValue(filter),

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Sidekick.Apis.Poe.Trade.Requests.Filters`
`4`	`4`	`{`
`5`		`- internal class ArmorFilter`
	`5`	`+ internal class ArmourFilters`
`6`	`6`	`{`
`7`	`7`	`[JsonPropertyName("ar")]`
`8`	`8`	`public SearchFilterValue? Armor { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters`
`2`	`2`	`{`
`3`	`3`	`internal class MapFilterGroup`
`4`	`4`	`{`
`5`		`- public MapFilter Filters { get; set; } = new();`
	`5`	`+ public MapFilters Filters { get; set; } = new();`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Sidekick.Apis.Poe.Trade.Requests.Filters`
`4`	`4`	`{`
`5`		`- internal class MapFilter`
	`5`	`+ internal class MapFilters`
`6`	`6`	`{`
`7`	`7`	`[JsonPropertyName("map_iiq")]`
`8`	`8`	`public SearchFilterValue? ItemQuantity { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters`
`2`	`2`	`{`
`3`	`3`	`internal class MiscFilterGroup`
`4`	`4`	`{`
`5`		`- public MiscFilter Filters { get; set; } = new();`
	`5`	`+ public MiscFilters Filters { get; set; } = new();`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Sidekick.Apis.Poe.Trade.Requests.Filters`
`4`	`4`	`{`
`5`		`- internal class MiscFilter`
	`5`	`+ internal class MiscFilters`
`6`	`6`	`{`
`7`	`7`	`public SearchFilterValue? Quality { get; set; }`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ namespace Sidekick.Apis.Poe.Trade.Requests.Filters`
`2`	`2`	`{`
`3`	`3`	`internal class RequirementFilterGroup`
`4`	`4`	`{`
`5`		`- public RequirementFilter Filters { get; set; } = new();`
	`5`	`+ public RequirementFilters Filters { get; set; } = new();`
`6`	`6`	`}`
`7`	`7`	`}`