Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions domain-model.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@

## Task Class

| Methods | Variables | Scenario | Output |
|-------------------------|----------------------|-----------------------------|-----------------------|
| | `boolean completed ` | | |
| | `String name ` | | |
| `void completeTask() ` | | A task is completed | Set completed to true |
| `String getName() ` | | Want to fetch a task name | Return task name |
| `boolean getStatus() ` | | Want to fetch a task status | Return task status |
| | | | |


## ToDoList Class

| Methods | Variables | Scenario | Output |
|-----------------------------------------|------------------------------|----------------------------------------------------|---------------------------------------------------------|
| | `ArrayList<Task task> list ` | | |
| ` void addTask(Task task) ` | | Want to add a task to the ToDo List | Adds task to list |
| ` Arraylist<String> seeAllTasks() ` | | Want to see all tasks in the list | Shows tasks in list |
| ` void changeStaus(Task task) ` | | Want to change status of existing task | Changes completed variable in chosen task |
| ` Arraylist<Task> getCompletedTasks() ` | | Want to get only completed tasks | Returns all completed tasks |
| ` Arraylist<Task> getInompleteTasks() ` | | Want to get only incomplete tasks | Returns all incomplete tasks |
| ` Task search(String taskName) ` | | Want to search for tasks | Searches for and returns task, and informs if not found |
| ` void removeTask(String taskName) ` | | Want to remove a task | removes task from list |
| ` Arraylist<String> alphabeticalA() ` | | Want to see tasks in alphabetical ascending order | Shows tasks in alphabetical ascending order |
| ` Arraylist<String> alphabeticalD() ` | | Want to see tasks in alphabetical descending order | Shows tasks in alphabetical descending order |
24 changes: 24 additions & 0 deletions src/main/java/com/booleanuk/core/Task.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.booleanuk.core;

public class Task {

String name;
boolean completed;

public Task(String name){
this.name = name;
this.completed = false;
}

public String getName(){
return this.name;
}

public boolean getStatus(){
return this.completed;
}

public void setStatus(boolean status){
this.completed = status;
}
}
83 changes: 83 additions & 0 deletions src/main/java/com/booleanuk/core/ToDoList.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
package com.booleanuk.core;

import java.util.ArrayList;
import java.util.Collections;

public class ToDoList {

ArrayList<Task> tasks = new ArrayList<>();

public void addTask(Task task){
if (!tasks.contains(task)){
tasks.add(task);
}
}

public void removeTask(String taskName){
tasks.removeIf(task -> task.getName().equals(taskName));
}

public void changeStatus(Task task, boolean completed){
if (tasks.contains(task)){
task.setStatus(completed);
}
}

public ArrayList<String> seeAllTasks(){

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just return the original array of tasks here?

ArrayList<String> showTasks = new ArrayList<>();
for (int i = 0; i < tasks.size(); i++){
showTasks.add(i, tasks.get(i).name);
}
return showTasks;
}

public ArrayList<Task> getCompletedTasks(){
ArrayList<Task> completedTasks = new ArrayList<>();
for (Task task : tasks){
if (task.completed){
completedTasks.add(task);
}
}
return completedTasks;
}

public ArrayList<Task> getIncompleteTasks(){
ArrayList<Task> incompleteTasks = new ArrayList<>();
for (Task task : tasks){
if (!task.completed){
incompleteTasks.add(task);
}
}
return incompleteTasks;
}

public Task search(String taskName){
for (Task task : tasks){
if (task.name.equals(taskName)){
return task;
}
}
System.out.println("The task was not found or does not exist!");
return null;
}

public ArrayList<String> alphabeticalA(){
ArrayList<String> alphabeticalAscending = new ArrayList<>();
for (Task task : tasks){
alphabeticalAscending.add(task.name);
}
Collections.sort(alphabeticalAscending);
return alphabeticalAscending;
}

public ArrayList<String> alphabeticalD(){
ArrayList<String> alphabeticalDescending = new ArrayList<>();
for (Task task : tasks){
alphabeticalDescending.add(task.name);
}
Collections.sort(alphabeticalDescending);
Collections.reverse(alphabeticalDescending);
return alphabeticalDescending;
}

}
5 changes: 0 additions & 5 deletions src/main/java/com/booleanuk/core/TodoList.java

