Adds ingredients managing

cookbook/src/lib.rs

@@ -6,13 +6,12 @@ pub mod schema;
 pub mod models;
 
 mod recipe;
-mod storage;
 mod importer;
 
 use diesel::prelude::*;
 use dotenv::dotenv;
 use std::env;
-use crate::models::{Recipe, NewRecipe, Ingredient, NewIngredient};
+use crate::models::{Recipe, NewRecipe};
 
 pub fn establish_connection() -> SqliteConnection {
     dotenv().ok();
@@ -39,11 +38,37 @@ pub fn create_recipe(conn: &SqliteConnection, title: &str, ingdts: &str) -> usiz
 
 }
 
-pub fn find_ingredient(conn: &SqliteConnection, alias: &str) -> Option<Ingredient> {
-    // Find ingredient by alias
-    None
+pub mod ingredients {
+    use crate::models::{Ingredient, NewIngredient};
+    use super::{SqliteConnection, schema};
+    use super::diesel::prelude::*;
+
+    pub fn find(conn: &SqliteConnection, name: &str) -> Option<Ingredient> {
+        use self::schema::ingredients::dsl::*;
+
+        let results = ingredients.filter(alias.like(name))
+            .limit(1)
+            .load::<Ingredient>(conn)
+            .expect("Error finding ingredient");
+
+        if !results.is_empty() {
+            Some(results.into_iter().nth(0).unwrap())
+        } else {
+            None
+        }
+    }
+
+    pub fn create(conn: &SqliteConnection, name: &str) -> usize {
+        use self::schema::ingredients;
+
+        diesel::insert_into(ingredients::table)
+            .values(&NewIngredient { alias: name })
+            .execute(conn)
+            .expect("Error inserting ingredient")
+    }
 }
 
+
 #[cfg(test)]
 mod tests {
     #[test]