Tests for remaining Teammate associated classes

src/main/java/seedu/address/commons/core/index/GitUserIndex.java

@@ -1,6 +1,5 @@
 package seedu.address.commons.core.index;
 
-
 import seedu.address.model.person.GitUserName;
 
 /**
@@ -34,6 +33,7 @@ public String getGitUserName() {
      * @return boolean to indicate validity of gitusername
      */
     public boolean isValidGitUserIndex(String gitUserName) {
+        assert (gitUserName != null);
         String trimmedGitUserName = gitUserName.trim();
         return GitUserName.isValidGitUserName(trimmedGitUserName);
     }
@@ -44,5 +44,4 @@ public boolean equals(Object other) {
             || (other instanceof GitUserIndex // instanceof handles nulls
             && uniqueGitUserIndex.equals(((GitUserIndex) other).uniqueGitUserIndex)); // state check
     }
-
 }

src/main/java/seedu/address/commons/core/index/Index.java

@@ -19,7 +19,6 @@ private Index(int zeroBasedIndex) {
         if (zeroBasedIndex < 0) {
             throw new IndexOutOfBoundsException();
         }
-
         this.zeroBasedIndex = zeroBasedIndex;
     }
 

src/main/java/seedu/address/logic/commands/project/AddTeammateParticipationCommand.java

@@ -1,6 +1,5 @@
 package seedu.address.logic.commands.project;
 
-import static java.util.Objects.isNull;
 import static java.util.Objects.requireNonNull;
 
 import java.util.logging.Level;
@@ -9,7 +8,6 @@
 import seedu.address.commons.core.index.GitUserIndex;
 import seedu.address.logic.commands.Command;
 import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.Model;
 import seedu.address.model.person.Person;
 import seedu.address.model.project.Project;
