Overhaul
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use crate::db;
|
||||
use crate::error::ApiResult;
|
||||
use serde::Deserialize;
|
||||
use sqlx::{Pool, Postgres};
|
||||
|
||||
const TABLE_NAME: &str = "user_airport_favorites";
|
||||
|
||||
@@ -11,8 +11,7 @@ pub struct UserFavorite {
|
||||
}
|
||||
|
||||
impl UserFavorite {
|
||||
pub async fn select_all(username: &str) -> ApiResult<Vec<String>> {
|
||||
let pool = db::pool();
|
||||
pub async fn select_all(pool: &Pool<Postgres>, username: &str) -> ApiResult<Vec<String>> {
|
||||
let user_favorites: Vec<UserFavorite> = sqlx::query_as::<_, UserFavorite>(&format!(
|
||||
r#"
|
||||
SELECT * FROM {} WHERE username = $1
|
||||
@@ -28,8 +27,7 @@ impl UserFavorite {
|
||||
Ok(favorites)
|
||||
}
|
||||
|
||||
pub async fn insert(username: &str, icao: &str) -> ApiResult<()> {
|
||||
let pool = db::pool();
|
||||
pub async fn insert(pool: &Pool<Postgres>, username: &str, icao: &str) -> ApiResult<()> {
|
||||
sqlx::query(&format!(
|
||||
r#"
|
||||
INSERT INTO {} (
|
||||
@@ -46,8 +44,7 @@ impl UserFavorite {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn delete(username: &str, icao: &str) -> ApiResult<()> {
|
||||
let pool = db::pool();
|
||||
pub async fn delete(pool: &Pool<Postgres>, username: &str, icao: &str) -> ApiResult<()> {
|
||||
sqlx::query(&format!(
|
||||
r#"
|
||||
DELETE FROM {} WHERE username = $1 AND icao = $2
|
||||
|
||||
Reference in New Issue
Block a user