Merge branch 'branch-Level-9' to master branch

Author: KnitidCeladon23

data/saveFile.txt

@@ -2,12 +2,8 @@ T @ 0 @ dishes
 D @ 1 @ submission  @ 2020-06-06
 E @ 0 @ play soccer  @ 2020-03-04
 T @ 1 @ dishes
-D @ 0 @ submission  @ 2020-06-06
-E @ 0 @ play soccer  @ 2020-03-04
-T @ 0 @ dishes
-D @ 0 @ submission  @ 2020-06-06
-D @ 0 @ submission  @ 2020-06-06
-E @ 0 @ play soccer  @ 2020-03-04
+D @ 0 @ another submission  @ 2020-06-06
+E @ 0 @ play table tennis @ 2020-03-04
 T @ 0 @ dishes
-D @ 0 @ submission  @ 2020-06-06
-E @ 0 @ play soccer  @ 2020-03-04
+D @ 0 @ another submission  @ 2020-06-06
+E @ 0 @ play table tennis  @ 2020-03-04

src/main/java/MyDuke.java

@@ -129,6 +129,13 @@ static void deadlineChecker(String[] inputArr) throws NoDeadlineException, NoDat
                             + "eg, deadline return book /by 2020-01-01");
         }
     }
+    static void finderChecker(String[] inputArr) throws NoKeywordException {
+        if (inputArr.length == 1) {
+            throw new NoKeywordException(
+                    "Paikia Bot: you want to find what task, limpeh need more information ah. "
+                            + "input 'find <keyword>. eg, find party");
+        }
+    }
 }
 
 /**
@@ -280,6 +287,31 @@ void handleInput() {
                 });
             }
             break;
+        case "find":
+            try {
+                MyDuke.finderChecker(getParsedInput());
+                String keyword = this.input.split(" ", 2)[1];
+                List<Task> searchResultList = new ArrayList<>();
+                for (Task t : tasks.getTaskList()) {
+                    if (t.info.contains(keyword)) {
+                        searchResultList.add(t);
+                    }
+                }
+                int searchResultCounter = 1;
+                String[] tempSearchResultArr = new String[100];
+                if (searchResultList.isEmpty()) { // improved implementation in case list is empty, gives a clear output
+                    ui.showListEmptyMsg();
+                } else {
+                    for (Task t : searchResultList) { // changed String s to Task t
+                        tempSearchResultArr[searchResultCounter - 1] = searchResultCounter + ". " + t.toString();
+                        searchResultCounter++;
+                    }
+                    ui.printSearchResultList(keyword, tempSearchResultArr);
+                }
+            } catch (NoKeywordException e) {
+                ui.printErrorMsg(e.getMessage());
+            }
+            break;
         default:
             ui.showInputError();
         }
@@ -466,7 +498,17 @@ String getInput(Scanner sc) {
     void print(String[] sArr) {
         System.out.println(DASH);
         for (String s : sArr) {
-            // Level-2 adjustments
+            if (s != null) {
+                System.out.println(s);
+            }
+        }
+        System.out.println(DASH);
+    }
+
+    void print(String description, String[] sArr) {
+        System.out.println(DASH);
+        System.out.println(description);
+        for (String s : sArr) {
             if (s != null) {
                 System.out.println(s);
             }
@@ -553,14 +595,15 @@ void showByeMsg() {
     void printTasksInList(String[] tasksArr) {
         print(tasksArr);
     }
+
+    void printSearchResultList(String keyword, String[] tasksArr) {
+        print("Paikia Bot: dis is your search result for '" + keyword + "'", tasksArr);
+    }
 }
 
-<<<<<<< HEAD
 /**
  * Represents a Task that contains its information/description and a done/not-done status
  */
-=======
->>>>>>> branch-A-CodingStandard
 class Task {
     String info;
     boolean isDone;
@@ -728,6 +771,12 @@ class NoDeadlineException extends MyDukeException {
     }
 }
 
