feat: query by timestamp

Author: EvolveArt

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

@@ -47,18 +47,18 @@ pub async fn get_entry(
         }));
     }
 
-    // Get entries from database with given pair id (only the latest one grouped by publisher)
-    let entry = entry_repository::get_median_price(&state.pool, pair_id.clone(), params.interval)
-        .await
-        .map_err(|db_error| to_entry_error(db_error, pair_id.clone()))?;
+    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 decimals = entry_repository::get_decimals(&state.pool, &pair_id)
         .await
-        .map_err(|db_error| match db_error {
-            InfraError::InternalServerError => EntryError::InternalServerError,
-            InfraError::NotFound => EntryError::NotFound(pair_id.clone()),
-            InfraError::InvalidTimeStamp => EntryError::InvalidTimestamp,
-        })?;
+        .map_err(|db_error| to_entry_error(db_error, &pair_id))?;
 
     Ok(Json(adapt_entry_to_entry_response(
         pair_id, &entry, decimals,
@@ -86,7 +86,7 @@ fn adapt_entry_to_entry_response(
     }
 }
 
-fn to_entry_error(error: InfraError, pair_id: String) -> EntryError {
+fn to_entry_error(error: InfraError, pair_id: &String) -> EntryError {
     match error {
         InfraError::InternalServerError => EntryError::InternalServerError,
         InfraError::NotFound => EntryError::NotFound(pair_id.to_string()),

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

@@ -85,6 +85,7 @@ pub async fn get_median_price(
     pool: &deadpool_diesel::postgres::Pool,
     pair_id: String,
     interval: Interval,
+    time: NaiveDateTime,
 ) -> Result<MedianEntry, InfraError> {
     let conn = pool.get().await.map_err(adapt_infra_error)?;
 
@@ -100,6 +101,8 @@ pub async fn get_median_price(
             price_1_min_agg
         WHERE
             pair_id = $1
+            AND
+            time <= $2
         ORDER BY
             time DESC
         LIMIT 1;
@@ -116,6 +119,8 @@ pub async fn get_median_price(
             price_15_min_agg
         WHERE
             pair_id = $1
+            AND
+            time <= $2
         ORDER BY
             time DESC
         LIMIT 1;
@@ -132,6 +137,8 @@ pub async fn get_median_price(
             price_1_hour_agg
         WHERE
             pair_id = $1
+            AND
+            time <= $2
         ORDER BY
             time DESC
         LIMIT 1;
@@ -143,6 +150,7 @@ pub async fn get_median_price(
         .interact(move |conn| {
             diesel::sql_query(raw_sql)
                 .bind::<diesel::sql_types::Text, _>(pair_id)
+                .bind::<diesel::sql_types::Timestamptz, _>(time)
                 .load::<MedianEntryRaw>(conn)
         })
         .await