Compare commits
2 Commits
627195fafe
...
46e547e3e2
Author | SHA1 | Date | |
---|---|---|---|
|
46e547e3e2 | ||
|
2178c1bea3 |
@ -21,18 +21,39 @@ public class DatabaseClient : IDatabaseClient
|
|||||||
public async Task<IEnumerable<Product>> GetProducts(string line)
|
public async Task<IEnumerable<Product>> GetProducts(string line)
|
||||||
{
|
{
|
||||||
string request;
|
string request;
|
||||||
|
IEnumerable<Product> products;
|
||||||
|
|
||||||
if (ProductSku.TryParse(line, out var skus))
|
if (ProductSku.TryParse(line, out var skus))
|
||||||
{
|
{
|
||||||
request = @"https://rh.cebotari.ru/api/products/" + skus.FirstOrDefault().ToString();
|
ProductSku sku = skus.FirstOrDefault();
|
||||||
|
request = @"https://rh.cebotari.ru/api/products/" + sku.ToString();
|
||||||
|
|
||||||
|
if (!_memoryCache.TryGetValue(sku, out products))
|
||||||
|
{
|
||||||
|
var response = await _httpClient.GetAsync(request);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
response.EnsureSuccessStatusCode();
|
||||||
|
string json = await response.Content.ReadAsStringAsync();
|
||||||
|
products = JsonConvert.DeserializeObject<IEnumerable<Product>>(json) ?? Enumerable.Empty<Product>();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
StatusCode = response.StatusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
var cacheEntryOptions = new MemoryCacheEntryOptions()
|
||||||
|
.SetSlidingExpiration(TimeSpan.FromHours(1));
|
||||||
|
_memoryCache.Set(sku, products, cacheEntryOptions);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
request = @"https://rh.cebotari.ru/api/search?query=" + line;
|
request = @"https://rh.cebotari.ru/api/search?query=" + line;
|
||||||
}
|
|
||||||
|
|
||||||
if (!_memoryCache.TryGetValue(line, out IEnumerable<Product> products))
|
if (!_memoryCache.TryGetValue(line, out products))
|
||||||
{
|
{
|
||||||
var response = await _httpClient.GetAsync(request);
|
var response = await _httpClient.GetAsync(request);
|
||||||
|
|
||||||
@ -50,6 +71,11 @@ public class DatabaseClient : IDatabaseClient
|
|||||||
var cacheEntryOptions = new MemoryCacheEntryOptions()
|
var cacheEntryOptions = new MemoryCacheEntryOptions()
|
||||||
.SetSlidingExpiration(TimeSpan.FromHours(1));
|
.SetSlidingExpiration(TimeSpan.FromHours(1));
|
||||||
_memoryCache.Set(line, products, cacheEntryOptions);
|
_memoryCache.Set(line, products, cacheEntryOptions);
|
||||||
|
if (products.Count() > 0)
|
||||||
|
{
|
||||||
|
_memoryCache.Set(products.First(), products, cacheEntryOptions);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return products;
|
return products;
|
||||||
|
@ -95,7 +95,7 @@ public class ExcelReader : IReader, IDisposable
|
|||||||
ProductLineCell = worksheet.Cells.Find(headers["ProductLine"]),
|
ProductLineCell = worksheet.Cells.Find(headers["ProductLine"]),
|
||||||
NameCell = worksheet.Cells.Find(headers["Name"]),
|
NameCell = worksheet.Cells.Find(headers["Name"]),
|
||||||
MeasureCell = worksheet.Cells.Find(headers["Measure"]);
|
MeasureCell = worksheet.Cells.Find(headers["Measure"]);
|
||||||
var lastRowIndex = worksheet.Cells[worksheet.Rows.Count, AmountCell.Column]
|
var lastRowIndex = worksheet.Cells[worksheet.Rows.Count, SkuCell.Column]
|
||||||
.End[XlDirection.xlUp].Row;
|
.End[XlDirection.xlUp].Row;
|
||||||
|
|
||||||
Dictionary<Product, double> readResult = new();
|
Dictionary<Product, double> readResult = new();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user