Merge pull request #171 from quzhetao01/misc-fix

Fix Edit Command

Author: darrentfy

docs/UserGuide.md

@@ -109,7 +109,8 @@ Format: `delete STUDENT_INDEX`
 #### 2.2.3 Adding notes for a Student: `note`
 
 <div markdown="span" class="alert alert-info">:information_source: **Note:**
-Double clicking on the Student card displays the Student notes under the Notes section !
+Double clicking on the Student card displays the Student notes under the Notes section!
+The "Notes" column will inform you if there are no student notes available.
 </div>
 
 Adds a note to an existing student, overwrites any existing note.
@@ -156,6 +157,21 @@ Format: `tag STUDENT_INDEX r/RISK_LEVEL`
 Examples:
 * `tag 2 r/high`
 
+#### 2.2.6 Editing Student details: `edit`
+
+Edit a student's contact number or address
+
+Format `edit STUDENT_INDEX c/CONTACT_NUMBER A/HOME_ADDRESS`
+
+**Parameters**:
+1. Student Index
+   - Must be an integer starting from 1
+   - Must be found in the students list
+2. Contact Number
+   - Numbers only, must be 8 characters long
+3. Home Address
+   - Maximum of 200 characters
+
 ### 2.3 Appointment Commands
 
 <div markdown="span" class="alert alert-info">:information_source: **Note:**

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

@@ -2,7 +2,6 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_STUDENTS;
 
