Add RAUPRICE function. Refactoring.

1 files changed, 5 insertions, 54 deletions

diff --git a/Source/ExcelDNA/Functions.cs b/Source/ExcelDNA/Functions.cs
index 9ce4429..a9bdfca 100644
--- a/Source/ExcelDNA/Functions.cs
+++ b/Source/ExcelDNA/Functions.cs
@@ -1,6 +1,4 @@
 using ExcelDna.Integration;
-using System.Runtime.Caching;
-using System.Threading.Tasks;
 
 namespace Rehau.Sku.Assist
 {
@@ -8,61 +6,14 @@ namespace Rehau.Sku.Assist
     {
         [ExcelFunction]
         public static object RAUNAME(string request)
-        {
-            if (MemoryCache.Default.Contains(request))
-            {
-                IProduct product = MemoryCache.Default[request] as IProduct;
-                return product.Name;
-            }
-
-            else
-            {
-                object result = ExcelAsyncUtil.Run("RauName", new[] { request },
-                    delegate
-                    {
-                        Task<IProduct> p = Task.Run(() => SkuAssist.GetProduct(request));
-                        return p.Result;
-                    });
-
-                if (result == null)
-                    return "Не найдено";
-
-                if (result.Equals(ExcelError.ExcelErrorNA))
-                    return "Загрузка...";
-
-                IProduct product = result as IProduct;
-                MemoryCache.Default.Add(request, product, System.DateTime.Now.AddMinutes(10));
-                return product.Name;
-            }
-        }
+            => SkuAssist.GetProduct(request, ProductField.Name);
 
         [ExcelFunction]
         public static object RAUSKU(string request)
-        {
-            if (MemoryCache.Default.Contains(request))
-            {
-                IProduct product = MemoryCache.Default[request] as IProduct;
-                return product.Id;
-            }
-            else
-            {
-                object result = ExcelAsyncUtil.Run("RauSku", new[] { request },
-                 delegate
-                 {
-                     Task<IProduct> p = Task.Run(() => SkuAssist.GetProduct(request));
-                     return p.Result;
-                 });
+            => SkuAssist.GetProduct(request, ProductField.Id);
 
-                if (result == null)
-                    return "Не найдено";
-
-                if (result.Equals(ExcelError.ExcelErrorNA))
-                    return "Загрузка...";
-
-                IProduct product = result as IProduct;
-                MemoryCache.Default.Add(request, product, System.DateTime.Now.AddMinutes(10));
-                return product.Id;
-            }
-        }
+        [ExcelFunction]
+        public static object RAUPRICE(string request)
+            => SkuAssist.GetProduct(request, ProductField.Price); 
     }
 }
\ No newline at end of file