Sasedev/khadhroony-bobobot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.7.27 +Refactor

Browse Source
This commit is contained in:
SinuS von SifriduS
2026-05-10 00:33:01 +02:00
parent cb2e8e7096
commit 1f0137b9de
261 changed files with 12308 additions and 8928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
kb_lib/src/db/queries/dex.rs
View File

@@ -1,17 +1,17 @@
// file: kb_lib/src/db/queries/dex.rs
//! Queries for `kb_dexes`.
//! Queries for `k_sol_dexes`.
/// Inserts or updates one normalized DEX row by code.
pub async fn upsert_dex(
database: &crate::KbDatabase,
dto: &crate::KbDexDto,
) -> Result<i64, crate::KbError> {
pub async fn query_dexs_upsert(
database: &crate::Database,
dto: &crate::DexDto,
) -> Result<i64, crate::Error> {
match database.connection() {
crate::KbDatabaseConnection::Sqlite(pool) => {
crate::DatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query(
r#"
INSERT INTO kb_dexes (
INSERT INTO k_sol_dexes (
code,
name,
program_id,
@@ -39,15 +39,15 @@ ON CONFLICT(code) DO UPDATE SET
.execute(pool)
.await;
if let Err(error) = query_result {
return Err(crate::KbError::Db(format!(
"cannot upsert kb_dexes on sqlite: {}",
return Err(crate::Error::Db(format!(
"cannot upsert k_sol_dexes on sqlite: {}",
error
)));
}
let id_result = sqlx::query_scalar::<sqlx::Sqlite, i64>(
r#"
SELECT id
FROM kb_dexes
FROM k_sol_dexes
WHERE code = ?
LIMIT 1
"#,
@@ -58,8 +58,8 @@ LIMIT 1
match id_result {
Ok(id) => return Ok(id),
Err(error) => {
return Err(crate::KbError::Db(format!(
"cannot fetch kb_dexes id for code '{}' on sqlite: {}",
return Err(crate::Error::Db(format!(
"cannot fetch k_sol_dexes id for code '{}' on sqlite: {}",
dto.code, error
)));
},
@@ -69,13 +69,13 @@ LIMIT 1
}
/// Reads one normalized DEX row by code.
pub async fn get_dex_by_code(
database: &crate::KbDatabase,
pub async fn query_dexs_get_by_code(
database: &crate::Database,
code: &str,
) -> Result<std::option::Option<crate::KbDexDto>, crate::KbError> {
) -> Result<std::option::Option<crate::DexDto>, crate::Error> {
match database.connection() {
crate::KbDatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::KbDexEntity>(
crate::DatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::DexEntity>(
r#"
SELECT
id,
@@ -86,7 +86,7 @@ SELECT
is_enabled,
created_at,
updated_at
FROM kb_dexes
FROM k_sol_dexes
WHERE code = ?
LIMIT 1
"#,
@@ -97,15 +97,15 @@ LIMIT 1
let entity_option = match query_result {
Ok(entity_option) => entity_option,
Err(error) => {
return Err(crate::KbError::Db(format!(
"cannot read kb_dexes '{}' on sqlite: {}",
return Err(crate::Error::Db(format!(
"cannot read k_sol_dexes '{}' on sqlite: {}",
code, error
)));
},
};
match entity_option {
Some(entity) => {
let dto_result = crate::KbDexDto::try_from(entity);
let dto_result = crate::DexDto::try_from(entity);
match dto_result {
Ok(dto) => return Ok(Some(dto)),
Err(error) => return Err(error),
@@ -118,12 +118,12 @@ LIMIT 1
}
/// Lists normalized DEX rows.
pub async fn list_dexes(
database: &crate::KbDatabase,
) -> Result<std::vec::Vec<crate::KbDexDto>, crate::KbError> {
pub async fn query_dexs_list(
database: &crate::Database,
) -> Result<std::vec::Vec<crate::DexDto>, crate::Error> {
match database.connection() {
crate::KbDatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::KbDexEntity>(
crate::DatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::DexEntity>(
r#"
SELECT
id,
@@ -134,7 +134,7 @@ SELECT
is_enabled,
created_at,
updated_at
FROM kb_dexes
FROM k_sol_dexes
ORDER BY code ASC
"#,
)
@@ -143,15 +143,15 @@ ORDER BY code ASC
let entities = match query_result {
Ok(entities) => entities,
Err(error) => {
return Err(crate::KbError::Db(format!(
"cannot list kb_dexes on sqlite: {}",
return Err(crate::Error::Db(format!(
"cannot list k_sol_dexes on sqlite: {}",
error
)));
},
};
let mut dtos = std::vec::Vec::new();
for entity in entities {
let dto_result = crate::KbDexDto::try_from(entity);
let dto_result = crate::DexDto::try_from(entity);
let dto = match dto_result {
Ok(dto) => dto,
Err(error) => return Err(error),
@@ -169,10 +169,10 @@ mod tests {
async fn dex_roundtrip_works() {
let tempdir = tempfile::tempdir().expect("tempdir must succeed");
let database_path = tempdir.path().join("dex_roundtrip.sqlite3");
let config = crate::KbDatabaseConfig {
let config = crate::DatabaseConfig {
enabled: true,
backend: crate::KbDatabaseBackend::Sqlite,
sqlite: crate::KbSqliteDatabaseConfig {
backend: crate::DatabaseBackend::Sqlite,
sqlite: crate::SqliteDatabaseConfig {
path: database_path.to_string_lossy().to_string(),
create_if_missing: true,
busy_timeout_ms: 5000,
@@ -181,22 +181,22 @@ mod tests {
use_wal: true,
},
};
let database = crate::KbDatabase::connect_and_initialize(&config)
let database = crate::Database::connect_and_initialize(&config)
.await
.expect("database init must succeed");
let dex_id = crate::upsert_dex(
let dex_id = crate::query_dexs_upsert(
&database,
&crate::KbDexDto::new("raydium".to_string(), "Raydium".to_string(), None, None, true),
&crate::DexDto::new("raydium".to_string(), "Raydium".to_string(), None, None, true),
)
.await
.expect("dex upsert must succeed");
assert!(dex_id > 0);
let dex = crate::get_dex_by_code(&database, "raydium")
let dex = crate::query_dexs_get_by_code(&database, "raydium")
.await
.expect("get dex must succeed");
assert!(dex.is_some());
assert_eq!(dex.expect("dex must exist").name, "Raydium");
let dexes = crate::list_dexes(&database).await.expect("list dexes must succeed");
let dexes = crate::query_dexs_list(&database).await.expect("list dexes must succeed");
assert_eq!(dexes.len(), 1);
}
}