From 44e04ccb1eb2b910fa32696b62d9ba5bb5523e9c Mon Sep 17 00:00:00 2001 From: Kara <49822414+karashiiro@users.noreply.github.com> Date: Sat, 20 Jul 2024 19:40:52 -0700 Subject: [PATCH] Revert "Restore sales (#1328)" (#1333) This reverts commit 62135eb8823ecefd6b20b6b1d1e8638b7cd4b312. --- .../CurrentlyShownControllerBase.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Universalis.Application/Controllers/CurrentlyShownControllerBase.cs b/src/Universalis.Application/Controllers/CurrentlyShownControllerBase.cs index 681a3b96..61dba465 100644 --- a/src/Universalis.Application/Controllers/CurrentlyShownControllerBase.cs +++ b/src/Universalis.Application/Controllers/CurrentlyShownControllerBase.cs @@ -378,16 +378,16 @@ private async Task FetchData(int worldId, int itemId, int nE { using var activity = Util.ActivitySource.StartActivity("CurrentlyShownBase.FetchData"); - var csTask = CurrentlyShown.Retrieve(new CurrentlyShownQuery { WorldId = worldId, ItemId = itemId }, + var cs = await CurrentlyShown.Retrieve(new CurrentlyShownQuery { WorldId = worldId, ItemId = itemId }, cancellationToken); - var hTask = History.Retrieve(new HistoryQuery { WorldId = worldId, ItemId = itemId, Count = nEntries }, - cancellationToken); - await Task.WhenAll(csTask, hTask); + // var hTask = History.Retrieve(new HistoryQuery { WorldId = worldId, ItemId = itemId, Count = nEntries }, + // cancellationToken); + // await Task.WhenAll(csTask, hTask); - var cs = await csTask; - var history = await hTask; + // var cs = await csTask; + // var history = await hTask; - return BuildPartialView(cs ?? new CurrentlyShown(), history ?? new History(), worldId, itemId); + return BuildPartialView(cs ?? new CurrentlyShown(), new History(), worldId, itemId); } private async Task> FetchDataBatched(IEnumerable worlds, @@ -401,13 +401,13 @@ private async Task> FetchDataBatched(IEnumerable itemIds.Select(itemId => new WorldItemPair(worldId, itemId))) .ToList(); - var csTask = CurrentlyShown.RetrieveMany(new CurrentlyShownManyQuery { WorldIds = worldIds, ItemIds = itemIds }, + var cs = await CurrentlyShown.RetrieveMany(new CurrentlyShownManyQuery { WorldIds = worldIds, ItemIds = itemIds }, cancellationToken); - var hTask = History.RetrieveMany( - new HistoryManyQuery { WorldIds = worldIds, ItemIds = itemIds, Count = nEntries }, cancellationToken); - await Task.WhenAll(csTask, hTask); + // var hTask = History.RetrieveMany( + // new HistoryManyQuery { WorldIds = worldIds, ItemIds = itemIds, Count = nEntries }, cancellationToken); + // await Task.WhenAll(csTask, hTask); - var cs = await csTask; + // var cs = await csTask; var csDict = CollectListings(cs); var history = Array.Empty(); var historyDict = CollectSales(history);