From f13e9f69405cf1df0ce8a22f485614c52e11ea7b Mon Sep 17 00:00:00 2001
From: "yahor.mazko" <yahor.mazko@soft-fx.lv>
Date: Fri, 27 Sep 2024 12:39:41 +0300
Subject: [PATCH] Add close price to trade close operation

---
 TTWebClient/Domain/TTTrade.cs                 |  5 +++-
 TTWebClient/TTWebClient.csproj                |  2 +-
 TTWebClient/app.config                        | 12 +++++-----
 TTWebClientRobot/App.config                   | 10 ++++----
 TTWebClientRobot/TTWebClientRobot.csproj      |  2 +-
 TTWebClientSample/App.config                  | 10 ++++----
 TTWebClientSample/TTWebClientSample.csproj    |  2 +-
 TTWebClientUI/App.config                      | 10 ++++----
 TTWebClientUI/ClientView.cs                   | 23 +++++++++++++++++++
 TTWebClientUI/MainWindow.xaml                 | 14 +++++++----
 .../Properties/Resources.Designer.cs          |  2 +-
 TTWebClientUI/Properties/Settings.Designer.cs |  2 +-
 TTWebClientUI/TTWebClientUI.csproj            |  2 +-
 13 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/TTWebClient/Domain/TTTrade.cs b/TTWebClient/Domain/TTTrade.cs
index 30ff46e..ebfaa85 100644
--- a/TTWebClient/Domain/TTTrade.cs
+++ b/TTWebClient/Domain/TTTrade.cs
@@ -158,7 +158,10 @@ public class TTTrade
         /// <summary>Trigger Time</summary>
         public DateTime? TriggerTime { get; set; }
 
-        /// <summary>Commission</summary>
+        /// <summary>Order Id Triggered By</summary>
         public long? OrderIdTriggeredBy { get; set; }
+
+        /// <summary>Close Price</summary>
+        public decimal? ClosePrice { get; set; }
     }
 }
diff --git a/TTWebClient/TTWebClient.csproj b/TTWebClient/TTWebClient.csproj
index 074e413..90ba7c1 100644
--- a/TTWebClient/TTWebClient.csproj
+++ b/TTWebClient/TTWebClient.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TTWebClient</RootNamespace>
     <AssemblyName>TTWebClient</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
diff --git a/TTWebClient/app.config b/TTWebClient/app.config
index 323c0f4..a905483 100644
--- a/TTWebClient/app.config
+++ b/TTWebClient/app.config
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/TTWebClientRobot/App.config b/TTWebClientRobot/App.config
index 1a53b96..1231108 100644
--- a/TTWebClientRobot/App.config
+++ b/TTWebClientRobot/App.config
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/TTWebClientRobot/TTWebClientRobot.csproj b/TTWebClientRobot/TTWebClientRobot.csproj
index 3da7d46..3e9a667 100644
--- a/TTWebClientRobot/TTWebClientRobot.csproj
+++ b/TTWebClientRobot/TTWebClientRobot.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TTWebClientRobot</RootNamespace>
     <AssemblyName>TTWebClientRobot</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/TTWebClientSample/App.config b/TTWebClientSample/App.config
index 1a53b96..1231108 100644
--- a/TTWebClientSample/App.config
+++ b/TTWebClientSample/App.config
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/TTWebClientSample/TTWebClientSample.csproj b/TTWebClientSample/TTWebClientSample.csproj
index f9cd116..15f31a7 100644
--- a/TTWebClientSample/TTWebClientSample.csproj
+++ b/TTWebClientSample/TTWebClientSample.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TTWebClientSample</RootNamespace>
     <AssemblyName>TTWebClientSample</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
diff --git a/TTWebClientUI/App.config b/TTWebClientUI/App.config
index d87e154..6e0188a 100644
--- a/TTWebClientUI/App.config
+++ b/TTWebClientUI/App.config
@@ -6,18 +6,18 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/TTWebClientUI/ClientView.cs b/TTWebClientUI/ClientView.cs
index 4bbed2b..2396b64 100644
--- a/TTWebClientUI/ClientView.cs
+++ b/TTWebClientUI/ClientView.cs
@@ -143,6 +143,7 @@ internal class ClientView : ObservableObject
         public Command GetPositionsCommand { get; set; }
         public Command GetTradesCommand { get; set; }
         public Command PostTradeCommand { get; set; }
