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

Service for editing/creating recipe

Browse source 
Other stuff...
This commit is contained in:
Greg Burri 2022-12-15 01:13:57 +01:00
parent adcf4a5a5d
commit cc2e5b6893
15 changed files with 323 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backend/src/data/asynchronous.rs
View file

@ -7,7 +7,6 @@ use chrono::{prelude::*, Duration};
use super::db::*;
use crate::model;
use crate::user::User;
#[derive(Debug)]
pub enum DBAsyncError {
@ -65,7 +64,7 @@ impl Connection {
)
}
pub async fn load_user_async(&self, user_id: i64) -> Result<User> {
pub async fn load_user_async(&self, user_id: i64) -> Result<model::User> {
let self_copy = self.clone();
combine_errors(
web::block(move || self_copy.load_user(user_id).map_err(DBAsyncError::from)).await,

85
backend/src/data/db.rs
View file

@ -12,10 +12,11 @@ use r2d2_sqlite::SqliteConnectionManager;
use rand::distributions::{Alphanumeric, DistString};
use rusqlite::{named_params, params, OptionalExtension, Params};
use crate::hash::{hash, verify_password};
use crate::model;
use crate::user::*;
use crate::{consts, user};
use crate::{
hash::{hash, verify_password},
model,
consts,
};
const CURRENT_DB_VERSION: u32 = 1;
@ -221,11 +222,12 @@ impl Connection {
pub fn get_recipe(&self, id: i64) -> Result<model::Recipe> {
let con = self.get()?;
con.query_row(
"SELECT [id], [title], [description] FROM [Recipe] WHERE [id] = ?1",
"SELECT [id], [user_id], [title], [description] FROM [Recipe] WHERE [id] = ?1",
[id],
|row| {
Ok(model::Recipe::new(
row.get("id")?,
row.get("user_id")?,
row.get("title")?,
row.get("description")?,
))
@ -234,10 +236,10 @@ impl Connection {
.map_err(DBError::from)
}
pub fn get_user_login_info(&self, token: &str) -> Result<UserLoginInfo> {
pub fn get_user_login_info(&self, token: &str) -> Result<model::UserLoginInfo> {
let con = self.get()?;
con.query_row("SELECT [last_login_datetime], [ip], [user_agent] FROM [UserLoginToken] WHERE [token] = ?1", [token], |r| {
Ok(UserLoginInfo {
Ok(model::UserLoginInfo {
last_login_datetime: r.get("last_login_datetime")?,
ip: r.get("ip")?,
user_agent: r.get("user_agent")?,
@ -245,13 +247,14 @@ impl Connection {
}).map_err(DBError::from)
}
pub fn load_user(&self, user_id: i64) -> Result<User> {
pub fn load_user(&self, user_id: i64) -> Result<model::User> {
let con = self.get()?;
con.query_row(
"SELECT [email] FROM [User] WHERE [id] = ?1",
[user_id],
|r| {
Ok(User {
Ok(model::User {
id: user_id,
email: r.get("email")?,
})
},
@ -290,13 +293,23 @@ impl Connection {
}
let token = generate_token();
let hashed_password = hash(password).map_err(|e| DBError::from_dyn_error(e))?;
tx.execute("UPDATE [User] SET [validation_token] = ?2, [creation_datetime] = ?3, [password] = ?4 WHERE [id] = ?1", params![id, token, datetime, hashed_password])?;
tx.execute(
"UPDATE [User]
SET [validation_token] = ?2, [creation_datetime] = ?3, [password] = ?4
WHERE [id] = ?1",
params![id, token, datetime, hashed_password],
)?;
token
}
None => {
let token = generate_token();
let hashed_password = hash(password).map_err(|e| DBError::from_dyn_error(e))?;
tx.execute("INSERT INTO [User] ([email], [validation_token], [creation_datetime], [password]) VALUES (?1, ?2, ?3, ?4)", params![email, token, datetime, hashed_password])?;
tx.execute(
"INSERT INTO [User]
([email], [validation_token], [creation_datetime], [password])
VALUES (?1, ?2, ?3, ?4)",
params![email, token, datetime, hashed_password],
)?;
token
}
};
@ -400,7 +413,12 @@ impl Connection {
.optional()?
{
Some((login_id, user_id)) => {
tx.execute("UPDATE [UserLoginToken] SET [last_login_datetime] = ?2, [ip] = ?3, [user_agent] = ?4 WHERE [id] = ?1", params![login_id, Utc::now(), ip, user_agent])?;
tx.execute(
"UPDATE [UserLoginToken]
SET [last_login_datetime] = ?2, [ip] = ?3, [user_agent] = ?4
WHERE [id] = ?1",
params![login_id, Utc::now(), ip, user_agent],
)?;
tx.commit()?;
Ok(AuthenticationResult::Ok(user_id))
}
@ -435,21 +453,27 @@ impl Connection {
let con = self.get()?;
// Verify if an empty recipe already exists. Returns its id if one exists.
match con.query_row(
"SELECT [Recipe].[id] FROM [Recipe]
match con
.query_row(
"SELECT [Recipe].[id] FROM [Recipe]
INNER JOIN [Image] ON [Image].[recipe_id] = [Recipe].[id]
INNER JOIN [Group] ON [Group].[recipe_id] = [Recipe].[id]
WHERE [Recipe].[user_id] = ?1 AND [Recipe].[estimate_time] = NULL AND [Recipe].[description] = NULL",
[user_id],
|r| {
Ok(r.get::<&str, i64>("id")?)
}
).optional()? {
WHERE [Recipe].[user_id] = ?1
AND [Recipe].[estimate_time] = NULL
AND [Recipe].[description] = NULL",
[user_id],
|r| Ok(r.get::<&str, i64>("id")?),
)
.optional()?
{
Some(recipe_id) => Ok(recipe_id),
None => {
con.execute("INSERT INTO [Recipe] ([user_id], [title]) VALUES (?1, '')", [user_id])?;
con.execute(
"INSERT INTO [Recipe] ([user_id], [title]) VALUES (?1, '')",
[user_id],
)?;
Ok(con.last_insert_rowid())
},
}
}
}
@ -495,7 +519,12 @@ impl Connection {
user_agent: &str,
) -> Result<String> {
let token = generate_token();
tx.execute("INSERT INTO [UserLoginToken] ([user_id], [last_login_datetime], [token], [ip], [user_agent]) VALUES (?1, ?2, ?3, ?4, ?5)", params![user_id, Utc::now(), token, ip, user_agent])?;
tx.execute(
"INSERT INTO [UserLoginToken]
([user_id], [last_login_datetime], [token], [ip], [user_agent])
VALUES (?1, ?2, ?3, ?4, ?5)",
params![user_id, Utc::now(), token, ip, user_agent],
)?;
Ok(token)
}
}
@ -542,7 +571,8 @@ mod tests {
fn sign_up_to_an_already_existing_user() -> Result<()> {
let connection = Connection::new_in_memory()?;
connection.execute_sql("
INSERT INTO [User] ([id], [email], [name], [password], [creation_datetime], [validation_token])
INSERT INTO
[User] ([id], [email], [name], [password], [creation_datetime], [validation_token])
VALUES (
1,
'paul@atreides.com',
@ -583,7 +613,8 @@ mod tests {
let connection = Connection::new_in_memory()?;
let token = generate_token();
connection.execute_sql("
INSERT INTO [User] ([id], [email], [name], [password], [creation_datetime], [validation_token])
INSERT INTO
[User] ([id], [email], [name], [password], [creation_datetime], [validation_token])
VALUES (
1,
'paul@atreides.com',
@ -794,7 +825,9 @@ mod tests {
let connection = Connection::new_in_memory()?;
connection.execute_sql(
"INSERT INTO [User] ([id], [email], [name], [password], [creation_datetime], [validation_token]) VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
"INSERT INTO [User]
([id], [email], [name], [password], [creation_datetime], [validation_token])
VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
params![
1,
"paul@atreides.com",

1
backend/src/main.rs
View file

@ -14,7 +14,6 @@ mod email;
mod hash;
mod model;
mod services;
mod user;
mod utils;
#[actix_web::main]

31
backend/src/model.rs
View file

@ -1,22 +1,41 @@
use chrono::prelude::*;
pub struct User {
pub id: i64,
pub email: String,
}
pub struct UserLoginInfo {
pub last_login_datetime: DateTime<Utc>,
pub ip: String,
pub user_agent: String,
}
pub struct Recipe {
pub id: i64,
pub user_id: i64,
pub title: String,
pub description: Option<String>,
pub description: String,
pub estimate_time: Option<i32>, // [min].
pub difficulty: Option<Difficulty>,
pub difficulty: Difficulty,
//ingredients: Vec<Ingredient>, // For four people.
pub process: Vec<Group>,
}
impl Recipe {
pub fn new(id: i64, title: String, description: Option<String>) -> Recipe {
pub fn empty(id: i64, user_id: i64) -> Recipe {
Self::new(id, user_id, String::new(), String::new())
}
pub fn new(id: i64, user_id: i64, title: String, description: String) -> Recipe {
Recipe {
id,
user_id,
title,
description,
estimate_time: None,
difficulty: None,
difficulty: Difficulty::Unknown,
process: Vec::new(),
}
}
@ -34,13 +53,13 @@ pub struct Quantity {
pub struct Group {
pub name: Option<String>,
pub input: Vec<StepInput>,
pub output: Vec<IntermediateSubstance>,
pub steps: Vec<Step>,
}
pub struct Step {
pub action: String,
pub input: Vec<StepInput>,
pub output: Vec<IntermediateSubstance>,
}
pub struct IntermediateSubstance {

87
backend/src/services.rs
View file

@ -11,13 +11,14 @@ use chrono::Duration;
use log::{debug, error, info, log_enabled, Level};
use serde::Deserialize;
use crate::config::Config;
use crate::consts;
use crate::data::{asynchronous, db};
use crate::email;
use crate::model;
use crate::user::User;
use crate::utils;
use crate::{
config::Config,
consts,
data::{asynchronous, db},
email,
model,
utils,
};
mod api;
@ -45,7 +46,7 @@ fn get_ip_and_user_agent(req: &HttpRequest) -> (String, String) {
async fn get_current_user(
req: &HttpRequest,
connection: web::Data<db::Connection>,
) -> Option<User> {
) -> Option<model::User> {
let (client_ip, client_user_agent) = get_ip_and_user_agent(req);
match req.cookie(consts::COOKIE_AUTH_TOKEN_NAME) {
@ -149,7 +150,7 @@ impl actix_web::error::ResponseError for ServiceError {
#[derive(Template)]
#[template(path = "home.html")]
struct HomeTemplate {
user: Option<User>,
user: Option<model::User>,
recipes: Vec<(i64, String)>,
current_recipe_id: Option<i64>,
}
@ -175,9 +176,10 @@ pub async fn home_page(
#[derive(Template)]
#[template(path = "view_recipe.html")]
struct ViewRecipeTemplate {
user: Option<User>,
user: Option<model::User>,
recipes: Vec<(i64, String)>,
current_recipe_id: Option<i64>,
current_recipe: model::Recipe,
}
@ -201,14 +203,15 @@ pub async fn view_recipe(
.to_response())
}
///// EDIT RECIPE /////
///// EDIT/NEW RECIPE /////
#[derive(Template)]
#[template(path = "edit_recipe.html")]
struct EditRecipeTemplate {
user: Option<User>,
user: Option<model::User>,
recipes: Vec<(i64, String)>,
current_recipe_id: Option<i64>,
current_recipe: model::Recipe,
}
@ -219,12 +222,28 @@ pub async fn edit_recipe(
connection: web::Data<db::Connection>,
) -> Result<HttpResponse> {
let (id,) = path.into_inner();
let user = get_current_user(&req, connection.clone()).await;
let recipes = connection.get_all_recipe_titles_async().await?;
let user = match get_current_user(&req, connection.clone()).await {
Some(u) => u,
None =>
return Ok(MessageTemplate {
user: None,
message: "Cannot edit a recipe without being logged in",
}.to_response())
};
let recipe = connection.get_recipe_async(id).await?;
if recipe.user_id != user.id {
return Ok(MessageTemplate {
message: "Cannot edit a recipe you don't own",
user: Some(user)
}.to_response())
}
let recipes = connection.get_all_recipe_titles_async().await?;
Ok(EditRecipeTemplate {
user,
user: Some(user),
current_recipe_id: Some(recipe.id),
recipes,
current_recipe: recipe,
@ -232,6 +251,34 @@ pub async fn edit_recipe(
.to_response())
}
#[get("/recipe/new")]
pub async fn new_recipe(
req: HttpRequest,
path: web::Path<(i64,)>,
connection: web::Data<db::Connection>,
) -> Result<HttpResponse> {
let user = match get_current_user(&req, connection.clone()).await {
Some(u) => u,
None =>
return Ok(MessageTemplate {
message: "Cannot create a recipe without being logged in",
user: None
}.to_response())
};
let recipe_id = connection.create_recipe_async(user.id).await?;
let recipes = connection.get_all_recipe_titles_async().await?;
let user_id = user.id;
Ok(EditRecipeTemplate {
user: Some(user),
current_recipe_id: Some(recipe_id),
recipes,
current_recipe: model::Recipe::empty(recipe_id, user_id),
}
.to_response())
}
///// MESSAGE /////
#[derive(Template)]
@ -243,7 +290,7 @@ struct MessageBaseTemplate<'a> {
#[derive(Template)]
#[template(path = "message.html")]
struct MessageTemplate<'a> {
user: Option<User>,
user: Option<model::User>,
message: &'a str,
}
@ -252,7 +299,7 @@ struct MessageTemplate<'a> {
#[derive(Template)]
#[template(path = "sign_up_form.html")]
struct SignUpFormTemplate {
user: Option<User>,
user: Option<model::User>,
email: String,
message: String,
message_email: String,
@ -300,7 +347,7 @@ pub async fn sign_up_post(
fn error_response(
error: SignUpError,
form: &web::Form<SignUpFormData>,
user: Option<User>,
user: Option<model::User>,
) -> Result<HttpResponse> {
Ok(SignUpFormTemplate {
user,
@ -486,7 +533,7 @@ pub async fn sign_up_validation(
#[derive(Template)]
#[template(path = "sign_in_form.html")]
struct SignInFormTemplate {
user: Option<User>,
user: Option<model::User>,
email: String,
message: String,
}
@ -524,7 +571,7 @@ pub async fn sign_in_post(
fn error_response(
error: SignInError,
form: &web::Form<SignInFormData>,
user: Option<User>,
user: Option<model::User>,
) -> Result<HttpResponse> {
Ok(SignInFormTemplate {
user,

22
backend/src/services/api.rs
View file

@ -1,22 +1,12 @@
use actix_web::{
cookie::Cookie,
get,
http::{header, header::ContentType, StatusCode},
post, put, web, HttpMessage, HttpRequest, HttpResponse, Responder,
};
use chrono::Duration;
use futures::TryFutureExt;
use log::{debug, error, info, log_enabled, Level};
use ron::de::from_bytes;
use serde::Deserialize;
use super::Result;
use crate::config::Config;
use crate::consts;
use crate::data::{asynchronous, db};
use crate::model;
use crate::user::User;
use crate::utils;
#[put("/ron-api/recipe/set-title")]
pub async fn set_recipe_title(
@ -43,3 +33,15 @@ pub async fn set_recipe_description(
.await?;
Ok(HttpResponse::Ok().finish())
}
// #[put("/ron-api/recipe/add-image)]
// #[put("/ron-api/recipe/rm-photo")]
// #[put("/ron-api/recipe/add-ingredient")]
// #[put("/ron-api/recipe/rm-ingredient")]
// #[put("/ron-api/recipe/set-ingredients-order")]
// #[put("/ron-api/recipe/add-group")]
// #[put("/ron-api/recipe/rm-group")]
// #[put("/ron-api/recipe/set-groups-order")]
// #[put("/ron-api/recipe/add-step")]
// #[put("/ron-api/recipe/rm-step")]
// #[put("/ron-api/recipe/set-steps-order")]

11
backend/src/user.rs
View file

@ -1,11 +0,0 @@
use chrono::prelude::*;
pub struct User {
pub email: String,
}
pub struct UserLoginInfo {
pub last_login_datetime: DateTime<Utc>,
pub ip: String,
pub user_agent: String,
}