tasks: hide task.done

bouzuya · Aug 19, 2021 · 8a9e535 · 8a9e535
1 parent 6d64483
commit 8a9e535
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/tasks/src/driver/list_console_presenter.rs b/tasks/src/driver/list_console_presenter.rs
@@ -16,7 +16,7 @@ impl ListPresenter for ListConsolePresenter {
                 .map(|task| format!(
                     "{} {} {}",
                     task.id(),
-                    if task.done { "☑" } else { "☐" },
+                    if task.done() { "☑" } else { "☐" },
                     task.text
                 ))
                 .collect::<Vec<String>>()

diff --git a/tasks/src/driver/task_json_repository.rs b/tasks/src/driver/task_json_repository.rs
@@ -18,7 +18,7 @@ struct TaskData {
 impl From<Task> for TaskData {
     fn from(task: Task) -> Self {
         Self {
-            done: task.done,
+            done: task.done(),
             id: task.id(),
             text: task.text,
         }

diff --git a/tasks/src/entity/task.rs b/tasks/src/entity/task.rs
@@ -1,6 +1,6 @@
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Task {
-    pub done: bool,
+    done: bool,
     id: usize,
     pub text: String,
 }
@@ -18,6 +18,10 @@ impl Task {
         }
     }
 
+    pub fn done(&self) -> bool {
+        self.done
+    }
+
     pub fn id(&self) -> usize {
         self.id
     }

diff --git a/tasks/src/use_case/list_use_case.rs b/tasks/src/use_case/list_use_case.rs
@@ -20,7 +20,7 @@ impl ListUseCase {
             .repository
             .find_all()
             .into_iter()
-            .filter(|task| all || !task.done)
+            .filter(|task| all || !task.done())
             .collect::<Vec<Task>>();
         self.presenter.complete(&tasks);
     }

diff --git a/tasks/src/use_case/task_memory_repository.rs b/tasks/src/use_case/task_memory_repository.rs
@@ -54,8 +54,8 @@ impl TaskRepository for TaskMemoryRepository {
             .iter()
             .position(|t| t.id() == task.id())
             .unwrap();
-        let task = tasks.tasks.get_mut(task_position).unwrap();
-        task.done = true;
+        let task_mut = tasks.tasks.get_mut(task_position).unwrap();
+        *task_mut = task;
     }
 }