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

Steps can now be ordered (via drag and drop)

Browse source
This commit is contained in:
Greg Burri 2025-01-15 01:37:49 +01:00
parent e355800f98
commit b86cded45d
8 changed files with 316 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -507,12 +507,14 @@ ORDER BY [name]
.await?
.unwrap_or(-1);
let db_result = sqlx::query("INSERT INTO [Group] ([recipe_id, [order]) VALUES ($1, $2)")
let db_result = sqlx::query("INSERT INTO [Group] ([recipe_id], [order]) VALUES ($1, $2)")
.bind(recipe_id)
.bind(last_order + 1)
.execute(&mut *tx)
.await?;
tx.commit().await?;
Ok(db_result.last_insert_rowid())
}
@ -562,10 +564,24 @@ ORDER BY [name]
}
pub async fn add_recipe_step(&self, group_id: i64) -> Result<i64> {
let db_result = sqlx::query("INSERT INTO [Step] ([group_id]) VALUES ($1)")
let mut tx = self.tx().await?;
let last_order = sqlx::query_scalar(
"SELECT [order] FROM [Step] WHERE [group_id] = $1 ORDER BY [order] DESC LIMIT 1",
)
.bind(group_id)
.fetch_optional(&mut *tx)
.await?
.unwrap_or(-1);
let db_result = sqlx::query("INSERT INTO [Step] ([group_id], [order]) VALUES ($1, $2)")
.bind(group_id)
.execute(&self.pool)
.bind(last_order + 1)
.execute(&mut *tx)
.await?;
tx.commit().await?;
Ok(db_result.last_insert_rowid())
}