Standardized the upsert and delete pattern across the repo.
This commit is contained in:
@@ -2,7 +2,7 @@ use uuid::Uuid;
|
||||
|
||||
use super::{
|
||||
DatabaseError,
|
||||
dtos::{Delete, Upsert, UserRow},
|
||||
dtos::{Upsert, UserRow},
|
||||
};
|
||||
|
||||
pub struct Query {
|
||||
@@ -69,27 +69,18 @@ where
|
||||
.await
|
||||
.map_err(DatabaseError::from)?;
|
||||
|
||||
let user = UserRow { id: row.id };
|
||||
|
||||
if row.old_id.is_some() {
|
||||
Ok(Upsert::Updated(user))
|
||||
} else {
|
||||
Ok(Upsert::Created(user))
|
||||
}
|
||||
Ok(Upsert {
|
||||
previous: row.old_id.map(|id| UserRow { id }),
|
||||
current: UserRow { id: row.id },
|
||||
})
|
||||
}
|
||||
|
||||
pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result<Delete, DatabaseError>
|
||||
pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result<Option<UserRow>, DatabaseError>
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let deleted = sqlx::query!("DELETE FROM users WHERE id = $1 RETURNING id", id)
|
||||
sqlx::query_as!(UserRow, "DELETE FROM users WHERE id = $1 RETURNING id", id)
|
||||
.fetch_optional(executor)
|
||||
.await
|
||||
.map_err(DatabaseError::from)?;
|
||||
|
||||
Ok(if deleted.is_some() {
|
||||
Delete::Deleted
|
||||
} else {
|
||||
Delete::NotFound
|
||||
})
|
||||
.map_err(DatabaseError::from)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user