refactor(currency_conversion): re frame the currency_conversion crate to make api calls on background thread

config/config.example.toml

@@ -75,13 +75,10 @@ max_feed_count = 200              # The maximum number of frames that will be fe
 
 # This section provides configs for currency conversion api
 [forex_api]
-call_delay = 21600                # Api calls are made after every 6 hrs
-local_fetch_retry_count = 5       # Fetch from Local cache has retry count as 5
-local_fetch_retry_delay = 1000    # Retry delay for checking write condition
-api_timeout = 20000               # Api timeouts once it crosses 20000 ms
-api_key = "YOUR API KEY HERE"     # Api key for making request to foreign exchange Api
-fallback_api_key = "YOUR API KEY" # Api key for the fallback service
-redis_lock_timeout = 26000        # Redis remains write locked for 26000 ms once the acquire_redis_lock is called
+call_delay = 21600                # Expiration time for data in cache as well as redis in seconds
+api_key = ""                      # Api key for making request to foreign exchange Api
+fallback_api_key = ""             # Api key for the fallback service
+redis_lock_timeout = 100          # Redis remains write locked for 100 s once the acquire_redis_lock is called
 
 # Logging configuration. Logging can be either to file or console or both.
 

config/deployments/env_specific.toml

@@ -101,13 +101,10 @@ bucket_name = "bucket"   # The AWS S3 bucket name for file storage
 
 # This section provides configs for currency conversion api
 [forex_api]
-call_delay = 21600                # Api calls are made after every 6 hrs
-local_fetch_retry_count = 5       # Fetch from Local cache has retry count as 5
-local_fetch_retry_delay = 1000    # Retry delay for checking write condition
-api_timeout = 20000               # Api timeouts once it crosses 20000 ms
-api_key = "YOUR API KEY HERE"     # Api key for making request to foreign exchange Api
-fallback_api_key = "YOUR API KEY" # Api key for the fallback service
-redis_lock_timeout = 26000        # Redis remains write locked for 26000 ms once the acquire_redis_lock is called
+call_delay = 21600                # Expiration time for data in cache as well as redis in seconds
+api_key = ""                      # Api key for making request to foreign exchange Api
+fallback_api_key = ""             # Api key for the fallback service
+redis_lock_timeout = 100          # Redis remains write locked for 100 s once the acquire_redis_lock is called
 
 [jwekey] # 3 priv/pub key pair
 vault_encryption_key = ""       # public key in pem format, corresponding private key in rust locker

config/development.toml

@@ -78,12 +78,9 @@ ttl_for_storage_in_secs = 220752000
 
 [forex_api]
 call_delay = 21600
-local_fetch_retry_count = 5
-local_fetch_retry_delay = 1000
-api_timeout = 20000
-api_key = "YOUR API KEY HERE"
-fallback_api_key = "YOUR API KEY HERE"
-redis_lock_timeout = 26000
+api_key = ""
+fallback_api_key = ""
+redis_lock_timeout = 100
 
 [jwekey]
 vault_encryption_key = ""

config/docker_compose.toml

@@ -31,12 +31,9 @@ pool_size = 5
 
 [forex_api]
 call_delay = 21600
-local_fetch_retry_count = 5
-local_fetch_retry_delay = 1000
-api_timeout = 20000
-api_key = "YOUR API KEY HERE"
-fallback_api_key = "YOUR API KEY HERE"
-redis_lock_timeout = 26000
+api_key = ""
+fallback_api_key = ""
+redis_lock_timeout = 100
 
 [replica_database]
 username = "db_user"

crates/analytics/docs/README.md

@@ -115,8 +115,8 @@ To configure the Forex APIs, update the `config/development.toml` or `config/doc
 
 ```toml
 [forex_api]
-api_key = "YOUR API KEY HERE" # Replace the placeholder with your Primary API Key
-fallback_api_key = "YOUR API KEY HERE" # Replace the placeholder with your Fallback API Key 
+api_key = "" # Replace the placeholder with your Primary API Key
+fallback_api_key = "" # Replace the placeholder with your Fallback API Key 
 ```
 ### Important Note
 ```bash
@@ -159,4 +159,4 @@ To view the data on the OpenSearch dashboard perform the following steps:
 - Select a time field that will be used for time-based queries
 - Save the index pattern
 
-Now, head on to `Discover` under the `OpenSearch Dashboards` tab, to select the newly created index pattern and query the data
+Now, head on to `Discover` under the `OpenSearch Dashboards` tab, to select the newly created index pattern and query the data

crates/router/src/configs/settings.rs

@@ -299,16 +299,11 @@ pub struct PaymentLink {
 #[derive(Debug, Deserialize, Clone, Default)]
 #[serde(default)]
 pub struct ForexApi {
-    pub local_fetch_retry_count: u64,
     pub api_key: Secret<String>,
     pub fallback_api_key: Secret<String>,
-    /// in ms
+    /// in s
     pub call_delay: i64,
-    /// in ms
-    pub local_fetch_retry_delay: u64,
-    /// in ms
-    pub api_timeout: u64,
-    /// in ms
+    /// in s
     pub redis_lock_timeout: u64,
 }
 

crates/router/src/core/currency.rs

@@ -15,16 +15,11 @@ pub async fn retrieve_forex(
 ) -> CustomResult<ApplicationResponse<currency::FxExchangeRatesCacheEntry>, ApiErrorResponse> {
     let forex_api = state.conf.forex_api.get_inner();
     Ok(ApplicationResponse::Json(
-        get_forex_rates(
-            &state,
-            forex_api.call_delay,
-            forex_api.local_fetch_retry_delay,
-            forex_api.local_fetch_retry_count,
-        )
-        .await
-        .change_context(ApiErrorResponse::GenericNotFoundError {
-            message: "Unable to fetch forex rates".to_string(),
-        })?,
+        get_forex_rates(&state, forex_api.call_delay)
+            .await
+            .change_context(ApiErrorResponse::GenericNotFoundError {
+                message: "Unable to fetch forex rates".to_string(),
+            })?,
     ))
 }
 
@@ -53,14 +48,9 @@ pub async fn get_forex_exchange_rates(
     state: SessionState,
 ) -> CustomResult<ExchangeRates, AnalyticsError> {
     let forex_api = state.conf.forex_api.get_inner();
-    let rates = get_forex_rates(
-        &state,
-        forex_api.call_delay,
-        forex_api.local_fetch_retry_delay,
-        forex_api.local_fetch_retry_count,
-    )
-    .await
-    .change_context(AnalyticsError::ForexFetchFailed)?;
+    let rates = get_forex_rates(&state, forex_api.call_delay)
+        .await
+        .change_context(AnalyticsError::ForexFetchFailed)?;
 
     Ok((*rates.data).clone())
 }