diff --git a/server/src/database/accounts.rs b/server/src/database/accounts.rs index 827e27c..e2d7ecf 100644 --- a/server/src/database/accounts.rs +++ b/server/src/database/accounts.rs @@ -21,7 +21,7 @@ impl Default for Query { } } -pub async fn query<'e, E>(executor: E, query: Query) -> Result, DatabaseError> +pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/database/recurring_transactions.rs b/server/src/database/recurring_transactions.rs index dcb14fd..9f3847a 100644 --- a/server/src/database/recurring_transactions.rs +++ b/server/src/database/recurring_transactions.rs @@ -19,7 +19,7 @@ impl Default for Query { } } -pub async fn query<'e, E>( +pub async fn list<'e, E>( executor: E, query: Query, ) -> Result, DatabaseError> diff --git a/server/src/database/transactions.rs b/server/src/database/transactions.rs index 782fe9d..e454898 100644 --- a/server/src/database/transactions.rs +++ b/server/src/database/transactions.rs @@ -19,7 +19,7 @@ impl Default for Query { } } -pub async fn query<'e, E>(executor: E, query: Query) -> Result, DatabaseError> +pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/database/user_app_secrets.rs b/server/src/database/user_app_secrets.rs index 099031b..4de7a18 100644 --- a/server/src/database/user_app_secrets.rs +++ b/server/src/database/user_app_secrets.rs @@ -21,7 +21,7 @@ impl Default for Query { } } -pub async fn query<'e, E>(executor: E, query: Query) -> Result, DatabaseError> +pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/database/user_apps.rs b/server/src/database/user_apps.rs index d0892b0..675e007 100644 --- a/server/src/database/user_apps.rs +++ b/server/src/database/user_apps.rs @@ -21,7 +21,7 @@ impl Default for Query { } } -pub async fn query<'e, E>(executor: E, query: Query) -> Result, DatabaseError> +pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/database/users.rs b/server/src/database/users.rs index e37f020..9b61566 100644 --- a/server/src/database/users.rs +++ b/server/src/database/users.rs @@ -19,7 +19,7 @@ impl Default for Query { } } -pub async fn query<'e, E>(executor: E, query: Query) -> Result, DatabaseError> +pub async fn list<'e, E>(executor: E, query: Query) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/repository/accounts.rs b/server/src/repository/accounts.rs index 250a2d6..6ff75d5 100644 --- a/server/src/repository/accounts.rs +++ b/server/src/repository/accounts.rs @@ -50,7 +50,7 @@ pub async fn list<'e, E>(executor: E, query: Query) -> Result, Repo where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let accounts = db::query(executor, query.try_into()?) + let accounts = db::list(executor, query.try_into()?) .await? .into_iter() .map(decode) @@ -59,7 +59,7 @@ where Ok(accounts) } -pub async fn get<'e, E>(executor: E, id: Uuid) -> Result, RepositoryError> +pub async fn get_by_id<'e, E>(executor: E, id: Uuid) -> Result, RepositoryError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { @@ -105,7 +105,7 @@ where Ok(account.into()) } -pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result +pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/repository/recurring_transactions.rs b/server/src/repository/recurring_transactions.rs index 8a6c2a7..cfaede2 100644 --- a/server/src/repository/recurring_transactions.rs +++ b/server/src/repository/recurring_transactions.rs @@ -47,14 +47,14 @@ impl TryFrom for db::Query { } } -pub async fn query<'e, E>( +pub async fn list<'e, E>( executor: E, query: Query, ) -> Result, RepositoryError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transactions = db::query(executor, query.try_into()?) + let transactions = db::list(executor, query.try_into()?) .await? .into_iter() .map(decode) @@ -63,7 +63,7 @@ where Ok(transactions) } -pub async fn get<'e, E>( +pub async fn get_by_id<'e, E>( executor: E, id: Uuid, ) -> Result, RepositoryError> @@ -109,7 +109,7 @@ fn classify_upsert_error(error: DatabaseError) -> RepositoryError { } } -pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result +pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/repository/transactions.rs b/server/src/repository/transactions.rs index ac2e6c5..f81659f 100644 --- a/server/src/repository/transactions.rs +++ b/server/src/repository/transactions.rs @@ -46,7 +46,7 @@ pub async fn list<'e, E>(executor: E, query: Query) -> Result, where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let transactions = db::query(executor, query.try_into()?) + let transactions = db::list(executor, query.try_into()?) .await? .into_iter() .map(decode) @@ -55,7 +55,7 @@ where Ok(transactions) } -pub async fn get<'e, E>(executor: E, id: Uuid) -> Result, RepositoryError> +pub async fn get_by_id<'e, E>(executor: E, id: Uuid) -> Result, RepositoryError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { @@ -93,7 +93,7 @@ fn classify_upsert_error(error: DatabaseError) -> RepositoryError { } } -pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result +pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/repository/user_app_secrets.rs b/server/src/repository/user_app_secrets.rs index b803bc3..ed28745 100644 --- a/server/src/repository/user_app_secrets.rs +++ b/server/src/repository/user_app_secrets.rs @@ -48,14 +48,14 @@ pub async fn list<'e, E>(executor: E, query: Query) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - Ok(db::query(executor, query.try_into()?) + Ok(db::list(executor, query.try_into()?) .await? .into_iter() .map(decode) .collect()) } -pub async fn get<'e, E>( +pub async fn get_by_id<'e, E>( executor: E, app_id: Uuid, id: Uuid, @@ -108,7 +108,7 @@ where Ok(db::verify(executor, app_id, secret_hash).await?) } -pub async fn delete<'e, E>( +pub async fn delete_by_id<'e, E>( executor: E, app_id: Uuid, id: Uuid, diff --git a/server/src/repository/user_apps.rs b/server/src/repository/user_apps.rs index 479b110..35a9bb2 100644 --- a/server/src/repository/user_apps.rs +++ b/server/src/repository/user_apps.rs @@ -46,14 +46,14 @@ pub async fn list<'e, E>(executor: E, query: Query) -> Result, Repo where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - Ok(db::query(executor, query.try_into()?) + Ok(db::list(executor, query.try_into()?) .await? .into_iter() .map(decode) .collect()) } -pub async fn get<'e, E>( +pub async fn get_by_id<'e, E>( executor: E, user_id: Uuid, id: Uuid, @@ -92,7 +92,7 @@ fn classify_upsert_error(error: DatabaseError) -> RepositoryError { } } -pub async fn delete<'e, E>( +pub async fn delete_by_id<'e, E>( executor: E, user_id: Uuid, id: Uuid, diff --git a/server/src/repository/users.rs b/server/src/repository/users.rs index c694f6b..e1d0acd 100644 --- a/server/src/repository/users.rs +++ b/server/src/repository/users.rs @@ -45,7 +45,7 @@ pub async fn list<'e, E>(executor: E, query: Query) -> Result, Reposit where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let users = db::query(executor, query.try_into()?) + let users = db::list(executor, query.try_into()?) .await? .into_iter() .map(decode) @@ -54,7 +54,7 @@ where Ok(users) } -pub async fn get<'e, E>(executor: E, id: Uuid) -> Result, RepositoryError> +pub async fn get_by_id<'e, E>(executor: E, id: Uuid) -> Result, RepositoryError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { @@ -72,7 +72,7 @@ where Ok(user.into()) } -pub async fn delete<'e, E>(executor: E, id: Uuid) -> Result +pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { diff --git a/server/src/routes/accounts.rs b/server/src/routes/accounts.rs index 2f77485..5bb95b4 100644 --- a/server/src/routes/accounts.rs +++ b/server/src/routes/accounts.rs @@ -61,7 +61,7 @@ async fn get_account( State(pool): State, Path(id): Path, ) -> Result, AppError> { - let account = repository::accounts::get(&pool, id) + let account = repository::accounts::get_by_id(&pool, id) .await? .ok_or(AppError::NotFound)?; @@ -91,7 +91,7 @@ async fn delete_account( Path(id): Path, State(pool): State, ) -> Result { - match repository::accounts::delete(&pool, id).await? { + match repository::accounts::delete_by_id(&pool, id).await? { Delete::Deleted => Ok(StatusCode::NO_CONTENT), Delete::NotFound => Err(AppError::NotFound), } diff --git a/server/src/routes/scheduled_transactions.rs b/server/src/routes/scheduled_transactions.rs index 015d49d..d06bdfb 100644 --- a/server/src/routes/scheduled_transactions.rs +++ b/server/src/routes/scheduled_transactions.rs @@ -51,7 +51,7 @@ async fn list_scheduled_transactions( }; let mut tx = pool.begin().await.map_err(RepositoryError::from)?; - let transactions = repository::recurring_transactions::query(&mut *tx, query).await?; + let transactions = repository::recurring_transactions::list(&mut *tx, query).await?; let accounts = get_accounts_for_transactions(&mut tx, &transactions).await?; tx.commit().await.map_err(RepositoryError::from)?; @@ -70,7 +70,7 @@ async fn get_scheduled_transaction( Path(id): Path, ) -> Result, AppError> { let mut tx = pool.begin().await.map_err(RepositoryError::from)?; - let transaction = repository::recurring_transactions::get(&mut *tx, id) + let transaction = repository::recurring_transactions::get_by_id(&mut *tx, id) .await? .ok_or(AppError::NotFound)?; let accounts = @@ -112,7 +112,7 @@ async fn delete_scheduled_transaction( State(pool): State, Path(id): Path, ) -> Result { - match repository::recurring_transactions::delete(&pool, id).await? { + match repository::recurring_transactions::delete_by_id(&pool, id).await? { Delete::Deleted => Ok(StatusCode::NO_CONTENT), Delete::NotFound => Err(AppError::NotFound), } diff --git a/server/src/routes/transactions.rs b/server/src/routes/transactions.rs index df86697..ca65ff5 100644 --- a/server/src/routes/transactions.rs +++ b/server/src/routes/transactions.rs @@ -66,7 +66,7 @@ async fn get_transaction( Path(id): Path, ) -> Result, AppError> { let mut tx = pool.begin().await.map_err(RepositoryError::from)?; - let transaction = repository::transactions::get(&mut *tx, id) + let transaction = repository::transactions::get_by_id(&mut *tx, id) .await? .ok_or(AppError::NotFound)?; let accounts = @@ -104,7 +104,7 @@ async fn delete_transaction( Path(id): Path, State(pool): State, ) -> Result { - match repository::transactions::delete(&pool, id).await? { + match repository::transactions::delete_by_id(&pool, id).await? { Delete::Deleted => Ok(StatusCode::NO_CONTENT), Delete::NotFound => Err(AppError::NotFound), } diff --git a/server/src/routes/user_app_secrets.rs b/server/src/routes/user_app_secrets.rs index 35838e9..5d9bb54 100644 --- a/server/src/routes/user_app_secrets.rs +++ b/server/src/routes/user_app_secrets.rs @@ -65,7 +65,7 @@ async fn get_user_app_secret( State(pool): State, Path((user_id, app_id, secret_id)): Path<(Uuid, Uuid, Uuid)>, ) -> Result, AppError> { - let secret = repository::user_app_secrets::get(&pool, app_id, secret_id) + let secret = repository::user_app_secrets::get_by_id(&pool, app_id, secret_id) .await? .ok_or(AppError::NotFound)?; @@ -116,7 +116,7 @@ async fn delete_user_app_secret( State(pool): State, Path((user_id, app_id, secret_id)): Path<(Uuid, Uuid, Uuid)>, ) -> Result { - match repository::user_app_secrets::delete(&pool, app_id, secret_id).await? { + match repository::user_app_secrets::delete_by_id(&pool, app_id, secret_id).await? { Delete::Deleted => Ok(StatusCode::NO_CONTENT), Delete::NotFound => Err(AppError::NotFound), } diff --git a/server/src/routes/user_apps.rs b/server/src/routes/user_apps.rs index 56f3064..9a0b7ac 100644 --- a/server/src/routes/user_apps.rs +++ b/server/src/routes/user_apps.rs @@ -61,7 +61,7 @@ async fn get_user_app( State(pool): State, Path((user_id, app_id)): Path<(Uuid, Uuid)>, ) -> Result, AppError> { - let app = repository::user_apps::get(&pool, user_id, app_id) + let app = repository::user_apps::get_by_id(&pool, user_id, app_id) .await? .ok_or(AppError::NotFound)?; @@ -92,7 +92,7 @@ async fn delete_user_app( State(pool): State, Path((user_id, app_id)): Path<(Uuid, Uuid)>, ) -> Result { - match repository::user_apps::delete(&pool, user_id, app_id).await? { + match repository::user_apps::delete_by_id(&pool, user_id, app_id).await? { Delete::Deleted => Ok(StatusCode::NO_CONTENT), Delete::NotFound => Err(AppError::NotFound), } diff --git a/server/src/routes/users.rs b/server/src/routes/users.rs index aa8286d..35509b8 100644 --- a/server/src/routes/users.rs +++ b/server/src/routes/users.rs @@ -59,7 +59,7 @@ async fn get_user( State(pool): State, Path(id): Path, ) -> Result, AppError> { - let user = repository::users::get(&pool, id) + let user = repository::users::get_by_id(&pool, id) .await? .ok_or(AppError::NotFound)?; @@ -89,7 +89,7 @@ async fn delete_user( Path(id): Path, State(pool): State, ) -> Result { - match repository::users::delete(&pool, id).await? { + match repository::users::delete_by_id(&pool, id).await? { Delete::Deleted => Ok(StatusCode::NO_CONTENT), Delete::NotFound => Err(AppError::NotFound), }