@@ -37,15 +36,13 @@ public class EditCommand extends Command {
             + "by the index number used in the displayed student list. "
             + "Existing values will be overwritten by the input values.\n"
             + "Parameters: INDEX (must be a positive integer) "
-            + "[" + PREFIX_NAME + "NAME] "
             + "[" + PREFIX_PHONE + "PHONE] "
             + "[" + PREFIX_ADDRESS + "ADDRESS]\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_PHONE + "91234567 ";
 
     public static final String MESSAGE_EDIT_STUDENT_SUCCESS = "Edited Student: %1$s";
     public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
-    public static final String MESSAGE_DUPLICATE_STUDENT = "This student already exists in the address book.";
 
     private final Index index;
     private final EditStudentDescriptor editStudentDescriptor;
@@ -74,9 +71,6 @@ public CommandResult execute(Model model) throws CommandException {
         Student studentToEdit = lastShownList.get(index.getZeroBased());
         Student editedStudent = createEditedStudent(studentToEdit, editStudentDescriptor);
 
-        if (!studentToEdit.isSameStudent(editedStudent) && model.hasStudent(editedStudent)) {
-            throw new CommandException(MESSAGE_DUPLICATE_STUDENT);
-        }
 
         model.setStudent(studentToEdit, editedStudent);
         model.updateFilteredStudentList(PREDICATE_SHOW_ALL_STUDENTS);
@@ -89,7 +83,7 @@ public CommandResult execute(Model model) throws CommandException {
      */
     private static Student createEditedStudent(Student studentToEdit, EditStudentDescriptor editStudentDescriptor) {
         assert studentToEdit != null;
-        Name updatedName = editStudentDescriptor.getName().orElse(studentToEdit.getName());
+        Name updatedName = studentToEdit.getName();
         Phone updatedPhone = editStudentDescriptor.getPhone().orElse(studentToEdit.getPhone());
         Address updatedAddress = editStudentDescriptor.getAddress().orElse(studentToEdit.getAddress());
         Set<RiskLevel> updatedTags = editStudentDescriptor.getTags().orElse(studentToEdit.getTags());
@@ -127,7 +121,7 @@ public String toString() {
      * corresponding field value of the student.
      */
     public static class EditStudentDescriptor {
-        private Name name;
+
         private Phone phone;
         private Address address;
         private Set<RiskLevel> riskLevel;
@@ -139,7 +133,6 @@ public EditStudentDescriptor() {}
          * A defensive copy of {@code tags} is used internally.
          */
         public EditStudentDescriptor(EditStudentDescriptor toCopy) {
-            setName(toCopy.name);
             setPhone(toCopy.phone);
             setAddress(toCopy.address);
             setTags(toCopy.riskLevel);
@@ -149,15 +142,7 @@ public EditStudentDescriptor(EditStudentDescriptor toCopy) {
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(name, phone, address, riskLevel);
-        }
-
-        public void setName(Name name) {
-            this.name = name;
-        }
-
-        public Optional<Name> getName() {
-            return Optional.ofNullable(name);
+            return CollectionUtil.isAnyNonNull(phone, address, riskLevel);
         }
 
         public void setPhone(Phone phone) {
@@ -205,16 +190,14 @@ public boolean equals(Object other) {
             }
 
             EditStudentDescriptor otherEditStudentDescriptor = (EditStudentDescriptor) other;
-            return Objects.equals(name, otherEditStudentDescriptor.name)
-                    && Objects.equals(phone, otherEditStudentDescriptor.phone)
+            return Objects.equals(phone, otherEditStudentDescriptor.phone)
                     && Objects.equals(address, otherEditStudentDescriptor.address)
                     && Objects.equals(riskLevel, otherEditStudentDescriptor.riskLevel);
         }
 
         @Override
         public String toString() {
             return new ToStringBuilder(this)
-                    .add("name", name)
                     .add("phone", phone)
                     .add("address", address)
                     .add("risk level", riskLevel)

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

@@ -41,13 +41,10 @@ public EditCommand parse(String args) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
         }
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_ADDRESS, PREFIX_RISK_LEVEL);
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_PHONE, PREFIX_ADDRESS, PREFIX_RISK_LEVEL);
 
         EditCommand.EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptor();
 
-        if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
-            editStudentDescriptor.setName(ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get()));
-        }
         if (argMultimap.getValue(PREFIX_PHONE).isPresent()) {
             editStudentDescriptor.setPhone(ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get()));
         }

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

@@ -64,7 +64,6 @@ public StudentCard(Student student, int displayedIndex, CommandExecutor showNote
     @FXML
     private void displayNote(MouseEvent event) {
         if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
-            System.out.println("Button clicked");
             showNote.execute(index);
         }
     }

src/main/resources/view/StudentNotePanel.fxml

@@ -7,7 +7,7 @@
 <VBox fx:id="columnContainer" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
     <Label fx:id="columnTitle" text="Notes" styleClass="column_title"/>
     <VBox  VBox.vgrow="ALWAYS" styleClass="noteBox">
-        <Label fx:id="studentName" text="" styleClass="cell_big_label"/>
+        <Label fx:id="studentName" text="" styleClass="cell_big_label" wrapText="true"/>
         <Label fx:id="notesPara" text="" styleClass="cell_small_label" wrapText="true"/>
     </VBox>
 </VBox>

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

@@ -30,6 +30,8 @@
 public class CommandTestUtil {
 
     public static final String VALID_NAME_AMY = "Amy Bee";
+
+    public static final String VALID_NAME_ALICE = "Alice Pauline";
     public static final String VALID_NAME_BOB = "Bob Choo";
     public static final String VALID_PHONE_AMY = "11111111";
     public static final String VALID_PHONE_BOB = "22222222";
@@ -93,11 +95,9 @@ public class CommandTestUtil {
     public static final EditCommand.EditStudentDescriptor DESC_BOB;
 
     static {
-        DESC_AMY = new EditStudentDescriptorBuilder().withName(VALID_NAME_AMY)
-                .withPhone(VALID_PHONE_AMY).withAddress(VALID_ADDRESS_AMY)
+        DESC_AMY = new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_AMY).withAddress(VALID_ADDRESS_AMY)
                 .withTags(VALID_RISK_LEVEL_HIGH).build();
-        DESC_BOB = new EditStudentDescriptorBuilder().withName(VALID_NAME_BOB)
-                .withPhone(VALID_PHONE_BOB).withAddress(VALID_ADDRESS_BOB)
+        DESC_BOB = new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_BOB).withAddress(VALID_ADDRESS_BOB)
                 .withTags(VALID_RISK_LEVEL_LOW).build();
     }
 

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

@@ -5,7 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_ALICE;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_RISK_LEVEL_LOW;
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
@@ -37,7 +37,7 @@ public class EditCommandTest {
 
     @Test
     public void execute_allFieldsSpecifiedUnfilteredList_success() {
-        Student editedStudent = new StudentBuilder().build();
+        Student editedStudent = new StudentBuilder().withName(VALID_NAME_ALICE).build();
         EditStudentDescriptor descriptor = new EditStudentDescriptorBuilder(editedStudent).build();
         EditCommand editCommand = new EditCommand(INDEX_FIRST_STUDENT, descriptor);
 
@@ -56,11 +56,11 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
         Student lastStudent = model.getFilteredStudentList().get(indexLastStudent.getZeroBased());
 
         StudentBuilder studentInList = new StudentBuilder(lastStudent);
-        Student editedStudent = studentInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
+        Student editedStudent = studentInList.withPhone(VALID_PHONE_BOB)
                 .withTags(VALID_RISK_LEVEL_LOW).build();
 
-        EditCommand.EditStudentDescriptor descriptor = new EditStudentDescriptorBuilder().withName(VALID_NAME_BOB)
-                .withPhone(VALID_PHONE_BOB).withTags(VALID_RISK_LEVEL_LOW).build();
+        EditCommand.EditStudentDescriptor descriptor = new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_BOB)
+                .withTags(VALID_RISK_LEVEL_LOW).build();
         EditCommand editCommand = new EditCommand(indexLastStudent, descriptor);
 
         String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_STUDENT_SUCCESS,
@@ -90,9 +90,9 @@ public void execute_filteredList_success() {
         showStudentAtIndex(model, INDEX_FIRST_STUDENT);
 
         Student studentInFilteredList = model.getFilteredStudentList().get(INDEX_FIRST_STUDENT.getZeroBased());
-        Student editedStudent = new StudentBuilder(studentInFilteredList).withName(VALID_NAME_BOB).build();
+        Student editedStudent = new StudentBuilder(studentInFilteredList).withPhone(VALID_PHONE_BOB).build();
         EditCommand editCommand = new EditCommand(INDEX_FIRST_STUDENT,
-                new EditStudentDescriptorBuilder().withName(VALID_NAME_BOB).build());
+                new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_BOB).build());
 
         String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_STUDENT_SUCCESS,
                 Messages.format(editedStudent));
@@ -103,32 +103,11 @@ public void execute_filteredList_success() {
         assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
     }
 
-    @Test
-    public void execute_duplicateStudentUnfilteredList_failure() {
-        Student firstStudent = model.getFilteredStudentList().get(INDEX_FIRST_STUDENT.getZeroBased());
-        EditCommand.EditStudentDescriptor descriptor = new EditStudentDescriptorBuilder(firstStudent).build();
-        EditCommand editCommand = new EditCommand(INDEX_SECOND_STUDENT, descriptor);
-
-        assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_STUDENT);
-    }
-
-    @Test
-    public void execute_duplicateStudentFilteredList_failure() {
-        showStudentAtIndex(model, INDEX_FIRST_STUDENT);
-
-        // edit student in filtered list into a duplicate in address book
-        Student studentInList = model.getWellNusData().getStudentList().get(INDEX_SECOND_STUDENT.getZeroBased());
-        EditCommand editCommand = new EditCommand(INDEX_FIRST_STUDENT,
-                new EditStudentDescriptorBuilder(studentInList).build());
-
-        assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_STUDENT);
-    }
-
     @Test
     public void execute_invalidStudentIndexUnfilteredList_failure() {
         Index outOfBoundIndex = Index.fromOneBased(model.getFilteredStudentList().size() + 1);
         EditCommand.EditStudentDescriptor descriptor = new EditStudentDescriptorBuilder()
-                .withName(VALID_NAME_BOB).build();
+                .withPhone(VALID_PHONE_BOB).build();
         EditCommand editCommand = new EditCommand(outOfBoundIndex, descriptor);
 
         assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
@@ -146,7 +125,7 @@ public void execute_invalidStudentIndexFilteredList_failure() {
         assertTrue(outOfBoundIndex.getZeroBased() < model.getWellNusData().getStudentList().size());
 
         EditCommand editCommand = new EditCommand(outOfBoundIndex,
-                new EditStudentDescriptorBuilder().withName(VALID_NAME_BOB).build());
+                new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_BOB).build());
 
         assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
     }

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

