09/24/2023 01:24:44 PM 💻

alloc33 · Sep 24, 2023 · 244c879 · 244c879
1 parent c1a16f6
commit 244c879
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 25 deletions.
diff --git a/market/src/api/error.rs b/market/src/api/error.rs
@@ -9,7 +9,7 @@ use serde::Serialize;
 use thiserror::Error as ThisError;
 use tracing::error;
 
-use crate::broker_client::BrokerError;
+use crate::clients::BrokerError;
 
 pub const INTERNAL_SERVER_ERROR: &str = "Internal server error occurred...";
 pub const PAYLOAD_TOO_LARGE: &str = "Request payload too large...";

diff --git a/market/src/api/handlers.rs b/market/src/api/handlers.rs
@@ -12,7 +12,7 @@ use tracing::error;
 use super::{alert::TradeSignal, error::ApiError, objects::Account, Response};
 use crate::{
     alert::WebhookAlertData,
-    broker_client::BrokerClient,
+    clients::ExchangeClient,
     strategy_manager::{process_trade_signal, Broker},
     App,
 };
@@ -75,8 +75,8 @@ pub async fn receive_webhook_alert(
 }
 
 #[derive(Debug, Deserialize)]
-pub struct BrokerQuery {
-    broker: Broker,
+pub struct ExchangeQuery {
+    exchange: Broker,
 }
 
 pub async fn check_health(State(_app): State<Arc<App>>) -> Response<()> {
@@ -85,40 +85,34 @@ pub async fn check_health(State(_app): State<Arc<App>>) -> Response<()> {
 
 pub async fn get_account(
     State(app): State<Arc<App>>,
-    Query(query): Query<BrokerQuery>,
+    Query(query): Query<ExchangeQuery>,
 ) -> Response<Account> {
-    println!("abx");
-
-    let client = match query.broker {
+    let client = match query.exchange {
         Broker::Alpaca => &app.clients.alpaca,
     };
 
-    println!("reached");
-
     let account = client.get_account().await?;
 
-    println!("reached 1");
-
     Ok((StatusCode::OK, Json(account)))
 }
 
 pub async fn get_assets(
     State(app): State<Arc<App>>,
-    Query(query): Query<BrokerQuery>,
+    Query(query): Query<ExchangeQuery>,
 ) -> Response<()> {
     Ok((StatusCode::OK, Json::default()))
 }
 
 pub async fn get_orders(
     State(app): State<Arc<App>>,
-    Query(query): Query<BrokerQuery>,
+    Query(query): Query<ExchangeQuery>,
 ) -> Response<()> {
     Ok((StatusCode::OK, Json::default()))
 }
 
 pub async fn get_positions(
     State(app): State<Arc<App>>,
-    Query(query): Query<BrokerQuery>,
+    Query(query): Query<ExchangeQuery>,
 ) -> Response<()> {
     Ok((StatusCode::OK, Json::default()))
 }
diff --git a/market/src/app_config.rs b/market/src/app_config.rs
@@ -10,6 +10,11 @@ pub struct Database {
     pub url: String,
 }
 
+#[derive(Debug, Deserialize, Clone)]
+pub struct Exchanges {
+    pub alpaca: Alpaca,
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct Alpaca {
     pub apca_api_key_id: String,
@@ -21,7 +26,7 @@ pub struct Alpaca {
 pub struct AppConfig {
     pub api_key: String,
     pub database: Database,
-    pub alpaca: Alpaca,
+    pub exchanges: Exchanges,
     pub strategies: Vec<Strategy>,
 }
 

diff --git a/market/src/broker_client.rs → market/src/clients.rs b/market/src/broker_client.rs → market/src/clients.rs
@@ -28,7 +28,7 @@ pub enum BrokerError {
 }
 
 #[axum::async_trait]
-pub trait BrokerClient: Send + Sync {
+pub trait ExchangeClient: Send + Sync {
     async fn get_account(&self) -> Result<Account, BrokerError>;
     async fn get_positions(&self) -> Result<(), BrokerError>;
     async fn get_orders(&self) -> Result<(), BrokerError>;
@@ -38,7 +38,7 @@ pub trait BrokerClient: Send + Sync {
 }
 
 #[axum::async_trait]
-impl BrokerClient for Arc<AlpacaClient> {
+impl ExchangeClient for Arc<AlpacaClient> {
     async fn get_account(&self) -> Result<Account, BrokerError> {
         let result = self
             .issue::<account::Get>(&())

diff --git a/market/src/lib.rs b/market/src/lib.rs
@@ -1,6 +1,6 @@
 pub mod api;
 pub mod app_config;
-pub mod broker_client;
+pub mod clients;
 pub mod middleware;
 pub mod strategy;
 pub mod strategy_manager;
@@ -15,7 +15,7 @@ use axum::{
     routing::{get, post},
     Router,
 };
-use broker_client::Clients;
+use clients::Clients;
 use sqlx::{postgres::PgConnectOptions, Error as SqlxError, PgPool};
 use tower::ServiceBuilder;
 
@@ -55,9 +55,9 @@ pub async fn build_state(config: AppConfig, clients: Arc<Clients>) -> Result<App
 
 pub fn build_broker_clients(config: &AppConfig) -> Result<Arc<Clients>, Box<dyn Error>> {
     let alpaca = AlpacaClient::new(ApiInfo::from_parts(
-        &config.alpaca.apca_api_base_url,
-        &config.alpaca.apca_api_key_id,
-        &config.alpaca.apca_api_secret_key,
+        &config.exchanges.alpaca.apca_api_base_url,
+        &config.exchanges.alpaca.apca_api_key_id,
+        &config.exchanges.alpaca.apca_api_secret_key,
     )?);
 
     Ok(Arc::new(Clients {

diff --git a/market/src/strategy_manager.rs b/market/src/strategy_manager.rs
@@ -14,12 +14,12 @@ use uuid7::uuid7;
 
 use crate::{
     api::alert::{AlertType, TradeSignal, WebhookAlertData},
-    broker_client::{BrokerClient, Clients},
+    clients::{ExchangeClient, Clients},
     App,
 };
 
 pub async fn process_trade_signal(
-    client: impl BrokerClient,
+    client: impl ExchangeClient,
     signal: TradeSignal,
 ) -> Result<(), ()> {
     Ok(())