Add tax rates for Tuliyollal (#1238)

Universalis-FFXIV · Jun 29, 2024 · 397ed49 · 397ed49
1 parent baa6f15
commit 397ed49
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/Universalis.Application.Tests/Uploads/Behaviors/TaxRatesUploadBehaviorTests.cs b/src/Universalis.Application.Tests/Uploads/Behaviors/TaxRatesUploadBehaviorTests.cs
@@ -42,6 +42,7 @@ public void Behavior_DoesNotRun_WithoutUploaderId()
                 Ishgard = 3,
                 Kugane = 0,
                 Crystarium = 0,
+                Tuliyollal = 0,
             },
         };
         Assert.False(behavior.ShouldExecute(upload));
@@ -63,6 +64,7 @@ public void Behavior_DoesNotRun_WithoutWorldId()
                 Ishgard = 3,
                 Kugane = 0,
                 Crystarium = 0,
+                Tuliyollal = 0,
             },
             UploaderId = "5627384655756342554",
         };
@@ -91,6 +93,7 @@ public async Task Behavior_Succeeds()
                 Ishgard = 3,
                 Kugane = 0,
                 Crystarium = 0,
+                Tuliyollal = 0,
             },
             UploaderId = "5627384655756342554",
         };
@@ -111,6 +114,7 @@ public async Task Behavior_Succeeds()
         Assert.Equal(upload.TaxRates.Ishgard, data.Ishgard);
         Assert.Equal(upload.TaxRates.Kugane, data.Kugane);
         Assert.Equal(upload.TaxRates.Crystarium, data.Crystarium);
+        Assert.Equal(upload.TaxRates.Tuliyollal, data.Tuliyollal);
         Assert.Equal(source.Name, data.UploadApplicationName);
     }
 }
diff --git a/src/Universalis.Application/Uploads/Schema/MarketTaxRates.cs b/src/Universalis.Application/Uploads/Schema/MarketTaxRates.cs
@@ -25,4 +25,8 @@ public class MarketTaxRates
     [JsonPropertyName("sharlayan")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public int? OldSharlayan { get; set; }
+
+    [JsonPropertyName("tuliyollal")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public int? Tuliyollal { get; set; }
 }
diff --git a/src/Universalis.DbAccess/MarketBoard/TaxRatesStore.cs b/src/Universalis.DbAccess/MarketBoard/TaxRatesStore.cs
@@ -75,6 +75,7 @@ private async Task StoreTaxRates(IDatabase db, TaxRates taxRates, int worldId)
                 new HashEntry("Kugane", taxRates.Kugane),
                 new HashEntry("Crystarium", taxRates.Crystarium),
                 new HashEntry("Old Sharlayan", taxRates.OldSharlayan),
+                new HashEntry("Tuliyollal", taxRates.Tuliyollal),
                 new HashEntry("source", taxRates.UploadApplicationName),
             }, CommandFlags.FireAndForget);
         }
@@ -108,7 +109,8 @@ private async Task<TaxRates> FetchTaxRates(IDatabase db, int worldId)
         try
         {
             var tasks = new[]
-                { "Limsa Lominsa", "Gridania", "Ul'dah", "Ishgard", "Kugane", "Crystarium", "Old Sharlayan", "source" }
+                { "Limsa Lominsa", "Gridania", "Ul'dah", "Ishgard", "Kugane", "Crystarium", "Old Sharlayan",
+                    "Tuliyollal", "source" }
             .Select(k => db.HashGetAsync(key, k, CommandFlags.PreferReplica));
             var values = await Task.WhenAll(tasks);
             return new TaxRates
@@ -120,7 +122,8 @@ private async Task<TaxRates> FetchTaxRates(IDatabase db, int worldId)
                 Kugane = (int)values[4],
                 Crystarium = (int)values[5],
                 OldSharlayan = (int)values[6],
-                UploadApplicationName = values[7],
+                Tuliyollal = (int)values[7],
+                UploadApplicationName = values[8],
             };
         }
         catch (Exception e)

diff --git a/src/Universalis.Entities/MarketBoard/TaxRates.cs b/src/Universalis.Entities/MarketBoard/TaxRates.cs
@@ -19,6 +19,8 @@ public class TaxRates : IEquatable<TaxRates>, ICopyable
 
     public int OldSharlayan { get; init; }
 
+    public int Tuliyollal { get; init; }
+
     public string UploadApplicationName { get; init; }
 
     public ICopyable Clone()
@@ -32,7 +34,8 @@ public bool Equals(TaxRates other)
         if (ReferenceEquals(this, other)) return true;
         return LimsaLominsa == other.LimsaLominsa && Gridania == other.Gridania && Uldah == other.Uldah &&
                Ishgard == other.Ishgard && Kugane == other.Kugane && Crystarium == other.Crystarium &&
-               OldSharlayan == other.OldSharlayan && UploadApplicationName == other.UploadApplicationName;
+               OldSharlayan == other.OldSharlayan && Tuliyollal == other.Tuliyollal &&
+               UploadApplicationName == other.UploadApplicationName;
     }
 
     public override bool Equals(object obj)
@@ -44,8 +47,9 @@ public override bool Equals(object obj)
 
     public override int GetHashCode()
     {
-        return HashCode.Combine(LimsaLominsa, Gridania, Uldah, Ishgard, Kugane, Crystarium, OldSharlayan,
-            UploadApplicationName);
+        var taxHash = HashCode.Combine(LimsaLominsa, Gridania, Uldah, Ishgard, Kugane, Crystarium, OldSharlayan,
+            Tuliyollal);
+        return HashCode.Combine(taxHash, UploadApplicationName);
     }
 
     public static bool operator ==(TaxRates left, TaxRates right)