Slightly more expressive expressions.
This commit is contained in:
@@ -4,7 +4,7 @@ use super::{
|
||||
QueryConversionError, ReferenceRelation, ReferenceViolationKind, RepositoryError, dtos::Upsert,
|
||||
};
|
||||
use crate::{
|
||||
database::{Constraint, DatabaseError, dtos::UserAppSecretRow, user_app_secrets as db},
|
||||
database::{self, Constraint, DatabaseError, dtos::UserAppSecretRow},
|
||||
domain::UserAppSecret,
|
||||
repository::DecodeError,
|
||||
};
|
||||
@@ -23,7 +23,7 @@ pub async fn list<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let query = db::Query {
|
||||
let query = database::user_app_secrets::Query {
|
||||
limit: query
|
||||
.limit
|
||||
.map(|limit| i64::try_from(limit).map_err(|_| QueryConversionError::Limit(limit)))
|
||||
@@ -34,7 +34,7 @@ where
|
||||
.transpose()?,
|
||||
};
|
||||
|
||||
let secrets = db::list(executor, user_id, app_id, query)
|
||||
let secrets = database::user_app_secrets::list(executor, user_id, app_id, query)
|
||||
.await?
|
||||
.into_iter()
|
||||
.map(decode)
|
||||
@@ -52,7 +52,7 @@ pub async fn get_by_id<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let secret = db::get_by_id(executor, user_id, app_id, id)
|
||||
let secret = database::user_app_secrets::get_by_id(executor, user_id, app_id, id)
|
||||
.await?
|
||||
.map(decode)
|
||||
.transpose()?;
|
||||
@@ -68,7 +68,7 @@ pub async fn upsert<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let secret = db::upsert(executor, user_id, encode(secret))
|
||||
let secret = database::user_app_secrets::upsert(executor, user_id, encode(secret))
|
||||
.await
|
||||
.map_err(classify_upsert_error)?
|
||||
.map(|upserted| upserted.try_map(decode))
|
||||
@@ -100,7 +100,7 @@ pub async fn verify<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let is_valid = db::verify(executor, app_id, secret_hash).await?;
|
||||
let is_valid = database::user_app_secrets::verify(executor, app_id, secret_hash).await?;
|
||||
|
||||
Ok(is_valid)
|
||||
}
|
||||
@@ -114,7 +114,7 @@ pub async fn delete_by_id<'e, E>(
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let secret = db::delete_by_id(executor, user_id, app_id, id)
|
||||
let secret = database::user_app_secrets::delete_by_id(executor, user_id, app_id, id)
|
||||
.await?
|
||||
.map(decode)
|
||||
.transpose()?;
|
||||
|
||||
Reference in New Issue
Block a user