Merge pull request nus-cs2103-AY2021S1#72 from TCQian/Refactor-Email-To-RepoURL-In-Project

Refactors email to repoUrl in project

Author: lll-jy

docs/AboutUs.md

@@ -7,7 +7,7 @@ We are a team based in the [School of Computing, National University of Singapor
 
 [[Visit our homepage](https://ay2021s1-cs2103t-w10-3.github.io/tp/)]
 
-You can reach us at the email `seer[at]comp.nus.edu.sg`
+You can reach us at the repoUrl `seer[at]comp.nus.edu.sg`
 
 ## Project team
 

docs/DeveloperGuide.md

@@ -328,7 +328,7 @@ Use case ends.
 **MSS:**
 
 1. Team leader create a new team member profile.
-2. TMTS asks for the details of the team member such as projectName, deadline, email and projectDescription.
+2. TMTS asks for the details of the team member such as projectName, deadline, repoUrl and projectDescription.
 3. Team leader keys in the details.
 4. TMTS stores the team member's profile into the data file.
 
@@ -353,7 +353,7 @@ Use case ends.
 1. Team leader chooses to edit a team member's profile.
 2. PTS asks for the projectName of the team member whose profile is to be edited.
 3. Team leader keys in the projectName of the team member.
-4. TMTS asks for the new information of team member such as projectName, deadline, email and projectDescription.
+4. TMTS asks for the new information of team member such as projectName, deadline and repoUrladdress and projectDescription..
 5. Team leader keys in the details.
 6. TMTS stores the team member's profile into the data file.
 

docs/UserGuide.md

@@ -188,9 +188,9 @@ Adds a new teammate to a project
 Format: `new NAME p/PHONE_NUMBER e/EMAIL`
 - `NAME` refers to the projectName of the teammate
 - `PHONE_NUMBER` refers to the teammate's contact number
-- `EMAIL` refers to the teammate's email
+- `EMAIL` refers to the teammate's repoUrl
 
-Example: `new Lucas p/94311421 e/[email protected]` Instantiates teammate Lucas with the specified contact number and email
+Example: `new Lucas p/94311421 e/[email protected]` Instantiates teammate Lucas with the specified contact number and repoUrl
 
 #### Add existing teammates of other projects to participate in this project `involves `
 Involves an existing teammate in other projects to the current project

docs/tutorials/RemovingFields.md

@@ -75,7 +75,7 @@ private Label projectDescription;
 ...
 <Label fx:id="deadline" styleClass="cell_small_label" text="\$deadline" />
 <Label fx:id="projectDescription" styleClass="cell_small_label" text="\$projectDescription" />
-<Label fx:id="email" styleClass="cell_small_label" text="\$email" />
+<Label fx:id="repoUrl" styleClass="cell_small_label" text="\$repoUrl" />
 ...
 ```
 
@@ -94,7 +94,7 @@ In `src/test/data/`, data meant for testing purposes are stored. While keeping t
   "projects": [ {
     "projectName": "Project with invalid projectName field: Ha!ns Mu@ster",
     "deadline": "21-03-2020 00:00:00",
-    "email": "[email protected]",
+    "repoUrl": "[email protected]",
     "projectDescription": "4th street"
   } ]
 }

src/main/java/seedu/address/logic/commands/AddCommand.java

@@ -2,10 +2,10 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DEADLINE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_DESCRIPTION;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_REPOURL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TASK;
 
 import seedu.address.logic.commands.exceptions.CommandException;
@@ -23,14 +23,14 @@ public class AddCommand extends Command {
             + "Parameters: "
             + PREFIX_PROJECT_NAME + "PROJECT NAME "
             + PREFIX_DEADLINE + "DEADLINE "
-            + PREFIX_EMAIL + "EMAIL "
+            + PREFIX_REPOURL + "REPOURL "
             + PREFIX_PROJECT_DESCRIPTION + "PROJECT DESCRIPTION "
             + "[" + PREFIX_PROJECT_TAG + "TAG]...\n"
             + "[" + PREFIX_TASK + "TASK]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_PROJECT_NAME + "The Blair project "
             + PREFIX_DEADLINE + "29-02-2020 00:00:00"
-            + PREFIX_EMAIL + "johnd@example.com "
+            + PREFIX_REPOURL + "http://github.com/a/b.git "
             + PREFIX_PROJECT_DESCRIPTION + "Coding in Greenwich "
             + PREFIX_PROJECT_TAG + "challenging "
             + PREFIX_PROJECT_TAG + "WFH"

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

@@ -2,10 +2,10 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DEADLINE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_DESCRIPTION;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_REPOURL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TASK;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PROJECTS;
 
@@ -22,10 +22,10 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.project.Deadline;
-import seedu.address.model.project.Email;
 import seedu.address.model.project.Project;
 import seedu.address.model.project.ProjectDescription;
 import seedu.address.model.project.ProjectName;
+import seedu.address.model.project.RepoUrl;
 import seedu.address.model.tag.ProjectTag;
 import seedu.address.model.task.Task;
 /**
@@ -41,13 +41,13 @@ public class EditCommand extends Command {
             + "Parameters: INDEX (must be a positive integer) "
             + "[" + PREFIX_PROJECT_NAME + "PROJECTNAME] "
             + "[" + PREFIX_DEADLINE + "DEADLINE] "
-            + "[" + PREFIX_EMAIL + "EMAIL] "
+            + "[" + PREFIX_REPOURL + "REPOURL] "
             + "[" + PREFIX_PROJECT_DESCRIPTION + "PROJECTDESCRIPTION] "
             + "[" + PREFIX_PROJECT_TAG + "PROJECT TAG]...\n"
             + "[" + PREFIX_TASK + "TASK]...\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_DEADLINE + "29-02-2020 00:00:00 "
-            + PREFIX_EMAIL + "johndoe@example.com";
+            + PREFIX_REPOURL + "https://github.com/a/a.git";
 
     public static final String MESSAGE_EDIT_PROJECT_SUCCESS = "Edited Project: %1$s";
     public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
@@ -98,14 +98,14 @@ private static Project createEditedProject(Project projectToEdit, EditProjectDes
 
         ProjectName updatedProjectName = editProjectDescriptor.getProjectName().orElse(projectToEdit.getProjectName());
         Deadline updatedDeadline = editProjectDescriptor.getDeadline().orElse(projectToEdit.getDeadline());
-        Email updatedEmail = editProjectDescriptor.getEmail().orElse(projectToEdit.getEmail());
+        RepoUrl updatedRepoUrl = editProjectDescriptor.getRepoUrl().orElse(projectToEdit.getRepoUrl());
         ProjectDescription updatedProjectDescription = editProjectDescriptor.getProjectDescription()
             .orElse(projectToEdit.getProjectDescription());
         Set<ProjectTag> updatedProjectTags = editProjectDescriptor.getProjectTags().orElse(
             projectToEdit.getProjectTags());
         Set<Task> updatedTasks = editProjectDescriptor.getTasks().orElse(projectToEdit.getTasks());
 
-        return new Project(updatedProjectName, updatedDeadline, updatedEmail, updatedProjectDescription,
+        return new Project(updatedProjectName, updatedDeadline, updatedRepoUrl, updatedProjectDescription,
                 updatedProjectTags, new HashMap<>(), updatedTasks);
     }
 
@@ -134,7 +134,7 @@ public boolean equals(Object other) {
     public static class EditProjectDescriptor {
         private ProjectName projectName;
         private Deadline deadline;
-        private Email email;
+        private RepoUrl repoUrl;
         private ProjectDescription projectDescription;
         private Set<ProjectTag> projectTags;
         private Set<Task> tasks;
@@ -148,7 +148,7 @@ public EditProjectDescriptor() {}
         public EditProjectDescriptor(EditProjectDescriptor toCopy) {
             setProjectName(toCopy.projectName);
             setDeadline(toCopy.deadline);
-            setEmail(toCopy.email);
+            setRepoUrl(toCopy.repoUrl);
             setProjectDescription(toCopy.projectDescription);
             setTags(toCopy.projectTags);
             setTasks(toCopy.tasks);
@@ -158,7 +158,7 @@ public EditProjectDescriptor(EditProjectDescriptor toCopy) {
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(projectName, deadline, email, projectDescription, projectTags, tasks);
+            return CollectionUtil.isAnyNonNull(projectName, deadline, repoUrl, projectDescription, projectTags, tasks);
         }
 
         public void setProjectName(ProjectName projectName) {
@@ -177,12 +177,12 @@ public Optional<Deadline> getDeadline() {
             return Optional.ofNullable(deadline);
         }
 
-        public void setEmail(Email email) {
-            this.email = email;
+        public void setRepoUrl(RepoUrl repoUrl) {
+            this.repoUrl = repoUrl;
         }
 
-        public Optional<Email> getEmail() {
-            return Optional.ofNullable(email);
+        public Optional<RepoUrl> getRepoUrl() {
+            return Optional.ofNullable(repoUrl);
         }
 
         public void setProjectDescription(ProjectDescription projectDescription) {
@@ -244,7 +244,7 @@ public boolean equals(Object other) {
 
             return getProjectName().equals(e.getProjectName())
                     && getDeadline().equals(e.getDeadline())
-                    && getEmail().equals(e.getEmail())
+                    && getRepoUrl().equals(e.getRepoUrl())
                     && getProjectDescription().equals(e.getProjectDescription())
                     && getProjectTags().equals(e.getProjectTags())
                     && getTasks().equals(e.getTasks());

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

@@ -2,10 +2,10 @@
 
 import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DEADLINE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_DESCRIPTION;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_REPOURL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TASK;
 
 import java.util.HashMap;
@@ -15,10 +15,10 @@
 import seedu.address.logic.commands.AddCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.project.Deadline;
-import seedu.address.model.project.Email;
 import seedu.address.model.project.Project;
 import seedu.address.model.project.ProjectDescription;
 import seedu.address.model.project.ProjectName;
+import seedu.address.model.project.RepoUrl;
 import seedu.address.model.tag.ProjectTag;
 import seedu.address.model.task.Task;
 
@@ -34,24 +34,24 @@ public class AddCommandParser implements Parser<AddCommand> {
      */
     public AddCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_PROJECT_NAME, PREFIX_DEADLINE, PREFIX_EMAIL,
+                ArgumentTokenizer.tokenize(args, PREFIX_PROJECT_NAME, PREFIX_DEADLINE, PREFIX_REPOURL,
                     PREFIX_PROJECT_DESCRIPTION, PREFIX_PROJECT_TAG, PREFIX_TASK);
 
         if (!arePrefixesPresent(argMultimap, PREFIX_PROJECT_NAME,
-            PREFIX_PROJECT_DESCRIPTION, PREFIX_DEADLINE, PREFIX_EMAIL)
+            PREFIX_PROJECT_DESCRIPTION, PREFIX_DEADLINE, PREFIX_REPOURL)
                 || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
         }
 
         ProjectName projectName = ParserUtil.parseProjectName(argMultimap.getValue(PREFIX_PROJECT_NAME).get());
         Deadline deadline = ParserUtil.parseDeadline(argMultimap.getValue(PREFIX_DEADLINE).get());
-        Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
+        RepoUrl repoUrl = ParserUtil.parseRepoUrl(argMultimap.getValue(PREFIX_REPOURL).get());
         ProjectDescription projectDescription = ParserUtil.projectDescription(argMultimap.getValue(
             PREFIX_PROJECT_DESCRIPTION).get());
         Set<ProjectTag> projectTagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_PROJECT_TAG));
         Set<Task> taskList = ParserUtil.parseTasks(argMultimap.getAllValues(PREFIX_TASK));
 
-        Project project = new Project(projectName, deadline, email, projectDescription, projectTagList,
+        Project project = new Project(projectName, deadline, repoUrl, projectDescription, projectTagList,
             new HashMap<>(), taskList);
 
         return new AddCommand(project);

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

@@ -8,7 +8,7 @@ public class CliSyntax {
     /* Prefix definitions */
     public static final Prefix PREFIX_PROJECT_NAME = new Prefix("n/");
     public static final Prefix PREFIX_DEADLINE = new Prefix("dl/");
-    public static final Prefix PREFIX_EMAIL = new Prefix("e/");
+    public static final Prefix PREFIX_REPOURL = new Prefix("ru/");
     public static final Prefix PREFIX_PROJECT_DESCRIPTION = new Prefix("d/");
     public static final Prefix PREFIX_PROJECT_TAG = new Prefix("tg/");
     public static final Prefix PREFIX_TASK = new Prefix("tk/");

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

@@ -3,10 +3,10 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DEADLINE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_DESCRIPTION;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PROJECT_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_REPOURL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TASK;
 
 import java.util.Collection;
@@ -34,7 +34,7 @@ public class EditCommandParser implements Parser<EditCommand> {
     public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_PROJECT_NAME, PREFIX_DEADLINE, PREFIX_EMAIL,
+                ArgumentTokenizer.tokenize(args, PREFIX_PROJECT_NAME, PREFIX_DEADLINE, PREFIX_REPOURL,
                     PREFIX_PROJECT_DESCRIPTION, PREFIX_PROJECT_TAG, PREFIX_TASK);
 
         Index index;
@@ -53,8 +53,8 @@ public EditCommand parse(String args) throws ParseException {
         if (argMultimap.getValue(PREFIX_DEADLINE).isPresent()) {
             editProjectDescriptor.setDeadline(ParserUtil.parseDeadline(argMultimap.getValue(PREFIX_DEADLINE).get()));
         }
-        if (argMultimap.getValue(PREFIX_EMAIL).isPresent()) {
-            editProjectDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
+        if (argMultimap.getValue(PREFIX_REPOURL).isPresent()) {
+            editProjectDescriptor.setRepoUrl(ParserUtil.parseRepoUrl(argMultimap.getValue(PREFIX_REPOURL).get()));
         }
         if (argMultimap.getValue(PREFIX_PROJECT_DESCRIPTION).isPresent()) {
             editProjectDescriptor.setProjectDescription(ParserUtil.projectDescription(argMultimap

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

@@ -10,9 +10,9 @@
 import seedu.address.commons.util.StringUtil;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.project.Deadline;
-import seedu.address.model.project.Email;
 import seedu.address.model.project.ProjectDescription;
 import seedu.address.model.project.ProjectName;
+import seedu.address.model.project.RepoUrl;
 import seedu.address.model.tag.ProjectTag;
 import seedu.address.model.task.Task;
 
@@ -82,18 +82,18 @@ public static ProjectDescription projectDescription(String projectDescription) t
     }
 
     /**
-     * Parses a {@code String email} into an {@code Email}.
+     * Parses a {@code String repoUrl} into an {@code RepoUrl}.
      * Leading and trailing whitespaces will be trimmed.
      *
-     * @throws ParseException if the given {@code email} is invalid.
+     * @throws ParseException if the given {@code repoUrl} is invalid.
      */
-    public static Email parseEmail(String email) throws ParseException {
-        requireNonNull(email);
-        String trimmedEmail = email.trim();
-        if (!Email.isValidEmail(trimmedEmail)) {
-            throw new ParseException(Email.MESSAGE_CONSTRAINTS);
+    public static RepoUrl parseRepoUrl(String repoUrl) throws ParseException {
+        requireNonNull(repoUrl);
+        String trimmedRepoUrl = repoUrl.trim();
+        if (!RepoUrl.isValidRepoUrl(trimmedRepoUrl)) {
+            throw new ParseException(RepoUrl.MESSAGE_CONSTRAINTS);
         }
-        return new Email(trimmedEmail);
+        return new RepoUrl(trimmedRepoUrl);
     }
 
     /**