fix item search query

planetarium · Oct 21, 2024 · c910c2b · c910c2b
1 parent 3569529
commit c910c2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/MarketService.Tests/MarketControllerTest.cs b/MarketService.Tests/MarketControllerTest.cs
@@ -65,7 +65,7 @@ public async void GetItemProducts()
             SizeLimit = null,
         });
         var controller = new MarketController(_logger, _context, cache);
-        var response = await controller.GetItemProducts((int) ItemSubType.Armor, null, null, null, null, Array.Empty<int>());
+        var response = await controller.GetItemProducts((int) ItemSubType.Armor, null, null, null, null, Array.Empty<int>(), false);
         var result = Assert.Single(response.ItemProducts);
         Assert.IsType<ItemProductResponseModel>(result);
         Assert.Equal(product.ProductId, result.ProductId);
@@ -227,14 +227,14 @@ public async void GetItemProductsByStat()
         var controller = new MarketController(_logger, _context, cache);
         foreach (var stat in new [] {"atk", "ATK", "HP", "hp", "Hp", "Atk", null })
         {
-            var response = await controller.GetItemProducts((int) ItemSubType.Armor, null, null, null, stat, Array.Empty<int>());
+            var response = await controller.GetItemProducts((int) ItemSubType.Armor, null, null, null, stat, Array.Empty<int>(), false);
             var result = Assert.Single(response.ItemProducts);
             Assert.IsType<ItemProductResponseModel>(result);
             Assert.Equal(product.ProductId, result.ProductId);
             Assert.Equal(2, result.Quantity);
             Assert.Equal(3, result.Price);
         }
-        var response2 = await controller.GetItemProducts((int) ItemSubType.Armor, null, null, null, "DEF", Array.Empty<int>());
+        var response2 = await controller.GetItemProducts((int) ItemSubType.Armor, null, null, null, "DEF", Array.Empty<int>(), false);
         Assert.Empty(response2.ItemProducts);
         await _context.Database.EnsureDeletedAsync();
     }

diff --git a/MarketService/Controllers/MarketController.cs b/MarketService/Controllers/MarketController.cs
@@ -28,14 +28,14 @@ public MarketController(ILogger<MarketController> logger, MarketContext marketCo
     }
 
     [HttpGet("products/items/{type}")]
-    public async Task<MarketProductResponse> GetItemProducts(int type, int? limit, int? offset, string? order, string? stat, [FromQuery] int[] itemIds)
+    public async Task<MarketProductResponse> GetItemProducts(int type, int? limit, int? offset, string? order, string? stat, [FromQuery] int[] iconIds, bool isCustom)
     {
         var itemSubType = (ItemSubType) type;
         var queryOffset = offset ?? 0;
         var queryLimit = limit ?? 100;
         var sort = string.IsNullOrEmpty(order) ? "cp_desc" : order;
         var statType = string.IsNullOrEmpty(stat) ? StatType.NONE : Enum.Parse<StatType>(stat, true);
-        var queryResult = await Get(itemSubType, queryLimit, queryOffset, sort, statType, itemIds);
+        var queryResult = await Get(itemSubType, queryLimit, queryOffset, sort, statType, iconIds, isCustom);
         var totalCount = queryResult.Count;
         return new MarketProductResponse(
             totalCount,
@@ -47,10 +47,10 @@ public async Task<MarketProductResponse> GetItemProducts(int type, int? limit, i
     }
 
     private async Task<List<ItemProductModel>> Get(ItemSubType itemSubType, int queryLimit, int queryOffset,
-        string sort, StatType statType, int[] iconIds, bool isCustom = false)
+        string sort, StatType statType, int[] iconIds, bool isCustom)
     {
         var ids = string.Join("_", iconIds.OrderBy(i => i));
-        var cacheKey = $"{itemSubType}_{queryLimit}_{queryOffset}_{sort}_{statType}_{ids}";
+        var cacheKey = $"{itemSubType}_{queryLimit}_{queryOffset}_{sort}_{statType}_{ids}_{isCustom}";
         if (!_memoryCache.TryGetValue(cacheKey, out List<ItemProductModel>? queryResult))
         {
             var query = _dbContext.ItemProducts