Gateways

Indemos · Nov 17, 2024 · 3210ae0 · 3210ae0
1 parent eb847f8
commit 3210ae0
Show file tree

Hide file tree

Showing 28 changed files with 493 additions and 613 deletions.
diff --git a/Core/Domains/Gateway.cs b/Core/Domains/Gateway.cs
@@ -61,7 +61,7 @@ public interface IGateway : IDisposable
     /// <param name="screener"></param>
     /// <param name="criteria"></param>
     /// <returns></returns>
-    Task<ResponseModel<DomModel>> GetDom(DomScreenerModel screener, Hashtable criteria);
+    Task<ResponseModel<DomModel>> GetDom(PointScreenerModel screener, Hashtable criteria);
 
     /// <summary>
     /// Get historical bars
@@ -175,7 +175,7 @@ public Gateway()
     /// <param name="args"></param>
     /// <param name="criteria"></param>
     /// <returns></returns>
-    public abstract Task<ResponseModel<DomModel>> GetDom(DomScreenerModel args, Hashtable criteria);
+    public abstract Task<ResponseModel<DomModel>> GetDom(PointScreenerModel args, Hashtable criteria);
 
     /// <summary>
     /// Get historical bars

diff --git a/Core/Enums/InstructionEnum.cs → Core/Enums/OrderInstructionEnum.cs b/Core/Enums/InstructionEnum.cs → Core/Enums/OrderInstructionEnum.cs
diff --git a/Core/Enums/StatusEnum.cs b/Core/Enums/StatusEnum.cs
@@ -4,6 +4,7 @@ public enum StatusEnum : byte
   {
     None = 0,
     Error = 1,
-    Success = 2
+    Success = 2,
+    Progress = 3
   }
 }
diff --git a/Core/Extensions/DateTime.cs b/Core/Extensions/DateTime.cs
@@ -16,5 +16,15 @@ public static class DateTimeExtensions
 
       return new DateTime(date - (date % excess), input.Value.Kind);
     }
+
+    public static DateOnly? AsDate(this DateTime? input)
+    {
+      if (input is null)
+      {
+        return null;
+      }
+
+      return DateOnly.FromDateTime(input.Value);
+    }
   }
 }
diff --git a/Core/Models/Points/DomScreenerModel.cs b/Core/Models/Points/DomScreenerModel.cs
diff --git a/Core/Models/Points/PointScreenerModel.cs b/Core/Models/Points/PointScreenerModel.cs
@@ -1,18 +1,14 @@
 using System;
