working on rust side

cookbook/src/lib.rs

@@ -38,6 +38,14 @@ pub mod recipes {
             .execute(conn)
             .is_ok()
     }
+
+    pub fn get(conn: &SqliteConnection, recipe_id: i32) -> Option<Recipe> {
+        use self::schema::recipes::dsl::*;
+
+        recipes.filter(id.eq(recipe_id))
+            .first(conn)
+            .ok()
+    }
 }
 
 pub mod ingredients {

planner/src/solver.rs

@@ -19,7 +19,7 @@ pub type DomainValues<'a, V> = Vec<&'a V>;
 /// The domain of values that can be assigned to variables
 #[derive(Clone)]
 pub struct Domain<V> {
-    values: Vec<V>
+    pub values: Vec<V>
 }
 
 impl<V> Domain<V> {
@@ -51,6 +51,7 @@ impl<V> Domain<V> {
             .filter(|v: &&V| filter_func(*v))
             .collect()
     }
+
 }
 
 impl<V: fmt::Debug> fmt::Debug for Domain<V> {
@@ -118,7 +119,12 @@ impl<'a,V, K: Eq + Hash + Clone> Problem<'a, V, K> {
     {
         let mut solutions: Vec<Variables<V, K>> = vec![];
         let mut stack: Vec<Assignment<'a, V, K>> = vec![];
-        stack.append(&mut self._push_updates().unwrap());
+        if let Some(mut init_updates) = self._push_updates() {
+            stack.append(&mut init_updates);
+        } else {
+            panic!("Could not initialize !");
+        }
+
         loop {
             let node = stack.pop();
             if node.is_none() { break; };
@@ -150,7 +156,12 @@ impl<'a,V, K: Eq + Hash + Clone> Problem<'a, V, K> {
               K: Clone + fmt::Debug,
     {
         let mut stack: Vec<Assignment<'a, V, K>> = vec![];
-        stack.append(&mut self._push_updates().unwrap());
+        if let Some(mut init_updates) = self._push_updates() {
+            stack.append(&mut init_updates);
+        } else {
+            panic!("Could not initialize !");
+        }
+
         loop {
             let node = stack.pop();
             if node.is_none() {

web/src/main.rs

@@ -37,7 +37,7 @@ mod api {
     pub struct CookbookDbConn(diesel::SqliteConnection);
 
     /// A serializable wrapper for [`cookbook::recipes::Recipe`]
-    #[derive(Serialize)]
+    #[derive(Serialize, Deserialize, Debug)]
     pub struct RecipeObject {
         id: i32,
         title: String,
@@ -76,13 +76,13 @@ mod api {
         Json( recipes::delete(&conn, id) )
     }
 
-    #[derive(Serialize)]
+    #[derive(Serialize, Deserialize, Debug)]
     pub struct TemplateItems {
         key: (String, String),
         value: Option<RecipeObject>,
     }
 
-    #[derive(Serialize)]
+    #[derive(Serialize, Deserialize)]
     pub struct TemplateObject {
         items: Vec<TemplateItems>
     }
@@ -118,6 +118,65 @@ mod api {
             panic!("No solution at all !");
         }
     }
+
+
+    #[post("/solver/complete", data="<partial>")]
+    pub fn complete_problem(conn: CookbookDbConn, partial: Json<Vec<TemplateItems>>) -> Json<TemplateObject> {
+        use planner::{
+            template,
+            solver::{Domain, Problem}
+        };
+
+        println!("{:?}", partial);
+        println!("Building problem");
+        let possible_values = recipes::load_all(&conn);
+        let domain = Domain::new(possible_values);
+        let mut problem = Problem::build();
+        for (var, dom, ini) in template::Template::generate_variables(&domain) {
+            // Let's hack for now
+            // BUGGY because template does not generate every variables, needs refactoring
+            // Find variable in partial
+            let initial_id = partial.iter().find_map(|slot| {
+                if slot.value.is_none() { return None; };
+                //println!("{:?} vs {:?}", slot, var);
+                if slot.key.0 == var.0
+                   && slot.key.1 == format!("{:?}",var.1)
+                {
+                       let id = slot.value.as_ref().unwrap().id;
+                       println!("found initial : recipe with id {}", id);
+                       return Some(id);
+                } else {
+                    return None;
+                }
+            });
+            let ini = if let Some(id) = initial_id {
+                let new_ini = domain.values.iter().find(|r| r.id == id);
+                println!("Overrided {:?}", new_ini);
+                new_ini
+            } else {
+                ini
+            };
+            // If found, override initial value
+            problem = problem.add_variable(var, dom, ini);
+        }
+        let mut problem = problem
+            .add_constraint(|_| true)
+            .finish();
+        if let Some(one_result) = problem.solve_one() {
+            Json(TemplateObject {
+                items: one_result
+                        .into_iter()
+                        .map(|(k,v)| {
+                            TemplateItems {
+                                key: (format!("{}", k.0), format!("{:?}", k.1)),
+                                value: v.map(|r| RecipeObject::from(&conn, r.clone())),
+                        }})
+                        .collect(),
+            })
+        } else {
+            panic!("No solution at all !");
+        }
+    }
 }
 
 fn main() -> Result<(), Error> {
@@ -137,7 +196,12 @@ fn main() -> Result<(), Error> {
     rocket::ignite()
         .attach(api::CookbookDbConn::fairing())
         .mount("/", routes![index, files])
-        .mount("/api", routes![api::recipes_list, api::delete_recipe, api::one_solution])
+        .mount("/api", routes![
+            api::recipes_list,
+            api::delete_recipe,
+            api::one_solution,
+            api::complete_problem,
+        ])
         .attach(cors)
         .launch();
     Ok(())

web/vue/src/components/Planner.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="box">
-    <button @click="fetchSolution"
+    <button @click="fetchCompletion"
             class="button is-primary is-fullwidth"
             v-bind:class="{'is-loading': is_loading }">
     FetchSolution</button>
-    <div v-if="template">
+    <div class="box">
       <div class="columns is-mobile is-vcentered is-multiline">
         <div v-for="[day, meals] in itemsGroupedByDay"
              class="column is-one-quarter-desktop is-half-mobile">
@@ -108,8 +108,24 @@ export default {
           this.is_loading = false;
           return res.json();}
         )
-        .then((data) => this.template.updateJson(data)) 
-        .catch((err) => console.log(err));
+        .then((data) => this.template.updateJson(data))
+        .catch((err) => console.error(err));
+    },
+    fetchCompletion: function() {
+      this.is_loading = true;
+      // TODO: Keep only value's id
+      let body = JSON.stringify(this.template.items);
+      fetch("http://localhost:8000/api/solver/complete", {
+        method: 'POST',
+        body,
+      })
+        .then((res) => {
+          this.is_loading = false;
+          return res.json();}
+        )
+        .then((data) => this.template.updateJson(data))
+        .catch((err) => console.error(err));
+
     },
     unsetMeal: function(mealKey) {
       let idx = this.template.findIndexByKey(mealKey);

web/vue/src/components/RecipeDetails.vue

@@ -2,9 +2,10 @@
   <div class="columns">
     <div class="column is-narrow">
       <a @click="$emit('close')"
-         class="has-text-dark">
+         class="button is-large is-outlined-dark is-fullwidth">
+        <span>Liste</span>
         <span class="icon is-large">
-          <i class="mdi mdi-48px mdi-view-list"></i>
+          <i class="mdi mdi-36px mdi-view-list"></i>
         </span>
       </a>
       <br class="is-hidden-mobile"/>

web/vue/src/components/RecipeList.vue

@@ -13,9 +13,11 @@
     </div>
     <div v-else class="columns">
       <div class="column is-narrow">
-        <a @click="setActiveCategory(-1)" class="has-text-dark">
+        <a @click="setActiveCategory(-1)"
+           class="button is-large is-fullwidth">
+          <span>Catégories</span>
           <span class="icon is-large" >
-            <i class="mdi mdi-48px mdi-view-grid"></i>
+            <i class="mdi mdi-36px mdi-view-grid"></i>
           </span>
         </a>
       </div>