RhSolutions.AddIn/Services/DatabaseClient.cs

@@ -21,62 +21,36 @@ public class DatabaseClient : IDatabaseClient
     public async Task<IEnumerable<Product>> GetProducts(string line)
     {
         string request;
-        IEnumerable<Product> products;
 
         if (ProductSku.TryParse(line, out var skus))
         {
-            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);
-            }
+            request = @"https://rh.cebotari.ru/api/products/" + skus.FirstOrDefault().ToString();
         }
 
         else
         {
             request = @"https://rh.cebotari.ru/api/search?query=" + line;
-            
-            if (!_memoryCache.TryGetValue(line, out products))
+        }
+
+        if (!_memoryCache.TryGetValue(line, out IEnumerable<Product> products))
+        {
+            var response = await _httpClient.GetAsync(request);
+
+            try
             {
-                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(line, products, cacheEntryOptions);
-                if (products.Count() > 0)
-                {
-                    _memoryCache.Set(products.First(), products, cacheEntryOptions);
-                }
+                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(line, products, cacheEntryOptions);
+        }
 
         return products;
     }

RhSolutions.AddIn/Services/ExcelReader.cs

@@ -95,7 +95,7 @@ public class ExcelReader : IReader, IDisposable
                 ProductLineCell = worksheet.Cells.Find(headers["ProductLine"]),
                 NameCell = worksheet.Cells.Find(headers["Name"]),
                 MeasureCell = worksheet.Cells.Find(headers["Measure"]);
-            var lastRowIndex = worksheet.Cells[worksheet.Rows.Count, SkuCell.Column]
+            var lastRowIndex = worksheet.Cells[worksheet.Rows.Count, AmountCell.Column]
                 .End[XlDirection.xlUp].Row;
 
             Dictionary<Product, double> readResult = new();