use itertools::Itertools;
use chrono::{prelude::*, Duration};
use rusqlite::{named_params, OptionalExtension, params, Params};
-use r2d2::Pool;
+use r2d2::{Pool, PooledConnection};
use r2d2_sqlite::SqliteConnectionManager;
use rand::distributions::{Alphanumeric, DistString};
pub enum ValidationResult {
UnknownUser,
ValidationExpired,
- Ok(String, i32), // Returns token and user id.
+ Ok(String, i64), // Returns token and user id.
}
#[derive(Debug)]
UserNotFound,
WrongPassword,
AccountNotValidated,
- Ok(String, i32), // Returns token and user id.
+ Ok(String, i64), // Returns token and user id.
}
#[derive(Debug)]
pub enum AuthenticationResult {
NotValidToken,
- Ok(i32), // Returns user id.
+ Ok(i64), // Returns user id.
}
#[derive(Clone)]
pub struct Connection {
- //con: rusqlite::Connection
pool: Pool<SqliteConnectionManager>
}
fn create_connection(manager: SqliteConnectionManager) -> Result<Connection> {
let pool = r2d2::Pool::new(manager).unwrap();
let connection = Connection { pool };
- connection.create_or_update()?;
+ connection.create_or_update_db()?;
Ok(connection)
}
+ fn get(&self) -> Result<PooledConnection<SqliteConnectionManager>> {
+ let con = self.pool.get()?;
+ con.pragma_update(None, "synchronous", "NORMAL")?;
+ Ok(con)
+ }
+
/// Called after the connection has been established for creating or updating the database.
/// The 'Version' table tracks the current state of the database.
- fn create_or_update(&self) -> Result<()> {
+ fn create_or_update_db(&self) -> Result<()> {
// Check the Database version.
- let mut con = self.pool.get()?;
+ let mut con = self.get()?;
+ con.pragma_update(None, "journal_mode", "WAL")?;
+
let tx = con.transaction()?;
// Version 0 corresponds to an empty database.
}
}
- pub fn get_all_recipe_titles(&self) -> Result<Vec<(i32, String)>> {
- let con = self.pool.get()?;
+ pub fn get_all_recipe_titles(&self) -> Result<Vec<(i64, String)>> {
+ let con = self.get()?;
let mut stmt = con.prepare("SELECT [id], [title] FROM [Recipe] ORDER BY [title]")?;
- let titles: std::result::Result<Vec<(i32, String)>, rusqlite::Error> =
+ let titles: std::result::Result<Vec<(i64, String)>, rusqlite::Error> =
stmt.query_map([], |row| {
Ok((row.get("id")?, row.get("title")?))
})?.collect();
/* Not used for the moment.
pub fn get_all_recipes(&self) -> Result<Vec<model::Recipe>> {
- let con = self.pool.get()?;
+ let con = self.get()?;
let mut stmt = con.prepare("SELECT [id], [title] FROM [Recipe] ORDER BY [title]")?;
let recipes =
stmt.query_map([], |row| {
Ok(recipes)
} */
- pub fn get_recipe(&self, id: i32) -> Result<model::Recipe> {
- let con = self.pool.get()?;
+ 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", [id], |row| {
Ok(model::Recipe::new(row.get("id")?, row.get("title")?, row.get("description")?))
}).map_err(DBError::from)
}
pub fn get_user_login_info(&self, token: &str) -> Result<UserLoginInfo> {
- let con = self.pool.get()?;
+ let con = self.get()?;
con.query_row("SELECT [last_login_datetime], [ip], [user_agent] FROM [UserLoginToken] WHERE [token] = ?1", [token], |r| {
Ok(UserLoginInfo {
last_login_datetime: r.get("last_login_datetime")?,
}).map_err(DBError::from)
}
- pub fn load_user(&self, user_id: i32) -> Result<User> {
- let con = self.pool.get()?;
+ pub fn load_user(&self, user_id: i64) -> Result<User> {
+ let con = self.get()?;
con.query_row("SELECT [email] FROM [User] WHERE [id] = ?1", [user_id], |r| {
Ok(User {
email: r.get("email")?,
}
fn sign_up_with_given_time(&self, email: &str, password: &str, datetime: DateTime<Utc>) -> Result<SignUpResult> {
- let mut con = self.pool.get()?;
+ let mut con = self.get()?;
let tx = con.transaction()?;
let token =
match tx.query_row("SELECT [id], [validation_token] FROM [User] WHERE [email] = ?1", [email], |r| {
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, Option<String>>("validation_token")?))
+ Ok((r.get::<&str, i64>("id")?, r.get::<&str, Option<String>>("validation_token")?))
}).optional()? {
Some((id, validation_token)) => {
if validation_token.is_none() {
}
pub fn validation(&self, token: &str, validation_time: Duration, ip: &str, user_agent: &str) -> Result<ValidationResult> {
- let mut con = self.pool.get()?;
+ let mut con = self.get()?;
let tx = con.transaction()?;
let user_id =
match tx.query_row("SELECT [id], [creation_datetime] FROM [User] WHERE [validation_token] = ?1", [token], |r| {
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, DateTime<Utc>>("creation_datetime")?))
+ Ok((r.get::<&str, i64>("id")?, r.get::<&str, DateTime<Utc>>("creation_datetime")?))
}).optional()? {
Some((id, creation_datetime)) => {
if Utc::now() - creation_datetime > validation_time {
}
pub fn sign_in(&self, email: &str, password: &str, ip: &str, user_agent: &str) -> Result<SignInResult> {
- let mut con = self.pool.get()?;
+ let mut con = self.get()?;
let tx = con.transaction()?;
match tx.query_row("SELECT [id], [password], [validation_token] FROM [User] WHERE [email] = ?1", [email], |r| {
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, String>("password")?, r.get::<&str, Option<String>>("validation_token")?))
+ Ok((r.get::<&str, i64>("id")?, r.get::<&str, String>("password")?, r.get::<&str, Option<String>>("validation_token")?))
}).optional()? {
Some((id, stored_password, validation_token)) => {
if validation_token.is_some() {
}
pub fn authentication(&self, token: &str, ip: &str, user_agent: &str) -> Result<AuthenticationResult> {
- let mut con = self.pool.get()?;
+ let mut con = self.get()?;
let tx = con.transaction()?;
match tx.query_row("SELECT [id], [user_id] FROM [UserLoginToken] WHERE [token] = ?1", [token], |r| {
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, i32>("user_id")?))
+ Ok((r.get::<&str, i64>("id")?, r.get::<&str, i64>("user_id")?))
}).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])?;
}
pub fn sign_out(&self, token: &str) -> Result<()> {
- let mut con = self.pool.get()?;
+ let mut con = self.get()?;
let tx = con.transaction()?;
match tx.query_row("SELECT [id] FROM [UserLoginToken] WHERE [token] = ?1", [token], |r| {
- Ok(r.get::<&str, i32>("id")?)
+ Ok(r.get::<&str, i64>("id")?)
}).optional()? {
Some(login_id) => {
tx.execute("DELETE FROM [UserLoginToken] WHERE [id] = ?1", params![login_id])?;
Ok(())
}
+ pub fn create_recipe(&self, user_id: i64) -> Result<i64> {
+ 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]
+ 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()? {
+ Some(recipe_id) => Ok(recipe_id),
+ None => {
+ con.execute("INSERT INTO [Recipe] ([user_id], [title]) VALUES (?1, '')", [user_id])?;
+ Ok(con.last_insert_rowid())
+ },
+ }
+ }
+
+ pub fn set_recipe_title(&self, recipe_id: i64, title: &str) -> Result<()> {
+ let con = self.get()?;
+ con.execute("UPDATE [Recipe] SET [title] = ?2 WHERE [id] = ?1", params![recipe_id, title]).map(|_n| ()).map_err(DBError::from)
+ }
+
+ pub fn set_recipe_description(&self, recipe_id: i64, description: &str) -> Result<()> {
+ let con = self.get()?;
+ con.execute("UPDATE [Recipe] SET [description] = ?2 WHERE [id] = ?1", params![recipe_id, description]).map(|_n| ()).map_err(DBError::from)
+ }
+
/// Execute a given SQL file.
pub fn execute_file<P: AsRef<Path> + fmt::Display>(&self, file: P) -> Result<()> {
- let con = self.pool.get()?;
+ let con = self.get()?;
let sql = load_sql_file(file)?;
con.execute_batch(&sql).map_err(DBError::from)
}
/// Execute any SQL statement.
/// Mainly used for testing.
pub fn execute_sql<P: Params>(&self, sql: &str, params: P) -> Result<usize> {
- let con = self.pool.get()?;
+ let con = self.get()?;
con.execute(sql, params).map_err(DBError::from)
}
// Return the token.
- fn create_login_token(tx: &rusqlite::Transaction, user_id: i32, ip: &str, user_agent: &str) -> Result<String> {
+ fn create_login_token(tx: &rusqlite::Transaction, user_id: i64, ip: &str, 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])?;
Ok(token)
#[cfg(test)]
mod tests {
use super::*;
+ use rusqlite::{Error, ErrorCode, ffi, types::Value};
#[test]
fn sign_up() -> Result<()> {
let connection = Connection::new_in_memory()?;
- match connection.sign_up("paul@test.org", "12345")? {
+ match connection.sign_up("paul@atreides.com", "12345")? {
SignUpResult::UserCreatedWaitingForValidation(_) => (), // Nominal case.
other => panic!("{:?}", other),
}
INSERT INTO [User] ([id], [email], [name], [password], [creation_datetime], [validation_token])
VALUES (
1,
- 'paul@test.org',
+ 'paul@atreides.com',
'paul',
'$argon2id$v=19$m=4096,t=3,p=1$1vtXcacYjUHZxMrN6b2Xng$wW8Z59MIoMcsIljnjHmxn3EBcc5ymEySZPUVXHlRxcY',
0,
NULL
);", [])?;
- match connection.sign_up("paul@test.org", "12345")? {
+ match connection.sign_up("paul@atreides.com", "12345")? {
SignUpResult::UserAlreadyExists => (), // Nominal case.
other => panic!("{:?}", other),
}
fn sign_up_and_sign_in_without_validation() -> Result<()> {
let connection = Connection::new_in_memory()?;
- let email = "paul@test.org";
+ let email = "paul@atreides.com";
let password = "12345";
match connection.sign_up(email, password)? {
INSERT INTO [User] ([id], [email], [name], [password], [creation_datetime], [validation_token])
VALUES (
1,
- 'paul@test.org',
+ 'paul@atreides.com',
'paul',
'$argon2id$v=19$m=4096,t=3,p=1$1vtXcacYjUHZxMrN6b2Xng$wW8Z59MIoMcsIljnjHmxn3EBcc5ymEySZPUVXHlRxcY',
0,
:token
);", named_params! { ":token": token })?;
- match connection.sign_up("paul@test.org", "12345")? {
+ match connection.sign_up("paul@atreides.com", "12345")? {
SignUpResult::UserCreatedWaitingForValidation(_) => (), // Nominal case.
other => panic!("{:?}", other),
}
fn sign_up_then_send_validation_at_time() -> Result<()> {
let connection = Connection::new_in_memory()?;
let validation_token =
- match connection.sign_up("paul@test.org", "12345")? {
+ match connection.sign_up("paul@atreides.com", "12345")? {
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.
other => panic!("{:?}", other),
};
fn sign_up_then_send_validation_too_late() -> Result<()> {
let connection = Connection::new_in_memory()?;
let validation_token =
- match connection.sign_up_with_given_time("paul@test.org", "12345", Utc::now() - Duration::days(1))? {
+ match connection.sign_up_with_given_time("paul@atreides.com", "12345", Utc::now() - Duration::days(1))? {
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.
other => panic!("{:?}", other),
};
fn sign_up_then_send_validation_with_bad_token() -> Result<()> {
let connection = Connection::new_in_memory()?;
let _validation_token =
- match connection.sign_up("paul@test.org", "12345")? {
+ match connection.sign_up("paul@atreides.com", "12345")? {
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.
other => panic!("{:?}", other),
};
fn sign_up_then_send_validation_then_sign_in() -> Result<()> {
let connection = Connection::new_in_memory()?;
- let email = "paul@test.org";
+ let email = "paul@atreides.com";
let password = "12345";
// Sign up.
fn sign_up_then_send_validation_then_authentication() -> Result<()> {
let connection = Connection::new_in_memory()?;
- let email = "paul@test.org";
+ let email = "paul@atreides.com";
let password = "12345";
// Sign up.
fn sign_up_then_send_validation_then_sign_out_then_sign_in() -> Result<()> {
let connection = Connection::new_in_memory()?;
- let email = "paul@test.org";
+ let email = "paul@atreides.com";
let password = "12345";
// Sign up.
Ok(())
}
+
+
+ #[test]
+ fn create_a_new_recipe_then_update_its_title() -> Result<()> {
+ 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)",
+ params![
+ 1,
+ "paul@atreides.com",
+ "paul",
+ "$argon2id$v=19$m=4096,t=3,p=1$G4fjepS05MkRbTqEImUdYg$GGziE8uVQe1L1oFHk37lBno10g4VISnVqynSkLCH3Lc",
+ "2022-11-29 22:05:04.121407300+00:00",
+ Value::Null,
+ ]
+ )?;
+
+ match connection.create_recipe(2) {
+ Err(DBError::SqliteError(Error::SqliteFailure(ffi::Error { code: ErrorCode::ConstraintViolation, extended_code: _ }, Some(_)))) => (), // Nominal case.
+ other => panic!("Creating a recipe with an inexistant user must fail: {:?}", other),
+ }
+
+ let recipe_id = connection.create_recipe(1)?;
+ assert_eq!(recipe_id, 1);
+
+ connection.set_recipe_title(recipe_id, "Crêpe")?;
+
+ let recipe = connection.get_recipe(recipe_id)?;
+ assert_eq!(recipe.title, "Crêpe".to_string());
+
+ Ok(())
+ }
}
projects / recipes.git / blobdiff