This file was deleted.

37 changes: 37 additions & 0 deletions src/main/java/com/booleanuk/extension/Task.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.booleanuk.extension;

public class Task {

private static int counter = 0;
private final int id;
private String name;
private boolean completed;

public Task(String name){
this.name = name;
this.completed = false;
this.id = counter += 1;
}

public int getId(){
return this.id;
}

public String getName(){
return this.name;
}

public void changeName(String newName){
this.name = newName;
}

public boolean getStatus(){
return this.completed;
}

public void setStatus(boolean status){
this.completed = status;
}


}
104 changes: 104 additions & 0 deletions src/main/java/com/booleanuk/extension/ToDoList.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
package com.booleanuk.extension;

import java.util.ArrayList;
import java.util.Collections;

public class ToDoList {

ArrayList<Task> tasks = new ArrayList<>();

public Task getTask(int id){
for (Task task : tasks){
if (task.getId() == id){
return task;
}
}
System.out.println("No task with this ID!");
return null;
}

public void updateName(int id, String newName){
for (Task task : tasks){
if (task.getId() == id){
task.changeName(newName);
}
}
System.out.println("No task with given ID!");
}

public void addTask(Task task){
if (!tasks.contains(task)){
tasks.add(task);
}
}

public void removeTask(String taskName){
tasks.removeIf(task -> task.getName().equals(taskName));
}

public void changeStatus(int id, boolean completed){
for (Task task : tasks){
if (task.getId() == id){
task.setStatus(completed);
}
}
}

public ArrayList<String> seeAllTasks(){
ArrayList<String> showTasks = new ArrayList<>();
for (int i = 0; i < tasks.size(); i++){
showTasks.add(i, tasks.get(i).getName());
}
return showTasks;
}

public ArrayList<Task> getCompletedTasks(){
ArrayList<Task> completedTasks = new ArrayList<>();
for (Task task : tasks){
if (task.getStatus()){
completedTasks.add(task);
}
}
return completedTasks;
}

public ArrayList<Task> getIncompleteTasks(){
ArrayList<Task> incompleteTasks = new ArrayList<>();
for (Task task : tasks){
if (!task.getStatus()){
incompleteTasks.add(task);
}
}
return incompleteTasks;
}

public Task search(String taskName){
for (Task task : tasks){
if (task.getName().equals(taskName)){
return task;
}
}
System.out.println("The task was not found or does not exist!");
return null;
}

public ArrayList<String> alphabeticalA(){
ArrayList<String> alphabeticalAscending = new ArrayList<>();
for (Task task : tasks){
alphabeticalAscending.add(task.getName());
}
Collections.sort(alphabeticalAscending);
return alphabeticalAscending;
}

public ArrayList<String> alphabeticalD(){
ArrayList<String> alphabeticalDescending = new ArrayList<>();
for (Task task : tasks){
alphabeticalDescending.add(task.getName());
}
Collections.sort(alphabeticalDescending);
Collections.reverse(alphabeticalDescending);
return alphabeticalDescending;
}

}
51 changes: 51 additions & 0 deletions src/test/java/com/booleanuk/core/TaskTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.booleanuk.core;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class TaskTest {

@Test
public void testValidTask(){
Task task = new Task("Code");

Assertions.assertFalse(task.name.isEmpty());
Assertions.assertFalse(task.completed);
}

@Test
public void testGetName(){
Task task = new Task("Run");

String name = task.getName();
Assertions.assertEquals("Run", name);
}

@Test
public void testChangeStatusTrue(){
Task task = new Task("Run");

task.setStatus(true);
Assertions.assertTrue(task.getStatus());
}

@Test
public void testChangeStatusFalse(){
Task task = new Task("Run");

task.setStatus(true);
Assertions.assertTrue(task.getStatus());
task.setStatus(false);
Assertions.assertFalse(task.getStatus());
}

@Test
public void testGetStatus(){
Task task = new Task("Run");

Assertions.assertFalse(task.getStatus());
task.setStatus(true);
Assertions.assertTrue(task.getStatus());
}

}
Loading
Loading