Refactoring (#15)

Reviewed-on: #15

.gitea/workflows/pr.yml

@@ -14,10 +14,10 @@ jobs:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
@@ -33,10 +33,10 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.96.1
       - run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
       - run: |
@@ -53,10 +53,10 @@ jobs:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.96.1
       - run: rustup component add clippy
       - uses: Swatinem/rust-cache@v2
       - run: |

Cargo.toml

@@ -1,18 +1,16 @@
 [package]
 name = "catapult"
-version = "0.3.0"
+version = "0.3.3"
-rust-version = "1.96"
+rust-version = "1.96.1"
 edition = "2024"
 
 [dependencies]
 tokio = { version = "1.52.3", features = ["full"] }
-futures = { version = "0.3.32" }
 reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] }
-serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.150" }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
+time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"] }
 uuid = { version = "1.23.3", features = ["v4", "serde"] }
-textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.1" }
-swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.2.0" }
+swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.5.2" }
 
 [dev-dependencies]

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build the application
-FROM rust:1.96 as builder
+FROM rust:1.96.1 as builder
 
 # Set the working directory inside the container
 WORKDIR /usr/src/app

src/app.rs

@@ -12,23 +12,21 @@ pub struct App {
     pub twilio_config: textsender_models::config::auxiliary::TwilioConfig,
 }
 
