gburri/recipes
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Add tables for shopping list and planner

Browse source
This commit is contained in:
Greg Burri 2025-01-21 19:27:06 +01:00
parent 0d3c63013e
commit d9449de02b
8 changed files with 99 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

31
backend/src/data/db/recipe.rs
View file

@ -64,8 +64,8 @@ ORDER BY [title]
r#"
SELECT COUNT(*) = 1
FROM [Recipe]
INNER JOIN [User] ON [User].id = [Recipe].user_id
WHERE [Recipe].[id] = $1 AND ([is_admin] OR [user_id] = $2)
INNER JOIN [User] ON [User].[id] = [Recipe].[user_id]
WHERE [Recipe].[id] = $1 AND ([user_id] = $2 OR (SELECT [is_admin] FROM [User] WHERE [id] = $2))
"#,
)
.bind(recipe_id)
@ -80,9 +80,9 @@ WHERE [Recipe].[id] = $1 AND ([is_admin] OR [user_id] = $2)
r#"
SELECT COUNT(*) = 1
FROM [Recipe]
INNER JOIN [User] ON [User].id = [Recipe].user_id
INNER JOIN [User] ON [User].[id] = [Recipe].[user_id]
INNER JOIN [Group] ON [Group].[recipe_id] = [Recipe].[id]
WHERE [Group].[id] = $1 AND ([is_admin] OR [user_id] = $2)
WHERE [Group].[id] = $1 AND ([user_id] = $2 OR (SELECT [is_admin] FROM [User] WHERE [id] = $2))
"#,
)
.bind(group_id)
@ -104,9 +104,9 @@ WHERE [Group].[id] = $1 AND ([is_admin] OR [user_id] = $2)
r#"
SELECT COUNT(*)
FROM [Recipe]
INNER JOIN [User] ON [User].id = [Recipe].user_id
INNER JOIN [User] ON [User].[id] = [Recipe].[user_id]
INNER JOIN [Group] ON [Group].[recipe_id] = [Recipe].[id]
WHERE [Group].[id] IN ({}) AND ([is_admin] OR [user_id] = $2)
WHERE [Group].[id] IN ({}) AND ([user_id] = $2 OR (SELECT [is_admin] FROM [User] WHERE [id] = $2))
"#,
params
);
@ -123,10 +123,10 @@ WHERE [Group].[id] IN ({}) AND ([is_admin] OR [user_id] = $2)
r#"
SELECT COUNT(*) = 1
FROM [Recipe]
INNER JOIN [User] ON [User].id = [Recipe].user_id
INNER JOIN [User] ON [User].[id] = [Recipe].[user_id]
INNER JOIN [Group] ON [Group].[recipe_id] = [Recipe].[id]
INNER JOIN [Step] ON [Step].[group_id] = [Group].[id]
WHERE [Step].[id] = $1 AND ([is_admin] OR [user_id] = $2)
WHERE [Step].[id] = $1 AND ([user_id] = $2 OR (SELECT [is_admin] FROM [User] WHERE [id] = $2))
"#,
)
.bind(step_id)
@ -144,10 +144,10 @@ WHERE [Step].[id] = $1 AND ([is_admin] OR [user_id] = $2)
r#"
SELECT COUNT(*)
FROM [Recipe]
INNER JOIN [User] ON [User].id = [Recipe].user_id
INNER JOIN [User] ON [User].[id] = [Recipe].[user_id]
INNER JOIN [Group] ON [Group].[recipe_id] = [Recipe].[id]
INNER JOIN [Step] ON [Step].[group_id] = [Group].[id]
WHERE [Step].[id] IN ({}) AND ([is_admin] OR [user_id] = $2)
WHERE [Step].[id] IN ({}) AND ([user_id] = $2 OR (SELECT [is_admin] FROM [User] WHERE [id] = $2))
"#,
params
);
@ -168,11 +168,11 @@ WHERE [Step].[id] IN ({}) AND ([is_admin] OR [user_id] = $2)
r#"
SELECT COUNT(*)
FROM [Recipe]
INNER JOIN [User] ON [User].id = [Recipe].user_id
INNER JOIN [User] ON [User].[id] = [Recipe].[user_id]
INNER JOIN [Group] ON [Group].[recipe_id] = [Recipe].[id]
INNER JOIN [Step] ON [Step].[group_id] = [Group].[id]
INNER JOIN [Ingredient] ON [Ingredient].[step_id] = [Step].[id]
WHERE [Ingredient].[id] = $1 AND ([is_admin] OR [user_id] = $2)
WHERE [Ingredient].[id] = $1 AND ([user_id] = $2 OR (SELECT [is_admin] FROM [User] WHERE [id] = $2))
"#,
)
.bind(ingredient_id)
@ -194,11 +194,12 @@ WHERE [Ingredient].[id] = $1 AND ([is_admin] OR [user_id] = $2)
r#"
SELECT COUNT(*)
FROM [Recipe]
INNER JOIN [User] ON [User].id = [Recipe].user_id
INNER JOIN [User] ON [User].[id] = [Recipe].[user_id]
INNER JOIN [Group] ON [Group].[recipe_id] = [Recipe].[id]
INNER JOIN [Step] ON [Step].[group_id] = [Group].[id]
INNER JOIN [Ingredient] ON [Ingredient].[step_id] = [Step].[id]
WHERE [Ingredient].[id] IN ({}) AND ([is_admin] OR [user_id] = $2)
WHERE [Ingredient].[id] IN ({}) AND
([user_id] = $2 OR (SELECT [is_admin] FROM [User] WHERE [id] = $2))
"#,
params
);
@ -681,6 +682,8 @@ VALUES ($1, $2)
.execute(&mut *tx)
.await?;
tx.commit().await?;
Ok(db_result.last_insert_rowid())
}

2
backend/src/html_templates.rs
View file

@ -1,4 +1,4 @@
use rinja_axum::Template;
use rinja::Template;
use crate::{
data::model,

1
backend/src/services/ron.rs
View file

@ -522,7 +522,6 @@ pub async fn add_ingredient(
) -> Result<impl IntoResponse> {
check_user_rights_recipe_step(&connection, &user, ron.id).await?;
let id = connection.add_recipe_ingredient(ron.id).await?;
Ok(ron_response(StatusCode::OK, common::ron_api::Id { id }))
}