+class NoKeywordException extends MyDukeException {
+    NoKeywordException(String s) {
+        super(s);
+    }
+}
+
 class NoDateException extends MyDukeException {
     NoDateException(String s) {
         super(s);

text-ui-test/EXPECTED.TXT

@@ -1,31 +1,52 @@
 ____________________________________________________________
 Pai Kia Bot: Eh harlo! Call me Pai Kia Bot.
-Pai Kia Bot: I cannot find ur input file sia, could be becuz
-1) u never create file because u r new user, in that case, just continue using this program and i will create the folder and save file for u in the directory [root]/data
-2) ur saveFile.txt is not in the correct directory, pls input bye and shift the file to [root]/data
-3) ur input file is not named saveFile.txt, pls input 'bye' and rename ur input file
-Pai Kia Bot: What help you want?
+____________________________________________________________
+____________________________________________________________
+Pai Kia Bot: Got ur input file, baik la
+____________________________________________________________
+____________________________________________________________
+Pai Kia Bot: how u want me to help u?
+____________________________________________________________
+You: list
+____________________________________________________________
+1. [T][ ] dishes
+2. [D][X] submission (JUN 06 2020)
+3. [E][ ] play soccer (MAR 04 2020)
+4. [T][X] dishes
+5. [D][ ] another submission (JUN 06 2020)
+6. [E][ ] play table tennis(MAR 04 2020)
 ____________________________________________________________
 You: todo dishes
 ____________________________________________________________
 Paikia Bot: ok i just help u added this todo -- [T][ ] dishes
-Paikia Bot: now u got 1 item(s) in your list ah
+Paikia Bot: now u got 7 item(s) in your list ah
+____________________________________________________________
+You: deadline another submission /by June 6th
 ____________________________________________________________
-You: deadline submission /by June 6th
+Paikia Bot: oi your date input got format error cannot parse sial: by June 6th
+Paikia Bot: the format should be liddis: yyyy-mm-dd, eg. 2020-03-02
 ____________________________________________________________
-Paikia Bot: ok i just help u added this deadline -- [D][ ] submission  (by June 6th)
-Paikia Bot: now u got 2 item(s) in your list ah
+You: deadline another submission /by 2020-06-06
 ____________________________________________________________
-You: event play soccer /at Aug 6th 2-4pm
+Paikia Bot: ok i just help u added this event -- [D][ ] another submission (JUN 06 2020)
+Paikia Bot: now u got 8 item(s) in your list ah
 ____________________________________________________________
-Paikia Bot: ok i just help u added this event -- [E][ ] play soccer  (at Aug 6th 2-4pm)
-Paikia Bot: now u got 3 item(s) in your list ah
+You: event play table tennis /at 2020-03-04
+____________________________________________________________
+Paikia Bot: ok i just help u added this event -- [E][ ] play table tennis (MAR 04 2020)
+Paikia Bot: now u got 9 item(s) in your list ah
 ____________________________________________________________
 You: list
 ____________________________________________________________
 1. [T][ ] dishes
-2. [D][ ] submission  (by June 6th)
-3. [E][ ] play soccer  (at Aug 6th 2-4pm)
+2. [D][X] submission (JUN 06 2020)
+3. [E][ ] play soccer (MAR 04 2020)
+4. [T][X] dishes
+5. [D][ ] another submission (JUN 06 2020)
+6. [E][ ] play table tennis(MAR 04 2020)
+7. [T][ ] dishes
+8. [D][ ] another submission (JUN 06 2020)
+9. [E][ ] play table tennis (MAR 04 2020)
 ____________________________________________________________
 You: done
 ____________________________________________________________
