fix(vendors): not refreshing properly

Author: Moons

API.csproj

@@ -26,7 +26,7 @@
     <PackageReference Include="DotNetBungieAPI" Version="2.12.2" />
     <PackageReference Include="DotNetBungieAPI.AspNet.Security.OAuth.Providers" Version="1.0.2" />
     <PackageReference Include="DotNetBungieAPI.DefinitionProvider.Sqlite" Version="1.5.3" />
-    <PackageReference Include="DotNetBungieAPI.HashReferences" Version="1.22.0" />
+    <PackageReference Include="DotNetBungieAPI.HashReferences" Version="1.22.1" />
     <PackageReference Include="DotNetBungieAPI.Models" Version="2.11.3" />
     <PackageReference Include="DotNetBungieAPI.Service.Abstractions" Version="2.11.1" />
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />

Tasks/VendorsAdepts.cs

@@ -4,9 +4,11 @@
 using API.Util;
 using DotNetBungieAPI.Extensions;
 using DotNetBungieAPI.Models.Destiny;
+using DotNetBungieAPI.Models.Destiny.Definitions.InventoryItems;
 using DotNetBungieAPI.Service.Abstractions;
 using Microsoft.EntityFrameworkCore;
 using static DotNetBungieAPI.HashReferences.DefinitionHashes;
+using UserExtensions = API.Util.UserExtensions;
 
 namespace API.Tasks;
 
@@ -35,6 +37,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
             TaskSchedulerService.Tasks.First(t => t.Name == ServiceName).IsRunning = true;
 
+            var nfAdept = string.Empty;
+            var trialsAdept = string.Empty;
+
             try
             {
                 var vendorUser = db.Users.Include(u => u.BungieProfiles)
@@ -120,6 +125,23 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                                 "FetchWeaponVendors", vendorWeapon);
 
                             db.WeaponSales.Add(vendorItem);
+
+                            var validDef = bungieClient.TryGetDefinition<DestinyInventoryItemDefinition>(
+                                vendorWeapon, out var adeptWeaponDef);
+
+                            switch (vendor.Key)
+                            {
+                                case Vendors.FocusedDecoding_502095006:
+                                    trialsAdept = validDef
+                                        ? adeptWeaponDef.DisplayProperties.Name
+                                        : "Unknown";
+                                    break;
+                                case Vendors.FocusedDecoding_2232145065:
+                                    nfAdept = validDef
+                                        ? adeptWeaponDef.DisplayProperties.Name
+                                        : "Unknown";
+                                    break;
+                            }
                         }
                         else
                         {
@@ -140,10 +162,23 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                             logger.LogInformation("[{service}]: No adept weapon found.", "FetchWeaponVendors");
 
                             db.WeaponSales.Add(vendorItem);
+
+                            switch (vendor.Value)
+                            {
+                                case Vendors.FocusedDecoding_502095006:
+                                    trialsAdept = "None";
+                                    break;
+                                case Vendors.FocusedDecoding_2232145065:
+                                    nfAdept = "None";
+                                    break;
+                            }
                         }
                     }
 
                     await db.SaveChangesAsync(stoppingToken);
+
+                    await DiscordTools.SendMessage(DiscordTools.WebhookChannel.Vendors,
+                        $"**Trials Adept:** {trialsAdept}\n**Nightfall Adept:** {nfAdept}");
                 }
             }
             catch (Exception e)
@@ -154,7 +189,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             TaskSchedulerService.Tasks.First(t => t.Name == ServiceName).IsRunning = false;
             TaskSchedulerService.Tasks.First(t => t.Name == ServiceName).LastRun = DateTime.UtcNow;
 
-            await Task.Delay(DateTimeExtensions.GetRoundTimeSpan(60), stoppingToken);
+            await bungieClient.ResetService.WaitForNextDailyReset(TimeSpan.FromMinutes(1), stoppingToken);
         }
     }
 }

Util/UserExtensions.cs

@@ -70,9 +70,9 @@ public static async Task RefreshToken(
             var refreshedUser = await bungieClient.Authorization.RenewToken(user.GetTokenData());
 
             user.OauthToken = refreshedUser.AccessToken;
-            user.TokenExpires = nowTime.AddSeconds(refreshedUser.ExpiresIn);
+            user.TokenExpires = nowTime + TimeSpan.FromSeconds(refreshedUser.ExpiresIn);
             user.RefreshToken = refreshedUser.RefreshToken;
-            user.RefreshExpires = nowTime.AddSeconds(refreshedUser.RefreshExpiresIn);
+            user.RefreshExpires = nowTime + TimeSpan.FromSeconds(refreshedUser.RefreshExpiresIn);
 
             if (user.DestinyMembershipId == 0) await user.UpdateMembership(bungieClient);
 

Util/VendorTools.cs

@@ -57,19 +57,25 @@ public static async Task SingleVendorUpdate(
             if (existingWeapon is { IsAvailable: false })
                 continue;
 
+            var addWeapon = true;
+
             if (existingWeapon != null)
             {
                 if (existingWeapon.ItemPerks != vendorItem.ItemPerks)
+                {
                     existingWeapon.IsAvailable = false;
+                }
                 else
+                {
                     existingWeapon.QueryTime = queryTime;
+                    addWeapon = false;
+                }
 
                 db.WeaponSales.Update(existingWeapon);
             }
-            else
-            {
+
+            if (addWeapon)
                 db.WeaponSales.Add(vendorItem);
-            }
         }
 
         await db.SaveChangesAsync(stoppingToken);

Util/WeaponTools.cs

@@ -1,10 +1,6 @@
 using DotNetBungieAPI.Extensions;
-using DotNetBungieAPI.HashReferences;
 using DotNetBungieAPI.Models;
-using DotNetBungieAPI.Models.Destiny.Definitions.InventoryItems;
-using DotNetBungieAPI.Models.Destiny;
 using DotNetBungieAPI.Models.Destiny.Responses;
-using DotNetBungieAPI.Service.Abstractions;
 using static DotNetBungieAPI.HashReferences.DefinitionHashes.InventoryItems;
 
 namespace API.Util;