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

Doc + formatting

Browse source
This commit is contained in:
Greg Burri 2025-03-18 20:03:25 +01:00
parent 9ed5a04e22
commit 995f77d1ef
9 changed files with 39 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -829,15 +829,13 @@ VALUES ($1, $2, $3, $4)
{
Err(Error::Database(error))
if error.code() == Some(std::borrow::Cow::Borrowed("2067"))
&& error.message() == "UNIQUE constraint failed: RecipeScheduled.user_id, RecipeScheduled.recipe_id, RecipeScheduled.date" =>
&& error.message()
== "UNIQUE constraint failed: RecipeScheduled.user_id, RecipeScheduled.recipe_id, RecipeScheduled.date" =>
{
Ok(AddScheduledRecipeResult::RecipeAlreadyScheduledAtThisDate)
}
Err(error) => {
Err(DBError::from(error))
}
Err(error) => Err(DBError::from(error)),
Ok(insert_result) => {
if add_ingredients_to_shopping_list {
sqlx::query(
r#"
@ -847,13 +845,14 @@ INSERT INTO [ShoppingEntry] ([ingredient_id], [user_id], [recipe_scheduled_id],
INNER JOIN [Group] ON [Group].[id] = [Step].[group_id]
INNER JOIN [Recipe] ON [Recipe].[id] = [Group].[recipe_id]
WHERE [Recipe].[id] = $1
"#)
.bind(recipe_id)
.bind(user_id)
.bind(insert_result.last_insert_rowid())
.bind(servings)
.execute(&mut *tx)
.await?;
"#,
)
.bind(recipe_id)
.bind(user_id)
.bind(insert_result.last_insert_rowid())
.bind(servings)
.execute(&mut *tx)
.await?;
}
tx.commit().await?;

1
backend/src/data/db/user.rs
View file

@ -1,4 +1,3 @@
use axum::Error;
use chrono::{Duration, prelude::*};
use rand::distr::{Alphanumeric, SampleString};
use sqlx::Sqlite;