Add news data support

- Refactor everything in the process, oops

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

src/routes/assets.rs

@@ -1,9 +1,8 @@
 use crate::{
     config::{Config, ALPACA_ASSET_API_URL},
-    database,
+    database, threads,
     types::{
         alpaca::api::incoming::{self, asset::Status},
-        state::{self, BroadcastMessage},
         Asset,
     },
 };
@@ -13,7 +12,7 @@ use core::panic;
 use http::StatusCode;
 use serde::Deserialize;
 use std::sync::Arc;
-use tokio::sync::broadcast::Sender;
+use tokio::sync::mpsc;
 
 pub async fn get(
     Extension(app_config): Extension<Arc<Config>>,
@@ -39,7 +38,7 @@ pub struct AddAssetRequest {
 
 pub async fn add(
     Extension(app_config): Extension<Arc<Config>>,
-    Extension(broadcast_bus_sender): Extension<Sender<BroadcastMessage>>,
+    Extension(asset_status_sender): Extension<mpsc::Sender<threads::data::asset_status::Message>>,
     Json(request): Json<AddAssetRequest>,
 ) -> Result<(StatusCode, Json<Asset>), StatusCode> {
     if database::assets::select_where_symbol(&app_config.clickhouse_client, &request.symbol)
@@ -77,31 +76,39 @@ pub async fn add(
 
     let asset = Asset::from(asset);
 
-    broadcast_bus_sender
-        .send(BroadcastMessage::Asset((
-            state::asset::BroadcastMessage::Add,
-            vec![asset.clone()],
-        )))
+    let (asset_status_message, asset_status_response) = threads::data::asset_status::Message::new(
+        threads::data::asset_status::Action::Add,
+        vec![asset.clone()],
+    );
+
+    asset_status_sender
+        .send(asset_status_message)
+        .await
         .unwrap();
+    asset_status_response.await.unwrap();
 
     Ok((StatusCode::CREATED, Json(asset)))
 }
 
 pub async fn delete(
     Extension(app_config): Extension<Arc<Config>>,
-    Extension(broadcast_bus_sender): Extension<Sender<BroadcastMessage>>,
+    Extension(asset_status_sender): Extension<mpsc::Sender<threads::data::asset_status::Message>>,
     Path(symbol): Path<String>,
 ) -> Result<StatusCode, StatusCode> {
     let asset = database::assets::select_where_symbol(&app_config.clickhouse_client, &symbol)
         .await
         .ok_or(StatusCode::NOT_FOUND)?;
 
-    broadcast_bus_sender
-        .send(BroadcastMessage::Asset((
-            state::asset::BroadcastMessage::Delete,
-            vec![asset],
-        )))
+    let (asset_status_message, asset_status_response) = threads::data::asset_status::Message::new(
+        threads::data::asset_status::Action::Remove,
+        vec![asset],
+    );
+
+    asset_status_sender
+        .send(asset_status_message)
+        .await
         .unwrap();
+    asset_status_response.await.unwrap();
 
     Ok(StatusCode::NO_CONTENT)
 }

src/routes/mod.rs

@@ -1,22 +1,25 @@
-use crate::{config::Config, types::BroadcastMessage};
+pub mod assets;
+
+use crate::{config::Config, threads};
 use axum::{
     routing::{delete, get, post},
     serve, Extension, Router,
 };
 use log::info;
 use std::{net::SocketAddr, sync::Arc};
-use tokio::{net::TcpListener, sync::broadcast::Sender};
+use tokio::{net::TcpListener, sync::mpsc};
 
-pub mod assets;
-
-pub async fn run(app_config: Arc<Config>, broadcast_sender: Sender<BroadcastMessage>) {
+pub async fn run(
+    app_config: Arc<Config>,
+    asset_status_sender: mpsc::Sender<threads::data::asset_status::Message>,
+) {
     let app = Router::new()
         .route("/assets", get(assets::get))
         .route("/assets/:symbol", get(assets::get_where_symbol))
         .route("/assets", post(assets::add))
         .route("/assets/:symbol", delete(assets::delete))
         .layer(Extension(app_config))
-        .layer(Extension(broadcast_sender));
+        .layer(Extension(asset_status_sender));
 
     let addr = SocketAddr::from(([0, 0, 0, 0], 7878));
     let listener = TcpListener::bind(addr).await.unwrap();