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

Rename 'published' to 'public' (for recipe)

Browse source
This commit is contained in:
Greg Burri 2025-04-02 01:53:02 +02:00
parent eaef6dc77e
commit 4f739593b8
20 changed files with 92 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ pub enum AddScheduledRecipeResult {
impl Connection {
/// Returns all the recipe titles where recipe is written in the given language.
/// If a user_id is given, the language constraint is ignored for recipes owned by user_id.
pub async fn get_all_published_recipe_titles(
pub async fn get_all_public_recipe_titles(
&self,
lang: &str,
user_id: Option<i64>,
@ -24,7 +24,7 @@ impl Connection {
r#"
SELECT [id], [title]
FROM [Recipe]
WHERE [is_published] = true AND ([lang] = $1 OR [user_id] = $2)
WHERE [is_public] = true AND ([lang] = $1 OR [user_id] = $2)
ORDER BY [title] COLLATE NOCASE
"#,
)
@ -35,7 +35,7 @@ ORDER BY [title] COLLATE NOCASE
r#"
SELECT [id], [title]
FROM [Recipe]
WHERE [is_published] = true AND [lang] = $1
WHERE [is_public] = true AND [lang] = $1
ORDER BY [title] COLLATE NOCASE
"#,
)
@ -46,15 +46,12 @@ ORDER BY [title] COLLATE NOCASE
.map_err(DBError::from)
}
pub async fn get_all_unpublished_recipe_titles(
&self,
owned_by: i64,
) -> Result<Vec<(i64, String)>> {
pub async fn get_all_private_recipe_titles(&self, owned_by: i64) -> Result<Vec<(i64, String)>> {
sqlx::query_as(
r#"
SELECT [id], [title]
FROM [Recipe]
WHERE [is_published] = false AND [user_id] = $1
WHERE [is_public] = false AND [user_id] = $1
ORDER BY [title]
"#,
)
@ -264,8 +261,7 @@ WHERE [id] = $1 AND ([user_id] = $2 OR (SELECT [is_admin] FROM [User] WHERE [id]
r#"
SELECT
[id], [user_id], [title], [lang],
[estimated_time], [description], [difficulty], [servings],
[is_published]
[estimated_time], [description], [difficulty], [servings], [is_public]
FROM [Recipe] WHERE [id] = $1
"#,
)
@ -520,10 +516,10 @@ WHERE [id] = $1 AND [id] NOT IN (
.map_err(DBError::from)
}
pub async fn set_recipe_is_published(&self, recipe_id: i64, is_published: bool) -> Result<()> {
sqlx::query("UPDATE [Recipe] SET [is_published] = $2 WHERE [id] = $1")
pub async fn set_recipe_is_public(&self, recipe_id: i64, is_public: bool) -> Result<()> {
sqlx::query("UPDATE [Recipe] SET [is_public] = $2 WHERE [id] = $1")
.bind(recipe_id)
.bind(is_published)
.bind(is_public)
.execute(&self.pool)
.await
.map(|_| ())
@ -966,7 +962,7 @@ mod tests {
.set_recipe_difficulty(recipe_id, Difficulty::Medium)
.await?;
connection.set_recipe_language(recipe_id, "fr").await?;
connection.set_recipe_is_published(recipe_id, true).await?;
connection.set_recipe_is_public(recipe_id, true).await?;
let recipe = connection.get_recipe(recipe_id, false).await?.unwrap();
@ -976,7 +972,7 @@ mod tests {
assert_eq!(recipe.estimated_time, Some(420));
assert_eq!(recipe.difficulty, Difficulty::Medium);
assert_eq!(recipe.lang, "fr");
assert!(recipe.is_published);
assert!(recipe.is_public);
Ok(())
}

2
backend/src/data/model.rs
View file

@ -32,7 +32,7 @@ pub struct Recipe {
pub difficulty: Difficulty,
pub servings: Option<u32>,
pub is_published: bool,
pub is_public: bool,
#[sqlx(skip)]
pub tags: Vec<String>,

4
backend/src/html_templates.rs
View file

@ -7,8 +7,8 @@ use crate::{
};
pub struct Recipes {
pub published: Vec<(i64, String)>,
pub unpublished: Vec<(i64, String)>,
pub public: Vec<(i64, String)>,
pub private: Vec<(i64, String)>,
pub current_id: Option<i64>,
}

4
backend/src/main.rs
View file

@ -162,8 +162,8 @@ async fn main() {
patch(services::ron::recipe::set_language),
)
.route(
"/recipe/is_published",
patch(services::ron::recipe::set_is_published),
"/recipe/is_public",
patch(services::ron::recipe::set_is_public),
)
.route("/recipe", delete(services::ron::recipe::rm))
.route("/recipe/groups", get(services::ron::recipe::get_groups))

10
backend/src/services/fragments.rs
View file

@ -21,16 +21,14 @@ pub async fn recipes_list_fragments(
Extension(context): Extension<Context>,
) -> Result<impl IntoResponse> {
let recipes = Recipes {
published: connection
.get_all_published_recipe_titles(
public: connection
.get_all_public_recipe_titles(
context.tr.current_lang_code(),
context.user.as_ref().map(|u| u.id),
)
.await?,
unpublished: if let Some(user) = context.user.as_ref() {
connection
.get_all_unpublished_recipe_titles(user.id)
.await?
private: if let Some(user) = context.user.as_ref() {
connection.get_all_private_recipe_titles(user.id).await?
} else {
vec![]
},

10
backend/src/services/mod.rs
View file

@ -51,16 +51,14 @@ pub async fn home_page(
Extension(context): Extension<Context>,
) -> Result<impl IntoResponse> {
let recipes = Recipes {
published: connection
.get_all_published_recipe_titles(
public: connection
.get_all_public_recipe_titles(
context.tr.current_lang_code(),
context.user.as_ref().map(|u| u.id),
)
.await?,
unpublished: if let Some(user) = context.user.as_ref() {
connection
.get_all_unpublished_recipe_titles(user.id)
.await?
private: if let Some(user) = context.user.as_ref() {
connection.get_all_private_recipe_titles(user.id).await?
} else {
vec![]
},

21
backend/src/services/recipe.rs
View file

@ -44,14 +44,11 @@ pub async fn edit(
if let Some(recipe) = connection.get_recipe(recipe_id, false).await? {
if model::can_user_edit_recipe(user, &recipe) {
let recipes = Recipes {
published: connection
.get_all_published_recipe_titles(
context.tr.current_lang_code(),
Some(user.id),
)
public: connection
.get_all_public_recipe_titles(context.tr.current_lang_code(), Some(user.id))
.await?,
unpublished: connection
.get_all_unpublished_recipe_titles(user.id)
private: connection
.get_all_private_recipe_titles(user.id)
.await?,
current_id: Some(recipe_id),
};
@ -98,7 +95,7 @@ pub async fn view(
) -> Result<Response> {
match connection.get_recipe(recipe_id, true).await? {
Some(recipe) => {
if !recipe.is_published
if !recipe.is_public
&& (context.user.is_none() || recipe.user_id != context.user.as_ref().unwrap().id)
{
return Ok(Html(
@ -115,15 +112,15 @@ pub async fn view(
}
let recipes = Recipes {
published: connection
.get_all_published_recipe_titles(
public: connection
.get_all_public_recipe_titles(
context.tr.current_lang_code(),
context.user.as_ref().map(|u| u.id),
)
.await?,
unpublished: if let Some(user) = context.user.as_ref() {
private: if let Some(user) = context.user.as_ref() {
connection
.get_all_unpublished_recipe_titles(user.id)
.get_all_private_recipe_titles(user.id)
.await?
} else {
vec![]

6
backend/src/services/ron/recipe.rs
View file

@ -152,14 +152,14 @@ pub async fn set_language(
}
#[debug_handler]
pub async fn set_is_published(
pub async fn set_is_public(
State(connection): State<db::Connection>,
Extension(context): Extension<Context>,
ExtractRon(ron): ExtractRon<ron_api::SetIsPublished>,
ExtractRon(ron): ExtractRon<ron_api::SetIsPublic>,
) -> Result<StatusCode> {
check_user_rights_recipe(&connection, &context.user, ron.recipe_id).await?;
connection
.set_recipe_is_published(ron.recipe_id, ron.is_published)
.set_recipe_is_public(ron.recipe_id, ron.is_public)
.await?;
Ok(StatusCode::OK)
}

4
backend/src/translation.rs
View file

@ -13,7 +13,7 @@ use crate::consts;
pub enum Sentence {
MainTitle = 0,
CreateNewRecipe,
UnpublishedRecipes,
PrivateRecipes,
UntitledRecipe,
Name,
@ -100,7 +100,7 @@ pub enum Sentence {
RecipeDifficultyHard,
RecipeTags,
RecipeLanguage,
RecipeIsPublished,
RecipeIsPublic,
RecipeDelete,
RecipeAddAGroup,
RecipeRemoveGroup,