From ed47fd38f652eaa228ca9c66b36d156371af0227 Mon Sep 17 00:00:00 2001 From: Serghei Cebotari Date: Sun, 21 Jan 2024 15:04:51 +0300 Subject: [PATCH] Use AsyncTaskUtil.RunTask for async functions in formulas --- .../AddIn/RhSolutionsFunctions.cs | 221 ++++++++---------- RhSolutions.AddIn/RhSolutions-AddIn.dna | 1 + RhSolutions.AddIn/RhSolutions.AddIn.csproj | 1 + 3 files changed, 94 insertions(+), 129 deletions(-) diff --git a/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs b/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs index 0d69d42..20ef613 100644 --- a/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs +++ b/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs @@ -1,47 +1,34 @@ -namespace RhSolutions.AddIn; +using ExcelDna.Registration.Utils; + +namespace RhSolutions.AddIn; public static class RhSolutionsFunctions { - private static IDatabaseClient databaseClient = RhSolutionsAddIn.ServiceProvider.GetService(); - private static ICurrencyClient currencyClient = RhSolutionsAddIn.ServiceProvider.GetRequiredService(); + private static readonly IDatabaseClient databaseClient = + RhSolutionsAddIn.ServiceProvider.GetService(); + private static readonly ICurrencyClient currencyClient = + RhSolutionsAddIn.ServiceProvider.GetRequiredService(); [ExcelFunction] public static object РЕХАУ(string query) { - ProductSku.TryParse(query, out var skus); - - if (ExcelAsyncUtil.Run(nameof(РЕХАУ), query, delegate + var functionName = nameof(РЕХАУ); + var parameters = new object[] { query }; + if (AsyncTaskUtil.RunTask(functionName, parameters, async () => { - return databaseClient.GetProducts(query) - .GetAwaiter() - .GetResult(); - }) is not IEnumerable requestResult) + return await databaseClient.GetProducts(query); + }) is not IEnumerable products) { - if (skus.Any()) - { - return $"{skus.First()} ..."; - } - else - { - return "Загрузка..."; - } + return "Загрузка..."; + } + else if (!products.Any()) + { + return ExcelError.ExcelErrorNA; } - else { - if (!requestResult.Any() && !skus.Any()) - { - return ExcelError.ExcelErrorNA; - } - else if (!requestResult.Any()) - { - return $"{skus.First()}"; - } - else - { - var firstProduct = requestResult.First(); - return $"{firstProduct.ProductSku} {firstProduct.Name}"; - } + var product = products.First(); + return $"{product.Id} {product.Name}"; } } @@ -52,10 +39,7 @@ public static class RhSolutionsFunctions { return skus.First().Id; } - else - { - return ExcelError.ExcelErrorNA; - } + return ExcelError.ExcelErrorNA; } [ExcelFunction] @@ -65,31 +49,24 @@ public static class RhSolutionsFunctions { return ExcelError.ExcelErrorNA; } + var article = skus.First().Id; + var functionName = nameof(РЕХАУИМЯ); + var parameters = new object[] { query }; + if (AsyncTaskUtil.RunTask(functionName, parameters, async () => + { + return await databaseClient.GetProducts(article); + }) is not IEnumerable requestResult) + { + return "Загрузка..."; + } + else if (!requestResult.Any()) + { + return ExcelError.ExcelErrorNA; + } else { - var article = skus.First().Id; - - if (ExcelAsyncUtil.Run(nameof(РЕХАУИМЯ), query, delegate - { - return databaseClient.GetProducts(article) - .GetAwaiter() - .GetResult(); - }) is not IEnumerable requestResult) - { - return "Загрузка..."; - } - else - { - if (!requestResult.Any()) - { - return ExcelError.ExcelErrorNA; - } - else - { - var firstProduct = requestResult.First(); - return firstProduct.Name; - } - } + var firstProduct = requestResult.First(); + return firstProduct.Name; } } @@ -100,82 +77,69 @@ public static class RhSolutionsFunctions { return ExcelError.ExcelErrorNA; } - else + var article = skus.First().Id; + var functionName = nameof(РЕХАУЦЕНА); + var parameters = new object[] { article }; + + if (AsyncTaskUtil.RunTask(functionName, parameters, async () => { - var article = skus.First().Id; - - if (ExcelAsyncUtil.Run(nameof(РЕХАУЦЕНА), query, delegate - { - return databaseClient.GetProducts(article) - .GetAwaiter() - .GetResult(); - }) is not IEnumerable requestResult) - { - return "Загрузка..."; - } - else - { - if (!requestResult.Any()) - { - return ExcelError.ExcelErrorNA; - } - else - { - var firstProduct = requestResult.First(); - return Math.Round(firstProduct.Price * 1.2m, 2); - } - } + return await databaseClient.GetProducts(article); + }) is not IEnumerable requestResult) + { + return "Загрузка..."; } - } - - [ExcelFunction] - public static object РЕХАУЦЕНАРУБ(string line, double dateField) - { - if (!ProductSku.TryParse(line, out var skus)) + else if (!requestResult.Any()) { return ExcelError.ExcelErrorNA; } else { - var article = skus.First().Id; - DateTime date = dateField == 0 ? DateTime.Today : DateTime.FromOADate(dateField); + var firstProduct = requestResult.First(); + return Math.Round(firstProduct.Price * 1.2m, 2); + } + } - if (ExcelAsyncUtil.Run(nameof(КУРСЕВРО), dateField, delegate - { - var requestResult = currencyClient.GetExchangeRate(date) - .GetAwaiter() - .GetResult(); + [ExcelFunction] + public static object РЕХАУЦЕНАРУБ(string query, double dateField) + { + if (!ProductSku.TryParse(query, out var skus)) + { + return ExcelError.ExcelErrorNA; + } + var article = skus.First().Id; + DateTime date = dateField == 0 ? DateTime.Today : DateTime.FromOADate(dateField); - return requestResult ?? -1m; - }) is not decimal exchangeRate) - { - return "Загрузка..."; - } - else if (ExcelAsyncUtil.Run(nameof(РЕХАУЦЕНАРУБ), line, delegate - { - var product = databaseClient.GetProducts(article) - .GetAwaiter() - .GetResult() - .FirstOrDefault(); + var functionName = nameof(РЕХАУЦЕНАРУБ); + var parameters = new object[] { date }; - return product == null ? -1m : - product.Price * (decimal)exchangeRate * 1.2m; - }) is not decimal requestResult) - { - return "Загрузка..."; - } - else - { - if (requestResult < 0) - { - return ExcelError.ExcelErrorNA; - } - else - { - return Math.Round(requestResult, 2); - } - } + if (AsyncTaskUtil.RunTask(functionName, parameters, async () => + { + var requestResult = await currencyClient.GetExchangeRate(date); + return requestResult ?? -1m; + }) is not decimal exchangeRate) + { + return "Загрузка..."; + } + + parameters = new object[] { query }; + if (AsyncTaskUtil.RunTask(functionName, parameters, async () => + { + var products = await databaseClient.GetProducts(article); + var product = products.FirstOrDefault(); + return product == null ? -1m : + product.Price * (decimal)exchangeRate * 1.2m; + }) is not decimal requestResult) + { + return "Загрузка..."; + } + else if (requestResult < 0 || exchangeRate < 0) + { + return ExcelError.ExcelErrorNA; + } + else + { + return Math.Round(requestResult, 2); } } @@ -183,13 +147,12 @@ public static class RhSolutionsFunctions public static object КУРСЕВРО(double dateField) { DateTime date = dateField == 0 ? DateTime.Today : DateTime.FromOADate(dateField); + var functionName = nameof(КУРСЕВРО); + var parameters = new object[] { date }; - var exchangeRate = ExcelAsyncUtil.Run(nameof(КУРСЕВРО), dateField, delegate + var exchangeRate = AsyncTaskUtil.RunTask(functionName, parameters, async () => { - var requestResult = currencyClient.GetExchangeRate(date) - .GetAwaiter() - .GetResult(); - + var requestResult = await currencyClient.GetExchangeRate(date); return requestResult ?? -1m; }); diff --git a/RhSolutions.AddIn/RhSolutions-AddIn.dna b/RhSolutions.AddIn/RhSolutions-AddIn.dna index 414613c..a28cea0 100644 --- a/RhSolutions.AddIn/RhSolutions-AddIn.dna +++ b/RhSolutions.AddIn/RhSolutions-AddIn.dna @@ -1,6 +1,7 @@ + diff --git a/RhSolutions.AddIn/RhSolutions.AddIn.csproj b/RhSolutions.AddIn/RhSolutions.AddIn.csproj index 977d314..f967319 100644 --- a/RhSolutions.AddIn/RhSolutions.AddIn.csproj +++ b/RhSolutions.AddIn/RhSolutions.AddIn.csproj @@ -13,6 +13,7 @@ +