Added source and destination accounts.

This commit is contained in:
2026-09-27 11:04:47 +02:00
parent d219d63dca
commit 26a370aa31
16 changed files with 253 additions and 122 deletions
+14 -7
View File
@@ -1,6 +1,9 @@
use uuid::Uuid;
use super::dtos::{AccountRow, Delete, Upsert};
use super::{
DatabaseError,
dtos::{AccountRow, Delete, Upsert},
};
pub struct Query {
pub name: Option<String>,
@@ -18,7 +21,7 @@ impl Default for Query {
}
}
pub async fn query<'e, E>(executor: E, query: Query) -> Result<Vec<AccountRow>, sqlx::Error>
pub async fn query<'e, E>(executor: E, query: Query) -> Result<Vec<AccountRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
@@ -38,9 +41,10 @@ where
)
.fetch_all(executor)
.await
.map_err(DatabaseError::from)
}
pub async fn get_by_id<'e, E>(executor: E, id: Uuid) -> Result<Option<AccountRow>, sqlx::Error>
pub async fn get_by_id<'e, E>(executor: E, id: Uuid) -> Result<Option<AccountRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
@@ -55,12 +59,13 @@ where
)
.fetch_optional(executor)
.await
.map_err(DatabaseError::from)
}
pub async fn upsert<'e, E>(
executor: E,
account: AccountRow,
) -> Result<Upsert<AccountRow>, sqlx::Error>
) -> Result<Upsert<AccountRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
@@ -79,7 +84,8 @@ where
account.name,
)
.fetch_one(executor)
.await?;
.await
.map_err(DatabaseError::from)?;
let account = AccountRow {
id: row.id,
@@ -93,13 +99,14 @@ where
}
}
pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result<Delete, sqlx::Error>
pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result<Delete, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let deleted = sqlx::query!("DELETE FROM accounts WHERE id = $1 RETURNING id", id)
.fetch_optional(executor)
.await?;
.await
.map_err(DatabaseError::from)?;
Ok(if deleted.is_some() {
Delete::Deleted