0.7.27 +Refactor
This commit is contained in:
@@ -1,27 +1,27 @@
|
||||
// file: kb_lib/src/db/queries/pair_analytic_signal.rs
|
||||
|
||||
//! Queries for `kb_pair_analytic_signals`.
|
||||
//! Queries for `k_sol_pair_analytic_signals`.
|
||||
|
||||
/// Inserts or updates one pair-analytic-signal row and returns its stable internal id.
|
||||
pub async fn upsert_pair_analytic_signal(
|
||||
database: &crate::KbDatabase,
|
||||
dto: &crate::KbPairAnalyticSignalDto,
|
||||
) -> Result<i64, crate::KbError> {
|
||||
pub async fn query_pair_analytic_signals_upsert(
|
||||
database: &crate::Database,
|
||||
dto: &crate::PairAnalyticSignalDto,
|
||||
) -> Result<i64, crate::Error> {
|
||||
let signal_value_json_result = serde_json::to_string(&dto.signal_value);
|
||||
let signal_value_json = match signal_value_json_result {
|
||||
Ok(signal_value_json) => signal_value_json,
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot serialize pair analytic signal payload: {}",
|
||||
error
|
||||
)));
|
||||
},
|
||||
};
|
||||
match database.connection() {
|
||||
crate::KbDatabaseConnection::Sqlite(pool) => {
|
||||
crate::DatabaseConnection::Sqlite(pool) => {
|
||||
let query_result = sqlx::query(
|
||||
r#"
|
||||
INSERT INTO kb_pair_analytic_signals (
|
||||
INSERT INTO k_sol_pair_analytic_signals (
|
||||
pair_id,
|
||||
signal_kind,
|
||||
severity,
|
||||
@@ -57,15 +57,15 @@ ON CONFLICT(pair_id, signal_kind, timeframe_seconds, bucket_start_unix) DO UPDAT
|
||||
.execute(pool)
|
||||
.await;
|
||||
if let Err(error) = query_result {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
"cannot upsert kb_pair_analytic_signals on sqlite: {}",
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot upsert k_sol_pair_analytic_signals on sqlite: {}",
|
||||
error
|
||||
)));
|
||||
}
|
||||
let id_result = sqlx::query_scalar::<sqlx::Sqlite, i64>(
|
||||
r#"
|
||||
SELECT id
|
||||
FROM kb_pair_analytic_signals
|
||||
FROM k_sol_pair_analytic_signals
|
||||
WHERE pair_id = ? AND signal_kind = ? AND timeframe_seconds = ? AND bucket_start_unix = ?
|
||||
LIMIT 1
|
||||
"#,
|
||||
@@ -79,8 +79,8 @@ LIMIT 1
|
||||
match id_result {
|
||||
Ok(id) => return Ok(id),
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
"cannot fetch kb_pair_analytic_signals id on sqlite: {}",
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot fetch k_sol_pair_analytic_signals id on sqlite: {}",
|
||||
error
|
||||
)));
|
||||
},
|
||||
@@ -90,16 +90,16 @@ LIMIT 1
|
||||
}
|
||||
|
||||
/// Returns one pair-analytic-signal row identified by its key, if it exists.
|
||||
pub async fn get_pair_analytic_signal_by_key(
|
||||
database: &crate::KbDatabase,
|
||||
pub async fn query_pair_analytic_signals_get_by_key(
|
||||
database: &crate::Database,
|
||||
pair_id: i64,
|
||||
signal_kind: &str,
|
||||
timeframe_seconds: i64,
|
||||
bucket_start_unix: i64,
|
||||
) -> Result<std::option::Option<crate::KbPairAnalyticSignalDto>, crate::KbError> {
|
||||
) -> Result<std::option::Option<crate::PairAnalyticSignalDto>, crate::Error> {
|
||||
match database.connection() {
|
||||
crate::KbDatabaseConnection::Sqlite(pool) => {
|
||||
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::KbPairAnalyticSignalEntity>(
|
||||
crate::DatabaseConnection::Sqlite(pool) => {
|
||||
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::PairAnalyticSignalEntity>(
|
||||
r#"
|
||||
SELECT
|
||||
id,
|
||||
@@ -114,7 +114,7 @@ SELECT
|
||||
last_transaction_id,
|
||||
created_at,
|
||||
updated_at
|
||||
FROM kb_pair_analytic_signals
|
||||
FROM k_sol_pair_analytic_signals
|
||||
WHERE pair_id = ? AND signal_kind = ? AND timeframe_seconds = ? AND bucket_start_unix = ?
|
||||
LIMIT 1
|
||||
"#,
|
||||
@@ -128,14 +128,14 @@ LIMIT 1
|
||||
let entity_option = match query_result {
|
||||
Ok(entity_option) => entity_option,
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
"cannot read kb_pair_analytic_signals by key on sqlite: {}",
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot read k_sol_pair_analytic_signals by key on sqlite: {}",
|
||||
error
|
||||
)));
|
||||
},
|
||||
};
|
||||
match entity_option {
|
||||
Some(entity) => return crate::KbPairAnalyticSignalDto::try_from(entity).map(Some),
|
||||
Some(entity) => return crate::PairAnalyticSignalDto::try_from(entity).map(Some),
|
||||
None => return Ok(None),
|
||||
}
|
||||
},
|
||||
@@ -143,13 +143,13 @@ LIMIT 1
|
||||
}
|
||||
|
||||
/// Lists all pair-analytic signals for one pair ordered by key.
|
||||
pub async fn list_pair_analytic_signals_by_pair_id(
|
||||
database: &crate::KbDatabase,
|
||||
pub async fn query_pair_analytic_signals_list_by_pair_id(
|
||||
database: &crate::Database,
|
||||
pair_id: i64,
|
||||
) -> Result<std::vec::Vec<crate::KbPairAnalyticSignalDto>, crate::KbError> {
|
||||
) -> Result<std::vec::Vec<crate::PairAnalyticSignalDto>, crate::Error> {
|
||||
match database.connection() {
|
||||
crate::KbDatabaseConnection::Sqlite(pool) => {
|
||||
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::KbPairAnalyticSignalEntity>(
|
||||
crate::DatabaseConnection::Sqlite(pool) => {
|
||||
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::PairAnalyticSignalEntity>(
|
||||
r#"
|
||||
SELECT
|
||||
id,
|
||||
@@ -164,7 +164,7 @@ SELECT
|
||||
last_transaction_id,
|
||||
created_at,
|
||||
updated_at
|
||||
FROM kb_pair_analytic_signals
|
||||
FROM k_sol_pair_analytic_signals
|
||||
WHERE pair_id = ?
|
||||
ORDER BY timeframe_seconds ASC, bucket_start_unix ASC, signal_kind ASC, id ASC
|
||||
"#,
|
||||
@@ -175,15 +175,15 @@ ORDER BY timeframe_seconds ASC, bucket_start_unix ASC, signal_kind ASC, id ASC
|
||||
let entities = match query_result {
|
||||
Ok(entities) => entities,
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
"cannot list kb_pair_analytic_signals by pair_id '{}' on sqlite: {}",
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot list k_sol_pair_analytic_signals by pair_id '{}' on sqlite: {}",
|
||||
pair_id, error
|
||||
)));
|
||||
},
|
||||
};
|
||||
let mut dtos = std::vec::Vec::new();
|
||||
for entity in entities {
|
||||
let dto_result = crate::KbPairAnalyticSignalDto::try_from(entity);
|
||||
let dto_result = crate::PairAnalyticSignalDto::try_from(entity);
|
||||
let dto = match dto_result {
|
||||
Ok(dto) => dto,
|
||||
Err(error) => return Err(error),
|
||||
|
||||
Reference in New Issue
Block a user