Layer query simplification.

This commit is contained in:
2026-10-08 21:32:44 +02:00
parent c51e9425d6
commit 3709fcbe02
12 changed files with 82 additions and 232 deletions
-10
View File
@@ -11,16 +11,6 @@ pub struct Query {
pub offset: Option<i64>,
}
impl Default for Query {
fn default() -> Self {
Self {
name: None,
limit: None,
offset: None,
}
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<AccountRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
@@ -10,15 +10,6 @@ pub struct Query {
pub offset: Option<i64>,
}
impl Default for Query {
fn default() -> Self {
Self {
limit: None,
offset: None,
}
}
}
pub async fn list<'e, E>(
executor: E,
query: Query,
-9
View File
@@ -10,15 +10,6 @@ pub struct Query {
pub offset: Option<i64>,
}
impl Default for Query {
fn default() -> Self {
Self {
limit: None,
offset: None,
}
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<TransactionRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
-10
View File
@@ -11,16 +11,6 @@ pub struct Query {
pub offset: Option<i64>,
}
impl Default for Query {
fn default() -> Self {
Self {
app_id: Uuid::nil(),
limit: None,
offset: None,
}
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<UserAppSecretRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
-10
View File
@@ -11,16 +11,6 @@ pub struct Query {
pub offset: Option<i64>,
}
impl Default for Query {
fn default() -> Self {
Self {
user_id: Uuid::nil(),
limit: None,
offset: None,
}
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<UserAppRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
-9
View File
@@ -10,15 +10,6 @@ pub struct Query {
pub offset: Option<i64>,
}
impl Default for Query {
fn default() -> Self {
Self {
limit: None,
offset: None,
}
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<UserRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
+9 -25
View File
@@ -17,21 +17,13 @@ pub struct Query {
pub offset: Option<u64>,
}
impl Default for Query {
fn default() -> Self {
Self {
name: None,
limit: None,
offset: None,
}
}
}
impl TryFrom<Query> for db::Query {
type Error = QueryConversionError;
fn try_from(query: Query) -> Result<Self, Self::Error> {
Ok(db::Query {
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<Account>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let accounts = db::list(
executor,
db::Query {
name: query.name,
limit: query
.limit
@@ -41,16 +33,8 @@ impl TryFrom<Query> for db::Query {
.offset
.map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o)))
.transpose()?,
..Default::default()
})
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<Account>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let accounts = db::list(executor, query.try_into()?)
},
)
.await?
.into_iter()
.map(decode)
+12 -27
View File
@@ -20,20 +20,16 @@ pub struct Query {
pub offset: Option<u64>,
}
impl Default for Query {
fn default() -> Self {
Self {
limit: None,
offset: None,
}
}
}
impl TryFrom<Query> for db::Query {
type Error = QueryConversionError;
fn try_from(query: Query) -> Result<Self, Self::Error> {
Ok(db::Query {
pub async fn list<'e, E>(
executor: E,
query: Query,
) -> Result<Vec<RecurringTransaction>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let transactions = db::list(
executor,
db::Query {
limit: query
.limit
.map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l)))
@@ -42,19 +38,8 @@ impl TryFrom<Query> for db::Query {
.offset
.map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o)))
.transpose()?,
..Default::default()
})
}
}
pub async fn list<'e, E>(
executor: E,
query: Query,
) -> Result<Vec<RecurringTransaction>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let transactions = db::list(executor, query.try_into()?)
},
)
.await?
.into_iter()
.map(decode)
+9 -24
View File
@@ -15,20 +15,13 @@ pub struct Query {
pub offset: Option<u64>,
}
impl Default for Query {
fn default() -> Self {
Self {
limit: None,
offset: None,
}
}
}
impl TryFrom<Query> for db::Query {
type Error = QueryConversionError;
fn try_from(query: Query) -> Result<Self, Self::Error> {
Ok(db::Query {
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<Transaction>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let transactions = db::list(
executor,
db::Query {
limit: query
.limit
.map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l)))
@@ -37,16 +30,8 @@ impl TryFrom<Query> for db::Query {
.offset
.map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o)))
.transpose()?,
..Default::default()
})
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<Transaction>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let transactions = db::list(executor, query.try_into()?)
},
)
.await?
.into_iter()
.map(decode)
+9 -24
View File
@@ -14,21 +14,13 @@ pub struct Query {
pub offset: Option<u64>,
}
impl Default for Query {
fn default() -> Self {
Self {
app_id: Uuid::nil(),
limit: None,
offset: None,
}
}
}
impl TryFrom<Query> for db::Query {
type Error = QueryConversionError;
fn try_from(query: Query) -> Result<Self, Self::Error> {
Ok(db::Query {
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<UserAppSecret>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
Ok(db::list(
executor,
db::Query {
app_id: query.app_id,
limit: query
.limit
@@ -40,15 +32,8 @@ impl TryFrom<Query> for db::Query {
i64::try_from(offset).map_err(|_| QueryConversionError::Offset(offset))
})
.transpose()?,
})
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<UserAppSecret>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
Ok(db::list(executor, query.try_into()?)
},
)
.await?
.into_iter()
.map(decode)
+9 -24
View File
@@ -12,21 +12,13 @@ pub struct Query {
pub offset: Option<u64>,
}
impl Default for Query {
fn default() -> Self {
Self {
user_id: Uuid::nil(),
limit: None,
offset: None,
}
}
}
impl TryFrom<Query> for db::Query {
type Error = QueryConversionError;
fn try_from(query: Query) -> Result<Self, Self::Error> {
Ok(db::Query {
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<UserApp>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
Ok(db::list(
executor,
db::Query {
user_id: query.user_id,
limit: query
.limit
@@ -38,15 +30,8 @@ impl TryFrom<Query> for db::Query {
i64::try_from(offset).map_err(|_| QueryConversionError::Offset(offset))
})
.transpose()?,
})
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<UserApp>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
Ok(db::list(executor, query.try_into()?)
},
)
.await?
.into_iter()
.map(decode)
+10 -27
View File
@@ -14,20 +14,13 @@ pub struct Query {
pub offset: Option<u64>,
}
impl Default for Query {
fn default() -> Self {
Self {
limit: None,
offset: None,
}
}
}
impl TryFrom<Query> for db::Query {
type Error = QueryConversionError;
fn try_from(query: Query) -> Result<Self, Self::Error> {
Ok(db::Query {
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<User>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let users = db::list(
executor,
db::Query {
limit: query
.limit
.map(|l| i64::try_from(l).map_err(|_| QueryConversionError::Limit(l)))
@@ -36,16 +29,8 @@ impl TryFrom<Query> for db::Query {
.offset
.map(|o| i64::try_from(o).map_err(|_| QueryConversionError::Offset(o)))
.transpose()?,
..Default::default()
})
}
}
pub async fn list<'e, E>(executor: E, query: Query) -> Result<Vec<User>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let users = db::list(executor, query.try_into()?)
},
)
.await?
.into_iter()
.map(decode)
@@ -84,9 +69,7 @@ where
}
fn classify_delete_error(error: DatabaseError) -> RepositoryError {
match &error {
_ => RepositoryError::Database(error),
}
RepositoryError::Database(error)
}
fn decode(row: UserRow) -> Result<User, DecodeError> {