-// TODO: Change this to non-async at some point.
+pub fn load_app() -> Result<App, std::io::Error> {
-// Will require changes in other libraries
-pub async fn load_app() -> Result<App, std::io::Error> {
     use textsender_models::envy;
-    let auth_url_env = envy::environment::get_env("AUTH_URL").await;
+    let auth_url_env = envy::environment::get_env("AUTH_URL");
-    let api_url_env = envy::environment::get_env("API_URL").await;
+    let api_url_env = envy::environment::get_env("API_URL");
-    let service_username_env = envy::environment::get_env("SERVICE_USERNAME").await;
+    let service_username_env = envy::environment::get_env("SERVICE_USERNAME");
-    let service_passphrase_env = envy::environment::get_env("SERVICE_PASSPHRASE").await;
+    let service_passphrase_env = envy::environment::get_env("SERVICE_PASSPHRASE");
 
     let envs = vec![
-        api_url_env,
+        &api_url_env,
-        auth_url_env,
+        &auth_url_env,
-        service_username_env,
+        &service_username_env,
-        service_passphrase_env,
+        &service_passphrase_env,
     ];
 
-    let check_envs = |vs: &Vec<envy::EnvVar>| -> (bool, Option<String>) {
+    let check_envs = |vs: &Vec<&envy::EnvVar>| -> (bool, Option<String>) {
         for env in vs {
             if env.value.is_empty() {
                 return (false, Some(format!("Key {} is not provided", env.key)));
@@ -38,19 +36,25 @@ pub async fn load_app() -> Result<App, std::io::Error> {
     };
 
     let (envs_valid, reason) = check_envs(&envs);
-
     if envs_valid {
-        match textsender_models::config::auxiliary::load_config().await {
+        let auth_url: String = auth_url_env.value;
+        let api_url: String = api_url_env.value;
+        let service_username: String = service_username_env.value;
+        let service_passphrase: String = service_passphrase_env.value;
+        match textsender_models::config::auxiliary::load_config() {
             Ok(twilio_config) => Ok(App {
-                api_url: envs[0].value.clone(),
+                api_url,
-                auth_url: envs[1].value.clone(),
+                auth_url,
-                service_username: envs[2].value.clone(),
+                service_username,
-                service_passphrase: envs[3].value.clone(),
+                service_passphrase,
                 twilio_config,
             }),
             Err(err) => Err(err),
         }
     } else {
-        Err(std::io::Error::other(reason.unwrap()))
+        match reason {
+            Some(reason) => Err(std::io::Error::other(reason)),
+            None => Err(std::io::Error::other("No reason found")),
+        }
     }
 }

src/main.rs

@@ -6,8 +6,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         std::process::exit(-1);
     }
 
-    let app = match catapult::app::load_app().await {
+    let app = match catapult::app::load_app() {
-        Ok(app) => app,
+        Ok(app) => std::sync::Arc::new(app),
         Err(err) => {
             eprintln!("Error: {err:?}");
             std::process::exit(-1);
@@ -16,9 +16,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     println!("App: {app:?}");
 
-    let auth = catapult::service::auth::Auth { app: app.clone() };
+    let auth = catapult::service::auth::Auth {
+        app: std::sync::Arc::clone(&app),
+    };
     let token = match auth.get_token().await {
-        Ok(token) => token,
+        Ok(token) => std::sync::Arc::new(token),
         Err(err) => {
             eprintln!("Error getting token");
             eprintln!("Error: {err:?}");
@@ -27,8 +29,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let mut svc = catapult::service::core::Service {
-        app: app.clone(),
+        app: std::sync::Arc::clone(&app),
-        token,
+        token: std::sync::Arc::clone(&token),
     };
 
     loop {
@@ -36,7 +38,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             match auth.get_refresh_token(&svc.token).await {
                 Ok(refresh) => {
                     println!("Refresh token: {refresh:?}");
-                    svc.token = refresh;
+                    let refreshed = std::sync::Arc::new(refresh);
+                    svc.token = refreshed;
                 }
                 Err(err) => {
                     eprintln!("Error: {err:?}");

src/service/auth.rs

@@ -1,5 +1,5 @@
 pub struct Auth {
-    pub app: crate::app::App,
+    pub app: std::sync::Arc<crate::app::App>,
 }
 
 impl Auth {

src/service/contact.rs

@@ -1,6 +1,6 @@
 pub struct Contact {
-    pub app: crate::app::App,
+    pub app: std::sync::Arc<crate::app::App>,
-    pub token: textsender_models::token::LoginResult,
+    pub token: std::sync::Arc<textsender_models::token::LoginResult>,
 }
 
 impl Contact {

src/service/core.rs

@@ -1,18 +1,17 @@
 pub struct Service {
-    pub app: crate::app::App,
+    pub app: std::sync::Arc<crate::app::App>,
-    pub token: textsender_models::token::Login,
+    pub token: std::sync::Arc<textsender_models::token::Login>,
 }
 
 impl Service {
     pub async fn do_the_work(&mut self) {
-        println!("Do some work");
         println!("Checking queue");
 
         use textsender_models::message::scheduling::ScheduledMessage;
 
         let queue = super::queue::Queue {
-            app: self.app.clone(),
+            app: std::sync::Arc::clone(&self.app),
-            token: self.token.clone(),
+            token: std::sync::Arc::clone(&self.token),
         };
         let queue_item: Option<ScheduledMessage> = match queue.get_queue().await {
             Ok(item) => Some(item),
@@ -38,8 +37,8 @@ impl Service {
         println!("Can schedule");
 
         let events_req = super::event::Event {
-            app: self.app.clone(),
+            app: std::sync::Arc::clone(&self.app),
-            token: self.token.clone(),
+            token: std::sync::Arc::clone(&self.token),
         };
 
         let scheduled_message_id = queue_item.id;
@@ -52,23 +51,31 @@ impl Service {
         };
 
         let contacts = super::contact::Contact {
-            app: self.app.clone(),
+            app: std::sync::Arc::clone(&self.app),
-            token: self.token.clone(),
+            token: std::sync::Arc::clone(&self.token),
         };
         let messages = super::message::Message {
-            app: self.app.clone(),
+            app: std::sync::Arc::clone(&self.app),
-            token: self.token.clone(),
+            token: std::sync::Arc::clone(&self.token),
         };
         let sch_msg = super::scheduler::ScheduledMessage {
-            app: self.app.clone(),
+            app: std::sync::Arc::clone(&self.app),
-            token: self.token.clone(),
+            token: std::sync::Arc::clone(&self.token),
         };
         let mer_req = super::mer::MessageEventResponse {
-            app: self.app.clone(),
+            app: std::sync::Arc::clone(&self.app),
-            token: self.token.clone(),
+            token: std::sync::Arc::clone(&self.token),
         };
 
         let events = events.unwrap_or_default();
+        let mut sendmsg = swoosh::SendMsg::default();
+        sendmsg.load_config(
+            &self.app.twilio_config.auth_token,
+            &self.app.twilio_config.phone_number,
+            &self.app.twilio_config.service_sid,
+            &self.app.twilio_config.account_sid,
+        );
+
         for event in &events {
             println!("Event: {event:?}");
             let contact = &match contacts.get(&event.contact_id).await {
@@ -105,8 +112,10 @@ impl Service {
             let twilio_config = &self.app.twilio_config;
             println!("Config: {twilio_config:?}");
             println!("SM: {scheduled_message:?}");
+            sendmsg.load_message(&message.content);
+            sendmsg.load_recipient(&contact.phone_number);
 
-            match swoosh::twilio::api::send_message(message, contact, &param, twilio_config).await {
+            match sendmsg.send_message(&param).await {
                 Ok(resp) => {
                     println!("Message scheduled");
                     // MER response
@@ -138,39 +147,14 @@ impl Service {
                 }
             }
         }
-
-        /*
-        todo!(
-            r#"
-        Need to finish this
-
-        [X] - This function should fetch a token, check if the token is valid, and obtain a refresh token if
-        it has expired.
-
-        Then do the real work.
-
-        1. Check the queue - Done
-        2. If there is an item, get the data - Done
-        3. Evaluate if it is schedulable - Done
-        4. Get the events and iterate each one - Done
-        5. Starting with the message - Done
-        6. Get the contact - Done
-        7. Send the message
-        8. Record the message event response - Added, not used
-        9. Add to scheduler
-            "#
-        );
-        */
     }
 
     fn is_schedulable(
         &self,
         queue_item: &textsender_models::message::scheduling::ScheduledMessage,
     ) -> bool {
-        let now = time::OffsetDateTime::now_utc();
-
         match queue_item.scheduled {
-            Some(date) => date > now,
+            Some(date) => date > time::OffsetDateTime::now_utc(),
             None => false,
         }
     }

src/service/event.rs

@@ -1,6 +1,6 @@
 pub struct Event {
-    pub app: crate::app::App,
+    pub app: std::sync::Arc<crate::app::App>,
-    pub token: textsender_models::token::LoginResult,
+    pub token: std::sync::Arc<textsender_models::token::LoginResult>,
 }
 
 impl Event {

src/service/mer.rs

@@ -1,6 +1,6 @@
 pub struct MessageEventResponse {
-    pub app: crate::app::App,
+    pub app: std::sync::Arc<crate::app::App>,
-    pub token: textsender_models::token::LoginResult,
+    pub token: std::sync::Arc<textsender_models::token::LoginResult>,
 }
 
 impl MessageEventResponse {

src/service/message.rs

@@ -1,6 +1,6 @@
 pub struct Message {
-    pub app: crate::app::App,
+    pub app: std::sync::Arc<crate::app::App>,
-    pub token: textsender_models::token::LoginResult,
+    pub token: std::sync::Arc<textsender_models::token::LoginResult>,
 }
 
 impl Message {

src/service/queue.rs

@@ -1,6 +1,6 @@
 pub struct Queue {
-    pub app: crate::app::App,
+    pub app: std::sync::Arc<crate::app::App>,
-    pub token: textsender_models::token::LoginResult,
+    pub token: std::sync::Arc<textsender_models::token::LoginResult>,
 }
 
 impl Queue {

src/service/scheduler.rs

@@ -1,6 +1,6 @@
 pub struct ScheduledMessage {
-    pub app: crate::app::App,
+    pub app: std::sync::Arc<crate::app::App>,
-    pub token: textsender_models::token::LoginResult,
+    pub token: std::sync::Arc<textsender_models::token::LoginResult>,
 }
 
 impl ScheduledMessage {