+using Terminal.Core.Domains;
 
 namespace Terminal.Core.Models
 {
-  public class PointScreenerModel
+  public class  PointScreenerModel
   {
     /// <summary>
-    /// Symbol name
+    /// Asset
     /// </summary>
-    public virtual string Name { get; set; }
-
-    /// <summary>
-    /// Security type
-    /// </summary>
-    public virtual string Security { get; set; }
+    public virtual InstrumentModel Instrument { get; set; }
 
     /// <summary>
     /// Start date

diff --git a/Core/Models/ResponseModel.cs b/Core/Models/ResponseModel.cs
@@ -4,6 +4,11 @@ namespace Terminal.Core.Models
 {
   public class ResponseModel<T>
   {
+    /// <summary>
+    /// Item
+    /// </summary>
+    public virtual string Cursor { get; set; }
+
     /// <summary>
     /// Item
     /// </summary>

diff --git a/Derivative/Pages/Cointegration.razor.cs b/Derivative/Pages/Cointegration.razor.cs
@@ -10,7 +10,6 @@
 using Microsoft.Extensions.Configuration;
 using MudBlazor;
 using Schwab;
-using Schwab.Messages;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -92,13 +91,10 @@ protected async Task OnChart<T>(Func<string, PortfolioInputModel, IDictionary<st
               {
                 Descriptor = Configuration.GetValue<string>("Schwab:Account")
               },
-              Scope = new ScopeMessage
-              {
-                ConsumerKey = Configuration.GetValue<string>("Schwab:ConsumerKey"),
-                ConsumerSecret = Configuration.GetValue<string>("Schwab:ConsumerSecret"),
-                RefreshToken = Configuration.GetValue<string>("Schwab:RefreshToken"),
-                AccessToken = Configuration.GetValue<string>("Schwab:AccessToken")
-              }
+              ClientId = Configuration.GetValue<string>("Schwab:ConsumerKey"),
+              ClientSecret = Configuration.GetValue<string>("Schwab:ConsumerSecret"),
+              RefreshToken = Configuration.GetValue<string>("Schwab:RefreshToken"),
+              AccessToken = Configuration.GetValue<string>("Schwab:AccessToken")
             };
 
             var caption = $"{Count++} : {data.Names} : {data.Duration} : {data.Resolution}";

diff --git a/Derivative/Pages/Gex.razor.cs b/Derivative/Pages/Gex.razor.cs
@@ -9,7 +9,6 @@
 using Microsoft.Extensions.Configuration;
 using MudBlazor;
 using Schwab;
-using Schwab.Messages;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -49,13 +48,10 @@ protected override async Task OnAfterRenderAsync(bool setup)
           {
             Descriptor = Configuration.GetValue<string>("Schwab:Account")
           },
-          Scope = new ScopeMessage
-          {
-            ConsumerKey = Configuration.GetValue<string>("Schwab:ConsumerKey"),
-            ConsumerSecret = Configuration.GetValue<string>("Schwab:ConsumerSecret"),
-            RefreshToken = Configuration.GetValue<string>("Schwab:RefreshToken"),
-            AccessToken = Configuration.GetValue<string>("Schwab:AccessToken")
-          }
+          AccessToken = Configuration["Schwab:AccessToken"],
+          RefreshToken = Configuration["Schwab:RefreshToken"],
+          ClientId = Configuration["Schwab:ConsumerKey"],
+          ClientSecret = Configuration["Schwab:ConsumerSecret"]
         };
 
         await Connector.Connect();

diff --git a/Derivative/Pages/Options.razor.cs b/Derivative/Pages/Options.razor.cs
@@ -12,7 +12,6 @@
 using Microsoft.Extensions.Configuration;
 using MudBlazor;
 using Schwab;
-using Schwab.Messages;
 using SkiaSharp;
 using System;
 using System.Collections;
@@ -215,13 +214,10 @@ protected async Task OnChart<T>(Func<string, dynamic, IList<InstrumentModel>, Ta
               {
                 Descriptor = Configuration.GetValue<string>("Schwab:Account")
               },
-              Scope = new ScopeMessage
-              {
-                ConsumerKey = Configuration.GetValue<string>("Schwab:ConsumerKey"),
-                ConsumerSecret = Configuration.GetValue<string>("Schwab:ConsumerSecret"),
-                RefreshToken = Configuration.GetValue<string>("Schwab:RefreshToken"),
-                AccessToken = Configuration.GetValue<string>("Schwab:AccessToken")
-              }
+              AccessToken = Configuration["Schwab:AccessToken"],
+              RefreshToken = Configuration["Schwab:RefreshToken"],
+              ClientId = Configuration["Schwab:ConsumerKey"],
+              ClientSecret = Configuration["Schwab:ConsumerSecret"]
             };
 
             var caption = $"{Count++} : {data.Name} : {data.Range.Start:yyyy-MM-dd} : {data.Range.End:yyyy-MM-dd}";

diff --git a/Derivative/Pages/Portfolio.razor.cs b/Derivative/Pages/Portfolio.razor.cs
@@ -9,7 +9,6 @@
 using Microsoft.Extensions.Configuration;
 using MudBlazor;
 using Schwab;
-using Schwab.Messages;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -92,13 +91,10 @@ protected async Task OnChart<T>(Func<string, PortfolioInputModel, IDictionary<st
               {
                 Descriptor = Configuration.GetValue<string>("Schwab:Account")
               },
-              Scope = new ScopeMessage
-              {
-                ConsumerKey = Configuration.GetValue<string>("Schwab:ConsumerKey"),
-                ConsumerSecret = Configuration.GetValue<string>("Schwab:ConsumerSecret"),
-                RefreshToken = Configuration.GetValue<string>("Schwab:RefreshToken"),
-                AccessToken = Configuration.GetValue<string>("Schwab:AccessToken")
-              }
+              AccessToken = Configuration["Schwab:AccessToken"],
+              RefreshToken = Configuration["Schwab:RefreshToken"],
+              ClientId = Configuration["Schwab:ConsumerKey"],
+              ClientSecret = Configuration["Schwab:ConsumerSecret"]
             };
 
             var caption = $"{Count++} : {data.Names} : {data.Duration} : {data.Resolution}";

diff --git a/Derivative/Services/SyncService.cs b/Derivative/Services/SyncService.cs
@@ -1,7 +1,6 @@
 using Distribution.Services;
 using Microsoft.Extensions.Configuration;
 using Schwab;
-using Schwab.Messages;
 using System;
 using System.Collections;
 using System.Collections.Concurrent;
@@ -34,13 +33,10 @@ public async Task Connect()
         {
           Descriptor = Configuration.GetValue<string>("Schwab:Account")
         },
-        Scope = new ScopeMessage
-        {
-          ConsumerKey = Configuration.GetValue<string>("Schwab:ConsumerKey"),
-          ConsumerSecret = Configuration.GetValue<string>("Schwab:ConsumerSecret"),
-          RefreshToken = Configuration.GetValue<string>("Schwab:RefreshToken"),
-          AccessToken = Configuration.GetValue<string>("Schwab:AccessToken")
-        }
+        AccessToken = Configuration["Schwab:AccessToken"],
+        RefreshToken = Configuration["Schwab:RefreshToken"],
+        ClientId = Configuration["Schwab:ConsumerKey"],
+        ClientSecret = Configuration["Schwab:ConsumerSecret"]
       };
 
       var interval = new Timer(TimeSpan.FromMinutes(1));