chore: move express-request and transaction reversal to builder pattern

.gitignore

@@ -2,4 +2,6 @@
 /.idea
 Cargo.lock
 .env
-.DS_Store
+.DS_Store
+
+.vscode

Cargo.toml

@@ -9,28 +9,6 @@ repository = "https://github.com/collinsmuriuki/mpesa-rust"
 readme = "./README.md"
 license = "MIT"
 
-[dependencies]
-cached = { version = "0.46", features = ["wasm", "async", "proc_macro"] }
-chrono = { version = "0.4", optional = true, default-features = false, features = [
-	"clock",
-	"serde",
-] }
-openssl = { version = "0.10", optional = true }
-reqwest = { version = "0.11", features = ["json"] }
-derive_builder = "0.12"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-serde_repr = "0.1"
-thiserror = "1.0.37"
-wiremock = "0.5"
-secrecy = "0.8.0"
-serde-aux = "4.2.0"
-
-[dev-dependencies]
-dotenv = "0.15"
-tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
-wiremock = "0.5"
-
 [features]
 default = [
 	"account_balance",
@@ -42,7 +20,7 @@ default = [
 	"express_request",
 	"transaction_reversal",
 	"transaction_status",
-	"dynamic_qr"
+	"dynamic_qr",
 ]
 dynamic_qr = []
 account_balance = ["dep:openssl"]
@@ -54,3 +32,28 @@ c2b_simulate = []
 express_request = ["dep:chrono"]
 transaction_reversal = ["dep:openssl"]
 transaction_status = ["dep:openssl"]
+
+
+[dependencies]
+cached = { version = "0.46", features = ["wasm", "async", "proc_macro"] }
+chrono = { version = "0.4", optional = true, default-features = false, features = [
+	"clock",
+	"serde",
+] }
+openssl = { version = "0.10", optional = true }
+reqwest = { version = "0.11", features = ["json"] }
+derive_builder = "0.12"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_repr = "0.1"
+thiserror = "1.0"
+secrecy = "0.8"
+serde-aux = "4.2"
+url = { version = "2", features = ["serde"] }
+regex = { version = "1.10", default-features = false, features = ["std"] }
+
+
+[dev-dependencies]
+dotenv = "0.15"
+tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
+wiremock = "0.5"

src/client.rs

@@ -1,4 +1,5 @@
 use std::cell::RefCell;
+use std::time::Duration;
 
 use cached::Cached;
 use openssl::base64;
@@ -13,9 +14,10 @@ use crate::auth::AUTH;
 use crate::environment::ApiEnvironment;
 use crate::services::{
     AccountBalanceBuilder, B2bBuilder, B2cBuilder, BulkInvoiceBuilder, C2bRegisterBuilder,
-    C2bSimulateBuilder, CancelInvoiceBuilder, DynamicQR, DynamicQRBuilder,
-    MpesaExpressRequestBuilder, OnboardBuilder, OnboardModifyBuilder, ReconciliationBuilder,
-    SingleInvoiceBuilder, TransactionReversalBuilder, TransactionStatusBuilder,
+    C2bSimulateBuilder, CancelInvoiceBuilder, DynamicQR, DynamicQRBuilder, MpesaExpress,
+    MpesaExpressBuilder, OnboardBuilder, OnboardModifyBuilder, ReconciliationBuilder,
+    SingleInvoiceBuilder, TransactionReversal, TransactionReversalBuilder,
+    TransactionStatusBuilder,
 };
 use crate::{auth, MpesaResult};
 
@@ -47,15 +49,15 @@ impl<'mpesa, Env: ApiEnvironment> Mpesa<Env> {
     /// ```
     ///
     /// # Panics
-    /// This method can panic if a TLS backend cannot be initialized for the internal http_client
+    /// This method can panic if a TLS backend cannot be initialized for the
+    /// internal http_client
     pub fn new<S: Into<String>>(client_key: S, client_secret: S, environment: Env) -> Self {
         let http_client = HttpClient::builder()
-            .connect_timeout(std::time::Duration::from_millis(10_000))
+            .connect_timeout(Duration::from_secs(10))
             .user_agent(format!("mpesa-rust@{CARGO_PACKAGE_VERSION}"))
-            // TODO: Potentialy return a `Result` enum from Mpesa::new?
-            //       Making assumption that creation of http client cannot fail
             .build()
             .expect("Error building http client");
+
         Self {
             client_key: client_key.into(),
             client_secret: Secret::new(client_secret.into()),
@@ -71,6 +73,7 @@ impl<'mpesa, Env: ApiEnvironment> Mpesa<Env> {
         let Some(p) = &*self.initiator_password.borrow() else {
             return DEFAULT_INITIATOR_PASSWORD.to_owned();
         };
+
         p.expose_secret().into()
     }
 
@@ -466,23 +469,17 @@ impl<'mpesa, Env: ApiEnvironment> Mpesa<Env> {
     ///    .send();
     /// ```
     #[cfg(feature = "express_request")]
-    pub fn express_request(
-        &'mpesa self,
-        business_short_code: &'mpesa str,
-    ) -> MpesaExpressRequestBuilder<'mpesa, Env> {
-        MpesaExpressRequestBuilder::new(self, business_short_code)
+    pub fn express_request(&'mpesa self) -> MpesaExpressBuilder<'mpesa, Env> {
+        MpesaExpress::builder(self)
     }
 
     ///**Transaction Reversal Builder**
     /// Reverses a B2B, B2C or C2B M-Pesa transaction.
     ///
     /// See more from the Safaricom API docs [here](https://developer.safaricom.co.ke/Documentation)
     #[cfg(feature = "transaction_reversal")]
-    pub fn transaction_reversal(
-        &'mpesa self,
-        initiator_name: &'mpesa str,
-    ) -> TransactionReversalBuilder<'mpesa, Env> {
-        TransactionReversalBuilder::new(self, initiator_name)
+    pub fn transaction_reversal(&'mpesa self) -> TransactionReversalBuilder<'mpesa, Env> {
+        TransactionReversal::builder(self)
     }
 
     ///**Transaction Status Builder**

src/constants.rs

@@ -7,7 +7,7 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 use crate::MpesaError;
 
 /// Mpesa command ids
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 pub enum CommandId {
     TransactionReversal,
     SalaryPayment,
@@ -39,6 +39,7 @@ pub enum IdentifierTypes {
     MSISDN = 1,
     TillNumber = 2,
     ShortCode = 4,
+    Reversal = 11,
 }
 
 impl Display for IdentifierTypes {

src/errors.rs

@@ -63,3 +63,9 @@ impl From<derive_builder::UninitializedFieldError> for MpesaError {
         Self::BuilderError(BuilderError::UninitializedField(e.field_name()))
     }
 }
+
+impl From<url::ParseError> for MpesaError {
+    fn from(e: url::ParseError) -> Self {
+        Self::BuilderError(BuilderError::ValidationError(e.to_string()))
+    }
+}

src/lib.rs

@@ -6,6 +6,7 @@ mod constants;
 pub mod environment;
 mod errors;
 pub mod services;
+pub mod validator;
 
 pub use client::Mpesa;
 pub use constants::{
@@ -14,4 +15,4 @@ pub use constants::{
 };
 pub use environment::ApiEnvironment;
 pub use environment::Environment::{self, Production, Sandbox};
-pub use errors::{MpesaError, MpesaResult, ResponseError};
+pub use errors::{BuilderError, MpesaError, MpesaResult, ResponseError};