Merge pull request #394 from tze088/error-msg

fix everything

Author: tze088

src/main/java/seedu/address/logic/commands/group/AddMemberCommand.java

@@ -79,11 +79,12 @@ public CommandResult execute(Model model) throws CommandException {
             Person targetPerson = lastShownPersonList.get(contactIndex.getZeroBased());
 
             if (groupToAddTo.containsPerson(targetPerson)) {
-                throw new CommandException(String.format(MESSAGE_DUPLICATE_PERSON, targetPerson.getName()));
+                throw new CommandException(String.format(MESSAGE_DUPLICATE_PERSON,
+                        targetPerson.getName() + " (" + targetPerson.getEmail() + ")"));
             }
 
             personsToAdd.add(targetPerson);
-            personNames.add(targetPerson.getNameAsString());
+            personNames.add(targetPerson.getNameAsString() + " (" + targetPerson.getEmail() + ")");
         }
 
         for (Person toAdd : personsToAdd) {

src/main/java/seedu/address/logic/commands/group/DeleteMemberCommand.java

@@ -78,7 +78,7 @@ public CommandResult execute(Model model) throws CommandException {
 
             Person targetPerson = lastShownMiniPersonList.get(contactIndex.getZeroBased());
             personsToRemove.add(targetPerson);
-            personNames.add(targetPerson.getNameAsString());
+            personNames.add(targetPerson.getNameAsString() + " (" + targetPerson.getEmail() + ")");
         }
 
         for (Person toRemove : personsToRemove) {

src/main/java/seedu/address/logic/commands/person/EditCommand.java

@@ -57,7 +57,7 @@ public class EditCommand extends Command {
     private final EditPersonDescriptor editPersonDescriptor;
 
     /**
-     * @param index                of the person in the filtered person list to edit
+     * @param index of the person in the filtered person list to edit
      * @param editPersonDescriptor details to edit the person with
      */
     public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {

src/test/java/seedu/address/logic/commands/group/AddMemberCommandTest.java

@@ -100,7 +100,8 @@ public void execute_duplicateGroupMember_throwsCommandException() {
         AddMemberCommand cmd = new AddMemberCommand(INDEX_FIRST_GROUP, persons);
 
         assertThrows(CommandException.class,
-                String.format(MESSAGE_DUPLICATE_PERSON, ALICE.getNameAsString()), () -> cmd.execute(modelStub));
+                String.format(MESSAGE_DUPLICATE_PERSON, ALICE.getNameAsString()
+                        + " (" + ALICE.getEmail() + ")"), () -> cmd.execute(modelStub));
     }
 
     @Test
@@ -112,9 +113,9 @@ public void execute_memberAddedToGroup_success() throws CommandException {
 
         GroupName targetGroupName = modelStub.getFilteredGroupList().get(INDEX_FIRST_GROUP.getZeroBased()).getName();
         assertEquals(String.format(MESSAGE_SUCCESS,
-                modelStub.getFilteredPersonList().get(1).getNameAsString(),
+                modelStub.getFilteredPersonList().get(1).getNameAsString()
+                + " (" + modelStub.getFilteredPersonList().get(1).getEmail() + ")",
                 targetGroupName), cmd.execute(modelStub).getFeedbackToUser());
-
         assertEquals(cs2103tWithGeorge, modelStub.getFilteredGroupList().get(0));
 
     }

src/test/java/seedu/address/logic/commands/group/DeleteMemberCommandTest.java

@@ -100,7 +100,8 @@ public void execute_memberDeletedFromGroup_success() throws CommandException {
         Group targetGroup = modelStub.getFilteredGroupList().get(INDEX_FIRST_GROUP.getZeroBased());
 
         assertEquals(String.format(MESSAGE_SUCCESS,
-                targetGroup.getPersons().get(0).getNameAsString(),
+                targetGroup.getPersons().get(0).getNameAsString()
+                + " (" + targetGroup.getPersons().get(0).getEmail() + ")",
                 targetGroup.getName()), cmd.execute(modelStub).getFeedbackToUser());
 
         assertEquals(cs2103tWithoutAlice, modelStub.getFilteredGroupList().get(0));
@@ -117,8 +118,10 @@ public void execute_multipleMembersDeletedFromGroup_success() throws CommandExce
 
         Group targetGroup = modelStub.getFilteredGroupList().get(INDEX_FIRST_GROUP.getZeroBased());
         ObservableList<Person> personList = targetGroup.getPersons();
-        List<String> personListAsString = List.of(personList.get(0).getNameAsString(),
-                personList.get(1).getNameAsString());
+        List<String> personListAsString = List.of(personList.get(0).getNameAsString()
+                + " (" + personList.get(0).getEmail() + ")",
+                personList.get(1).getNameAsString()
+                + " (" + personList.get(1).getEmail() + ")");
 
         assertEquals(String.format(MESSAGE_SUCCESS,
                 personListAsString.stream().collect(Collectors.joining(", ")),