fix: optional query params

Author: EvolveArt

pragma-node/src/handlers/entries/get_entry.rs

@@ -2,7 +2,7 @@ use axum::extract::{Query, State};
 use axum::Json;
 use bigdecimal::num_bigint::ToBigInt;
 
-use crate::handlers::entries::GetEntryResponse;
+use crate::handlers::entries::{GetEntryResponse, Interval};
 use crate::infra::repositories::entry_repository::{self, MedianEntry};
 use crate::utils::PathExtractor;
 use crate::AppState;
@@ -31,8 +31,22 @@ pub async fn get_entry(
     // Construct pair id
     let pair_id = currency_pair_to_pair_id(&pair.1, &pair.0);
 
+    let now = chrono::Utc::now().naive_utc().timestamp_millis() as u64;
+
+    let timestamp = if let Some(timestamp) = params.timestamp {
+        timestamp
+    } else {
+        now
+    };
+
+    let interval = if let Some(interval) = params.interval {
+        interval
+    } else {
+        Interval::OneMinute
+    };
+
     // Validate given timestamp
-    if params.timestamp > chrono::Utc::now().naive_utc() {
+    if timestamp > now {
         return Err(EntryError::InvalidTimestamp);
     }
 
@@ -47,14 +61,10 @@ pub async fn get_entry(
         }));
     }
 
-    let entry = entry_repository::get_median_price(
-        &state.pool,
-        pair_id.clone(),
-        params.interval,
-        params.timestamp,
-    )
-    .await
-    .map_err(|db_error| to_entry_error(db_error, &pair_id))?;
+    let entry =
+        entry_repository::get_median_price(&state.pool, pair_id.clone(), interval, timestamp)
+            .await
+            .map_err(|db_error| to_entry_error(db_error, &pair_id))?;
 
     let decimals = entry_repository::get_decimals(&state.pool, &pair_id)
         .await

pragma-node/src/handlers/entries/mod.rs

@@ -1,4 +1,3 @@
-use chrono::NaiveDateTime;
 use serde::{Deserialize, Serialize};
 
 use starknet::core::types::FieldElement;
@@ -72,15 +71,15 @@ pub enum Interval {
 
 #[derive(Debug, Deserialize)]
 pub struct GetEntryParams {
-    pub timestamp: NaiveDateTime,
-    pub interval: Interval,
+    pub timestamp: Option<u64>,
+    pub interval: Option<Interval>,
 }
 
 impl Default for GetEntryParams {
     fn default() -> Self {
         Self {
-            timestamp: chrono::Utc::now().naive_utc(),
-            interval: Interval::default(),
+            timestamp: Some(chrono::Utc::now().timestamp_millis() as u64),
+            interval: Some(Interval::default()),
         }
     }
 }

pragma-node/src/infra/repositories/entry_repository.rs

@@ -85,7 +85,7 @@ pub async fn get_median_price(
     pool: &deadpool_diesel::postgres::Pool,
     pair_id: String,
     interval: Interval,
-    time: NaiveDateTime,
+    time: u64,
 ) -> Result<MedianEntry, InfraError> {
     let conn = pool.get().await.map_err(adapt_infra_error)?;
 
@@ -102,7 +102,7 @@ pub async fn get_median_price(
         WHERE
             pair_id = $1
             AND
-            time <= $2
+            bucket <= $2
         ORDER BY
             time DESC
         LIMIT 1;
@@ -120,7 +120,7 @@ pub async fn get_median_price(
         WHERE
             pair_id = $1
             AND
-            time <= $2
+            bucket <= $2
         ORDER BY
             time DESC
         LIMIT 1;
@@ -134,23 +134,26 @@ pub async fn get_median_price(
             median_price,
             num_sources
         FROM
-            price_1_hour_agg
+            price_1_h_agg
         WHERE
             pair_id = $1
             AND
-            time <= $2
+            bucket <= $2
         ORDER BY
             time DESC
         LIMIT 1;
     "#
         }
     };
 
+    let date_time =
+        NaiveDateTime::from_timestamp_millis(time as i64).ok_or(InfraError::InvalidTimeStamp)?;
+
     let raw_entry = conn
         .interact(move |conn| {
             diesel::sql_query(raw_sql)
                 .bind::<diesel::sql_types::Text, _>(pair_id)
-                .bind::<diesel::sql_types::Timestamptz, _>(time)
+                .bind::<diesel::sql_types::Timestamptz, _>(date_time)
                 .load::<MedianEntryRaw>(conn)
         })
         .await