@@ -37,37 +58,43 @@ Paikia Bot: the number that you inputted is invalid leh (more than the total num
 ____________________________________________________________
 You: done 4
 ____________________________________________________________
-Paikia Bot: the number that you inputted is invalid leh (more than the total number of tasks or less than 1), try again pls ah
+Paikia Bot: ok i just help u checked this task as done -- [T][X] dishes
 ____________________________________________________________
 You: done 2
 ____________________________________________________________
-Paikia Bot: ok i just help u checked this task as done -- [D][X] submission  (by June 6th)
+Paikia Bot: ok i just help u checked this task as done -- [D][X] submission (JUN 06 2020)
 ____________________________________________________________
 You: list
 ____________________________________________________________
 1. [T][ ] dishes
-2. [D][X] submission  (by June 6th)
-3. [E][ ] play soccer  (at Aug 6th 2-4pm)
+2. [D][X] submission (JUN 06 2020)
+3. [E][ ] play soccer (MAR 04 2020)
+4. [T][X] dishes
+5. [D][ ] another submission (JUN 06 2020)
+6. [E][ ] play table tennis(MAR 04 2020)
+7. [T][ ] dishes
+8. [D][ ] another submission (JUN 06 2020)
+9. [E][ ] play table tennis (MAR 04 2020)
 ____________________________________________________________
 You: todo
 ____________________________________________________________
 Paikia Bot: you want to add what todo task, limpeh need more information ah. input 'todo <info>. eg, todo read book
 ____________________________________________________________
 You: deadline
 ____________________________________________________________
-Paikia Bot: you want to add what deadline task, limpeh need more information ah. input 'deadline <info> <date>. eg, deadline return book /by 10 Aug
+Paikia Bot: you want to add what deadline task, limpeh need more information ah. input 'deadline <info> <date>. eg, deadline return book /by 2020-01-01
 ____________________________________________________________
 You: deadline return another submission
 ____________________________________________________________
-Paikia Bot: i dun see any date inputs leh. to add date input, use '/<date>'. eg, deadline return book /by 10 Aug
+Paikia Bot: i dun see any date inputs leh. to add date input, use '/YYYY-MM-DD'. eg, deadline return book /by 2020-01-01
 ____________________________________________________________
 You: event
 ____________________________________________________________
-Paikia Bot: you want to add what event task, limpeh need more information ah. input 'event <info> /<date>. eg, event bookfest /at 24 Aug 1pm
+Paikia Bot: you want to add what event task, limpeh need more information ah. input 'event <info> /YYYY-MM-DD. eg, event bookfest /at 2020-08-24
 ____________________________________________________________
 You: event another play basketball
 ____________________________________________________________
-Paikia Bot: i dun see any date inputs leh. to add date input, use '/<date>'. eg, event bookfest /at 24 Aug 1pm
+Paikia Bot: i dun see any date inputs leh. to add date input, use '/YYYY-MM-DD'. eg, event bookfest /at 2020-08-24
 ____________________________________________________________
 You: lmao
 ____________________________________________________________
@@ -76,8 +103,14 @@ ____________________________________________________________
 You: list
 ____________________________________________________________
 1. [T][ ] dishes
-2. [D][X] submission  (by June 6th)
-3. [E][ ] play soccer  (at Aug 6th 2-4pm)
+2. [D][X] submission (JUN 06 2020)
+3. [E][ ] play soccer (MAR 04 2020)
+4. [T][X] dishes
+5. [D][ ] another submission (JUN 06 2020)
+6. [E][ ] play table tennis(MAR 04 2020)
+7. [T][ ] dishes
+8. [D][ ] another submission (JUN 06 2020)
+9. [E][ ] play table tennis (MAR 04 2020)
 ____________________________________________________________
 You: delete
 ____________________________________________________________
@@ -93,16 +126,34 @@ Paikia Bot: the number that you inputted is invalid leh (more than the total num
 ____________________________________________________________
 You: delete 1
 ____________________________________________________________
-Paikia Bot: ok i just help u deleted this task -- [T][ ] dishes
-Paikia Bot: now u got 2 item(s) in your list ah
+Paikia Bot: the number that you inputted is invalid leh (more than the total number of tasks or less than 1), try again pls ah
 ____________________________________________________________
 You: list
 ____________________________________________________________
-1. [D][X] submission  (by June 6th)
-2. [E][ ] play soccer  (at Aug 6th 2-4pm)
+1. [T][ ] dishes
+2. [D][X] submission (JUN 06 2020)
+3. [E][ ] play soccer (MAR 04 2020)
+4. [T][X] dishes
+5. [D][ ] another submission (JUN 06 2020)
+6. [E][ ] play table tennis(MAR 04 2020)
+7. [T][ ] dishes
+8. [D][ ] another submission (JUN 06 2020)
+9. [E][ ] play table tennis (MAR 04 2020)
+____________________________________________________________
+You: find play
+____________________________________________________________
+Paikia Bot: dis is your search result for 'play'
+1. [E][ ] play soccer (MAR 04 2020)
+2. [E][ ] play table tennis(MAR 04 2020)
+3. [E][ ] play table tennis (MAR 04 2020)
+____________________________________________________________
+You: find table tennis
+____________________________________________________________
+Paikia Bot: dis is your search result for 'table tennis'
+1. [E][ ] play table tennis(MAR 04 2020)
+2. [E][ ] play table tennis (MAR 04 2020)
 ____________________________________________________________
 You: bye
 ____________________________________________________________
-Pai Kia Bot: Leave so soon ah? Limpeh sleep first, if got no issue don't disturb me.
+Pai Kia Bot: Leave so soon ah? Ok can limpeh help u save your list in [root]/data as saveFile.txt, i go sleep first
 ____________________________________________________________
-Something went wrong: git\data\saveFile.txt (The system cannot find the path specified)

text-ui-test/input.txt

@@ -1,8 +1,8 @@
 list
 todo dishes
-deadline submission /by June 6th
-deadline submission /by 2020-06-06
-event play soccer /at 2020-03-04
+deadline another submission /by June 6th
+deadline another submission /by 2020-06-06
+event play table tennis /at 2020-03-04
 list
 done
 done 0
@@ -21,4 +21,6 @@ delete 0
 delete 10
 delete 1
 list
+find play
+find table tennis
 bye