Remove phone and email validation

AY2425S1-CS2103T-F08-1a · Nov 11, 2024 · fea7dc7 · fea7dc7
1 parent 98f7e04
commit fea7dc7
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 59 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -101,16 +101,6 @@ public CommandResult execute(Model model, CommandHistory history) throws Command
             throw new CommandException(MESSAGE_DUPLICATE_PERSON);
         }
 
-        if (model.hasDuplicatePhone(editedPerson.getPhone())
-                && !personToEdit.getPhone().equals(editedPerson.getPhone())) {
-            throw new CommandException("This phone number is already in use.");
-        }
-
-        if (model.hasDuplicateEmail(editedPerson.getEmail())
-                && !personToEdit.getEmail().equals(editedPerson.getEmail())) {
-            throw new CommandException("This email address is already in use.");
-        }
-
         for (Lesson l : model.getAssociatedLessons(personToEdit)) {
             model.deleteLesson(l);
             if (editedPerson.isTutor()) {

diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
@@ -8,9 +8,7 @@
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.model.lesson.Lesson;
-import seedu.address.model.person.Email;
 import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
 import seedu.address.model.person.Subject;
 
 /**
@@ -123,10 +121,6 @@ public interface Model {
      */
     void updateFilteredPersonList(Predicate<Person> predicate);
 
-    public boolean hasDuplicatePhone(Phone phone);
-
-    public boolean hasDuplicateEmail(Email email);
-
     //@@author estellelim-reused
     //Reused from https://github.com/se-edu/addressbook-level4.git
     /**

diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
@@ -14,9 +14,7 @@
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.model.lesson.Lesson;
-import seedu.address.model.person.Email;
 import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
 import seedu.address.model.person.Subject;
 
 /**
@@ -189,21 +187,6 @@ public void commitAddressBook() {
         versionedAddressBook.commit();
     }
 
-    /**
-     * Returns true if the model has person with the same phone number as the given phone.
-     */
-    public boolean hasDuplicatePhone(Phone phone) {
-        return getFilteredPersonList().stream()
-                .anyMatch(person -> person.getPhone().equals(phone));
-    }
-
-    /**
-     * Returns true if the model has person with the same email as the given email.
-     */
-    public boolean hasDuplicateEmail(Email email) {
-        return getFilteredPersonList().stream()
-                .anyMatch(person -> person.getEmail().equals(email));
-    }
     //@@author
 
     @Override

diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
@@ -103,9 +103,8 @@ public boolean isSamePerson(Person otherPerson) {
             return true;
         }
 
-        boolean res = otherPerson != null
+        return otherPerson != null
                 && otherPerson.getName().equals(getName()) && otherPerson.getPhone().equals(getPhone());
-        return res;
     }
 
 

diff --git a/src/test/java/seedu/address/logic/commands/AddTuteeCommandTest.java b/src/test/java/seedu/address/logic/commands/AddTuteeCommandTest.java
@@ -26,9 +26,7 @@
 import seedu.address.model.ReadOnlyAddressBook;
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.lesson.Lesson;
-import seedu.address.model.person.Email;
 import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
 import seedu.address.model.person.Subject;
 import seedu.address.model.person.Tutee;
 import seedu.address.testutil.TuteeBuilder;
@@ -202,16 +200,6 @@ public void updateFilteredPersonList(Predicate<Person> predicate) {
             throw new AssertionError("This method should not be called.");
         }
 
-        @Override
-        public boolean hasDuplicateEmail(Email email) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public boolean hasDuplicatePhone(Phone phone) {
-            throw new AssertionError("This method should not be called.");
-        }
-
         @Override
         public boolean canUndoAddressBook() {
             throw new AssertionError("This method should not be called.");

diff --git a/src/test/java/seedu/address/logic/commands/AddTutorCommandTest.java b/src/test/java/seedu/address/logic/commands/AddTutorCommandTest.java
@@ -26,9 +26,7 @@
 import seedu.address.model.ReadOnlyAddressBook;
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.lesson.Lesson;
-import seedu.address.model.person.Email;
 import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
 import seedu.address.model.person.Subject;
 import seedu.address.model.person.Tutor;
 import seedu.address.testutil.TutorBuilder;
@@ -202,16 +200,6 @@ public void updateFilteredPersonList(Predicate<Person> predicate) {
             throw new AssertionError("This method should not be called.");
         }
 
-        @Override
-        public boolean hasDuplicateEmail(Email email) {
-            throw new AssertionError("This method should not be called.");
-        }
-
-        @Override
-        public boolean hasDuplicatePhone(Phone phone) {
-            throw new AssertionError("This method should not be called.");
-        }
-
         @Override
         public boolean canUndoAddressBook() {
             throw new AssertionError("This method should not be called.");