Add/delete tasks, read task id from db

src/app.rs

@@ -1,6 +1,5 @@
 // use indexmap::IndexMap;
 // use int_enum::IntEnum;
-// use crate::get_all_tasks;
 use rusqlite::Connection;
 use serde::{Deserialize, Serialize};
 use std::cmp::min;
@@ -22,6 +21,7 @@ pub struct Column {
 
 #[derive(Clone, Default, Deserialize, Serialize, Debug)]
 pub struct Task {
+    pub id: i64,
     pub title: String,
     pub description: String,
 }
@@ -71,7 +71,7 @@ impl Default for TaskState<'_> {
 
 pub struct State<'a> {
     pub project: Project,
-    pub db_pool: Connection,
+    pub db_conn: Connection,
     pub quit: bool,
     pub columns: Vec<Column>,
     pub task_edit_state: Option<TaskState<'a>>,
@@ -83,7 +83,7 @@ impl State<'_> {
         State {
             quit: false,
             task_edit_state: None,
-            db_pool,
+            db_conn: db_pool,
             project,
             columns: vec![],
         }
@@ -100,10 +100,9 @@ impl<'a> Column {
         }
     }
 
-    pub fn add_task(&mut self, title: String, description: String) {
+    pub fn add_task(&mut self, task: Task) {
-        let task = Task { title, description };
         self.tasks.push(task);
-        self.select_next_task();
+        self.select_last_task();
     }
 
     pub fn remove_task(&mut self) {

src/db.rs

@@ -1,10 +1,10 @@
-use crate::{Task};
+use crate::{Column, Task};
-use rusqlite::{Connection, Result};
+use rusqlite::{params, Connection, Result};
 
 pub fn get_tasks_by_column(conn: &Connection, column_name: &String) -> Result<Vec<Task>> {
     let mut stmt = conn.prepare(
         r#"
-            select title, description from task
+            select task.id, title, description from task
             join kb_column on column_id = kb_column.id
             where kb_column.name = ?1
         "#,
@@ -12,8 +12,9 @@ pub fn get_tasks_by_column(conn: &Connection, column_name: &String) -> Result<Ve
     let mut tasks = Vec::new();
     let rows = stmt.query_map(&[column_name], |row| {
         Ok(Task {
-            title: row.get(0)?,
+            id: row.get(0)?,
-            description: row.get(1)?,
+            title: row.get(1)?,
+            description: row.get(2)?,
         })
     })?;
     for row in rows {
@@ -24,9 +25,7 @@ pub fn get_tasks_by_column(conn: &Connection, column_name: &String) -> Result<Ve
 
 pub fn get_all_tasks(conn: &Connection) -> Result<Vec<(String, Vec<Task>)>> {
     let mut stmt = conn.prepare("select name from kb_column")?;
-    let columns = stmt.query_map((), |row| {
+    let columns = stmt.query_map((), |row| Ok(row.get::<usize, String>(0)?))?;
-        Ok(row.get::<usize, String>(0)?)
-    })?;
     let mut tasks_by_column: Vec<(String, Vec<Task>)> = Vec::new();
     for col in columns {
         let name = &col?;
@@ -36,13 +35,23 @@ pub fn get_all_tasks(conn: &Connection) -> Result<Vec<(String, Vec<Task>)>> {
     Ok(tasks_by_column)
 }
 
-// pub async fn insert_new_task(pool: &SqlitePool, task: &Task, column: &Column) {
+pub fn insert_new_task(conn: &Connection, title: String, description: String, _column: &Column) -> Task {
-//     // TODO: You have to add the id to the column
+    let mut stmt = conn
-//     sqlx::query!("insert into task(title, description, column_id) values (?1, ?2, ?3)", task.title, task.description, 1)
+        .prepare("insert into task(title, description, column_id) values (?1, ?2, ?3)")
-//         .execute(pool)
+        .unwrap();
-//         .await
+    stmt.execute(params![title, description, 1])
-//         .unwrap();
+        .unwrap();
-// }
+    let id = conn.last_insert_rowid();
+    Task { id, title, description }
+}
+
+pub fn delete_task(conn: &Connection, task: &Task) {
+    let mut stmt = conn
+        .prepare("delete from task where id = ?1")
+        .unwrap();
+    stmt.execute([task.id])
+        .unwrap();
+}
 
 // pub async fn update_task(pool: &SqlitePool, task: &Task) {
 //     sqlx::query!("update task set title = ?1, description = ?2", task.title, task.description)
@@ -66,11 +75,3 @@ pub fn get_all_tasks(conn: &Connection) -> Result<Vec<(String, Vec<Task>)>> {
 //         .await
 //         .unwrap();
 // }
-
-// pub async fn delete_task(pool: &SqlitePool, task: &Task) {
-//     // TODO: We have to add ids to tasks
-//     sqlx::query!("delete from task where id = ?1", 1)
-//         .execute(pool)
-//         .await
-//         .unwrap();
-// }

src/input.rs

@@ -1,4 +1,5 @@
 use crate::app::{State, TaskEditFocus, TaskState};
+use crate::{db};
 use crossterm::event;
 use crossterm::event::{Event, KeyCode};
 
@@ -41,7 +42,8 @@ pub fn handle(state: &mut State<'_>) -> Result<(), std::io::Error> {
                                     selected_task.description = description;
                                 }
                             } else {
-                                column.add_task(title, description);
+                                let task = db::insert_new_task(&state.db_conn, title, description, &column);
+                                column.add_task(task);
                             }
                             state.task_edit_state = None;
                             project.save();
@@ -80,7 +82,8 @@ pub fn handle(state: &mut State<'_>) -> Result<(), std::io::Error> {
                 }
                 KeyCode::Char('D') => {
                     column.remove_task();
-                    project.save();
+                    db::delete_task(&state.db_conn, column.get_selected_task().unwrap());
+                    // project.save();
                 }
                 _ => {}
             },