@@ -21,25 +19,20 @@ public class AddTeammateParticipationCommand extends Command {
 
     public static final String COMMAND_WORD = "addpart";
     public static final String MESSAGE_ADD_TEAMMATE_PARTICIPATION_SUCCESS = "New Teammate added: %1$s";
-    public static final String MESSAGE_TEAMMATE_NOT_FOUND = "Teammate not found";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds teammate to this project"
         + "Parameters: Git UserName (must be a single word)\n "
         + "Example: " + COMMAND_WORD + " LucasTai98 ";
 
     private static final Logger logger = Logger.getLogger("AddTeammateParticipationCommandLogger");
-    private final Person toAdd;
+    private final GitUserIndex gitUserIndex;
 
     /**
-     * Creates an new teammate that is associated with the project
+     * Adds an existing teammate to a project,
      */
-    public AddTeammateParticipationCommand(GitUserIndex index) throws ParseException {
+    public AddTeammateParticipationCommand(GitUserIndex index) {
         requireNonNull(index);
-        toAdd = Person.getPersonFromList(index);
-        if (isNull(toAdd)) {
-            logger.log(Level.INFO, "Teammate gitusername incorrect");
-            throw new ParseException(MESSAGE_TEAMMATE_NOT_FOUND);
-        }
+        gitUserIndex = index;
     }
 
     /**
@@ -52,6 +45,7 @@ public AddTeammateParticipationCommand(GitUserIndex index) throws ParseException
     public CommandResult execute(Model model) {
         requireNonNull(model);
         Project project = model.getProjectToBeDisplayedOnDashboard().get();
+        Person toAdd = Person.getPersonFromList(gitUserIndex);
         toAdd.addProject(project);
         project.addParticipation(toAdd);
         model.addParticipation(project.getParticipation(toAdd.getGitUserNameString()));
@@ -60,4 +54,10 @@ public CommandResult execute(Model model) {
             toAdd.getGitUserNameString()));
     }
 
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+            || (other instanceof AddTeammateParticipationCommand) // instanceof handles nulls
+            && gitUserIndex.equals(((AddTeammateParticipationCommand) other).gitUserIndex); // state check
+    }
 }

src/main/java/seedu/address/logic/commands/project/DeleteTeammateParticipationCommand.java

@@ -58,4 +58,11 @@ public CommandResult execute(Model model) throws CommandException {
         return new CommandResult(String.format(MESSAGE_DELETE_TEAMMATE_PARTICIPATION_SUCCESS,
             personToDeleteParticipation));
     }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+            || (other instanceof DeleteTeammateParticipationCommand) // instanceof handles nulls
+            && gitUserIndex.equals(((DeleteTeammateParticipationCommand) other).gitUserIndex); // state check
+    }
 }

src/main/java/seedu/address/logic/commands/project/EditTeammateCommand.java

@@ -155,7 +155,6 @@ public EditTeammateDescriptor() {}
          */
         public EditTeammateDescriptor(EditTeammateDescriptor toCopy) {
             setTeammateName(toCopy.name);
-            setGitUserName(toCopy.gitUserName);
             setPhone(toCopy.phone);
             setEmail(toCopy.email);
             setAddress(toCopy.address);

src/main/java/seedu/address/logic/parser/AddTeammateParticipationParser.java → src/main/java/seedu/address/logic/parser/AddTeammateParticipationCommandParser.java

@@ -4,7 +4,7 @@
 import seedu.address.logic.commands.project.AddTeammateParticipationCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
-public class AddTeammateParticipationParser implements Parser<AddTeammateParticipationCommand> {
+public class AddTeammateParticipationCommandParser implements Parser<AddTeammateParticipationCommand> {
 
 
     /**

src/main/java/seedu/address/logic/parser/DeleteTeammateParticipationParser.java → src/main/java/seedu/address/logic/parser/DeleteTeammateParticipationCommandParser.java

@@ -4,7 +4,7 @@
 import seedu.address.logic.commands.project.DeleteTeammateParticipationCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
-public class DeleteTeammateParticipationParser implements Parser<DeleteTeammateParticipationCommand> {
+public class DeleteTeammateParticipationCommandParser implements Parser<DeleteTeammateParticipationCommand> {
 
     /**
      * Parses {@code userInput} into a command and returns it.

src/main/java/seedu/address/logic/parser/MainCatalogueParser.java

@@ -152,14 +152,14 @@ public Command parseCommand(String userInput, Status status) throws ParseExcepti
 
         case AddTeammateParticipationCommand.COMMAND_WORD:
             if (status != Status.PROJECT_LIST) {
-                return new AddTeammateParticipationParser().parse(arguments);
+                return new AddTeammateParticipationCommandParser().parse(arguments);
             } else {
                 throw new InvalidScopeException(Status.PROJECT, status);
             }
 
         case DeleteTeammateParticipationCommand.COMMAND_WORD:
             if (status != Status.PROJECT_LIST) {
-                return new DeleteTeammateParticipationParser().parse(arguments);
+                return new DeleteTeammateParticipationCommandParser().parse(arguments);
             } else {
                 throw new InvalidScopeException(Status.PROJECT, status);
             }

src/main/java/seedu/address/model/ModelManager.java

@@ -307,9 +307,8 @@ public boolean equals(Object obj) {
 
         // state check
         ModelManager other = (ModelManager) obj;
-        return mainCatalogue.equals(other.mainCatalogue)
-                && userPrefs.equals(other.userPrefs)
-                && filteredProjects.equals(other.filteredProjects);
+        return userPrefs.equals(other.userPrefs)
+               && filteredProjects.equals(other.filteredProjects);
                 //&& filteredTasks.equals(other.filteredTasks)
                 //&& filteredTeammates.equals(other.filteredTeammates);
     }

src/main/java/seedu/address/ui/MainWindow.java

@@ -237,8 +237,8 @@ private CommandResult executeCommand(String commandText) throws CommandException
         try {
             CommandResult commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult.getFeedbackToUser());
-            resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
             fillInnerParts();
+            resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
 
             if (commandResult.isShowHelp()) {
                 handleHelp();

src/test/java/seedu/address/logic/commands/TeammateTestUtil.java

@@ -15,6 +15,7 @@ public class TeammateTestUtil {
     public static final String VALID_TEAMMATE_GIT_USERNAME_A = "Sparrow32";
     public static final String VALID_TEAMMATE_GIT_USERNAME_B = "Tatey";
     public static final String VALID_TEAMMATE_GIT_USERNAME_C = "Modi";
+    public static final String INVALID_TEAMMATE_GIT_USERNAME = "$";
 
     public static final String VALID_TEAMMATE_PHONE_A = "92883923";
     public static final String VALID_TEAMMATE_PHONE_B = "92824833";
@@ -58,6 +59,6 @@ public class TeammateTestUtil {
         + "May Theresa";
     public static final String INVALID_TEAMMATE_PHONE_DESC_A = " " + PREFIX_TEAMMATE_PHONE + "3818djfjjd";
     public static final String INVALID_TEAMMATE_EMAIL_DESC_A = " " + PREFIX_TEAMMATE_EMAIL + "hey @";
-    public static final String INVALID_TEAMMATE_ADDRESS_DESC_A = " " + PREFIX_TEAMMATE_ADDRESS + "  the Platform  ";
+    public static final String INVALID_TEAMMATE_ADDRESS_DESC_A = " " + PREFIX_TEAMMATE_ADDRESS + " ";
 
 }

src/test/java/seedu/address/logic/commands/project/AddTeammateCommandTest.java

@@ -1,7 +1,6 @@
 package seedu.address.logic.commands.project;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static seedu.address.testutil.TypicalPersons.DESC_A;
@@ -66,7 +65,7 @@ public void execute_equals() {
         assertEquals(addTeammateCommand1Copy, addTeammateCommand1);
 
         // different types -> returns false
-        assertFalse(addTeammateCommand1.equals("this test will return false"));
+        assertNotEquals(addTeammateCommand1, "this test will return false");
 
         // null -> returns false
         assertNotEquals(addTeammateCommand1, null);

src/test/java/seedu/address/logic/commands/project/AddTeammateParticipationCommandTest.java

@@ -0,0 +1,93 @@
+package seedu.address.logic.commands.project;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.TeammateTestUtil.VALID_TEAMMATE_GIT_USERNAME_A;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalGitIndexes.GIT_USERINDEX_FIRST_TEAMMATE;
+import static seedu.address.testutil.TypicalGitIndexes.GIT_USERINDEX_INVALID_TEAMMATE;
+import static seedu.address.testutil.TypicalGitIndexes.GIT_USERINDEX_SECOND_TEAMMATE;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PROJECT;
+import static seedu.address.testutil.TypicalPersons.DESC_A;
+import static seedu.address.testutil.TypicalProjects.getTypicalMainCatalogue;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.project.Project;
+import seedu.address.model.project.exceptions.DuplicateParticipationException;
+
+public class AddTeammateParticipationCommandTest {
+
+    @Test
+    public void execute_validGitUserIndex_success() {
+        Model model = new ModelManager(getTypicalMainCatalogue(), new UserPrefs());
+        Project project = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased());
+        model.enter(project);
+
+        Model expectedModel = new ModelManager(getTypicalMainCatalogue(), new UserPrefs());
+        expectedModel.enter(project);
+        Project expectedProject = expectedModel.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased());
+        expectedProject.addParticipation(DESC_A);
+        expectedModel.addParticipation(expectedProject.getParticipation(DESC_A.getGitUserNameString()));
+
+        String expectedMessage =
+            String.format(AddTeammateParticipationCommand.MESSAGE_ADD_TEAMMATE_PARTICIPATION_SUCCESS,
+                VALID_TEAMMATE_GIT_USERNAME_A);
+        AddTeammateParticipationCommand addTeammateParticipationCommand =
+            new AddTeammateParticipationCommand(GIT_USERINDEX_FIRST_TEAMMATE);
+
+        assertCommandSuccess(addTeammateParticipationCommand, model, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_validGitUserDuplicateParticipation_throwsCommandException() {
+        Model model = new ModelManager(getTypicalMainCatalogue(), new UserPrefs());
+        Project project = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased());
+        model.enter(project);
+        project.addParticipation(DESC_A);
+        model.addParticipation(project.getParticipation(DESC_A.getGitUserNameString()));
+
+        AddTeammateParticipationCommand addTeammateParticipationCommand =
+            new AddTeammateParticipationCommand(GIT_USERINDEX_FIRST_TEAMMATE);
+
+        assertThrows(DuplicateParticipationException.class, () -> addTeammateParticipationCommand.execute(model));
+    }
+
+    @Test
+    public void execute_invalidGitUserIndex_success() {
+        Model model = new ModelManager(getTypicalMainCatalogue(), new UserPrefs());
+        Project project = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased());
+        model.enter(project);
+
+        AddTeammateParticipationCommand addTeammateParticipationCommand =
+            new AddTeammateParticipationCommand(GIT_USERINDEX_INVALID_TEAMMATE);
+
+        assertThrows(NullPointerException.class, () -> addTeammateParticipationCommand.execute(model));
+    }
+
+    @Test
+    public void equals() {
+        AddTeammateParticipationCommand addFirst = new AddTeammateParticipationCommand(GIT_USERINDEX_FIRST_TEAMMATE);
+        AddTeammateParticipationCommand addSecond = new AddTeammateParticipationCommand(GIT_USERINDEX_FIRST_TEAMMATE);
+        AddTeammateParticipationCommand addThird = new AddTeammateParticipationCommand(GIT_USERINDEX_SECOND_TEAMMATE);
+
+        // same object -> returns true
+        assertTrue(addFirst.equals(addFirst));
+
+        // same values -> returns true
+        assertTrue(addFirst.equals(addSecond));
+
+        // different types -> returns false
+        assertFalse(addFirst.equals(1));
+
+        // null -> returns false
+        assertFalse(addFirst.equals(null));
+
+        // different gitUserName -> returns false
+        assertFalse(addFirst.equals(addThird));
+    }
+}