now if the user inputs a name that does not exist, an exception is th…

…rown and specifies which names are incorrect.
nus-cs2103-AY2223S2 · Mar 24, 2023 · a6d18f1 · a6d18f1
1 parent 0d172a3
commit a6d18f1
Show file tree

Hide file tree

Showing 19 changed files with 161 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,3 @@ docs/_site/
 *.fxml
 *.class
 *.css
-*.png
diff --git a/src/main/java/seedu/address/commons/core/Messages.java b/src/main/java/seedu/address/commons/core/Messages.java
@@ -51,6 +51,7 @@ public class Messages {
         + "Lesson name: %s\n"
         + "Start Time: %s\n"
         + "End Time: %s\n";
-    public static final String MESSAGE_HAS_DUPLICATE_NAMES = "Duplicate names detected for **%s** "
-            + "please enter full name(s)";
+    public static final String MESSAGE_HAS_DUPLICATE_NAMES = "Duplicate names detected for **%s**."
+            + "\nPlease enter full name(s)";
+    public static final String MESSAGE_NO_SUCH_STUDENT = "No student found: **%s**.\nPlease check the name entered";
 }
diff --git a/src/main/java/seedu/address/logic/commands/CreateExamCommand.java b/src/main/java/seedu/address/logic/commands/CreateExamCommand.java
@@ -62,6 +62,16 @@ public CreateExamCommand(List<String> names, NamePredicate predicate, String exa
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/CreateLessonCommand.java b/src/main/java/seedu/address/logic/commands/CreateLessonCommand.java
@@ -64,6 +64,16 @@ public CreateLessonCommand(List<String> names, NamePredicate predicate, String l
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/DeleteExamCommand.java b/src/main/java/seedu/address/logic/commands/DeleteExamCommand.java
@@ -56,6 +56,16 @@ public DeleteExamCommand(List<String> inputNames, NamePredicate predicate, Index
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : inputNames) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder("");
         for (String name : inputNames) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/DeleteLessonCommand.java b/src/main/java/seedu/address/logic/commands/DeleteLessonCommand.java
@@ -56,6 +56,16 @@ public DeleteLessonCommand(List<String> inputNames, NamePredicate predicate, Ind
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : inputNames) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder("");
         for (String name : inputNames) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/UpdateExamCommand.java b/src/main/java/seedu/address/logic/commands/UpdateExamCommand.java
@@ -71,6 +71,16 @@ public UpdateExamCommand(List<String> names, Index index, NamePredicate predicat
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/UpdateLessonCommand.java b/src/main/java/seedu/address/logic/commands/UpdateLessonCommand.java
@@ -71,6 +71,16 @@ public UpdateLessonCommand(List<String> names, Index index, NamePredicate predic
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/ViewExamCommand.java b/src/main/java/seedu/address/logic/commands/ViewExamCommand.java
@@ -93,6 +93,16 @@ public ViewExamCommand(List<String> names, Predicate<Student> namePredicate, Pre
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/ViewLessonCommand.java b/src/main/java/seedu/address/logic/commands/ViewLessonCommand.java
@@ -99,6 +99,16 @@ public ViewLessonCommand(List<String> names, Predicate<Student> namePredicate,
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/homework/CreateHomeworkCommand.java b/src/main/java/seedu/address/logic/commands/homework/CreateHomeworkCommand.java
@@ -58,6 +58,17 @@ public CreateHomeworkCommand(List<String> names, NamePredicate predicate, String
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
+
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/homework/DeleteHomeworkCommand.java b/src/main/java/seedu/address/logic/commands/homework/DeleteHomeworkCommand.java
@@ -55,6 +55,16 @@ public DeleteHomeworkCommand(List<String> names, NamePredicate predicate, Index
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/homework/MarkHomeworkAsDoneCommand.java b/src/main/java/seedu/address/logic/commands/homework/MarkHomeworkAsDoneCommand.java
@@ -57,6 +57,16 @@ public MarkHomeworkAsDoneCommand(List<String> names, NamePredicate predicate, In
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/homework/MarkHomeworkAsUndoCommand.java b/src/main/java/seedu/address/logic/commands/homework/MarkHomeworkAsUndoCommand.java
@@ -56,6 +56,16 @@ public MarkHomeworkAsUndoCommand(List<String> names, NamePredicate predicate, In
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/homework/UpdateHomeworkCommand.java b/src/main/java/seedu/address/logic/commands/homework/UpdateHomeworkCommand.java
@@ -67,6 +67,16 @@ public UpdateHomeworkCommand(List<String> names, Index index, NamePredicate pred
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/logic/commands/homework/ViewHomeworkCommand.java b/src/main/java/seedu/address/logic/commands/homework/ViewHomeworkCommand.java
@@ -78,6 +78,16 @@ public ViewHomeworkCommand(List<String> names, Predicate<Student> namePredicate,
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
+        StringBuilder nonExistNames = new StringBuilder();
+        for (String name : names) {
+            if (model.noSuchStudent(name)) {
+                nonExistNames.append(name).append(", ");
+            }
+            if (nonExistNames.length() != 0) {
+                nonExistNames = new StringBuilder(nonExistNames.substring(0, nonExistNames.length() - 2));
+                throw new CommandException(String.format(Messages.MESSAGE_NO_SUCH_STUDENT, nonExistNames));
+            }
+        }
         StringBuilder dupNames = new StringBuilder();
         for (String name : names) {
             if (model.hasDuplicateName(name)) {

diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
@@ -86,4 +86,6 @@ public interface Model {
     void updateFilteredStudentList(Predicate<Student> predicate);
 
     boolean hasDuplicateName(String name);
+
+    boolean noSuchStudent(String name);
 }
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
@@ -157,4 +157,14 @@ public boolean hasDuplicateName(String name) {
         }
         return count >= 2;
     }
+
+    @Override
+    public boolean noSuchStudent(String name) {
+        for (Student s : filteredPersons) {
+            if (s.getName().toString().contains(name)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
@@ -152,6 +152,11 @@ public void updateFilteredStudentList(Predicate<Student> predicate) {
         public boolean hasDuplicateName(String name) {
             throw new AssertionError("this method should not be called.");
         }
+
+        @Override
+        public boolean noSuchStudent(String name) {
+            throw new AssertionError("this method should not be called.");
+        }
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,4 +23,3 @@ docs/_site/ @@
     *.fxml
     *.class
     *.css
-    *.png