From 2506f0fe093529951a57ebec270a6ecc073d8f91 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 28 Dec 2022 15:26:41 +0300 Subject: [PATCH] Return parsed sku while awaiting database response --- src/AddIn/Functions.cs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/AddIn/Functions.cs b/src/AddIn/Functions.cs index 0d3aef5..78466bf 100644 --- a/src/AddIn/Functions.cs +++ b/src/AddIn/Functions.cs @@ -1,5 +1,7 @@ using ExcelDna.Integration; +using RhSolutions.Models; using RhSolutions.Services; +using System.Linq; namespace RhSolutions.AddIn { @@ -15,14 +17,31 @@ namespace RhSolutions.AddIn return RhDatabaseClient.GetProduct(line).GetAwaiter().GetResult(); }); + string parsedSku = Sku.TryParse(line, out var skus) + ? skus.First().ToString() : string.Empty; + if (result == null) { - return ExcelError.ExcelErrorNA; + if (string.IsNullOrEmpty(parsedSku)) + { + return ExcelError.ExcelErrorNA; + } + else + { + return skus.First().ToString(); + } } if (result.Equals(ExcelError.ExcelErrorNA)) { - return "Загрузка..."; + if (string.IsNullOrEmpty(parsedSku)) + { + return "Загрузка..."; + } + else + { + return skus.First().ToString(); + } } return result;