From 6010de978d7c605fcbf9de3491584200a5288d82 Mon Sep 17 00:00:00 2001 From: Mark Sinclair Date: Wed, 13 Nov 2024 11:03:50 +0000 Subject: [PATCH] data-observatory: renamed `transactions` to `payments` because there is already `transaction` in the base scraper schema --- .../migrations/002_payment_transactions.sql | 2 +- nym-data-observatory/src/db/models.rs | 2 +- nym-data-observatory/src/db/queries/payments.rs | 4 ++-- nym-data-observatory/src/http/api_docs.rs | 6 +++++- nym-data-observatory/src/payment_listener/mod.rs | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/nym-data-observatory/migrations/002_payment_transactions.sql b/nym-data-observatory/migrations/002_payment_transactions.sql index 7ba3b0c8e2..77fa6bc83a 100644 --- a/nym-data-observatory/migrations/002_payment_transactions.sql +++ b/nym-data-observatory/migrations/002_payment_transactions.sql @@ -1,4 +1,4 @@ -CREATE TABLE transactions ( +CREATE TABLE payments ( id INTEGER PRIMARY KEY AUTOINCREMENT, transaction_hash TEXT NOT NULL UNIQUE, sender_address TEXT NOT NULL, diff --git a/nym-data-observatory/src/db/models.rs b/nym-data-observatory/src/db/models.rs index 24d04de5f1..8ad20e97c0 100644 --- a/nym-data-observatory/src/db/models.rs +++ b/nym-data-observatory/src/db/models.rs @@ -31,7 +31,7 @@ pub(crate) struct PriceHistory { } #[derive(Serialize, Deserialize, Debug, ToSchema)] -pub(crate) struct PaymentTransaction { +pub(crate) struct PaymentRecord { pub(crate) transaction_hash: String, pub(crate) sender_address: String, pub(crate) receiver_address: String, diff --git a/nym-data-observatory/src/db/queries/payments.rs b/nym-data-observatory/src/db/queries/payments.rs index cb9fae1f7f..c7757d6e67 100644 --- a/nym-data-observatory/src/db/queries/payments.rs +++ b/nym-data-observatory/src/db/queries/payments.rs @@ -2,7 +2,7 @@ use crate::db::DbPool; use anyhow::Result; pub async fn get_last_checked_height(pool: &DbPool) -> Result { - let result = sqlx::query_scalar!("SELECT MAX(height) FROM transactions") + let result = sqlx::query_scalar!("SELECT MAX(height) FROM payments") .fetch_one(pool) .await?; Ok(result.unwrap_or(0)) @@ -21,7 +21,7 @@ pub async fn insert_payment( sqlx::query!( r#" - INSERT INTO transactions ( + INSERT INTO payments ( transaction_hash, sender_address, receiver_address, amount, height, timestamp, memo ) VALUES (?, ?, ?, ?, ?, ?, ?) diff --git a/nym-data-observatory/src/http/api_docs.rs b/nym-data-observatory/src/http/api_docs.rs index ec77e3745c..c7dbe0118d 100644 --- a/nym-data-observatory/src/http/api_docs.rs +++ b/nym-data-observatory/src/http/api_docs.rs @@ -6,5 +6,9 @@ use utoipauto::utoipauto; // https://github.com/ProbablyClem/utoipauto/issues/13#issuecomment-1974911829 #[utoipauto(paths = "./nym-data-observatory/src")] #[derive(OpenApi)] -#[openapi(info(title = "Nym API"), tags(), components(schemas()))] +#[openapi( + info(title = "Nym Data Observatory API"), + tags(), + components(schemas()) +)] pub(super) struct ApiDoc; diff --git a/nym-data-observatory/src/payment_listener/mod.rs b/nym-data-observatory/src/payment_listener/mod.rs index 4158e65a0d..7006b413e6 100644 --- a/nym-data-observatory/src/payment_listener/mod.rs +++ b/nym-data-observatory/src/payment_listener/mod.rs @@ -37,7 +37,7 @@ pub(crate) async fn run_payment_listener( .await?; for tx in transactions { - println!("Processing transaction: {}", tx.hash); + tracing::info!("Processing transaction: {}", tx.hash); if let Some(raw_log) = tx.raw_log.as_deref() { if let Some(transfer) = parse_transfer_from_raw_log(raw_log)? { if transfer.recipient == payment_receive_address {