@@ -6,7 +6,6 @@
 import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_RISK_LEVEL_LOW;
 
@@ -35,13 +34,9 @@ public void equals() {
         // different values -> returns false
         assertFalse(DESC_AMY.equals(DESC_BOB));
 
-        // different name -> returns false
-        EditCommand.EditStudentDescriptor editedAmy = new EditStudentDescriptorBuilder(DESC_AMY)
-                .withName(VALID_NAME_BOB).build();
-        assertFalse(DESC_AMY.equals(editedAmy));
-
         // different phone -> returns false
-        editedAmy = new EditStudentDescriptorBuilder(DESC_AMY).withPhone(VALID_PHONE_BOB).build();
+        EditCommand.EditStudentDescriptor editedAmy = new EditStudentDescriptorBuilder(DESC_AMY)
+                .withPhone(VALID_PHONE_BOB).build();
         assertFalse(DESC_AMY.equals(editedAmy));
 
         // different address -> returns false
@@ -56,8 +51,7 @@ public void equals() {
     @Test
     public void toStringMethod() {
         EditCommand.EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptor();
-        String expected = EditCommand.EditStudentDescriptor.class.getCanonicalName() + "{name="
-                + editStudentDescriptor.getName().orElse(null) + ", phone="
+        String expected = EditCommand.EditStudentDescriptor.class.getCanonicalName() + "{phone="
                 + editStudentDescriptor.getPhone().orElse(null) + ", address="
                 + editStudentDescriptor.getAddress().orElse(null) + ", risk level="
                 + editStudentDescriptor.getTags().orElse(null) + "}";