fix(vendors): fix multiple issues

Author: Moons

Program.cs

@@ -118,7 +118,8 @@ public static void Main()
                 .AddHostedService<VendorsGunsmith>()
                 .AddHostedService<VendorsIronBanner>()
                 .AddHostedService<VendorsTrials>()
-                .AddHostedService<VendorsWarTable>();
+                .AddHostedService<VendorsWarTable>()
+                ;
 
             builder.Services
                 .AddAuthentication(options =>

Tasks/VendorsAdepts.cs

@@ -40,6 +40,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             var nfAdept = "None";
             var trialsAdept = "None";
 
+            var currentTime = DateTime.UtcNow;
+
             try
             {
                 var vendorUser = db.Users.Include(u => u.BungieProfiles)
@@ -112,12 +114,14 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                             if (existingItem != null)
                                 db.WeaponSales.Remove(existingItem);
 
+                            await db.SaveChangesAsync(stoppingToken);
+
                             var vendorItem = new WeaponSale
                             {
                                 IsAvailable = true,
                                 ItemId = vendorWeapon,
                                 ItemPerks = "[[0]]",
-                                QueryTime = DateTime.UtcNow,
+                                QueryTime = currentTime,
                                 VendorId = vendor.Value
                             };
 
@@ -133,12 +137,12 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                             {
                                 case Vendors.FocusedDecoding_502095006:
                                     trialsAdept = validDef
-                                        ? adeptWeaponDef.DisplayProperties.Name
+                                        ? $"[{adeptWeaponDef.DisplayProperties.Name}](https://d2foundry.gg/w/{adeptWeaponDef.Hash})"
                                         : "Unknown";
                                     break;
                                 case Vendors.FocusedDecoding_2232145065:
                                     nfAdept = validDef
-                                        ? adeptWeaponDef.DisplayProperties.Name
+                                        ? $"[{adeptWeaponDef.DisplayProperties.Name}](https://d2foundry.gg/w/{adeptWeaponDef.Hash})"
                                         : "Unknown";
                                     break;
                             }
@@ -150,12 +154,14 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                             if (existingItem != null)
                                 db.WeaponSales.Remove(existingItem);
 
+                            await db.SaveChangesAsync(stoppingToken);
+
                             var vendorItem = new WeaponSale
                             {
                                 IsAvailable = true,
                                 ItemId = 0,
                                 ItemPerks = "[[0]]",
-                                QueryTime = DateTime.UtcNow,
+                                QueryTime = currentTime,
                                 VendorId = vendor.Value
                             };
 
@@ -175,6 +181,16 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                         }
                     }
 
+                    var oldWeapons = db.WeaponSales.Where(x => x.QueryTime < currentTime && x.ItemPerks == "[[0]]").ToList();
+
+                    foreach (var weaponSale in oldWeapons)
+                    {
+                        if(weaponSale.IsAvailable)
+                            weaponSale.IsAvailable = false;
+
+                        db.WeaponSales.Update(weaponSale);
+                    }
+
                     await db.SaveChangesAsync(stoppingToken);
 
                     await DiscordTools.SendMessage(DiscordTools.WebhookChannel.Vendors,

Util/VendorTools.cs

@@ -55,36 +55,45 @@ public static async Task SingleVendorUpdate(
                 vendorItem.RequiredRank = Convert.ToInt32(failureString);
             }
 
-            var existingWeapon = db.WeaponSales.FirstOrDefault(x => x.ItemId == vendorItem.ItemId);
+            var existingWeapons = db.WeaponSales.Where(w => w.ItemId == vendorItem.Id && w.VendorId == vendorId).ToList();
 
-            if (existingWeapon is { IsAvailable: false })
-                continue;
-
-            var addWeapon = true;
-
-            if (existingWeapon != null)
+            if (existingWeapons.Count == 0)
             {
-                if (existingWeapon.ItemPerks != vendorItem.ItemPerks)
-                {
-                    existingWeapon.IsAvailable = false;
-                }
-                else
+                // Case: Weapon isn't in the db, add it
+                db.WeaponSales.Add(vendorItem);
+            }
+            else
+            {
+                var addWeapon = true;
+
+                foreach (var existingWeapon in existingWeapons)
                 {
-                    existingWeapon.QueryTime = queryTime;
-                    addWeapon = false;
+                    if (existingWeapon.ItemPerks == vendorItem.ItemPerks)
+                    {
+                        // Case: Weapon is in the db with the same itemPerks, update querytime and isAvailable
+                        existingWeapon.QueryTime = queryTime;
+                        existingWeapon.IsAvailable = true;
+
+                        db.WeaponSales.Update(existingWeapon);
+                        addWeapon = false;
+                    }
+                    else
+                    {
+                        // Case: Weapon is in the db with different itemPerks, set isAvailable to false for each entry
+                        existingWeapon.IsAvailable = false;
+                        db.WeaponSales.Update(existingWeapon);
+                    }
                 }
 
-                db.WeaponSales.Update(existingWeapon);
+                if (addWeapon)
+                    db.WeaponSales.Add(vendorItem);
             }
-
-            if (addWeapon)
-                db.WeaponSales.Add(vendorItem);
         }
 
         await db.SaveChangesAsync(stoppingToken);
 
         foreach (var sale in db.WeaponSales.Where(x => x.VendorId == vendorId))
-            if (sale.QueryTime < queryTime)
+            if (sale.QueryTime < queryTime && sale.ItemPerks != "[[0]]")
                 sale.IsAvailable = false;
 
         await db.SaveChangesAsync(stoppingToken);