+        public Command CloseTradeCommand { get; set; }
         public Command GetTradeHistoryCommand { get; set; }
 
         public bool IsPublicEnabled
@@ -538,6 +539,7 @@ public ClientView(CredsModel creds)
             GetPositionsCommand = new Command(async () => await GetPositions());
             GetTradesCommand = new Command(async () => await GetTrades());
             PostTradeCommand = new Command(async () => await PostTrade());
+            CloseTradeCommand = new Command(async () => await CloseTrade());
             GetTradeHistoryCommand = new Command(async () => await GetTradeHistory());
 
             if (creds.IsPublicOnly)
@@ -876,6 +878,27 @@ public async Task PostTrade()
             Trades = trades != null ? new ObservableCollection<TTTrade>(trades) : null;
         }
 
+        public async Task CloseTrade()
+        {
+            // Account trades
+            List<TTTrade> trades = null;
+            if (!long.TryParse(TradeId, out var tradeId))
+                return;
+            else
+            {
+                try
+                {
+                    var trade = await _client.CloseTradeAsync(tradeId, null);
+                    trades = new List<TTTrade>(new[] { trade.Trade });
+                }
+                catch (Exception)
+                {
+                }
+            }
+
+            Trades = trades != null ? new ObservableCollection<TTTrade>(trades) : null;
+        }
+
         #endregion
 
         #region Account trade history information
diff --git a/TTWebClientUI/MainWindow.xaml b/TTWebClientUI/MainWindow.xaml
index a4ebbb7..8fa781b 100644
--- a/TTWebClientUI/MainWindow.xaml
+++ b/TTWebClientUI/MainWindow.xaml
@@ -576,10 +576,15 @@
                                     <RowDefinition Height="Auto"/>
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
-                                <StackPanel Grid.Row="0" Orientation="Horizontal">
-                                    <Button Content="GET" Command="{Binding Path=ClientView.GetTradesCommand}"/>
-                                    <Label Content="Trade Id:"/>
-                                    <TextBox Text="{Binding Path=ClientView.TradeId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                <StackPanel Grid.Row="0" Orientation="Vertical">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Button Content="GET" Command="{Binding Path=ClientView.GetTradesCommand}"/>
+                                        <Label Content="Trade Id:"/>
+                                        <TextBox Text="{Binding Path=ClientView.TradeId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Button Content="DELETE" Command="{Binding Path=ClientView.CloseTradeCommand}"/>
+                                    </StackPanel>
                                 </StackPanel>
                                 <ListView Grid.Row="1" ItemsSource="{Binding Path=ClientView.Trades}">
                                     <ListView.View>
@@ -619,6 +624,7 @@
                                                 <GridViewColumn Header="TriggerTime" DisplayMemberBinding="{Binding Path=TriggerTime}"/>
                                                 <GridViewColumn Header="TradeIdTriggeredBy" DisplayMemberBinding="{Binding Path=OrderIdTriggeredBy}"/>
                                                 <GridViewColumn Header="Comment" DisplayMemberBinding="{Binding Path=Comment}"/>
+                                                <GridViewColumn Header="ClosePrice" DisplayMemberBinding="{Binding Path=ClosePrice}"/>
                                             </GridView.Columns>
                                         </GridView>
                                     </ListView.View>
diff --git a/TTWebClientUI/Properties/Resources.Designer.cs b/TTWebClientUI/Properties/Resources.Designer.cs
index 764ba33..71744cd 100644
--- a/TTWebClientUI/Properties/Resources.Designer.cs
+++ b/TTWebClientUI/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace TTWebClientUI.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/TTWebClientUI/Properties/Settings.Designer.cs b/TTWebClientUI/Properties/Settings.Designer.cs
index e9aafa8..b624aa3 100644
--- a/TTWebClientUI/Properties/Settings.Designer.cs
+++ b/TTWebClientUI/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace TTWebClientUI.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/TTWebClientUI/TTWebClientUI.csproj b/TTWebClientUI/TTWebClientUI.csproj
index 6bbad2b..caabb8d 100644
--- a/TTWebClientUI/TTWebClientUI.csproj
+++ b/TTWebClientUI/TTWebClientUI.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TTWebClientUI</RootNamespace>
     <AssemblyName>TTWebClientUI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>