From db2d3a33913f52a2ff93c1e30e6f4f6a0d3044d0 Mon Sep 17 00:00:00 2001
From: nniiggeell <e0559733@u.nus.edu>
Date: Tue, 12 Oct 2021 18:31:05 +0800
Subject: [PATCH 1/8] Add MedicalHistory command

---
 .../commands/student/EditStudentCommand.java  | 15 +++++++----
 .../logic/parser/AddressBookParser.java       |  5 ++++
 .../seedu/address/logic/parser/CliSyntax.java |  1 +
 .../logic/parser/StudentCommandParser.java    |  5 ++--
 .../student/AddStudentCommandParser.java      |  5 ++--
 .../seedu/address/model/person/Student.java   | 25 ++++++++++++++++---
 .../address/model/util/SampleDataUtil.java    | 18 ++++++++-----
 .../address/storage/JsonAdaptedStudent.java   | 22 +++++++++++++---
 8 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/src/main/java/seedu/address/logic/commands/student/EditStudentCommand.java b/src/main/java/seedu/address/logic/commands/student/EditStudentCommand.java
index 05f2fc2b97e..69767704217 100644
--- a/src/main/java/seedu/address/logic/commands/student/EditStudentCommand.java
+++ b/src/main/java/seedu/address/logic/commands/student/EditStudentCommand.java
@@ -23,10 +23,14 @@
 import seedu.address.model.Model;
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
 import seedu.address.model.person.Student;
 
+/**
+ * Edits the fields of an existing student in the New Address Book.
+ */
 public class EditStudentCommand extends EditCommand {
 
     public static final String COMMAND_WORD = "editStudent";
@@ -72,7 +76,8 @@ private static Student createdEditedStudent(Student studentToEdit, EditStudentDe
                 editStudentDescriptor.getEmergencyContact().orElse(studentToEdit.getEmergencyContact());
         FormClass updatedFormClass = editStudentDescriptor.getFormClass().orElse(studentToEdit.getFormClass());
         Gender updatedGender = editStudentDescriptor.getGender().orElse(studentToEdit.getGender());
-        return new Student(person, updatedEmergencyContact, updatedFormClass, updatedGender);
+        MedicalHistory updatedMedicalHistory = studentToEdit.getMedicalHistory(); //edit command does not edit medical
+        return new Student(person, updatedEmergencyContact, updatedFormClass, updatedGender, updatedMedicalHistory);
     }
 
     @Override
@@ -84,14 +89,14 @@ public CommandResult execute(Model model) throws CommandException {
             throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
 
-        Student personToEdit = (Student) lastShownList.get(index.getZeroBased());
-        Student editedStudent = createdEditedStudent(personToEdit, editStudentDescriptor);
+        Student studentToEdit = (Student) lastShownList.get(index.getZeroBased());
+        Student editedStudent = createdEditedStudent(studentToEdit, editStudentDescriptor);
 
-        if (!personToEdit.isSamePerson(editedStudent) && model.hasPerson(editedStudent)) {
+        if (!studentToEdit.isSamePerson(editedStudent) && model.hasPerson(editedStudent)) {
             throw new CommandException(MESSAGE_DUPLICATE_PERSON);
         }
 
-        model.setPerson(personToEdit, editedStudent);
+        model.setPerson(studentToEdit, editedStudent);
         model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
         return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedStudent));
     }
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
index b6c23f2eda2..23eb28685db 100644
--- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -17,9 +17,11 @@
 import seedu.address.logic.commands.ListCommand;
 import seedu.address.logic.commands.student.AddStudentCommand;
 import seedu.address.logic.commands.student.EditStudentCommand;
+import seedu.address.logic.commands.student.MedicalHistoryCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.logic.parser.student.AddStudentCommandParser;
 import seedu.address.logic.parser.student.EditStudentCommandParser;
+import seedu.address.logic.parser.student.MedicalHistoryCommandParser;
 
 /**
  * Parses user input.
@@ -78,6 +80,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case FilterCommand.COMMAND_WORD:
             return new FilterCommandParser().parse(arguments);
 
+        case MedicalHistoryCommand.COMMAND_WORD:
+            return new MedicalHistoryCommandParser().parse(arguments);
+
         default:
             throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
         }
diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
index 6f07369134a..379932a8f61 100644
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -16,4 +16,5 @@ public class CliSyntax {
     public static final Prefix PREFIX_FORM_CLASS = new Prefix("f/");
     public static final Prefix PREFIX_GENDER = new Prefix("g/");
     public static final Prefix PREFIX_COPY_FIELD = new Prefix("c/");
+    public static final Prefix PREFIX_MEDICAL_HISTORY = new Prefix("m/");
 }
diff --git a/src/main/java/seedu/address/logic/parser/StudentCommandParser.java b/src/main/java/seedu/address/logic/parser/StudentCommandParser.java
index 0e75d356a54..33e50d57123 100644
--- a/src/main/java/seedu/address/logic/parser/StudentCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/StudentCommandParser.java
@@ -21,6 +21,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 import seedu.address.model.person.Student;
@@ -66,9 +67,9 @@ public StudentCommand parse(String args) throws ParseException {
         Phone emergencyContact = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_EMERGENCY_CONTACT).get());
         FormClass formClass = ParserUtil.parseFormClass(argMultimap.getValue(PREFIX_FORM_CLASS).get());
         Gender gender = ParserUtil.parseGender(argMultimap.getValue(PREFIX_GENDER).get());
-
+        MedicalHistory medicalHistory = new MedicalHistory(""); //adding student does not allow adding medical
         Student student = new Student(name, phone, email, address, involvement, tagList, emergencyContact, formClass,
-                gender);
+                gender, medicalHistory);
 
         return new StudentCommand(student);
     }
diff --git a/src/main/java/seedu/address/logic/parser/student/AddStudentCommandParser.java b/src/main/java/seedu/address/logic/parser/student/AddStudentCommandParser.java
index d06a388ee81..a403fe76bea 100644
--- a/src/main/java/seedu/address/logic/parser/student/AddStudentCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/student/AddStudentCommandParser.java
@@ -26,6 +26,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 import seedu.address.model.person.Student;
@@ -67,9 +68,9 @@ public AddStudentCommand parse(String args) throws ParseException {
         Phone emergencyContact = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_EMERGENCY_CONTACT).get());
         FormClass formClass = ParserUtil.parseFormClass(argMultimap.getValue(PREFIX_FORM_CLASS).get());
         Gender gender = ParserUtil.parseGender(argMultimap.getValue(PREFIX_GENDER).get());
-
+        MedicalHistory medicalHistory = new MedicalHistory(""); //add command does not allow medical
         Student student = new Student(name, phone, email, address, involvement, tagList, emergencyContact, formClass,
-                gender);
+                gender, medicalHistory);
 
         return new AddStudentCommand(student);
     }
diff --git a/src/main/java/seedu/address/model/person/Student.java b/src/main/java/seedu/address/model/person/Student.java
index 908b0d5c436..8912e611b16 100644
--- a/src/main/java/seedu/address/model/person/Student.java
+++ b/src/main/java/seedu/address/model/person/Student.java
@@ -13,6 +13,7 @@ public class Student extends Person {
     private Phone emergencyContact;
     private FormClass formClass;
     private Gender gender;
+    private MedicalHistory medicalHistory;
 
     /**
      * Constructor for {@code Student}
@@ -25,14 +26,15 @@ public class Student extends Person {
      * @param emergencyContact Emergency contact of student
      * @param formClass        Form Class of Student
      * @param gender           Gender of student
+     * @param medicalHistory   Medical History of student
      */
-
     public Student(Name name, Phone phone, Email email, Address address, Involvement involvement, Set<Tag> tags,
-                   Phone emergencyContact, FormClass formClass, Gender gender) {
+                   Phone emergencyContact, FormClass formClass, Gender gender, MedicalHistory medicalHistory) {
         super(name, phone, email, address, involvement, tags);
         this.emergencyContact = emergencyContact;
         this.formClass = formClass;
         this.gender = gender;
+        this.medicalHistory = medicalHistory;
     }
 
     /**
@@ -42,14 +44,17 @@ public Student(Name name, Phone phone, Email email, Address address, Involvement
      * @param emergencyContact Emergency contact of student
      * @param formClass Form Class of Student
      * @param gender Gender of student
+     * @param medicalHistory Medical History of student
      */
 
-    public Student(Person person, Phone emergencyContact, FormClass formClass, Gender gender) {
+    public Student(Person person, Phone emergencyContact, FormClass formClass, Gender gender,
+                   MedicalHistory medicalHistory) {
         super(person.getName(), person.getPhone(), person.getEmail(), person.getAddress(), person.getInvolvement(),
                 person.getTags());
         this.emergencyContact = emergencyContact;
         this.formClass = formClass;
         this.gender = gender;
+        this.medicalHistory = medicalHistory;
     }
 
     public Phone getEmergencyContact() {
@@ -64,6 +69,10 @@ public Gender getGender() {
         return this.gender;
     }
 
+    public MedicalHistory getMedicalHistory() {
+        return this.medicalHistory;
+    }
+
     /**
      * Returns true if both person are students, and have the same identity and data fields.
      * This defines a stronger notion of equality between two students.
@@ -86,6 +95,14 @@ public boolean equals(Object other) {
 
     @Override
     public String toString() {
-        return super.toString() + "; " + String.format("Emergency contact: %s", getEmergencyContact());
+        return super.toString()
+                + "; "
+                + String.format("Emergency contact: %s", getEmergencyContact())
+                + "; "
+                + String.format("Form class: %s", getFormClass())
+                + "; "
+                + String.format("Gender: %s", getGender())
+                + "; "
+                + String.format("Medical History: %s", getMedicalHistory());
     }
 }
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
index 4f6206d00cc..b786c081d34 100644
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ b/src/main/java/seedu/address/model/util/SampleDataUtil.java
@@ -11,6 +11,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
@@ -22,27 +23,32 @@
  */
 public class SampleDataUtil {
     public static Student[] getSamplePersons() {
+        MedicalHistory emptyMedicalHistory = new MedicalHistory("");
         return new Student[] {
             new Student(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
                 new Address("Blk 30 Geylang Street 29, #06-40"), new Involvement("Math class"),
-                getTagSet("friends"), new Phone("91934131"), new FormClass("1E1"), new Gender("M")),
+                getTagSet("friends"), new Phone("91934131"), new FormClass("1E1"), new Gender("M"),
+                    emptyMedicalHistory),
             new Student(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
                 new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), new Involvement("Badminton CCA"),
                 getTagSet("colleagues", "friends"), new Phone("95614132"), new FormClass("1E4"),
-                    new Gender("F")),
+                    new Gender("F"), emptyMedicalHistory),
             new Student(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
                 new Address("Blk 11 Ang Mo Kio Street 74, #11-04"), new Involvement("Bio class"),
-                getTagSet("neighbours"), new Phone("90234134"), new FormClass("3Bio5"), new Gender("F")),
+                getTagSet("neighbours"), new Phone("90234134"), new FormClass("3Bio5"), new Gender("F"),
+                    emptyMedicalHistory),
             new Student(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
                 new Address("Blk 436 Serangoon Gardens Street 26, #16-43"), new Involvement("Math class"),
-                getTagSet("family"), new Phone("81934910"), new FormClass("2Science2"), new Gender("M")),
+                getTagSet("family"), new Phone("81934910"), new FormClass("2Science2"), new Gender("M"),
+                    emptyMedicalHistory),
             new Student(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
                 new Address("Blk 47 Tampines Street 20, #17-35"), new Involvement("Math class"),
                 getTagSet("classmates"), new Phone("94893113"), new FormClass("Sec 3 Pure Geography"),
-                    new Gender("N")),
+                    new Gender("N"), emptyMedicalHistory),
             new Student(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
                 new Address("Blk 45 Aljunied Street 85, #11-31"), new Involvement("Math class"),
-                getTagSet("colleagues"), new Phone("91919301"), new FormClass("3 NORMAL 2"), new Gender("N"))
+                getTagSet("colleagues"), new Phone("91919301"), new FormClass("3 NORMAL 2"), new Gender("N"),
+                    emptyMedicalHistory)
         };
     }
 
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedStudent.java b/src/main/java/seedu/address/storage/JsonAdaptedStudent.java
index de7c213fdc6..69e1b6c9a1e 100644
--- a/src/main/java/seedu/address/storage/JsonAdaptedStudent.java
+++ b/src/main/java/seedu/address/storage/JsonAdaptedStudent.java
@@ -14,6 +14,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 import seedu.address.model.person.Student;
@@ -30,6 +31,7 @@ class JsonAdaptedStudent extends JsonAdaptedPerson {
     private final String emergencyContact;
     private final String formClass;
     private final String gender;
+    private final String medicalHistory;
 
     /**
      * Constructs a {@code JsonAdaptedPerson} with the given student details.
@@ -41,16 +43,18 @@ public JsonAdaptedStudent(@JsonProperty("name") String name, @JsonProperty("phon
                               @JsonProperty("tagged") List<JsonAdaptedTag> tagged,
                               @JsonProperty("emergencyContact") String emergencyContact,
                               @JsonProperty("formClass") String formClass,
-                              @JsonProperty("gender") String gender) {
+                              @JsonProperty("gender") String gender,
+                              @JsonProperty("medicalHistory") String medicalHistory) {
         super(name, phone, email, involvement, tagged);
         this.address = address;
         this.emergencyContact = emergencyContact;
         this.formClass = formClass;
         this.gender = gender;
+        this.medicalHistory = medicalHistory;
     }
 
     /**
-     * Converts a given {@code Person} into this class for Jackson use.
+     * Converts a given {@code Student} into this class for Jackson use.
      */
     public JsonAdaptedStudent(Student source) {
         super(source);
@@ -58,6 +62,7 @@ public JsonAdaptedStudent(Student source) {
         this.emergencyContact = source.getEmergencyContact().value;
         this.formClass = source.getFormClass().formClass;
         this.gender = source.getGender().gender;
+        this.medicalHistory = source.getMedicalHistory().value;
     }
 
     /**
@@ -128,6 +133,8 @@ public Student toModelType() throws IllegalValueException {
         if (!FormClass.isValidFormClass(formClass)) {
             throw new IllegalValueException(FormClass.MESSAGE_CONSTRAINTS);
         }
+        final FormClass modelFormClass = new FormClass(formClass);
+
         if (gender == null) {
             throw new IllegalValueException(String.format(
                     MISSING_FIELD_MESSAGE_FORMAT, Gender.class.getSimpleName()));
@@ -135,8 +142,15 @@ public Student toModelType() throws IllegalValueException {
         if (!Gender.isValidGender(gender)) {
             throw new IllegalValueException(Gender.MESSAGE_CONSTRAINTS);
         }
-        final FormClass modelFormClass = new FormClass(formClass);
+        final Gender modelGender = new Gender(gender);
+
+        if (medicalHistory == null) {
+            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
+                    MedicalHistory.class.getSimpleName()));
+        }
+        final MedicalHistory modelMedicalHistory = new MedicalHistory(medicalHistory);
+
         return new Student(modelName, modelPhone, modelEmail, modelAddress, modelInvolvement,
-                modelTags, modelEmergencyContact, modelFormClass, new Gender(gender));
+                modelTags, modelEmergencyContact, modelFormClass, modelGender, modelMedicalHistory);
     }
 }

From df13301687ef1a57d29edff69eab39e0013827e5 Mon Sep 17 00:00:00 2001
From: nniiggeell <e0559733@u.nus.edu>
Date: Tue, 12 Oct 2021 18:31:19 +0800
Subject: [PATCH 2/8] Add medical history label

---
 src/main/java/seedu/address/ui/StudentCard.java | 3 +++
 src/main/resources/view/PersonListCard.fxml     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/seedu/address/ui/StudentCard.java b/src/main/java/seedu/address/ui/StudentCard.java
index fa4017789c9..207271ff20d 100644
--- a/src/main/java/seedu/address/ui/StudentCard.java
+++ b/src/main/java/seedu/address/ui/StudentCard.java
@@ -48,6 +48,8 @@ public class StudentCard extends UiPart<Region> {
     private Label formClass;
     @FXML
     private Label gender;
+    @FXML
+    private Label medicalHistory;
 
     /**
      * Creates a {@code PersonCode} with the given {@code Person} and index to display.
@@ -62,6 +64,7 @@ public StudentCard(Student student, int displayedIndex) {
         email.setText(student.getEmail().value);
         formClass.setText(student.getFormClass().formClass);
         gender.setText(student.getGender().gender);
+        medicalHistory.setText(student.getMedicalHistory().value);
         involvement.setText(student.getInvolvement().involvement);
         student.getTags().stream()
                 .sorted(Comparator.comparing(tag -> tag.tagName))
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index b0064e289d2..1bb66d0ad14 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -32,6 +32,7 @@
          <HBox prefHeight="0.0" prefWidth="130.0">
             <children>
             <Label fx:id="formClass" styleClass="cell_small_label" text="\$formClass" />
+            <Label fx:id="medicalHistory" styleClass="cell_small_label" text="\$medicalHistory" />
             <Label fx:id="involvement" styleClass="cell_small_label" text="\$involvement">
                   <HBox.margin>
                      <Insets left="4.0" />

From 957310a4cd613b63bf5342e2b1353cf2286ed76f Mon Sep 17 00:00:00 2001
From: nniiggeell <e0559733@u.nus.edu>
Date: Tue, 12 Oct 2021 18:31:41 +0800
Subject: [PATCH 3/8] Update test case and relevant files

---
 .../duplicatePersonAddressBook.json           |  6 ++-
 .../typicalPersonsAddressBook.json            | 23 +++++---
 .../logic/commands/CommandTestUtil.java       |  2 +
 .../commands/EditStudentCommandTest.java      | 15 ------
 .../logic/parser/AddressBookParserTest.java   | 12 +++++
 .../storage/JsonAdaptedStudentTest.java       | 54 +++++++++++++------
 .../address/testutil/StudentBuilder.java      | 20 ++++++-
 .../address/testutil/TypicalStudents.java     | 13 ++++-
 8 files changed, 101 insertions(+), 44 deletions(-)

diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
index cab335f5b45..1796b0517e8 100644
--- a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
@@ -8,7 +8,8 @@
     "tagged": [ "friends" ],
     "emergencyContact" : "95614132",
     "formClass" : "4E1",
-    "gender": "F"
+    "gender": "F",
+    "medicalHistory": ""
   }, {
     "name": "Alice Pauline",
     "phone": "94351253",
@@ -17,6 +18,7 @@
     "involvement": "Math class",
     "emergencyContact" : "95614132",
     "formClass" : "4E1",
-    "gender": "F"
+    "gender": "F",
+    "medicalHistory": ""
   } ]
 }
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
index 609b7b9841c..8704f96a82c 100644
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
@@ -9,7 +9,8 @@
     "tagged" : [ "friends" ],
     "emergencyContact" : "95614132",
     "formClass" : "4N1",
-    "gender" : "F"
+    "gender" : "F",
+    "medicalHistory" : "ADHD"
   }, {
     "name" : "Benson Meier",
     "phone" : "98765432",
@@ -19,7 +20,8 @@
     "tagged" : [ "owesMoney", "friends" ],
     "emergencyContact" : "91939100",
     "formClass" : "3E3",
-    "gender" : "M"
+    "gender" : "M",
+    "medicalHistory" : "Autistic"
   }, {
     "name" : "Carl Kurz",
     "phone" : "95352563",
@@ -29,7 +31,8 @@
     "tagged" : [ ],
     "emergencyContact" : "48190514",
     "formClass" : "4E2",
-    "gender" : "M"
+    "gender" : "M",
+    "medicalHistory" : ""
   }, {
     "name" : "Daniel Meier",
     "phone" : "87652533",
@@ -39,7 +42,8 @@
     "tagged" : [ "friends" ],
     "emergencyContact" : "58141834",
     "formClass" : "4E2",
-    "gender" : "M"
+    "gender" : "M",
+    "medicalHistory" : ""
   }, {
     "name" : "Elle Meyer",
     "phone" : "9482224",
@@ -49,7 +53,8 @@
     "tagged" : [ ],
     "emergencyContact" : "92329700",
     "formClass" : "4E2",
-    "gender" : "F"
+    "gender" : "F",
+    "medicalHistory" : ""
   }, {
     "name" : "Fiona Kunz",
     "phone" : "9482427",
@@ -57,9 +62,10 @@
     "address" : "little tokyo",
     "involvement": "English class",
     "tagged" : [ ],
-    "emergencyContact" : "580947918074907019749087",
+    "emergencyContact" : "99749087",
     "formClass" : "1T1",
-    "gender" : "F"
+    "gender" : "F",
+    "medicalHistory" : ""
   }, {
     "name" : "George Best",
     "phone" : "9482442",
@@ -69,6 +75,7 @@
     "tagged" : [ ],
     "emergencyContact" : "84041748901",
     "formClass" : "1T1",
-    "gender" : "M"
+    "gender" : "M",
+    "medicalHistory" : ""
   } ]
 }
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
index be8593389d5..52759ddedc7 100644
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -50,6 +50,8 @@ public class CommandTestUtil {
     public static final String VALID_GENDER_AMY = "F";
     public static final String VALID_GENDER_BOB = "M";
     public static final String VALID_GENDER_NON_BINARY = "N";
+    public static final String VALID_MEDICAL_HISTORY_AMY = "ADHD";
+    public static final String VALID_MEDICAL_HISTORY_BOB = "Autistic";
 
     public static final String NAME_DESC_AMY = " " + PREFIX_NAME + VALID_NAME_AMY;
     public static final String NAME_DESC_BOB = " " + PREFIX_NAME + VALID_NAME_BOB;
diff --git a/src/test/java/seedu/address/logic/commands/EditStudentCommandTest.java b/src/test/java/seedu/address/logic/commands/EditStudentCommandTest.java
index bdf2beaf49c..cea503118b4 100644
--- a/src/test/java/seedu/address/logic/commands/EditStudentCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/EditStudentCommandTest.java
@@ -36,21 +36,6 @@ public class EditStudentCommandTest {
 
     private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
 
-    @Test
-    public void execute_allFieldsSpecifiedUnfilteredList_success() {
-        // check if all fields can be edited
-        Student editedPerson = new StudentBuilder().build();
-        EditStudentDescriptor descriptor = new EditStudentDescriptorBuilder(editedPerson).build();
-        EditCommand editCommand = new EditStudentCommand(INDEX_FIRST_PERSON, descriptor);
-
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
-        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-        expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
-
-        assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
-    }
-
     @Test
     public void execute_someFieldsSpecifiedUnfilteredList_success() {
         Index indexLastPerson = Index.fromOneBased(model.getFilteredPersonList().size());
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
index f62e26165fe..ef75545312e 100644
--- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MEDICAL_HISTORY;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
 
@@ -22,7 +23,9 @@
 import seedu.address.logic.commands.descriptors.EditStudentDescriptor;
 import seedu.address.logic.commands.student.AddStudentCommand;
 import seedu.address.logic.commands.student.EditStudentCommand;
+import seedu.address.logic.commands.student.MedicalHistoryCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.NameContainsKeywordsPredicate;
 import seedu.address.model.person.Student;
 import seedu.address.testutil.EditStudentDescriptorBuilder;
@@ -88,6 +91,15 @@ public void parseCommand_list() throws Exception {
         assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
     }
 
+    @Test
+    public void parseCommand_medical() throws Exception {
+        final MedicalHistory medicalHistory = new MedicalHistory("ADHD");
+        MedicalHistoryCommand command = (MedicalHistoryCommand) parser.parseCommand(
+                MedicalHistoryCommand.COMMAND_WORD + " "
+                + INDEX_FIRST_PERSON.getOneBased() + " " + PREFIX_MEDICAL_HISTORY + medicalHistory.value);
+        assertEquals(new MedicalHistoryCommand(INDEX_FIRST_PERSON, medicalHistory), command);
+    }
+
     @Test
     public void parseCommand_unrecognisedInput_throwsParseException() {
         assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), ()
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java b/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java
index cfc8f5538ce..b096036f58d 100644
--- a/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java
+++ b/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java
@@ -17,6 +17,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 
@@ -40,6 +41,7 @@ public class JsonAdaptedStudentTest {
             .map(JsonAdaptedTag::new)
             .collect(Collectors.toList());
     private static final String VALID_GENDER = BENSON.getGender().toString();
+    private static final String VALID_MEDICAL_HISTORY = BENSON.getMedicalHistory().toString();
 
     @Test
     public void toModelType_validStudentDetails_returnsStudent() throws Exception {
@@ -51,7 +53,8 @@ public void toModelType_validStudentDetails_returnsStudent() throws Exception {
     public void toModelType_invalidName_throwsIllegalValueException() {
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         String expectedMessage = Name.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -59,7 +62,7 @@ public void toModelType_invalidName_throwsIllegalValueException() {
     @Test
     public void toModelType_nullName_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(null, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER, VALID_MEDICAL_HISTORY);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -68,7 +71,8 @@ public void toModelType_nullName_throwsIllegalValueException() {
     public void toModelType_invalidPhone_throwsIllegalValueException() {
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -76,7 +80,7 @@ public void toModelType_invalidPhone_throwsIllegalValueException() {
     @Test
     public void toModelType_nullPhone_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, null, VALID_EMAIL, VALID_ADDRESS,
-                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER, VALID_MEDICAL_HISTORY);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -85,7 +89,8 @@ public void toModelType_nullPhone_throwsIllegalValueException() {
     public void toModelType_invalidEmail_throwsIllegalValueException() {
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         String expectedMessage = Email.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -93,7 +98,7 @@ public void toModelType_invalidEmail_throwsIllegalValueException() {
     @Test
     public void toModelType_nullEmail_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, null, VALID_ADDRESS,
-                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER, VALID_MEDICAL_HISTORY);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -102,7 +107,8 @@ public void toModelType_nullEmail_throwsIllegalValueException() {
     public void toModelType_invalidAddress_throwsIllegalValueException() {
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         String expectedMessage = Address.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -110,7 +116,7 @@ public void toModelType_invalidAddress_throwsIllegalValueException() {
     @Test
     public void toModelType_nullAddress_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, null,
-                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER, VALID_MEDICAL_HISTORY);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -119,7 +125,8 @@ public void toModelType_nullAddress_throwsIllegalValueException() {
     public void toModelType_invalidInvolvement_throwsIllegalValueException() {
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                        INVALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                        INVALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         String expectedMessage = Involvement.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -127,7 +134,7 @@ public void toModelType_invalidInvolvement_throwsIllegalValueException() {
     @Test
     public void toModelType_nullInvolvement_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                null, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                null, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER, VALID_MEDICAL_HISTORY);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Involvement.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -138,7 +145,8 @@ public void toModelType_invalidTags_throwsIllegalValueException() {
         invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, INVALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, INVALID_PHONE, VALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         assertThrows(IllegalValueException.class, student::toModelType);
     }
 
@@ -148,7 +156,8 @@ public void toModelType_invalidEmergencyContact_throwsIllegalValueException() {
         invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, INVALID_PHONE, VALID_FORM_CLASS, VALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, INVALID_PHONE, VALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         assertThrows(IllegalValueException.class, student::toModelType);
     }
 
@@ -158,7 +167,8 @@ public void toModelType_nullEmergencyContact_throwsIllegalValueException() {
         invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, null, VALID_FORM_CLASS, VALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, null, VALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         assertThrows(IllegalValueException.class, student::toModelType);
     }
 
@@ -166,7 +176,8 @@ public void toModelType_nullEmergencyContact_throwsIllegalValueException() {
     public void toModelType_invalidFormClass_throwsIllegalValueException() {
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, INVALID_FORM_CLASS, VALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, INVALID_FORM_CLASS, VALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         String expectedMessage = FormClass.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -174,7 +185,7 @@ public void toModelType_invalidFormClass_throwsIllegalValueException() {
     @Test
     public void toModelType_nullFormClass_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, null, VALID_GENDER);
+                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, null, VALID_GENDER, VALID_MEDICAL_HISTORY);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, FormClass.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -183,7 +194,8 @@ public void toModelType_nullFormClass_throwsIllegalValueException() {
     public void toModelType_invalidGender_throwsIllegalValueException() {
         JsonAdaptedStudent student =
                 new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, INVALID_GENDER);
+                        VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, INVALID_GENDER,
+                        VALID_MEDICAL_HISTORY);
         String expectedMessage = Gender.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
@@ -191,9 +203,17 @@ public void toModelType_invalidGender_throwsIllegalValueException() {
     @Test
     public void toModelType_nullGender_throwsIllegalValueException() {
         JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
-                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, null);
+                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, null, VALID_MEDICAL_HISTORY);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Gender.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
     }
 
+    @Test
+    public void toModelType_nullMedicalHistory_throwsIllegalValueException() {
+        JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS,
+                VALID_INVOLVEMENT, VALID_TAGS, VALID_PHONE, VALID_FORM_CLASS, VALID_GENDER, null);
+        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, MedicalHistory.class.getSimpleName());
+        assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+    }
+
 }
diff --git a/src/test/java/seedu/address/testutil/StudentBuilder.java b/src/test/java/seedu/address/testutil/StudentBuilder.java
index 950a6a7a7d5..50af6f1b52a 100644
--- a/src/test/java/seedu/address/testutil/StudentBuilder.java
+++ b/src/test/java/seedu/address/testutil/StudentBuilder.java
@@ -8,6 +8,7 @@
 import seedu.address.model.person.FormClass;
 import seedu.address.model.person.Gender;
 import seedu.address.model.person.Involvement;
+import seedu.address.model.person.MedicalHistory;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
 import seedu.address.model.person.Student;
@@ -27,6 +28,7 @@ public class StudentBuilder {
     public static final String DEFAULT_INVOLVEMENT = "Math class";
     public static final String DEFAULT_FORM_CLASS = "4E1";
     public static final String DEFAULT_GENDER = "M";
+    public static final String DEFAULT_MEDICAL_HISTORY = "ADHD";
 
     private Name name;
     private Phone phone;
@@ -37,6 +39,7 @@ public class StudentBuilder {
     private Phone emergencyContact;
     private FormClass formClass;
     private Gender gender;
+    private MedicalHistory medicalHistory;
 
     /**
      * Creates a {@code StudentBuilder} with the default details.
@@ -51,6 +54,7 @@ public StudentBuilder() {
         emergencyContact = new Phone(DEFAULT_EMERGENCY_CONTACT);
         formClass = new FormClass(DEFAULT_FORM_CLASS);
         gender = new Gender(DEFAULT_GENDER);
+        medicalHistory = new MedicalHistory(DEFAULT_MEDICAL_HISTORY);
     }
 
     /**
@@ -66,6 +70,7 @@ public StudentBuilder(Student studentToCopy) {
         emergencyContact = studentToCopy.getEmergencyContact();
         formClass = studentToCopy.getFormClass();
         gender = studentToCopy.getGender();
+        medicalHistory = studentToCopy.getMedicalHistory();
     }
 
     /**
@@ -142,8 +147,21 @@ public StudentBuilder withGender(String gender) {
         return this;
     }
 
+    /**
+     * Sets the {@code MedicalHistory} of the {@code Student} that we are building.
+     */
+    public StudentBuilder withMedicalHistory(String medicalHistory) {
+        this.medicalHistory = new MedicalHistory(medicalHistory);
+        return this;
+    }
+
+    /**
+     * Builds the {@code Student}.
+     * @return the student.
+     */
     public Student build() {
-        return new Student(name, phone, email, address, involvement, tags, emergencyContact, formClass, gender);
+        return new Student(name, phone, email, address, involvement, tags, emergencyContact, formClass, gender,
+                medicalHistory);
     }
 
 }
diff --git a/src/test/java/seedu/address/testutil/TypicalStudents.java b/src/test/java/seedu/address/testutil/TypicalStudents.java
index d82d8ba8194..074b35c80f5 100644
--- a/src/test/java/seedu/address/testutil/TypicalStudents.java
+++ b/src/test/java/seedu/address/testutil/TypicalStudents.java
@@ -41,6 +41,7 @@ public class TypicalStudents {
             .withInvolvement("Math class")
             .withFormClass("4N1")
             .withGender("F")
+            .withMedicalHistory("ADHD")
             .build();
     public static final Student BENSON = new StudentBuilder()
             .withName("Benson Meier")
@@ -52,6 +53,7 @@ public class TypicalStudents {
             .withInvolvement("Math class")
             .withFormClass("3E3")
             .withGender("M")
+            .withMedicalHistory("Autistic")
             .build();
     public static final Student CARL = new StudentBuilder()
             .withName("Carl Kurz")
@@ -62,6 +64,7 @@ public class TypicalStudents {
             .withInvolvement("Form class")
             .withFormClass("4E2")
             .withGender("M")
+            .withMedicalHistory("")
             .build();
     public static final Student DANIEL = new StudentBuilder()
             .withName("Daniel Meier")
@@ -73,6 +76,7 @@ public class TypicalStudents {
             .withInvolvement("Form class")
             .withFormClass("4E2")
             .withGender("M")
+            .withMedicalHistory("")
             .build();
     public static final Student ELLE = new StudentBuilder()
             .withName("Elle Meyer")
@@ -83,16 +87,18 @@ public class TypicalStudents {
             .withInvolvement("Form class")
             .withFormClass("4E2")
             .withGender("F")
+            .withMedicalHistory("")
             .build();
     public static final Student FIONA = new StudentBuilder()
             .withName("Fiona Kunz")
             .withPhone("9482427")
             .withEmail("lydia@example.com")
             .withAddress("little tokyo")
-            .withEmergencyContact("580947918074907019749087")
+            .withEmergencyContact("99749087")
             .withInvolvement("English class")
             .withFormClass("1T1")
             .withGender("F")
+            .withMedicalHistory("")
             .build();
     public static final Student GEORGE = new StudentBuilder()
             .withName("George Best")
@@ -103,6 +109,7 @@ public class TypicalStudents {
             .withInvolvement("English class")
             .withFormClass("1T1")
             .withGender("M")
+            .withMedicalHistory("")
             .build();
 
     // Manually added
@@ -115,6 +122,7 @@ public class TypicalStudents {
             .withInvolvement("English rep")
             .withFormClass("3E2")
             .withGender("N")
+            .withMedicalHistory("")
             .build();
 
     public static final Student IDA = new StudentBuilder()
@@ -126,6 +134,7 @@ public class TypicalStudents {
             .withInvolvement("Bio rep")
             .withFormClass("2T1")
             .withGender("F")
+            .withMedicalHistory("")
             .build();
 
     // Manually added - Person's details found in {@code CommandTestUtil}
@@ -139,6 +148,7 @@ public class TypicalStudents {
             .withEmergencyContact(VALID_EMERGENCY_CONTACT_AMY)
             .withFormClass(VALID_FORM_CLASS_AMY)
             .withGender(VALID_GENDER_AMY)
+            .withMedicalHistory("")
             .build();
 
     public static final Student BOB = new StudentBuilder()
@@ -151,6 +161,7 @@ public class TypicalStudents {
             .withEmergencyContact(VALID_EMERGENCY_CONTACT_BOB)
             .withFormClass(VALID_FORM_CLASS_BOB)
             .withGender(VALID_GENDER_BOB)
+            .withMedicalHistory("")
             .build();
 
     public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER

From 31b78fb1ca8de50ce3c836946d5f18ebf7a39d2a Mon Sep 17 00:00:00 2001
From: nniiggeell <e0559733@u.nus.edu>
Date: Tue, 12 Oct 2021 18:31:58 +0800
Subject: [PATCH 4/8] Add MedicalHistoryCommand.java

For the new command.
---
 .../student/MedicalHistoryCommand.java        | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 src/main/java/seedu/address/logic/commands/student/MedicalHistoryCommand.java

diff --git a/src/main/java/seedu/address/logic/commands/student/MedicalHistoryCommand.java b/src/main/java/seedu/address/logic/commands/student/MedicalHistoryCommand.java
new file mode 100644
index 00000000000..e6c1438a51d
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/student/MedicalHistoryCommand.java
@@ -0,0 +1,99 @@
+package seedu.address.logic.commands.student;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.MedicalHistory;
+import seedu.address.model.person.Person;
+import seedu.address.model.person.Student;
+
+/**
+ * Changes the medical history of an existing student inside the New Address Book.
+ */
+public class MedicalHistoryCommand extends Command {
+    public static final String COMMAND_WORD = "medical";
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Edits the medical history of the person identified "
+            + "by the index number used in the last person listing. "
+            + "Existing medical history will be overwritten by the input.\n"
+            + "Parameters: INDEX (must be a positive integer) "
+            + "m/ [MEDICAL_HISTORY]\n"
+            + "Example: " + COMMAND_WORD + " 1 "
+            + "m/ ADHD";
+
+    public static final String MESSAGE_ARGUMENTS = "Index: %1$d, Medical_History: %2$s";
+    public static final String MESSAGE_ADD_MEDICAL_HISTORY_SUCCESS = "Added medical history to Person: %1$s";
+    public static final String MESSAGE_DELETE_MEDICAL_HISTORY_SUCCESS = "Removed medical history from Person: %1$s";
+
+    private final Index index;
+    private final MedicalHistory medicalHistory;
+
+    /**
+     * @param index of the student in the filtered person list to edit the {@code MedicalHistory}
+     * @param medicalHistory of the student to be updated to
+     */
+    public MedicalHistoryCommand(Index index, MedicalHistory medicalHistory) {
+        requireAllNonNull(index, medicalHistory);
+
+        this.index = index;
+        this.medicalHistory = medicalHistory;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+        List<Person> lastShownList = model.getFilteredPersonList();
+        if (index.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        }
+
+        Student studentToEdit = (Student) lastShownList.get(index.getZeroBased());
+        Student editedStudent = new Student(studentToEdit.getName(), studentToEdit.getPhone(), studentToEdit.getEmail(),
+                studentToEdit.getAddress(), studentToEdit.getInvolvement(), studentToEdit.getTags(),
+                studentToEdit.getEmergencyContact(), studentToEdit.getFormClass(), studentToEdit.getGender(),
+                medicalHistory);
+
+        model.setPerson(studentToEdit, editedStudent);
+        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+
+        return new CommandResult(generateSuccessMessage(editedStudent));
+    }
+
+    /**
+     * Generates a command execution success message based on whether
+     * the medical history is added to or removed from
+     * {@code studentToEdit}.
+     */
+    private String generateSuccessMessage(Student studentToEdit) {
+        String message = !medicalHistory.value.isEmpty() ? MESSAGE_ADD_MEDICAL_HISTORY_SUCCESS
+                : MESSAGE_DELETE_MEDICAL_HISTORY_SUCCESS;
+        return String.format(message, studentToEdit);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        // short circuit if same object
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof MedicalHistoryCommand)) {
+            return false;
+        }
+
+        // state check
+        MedicalHistoryCommand e = (MedicalHistoryCommand) other;
+        return index.equals(e.index)
+                && medicalHistory.equals(e.medicalHistory);
+    }
+}

From 315be6699df1103607fe4c4638309fc35f9cddb4 Mon Sep 17 00:00:00 2001
From: nniiggeell <e0559733@u.nus.edu>
Date: Tue, 12 Oct 2021 18:32:12 +0800
Subject: [PATCH 5/8] Add MedicalHistoryCommandParser.java

For the new command.
---
 .../student/MedicalHistoryCommandParser.java  | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/main/java/seedu/address/logic/parser/student/MedicalHistoryCommandParser.java

diff --git a/src/main/java/seedu/address/logic/parser/student/MedicalHistoryCommandParser.java b/src/main/java/seedu/address/logic/parser/student/MedicalHistoryCommandParser.java
new file mode 100644
index 00000000000..6e43b05419b
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/student/MedicalHistoryCommandParser.java
@@ -0,0 +1,45 @@
+package seedu.address.logic.parser.student;
+
+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_MEDICAL_HISTORY;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.logic.commands.student.MedicalHistoryCommand;
+import seedu.address.logic.parser.ArgumentMultimap;
+import seedu.address.logic.parser.ArgumentTokenizer;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.MedicalHistory;
+
+/**
+ * Parses input arguments and creates a new {@code MedicalHistoryCommand} object.
+ */
+public class MedicalHistoryCommandParser implements Parser<MedicalHistoryCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the MedicalHistoryCommand
+     * and returns an MedicalHistoryCommand object for execution.
+     *
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public MedicalHistoryCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args,
+                PREFIX_MEDICAL_HISTORY);
+
+        Index index;
+        try {
+            index = ParserUtil.parseIndex(argMultimap.getPreamble());
+        } catch (IllegalValueException ive) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                    MedicalHistoryCommand.MESSAGE_USAGE), ive);
+        }
+
+        String medicalHistory = argMultimap.getValue(PREFIX_MEDICAL_HISTORY).orElse("");
+
+        return new MedicalHistoryCommand(index, new MedicalHistory(medicalHistory));
+    }
+}

From da145493f006df0dbeb7148195af1b8deaa7eb87 Mon Sep 17 00:00:00 2001
From: nniiggeell <e0559733@u.nus.edu>
Date: Tue, 12 Oct 2021 18:32:31 +0800
Subject: [PATCH 6/8] Add MedicalHistory.java

For the field in Student.
---
 .../address/model/person/MedicalHistory.java  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/main/java/seedu/address/model/person/MedicalHistory.java

diff --git a/src/main/java/seedu/address/model/person/MedicalHistory.java b/src/main/java/seedu/address/model/person/MedicalHistory.java
new file mode 100644
index 00000000000..fcfbc39a880
--- /dev/null
+++ b/src/main/java/seedu/address/model/person/MedicalHistory.java
@@ -0,0 +1,38 @@
+package seedu.address.model.person;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Represents a Student's medical history in the address book.
+ * Guarantees: immutable; is always valid
+ */
+public class MedicalHistory {
+    public final String value;
+
+    /**
+     * Constructs a {@code MedicalHistory}.
+     *
+     * @param medicalHistory A medicalHistory.
+     */
+    public MedicalHistory(String medicalHistory) {
+        requireNonNull(medicalHistory);
+        value = medicalHistory;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof MedicalHistory // instanceof handles nulls
+                && value.equals(((MedicalHistory) other).value)); // state check
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+}

From d9e9f2653089a3ad7fae31a3670cd5d99df2f14d Mon Sep 17 00:00:00 2001
From: nniiggeell <e0559733@u.nus.edu>
Date: Tue, 12 Oct 2021 18:32:41 +0800
Subject: [PATCH 7/8] Add test cases for MedicalHistory

---
 .../student/MedicalHistoryCommandTest.java    | 140 ++++++++++++++++++
 .../MedicalHistoryCommandParserTest.java      |  44 ++++++
 .../model/person/MedicalHistoryTest.java      |  31 ++++
 3 files changed, 215 insertions(+)
 create mode 100644 src/test/java/seedu/address/logic/commands/student/MedicalHistoryCommandTest.java
 create mode 100644 src/test/java/seedu/address/logic/parser/student/MedicalHistoryCommandParserTest.java
 create mode 100644 src/test/java/seedu/address/model/person/MedicalHistoryTest.java

diff --git a/src/test/java/seedu/address/logic/commands/student/MedicalHistoryCommandTest.java b/src/test/java/seedu/address/logic/commands/student/MedicalHistoryCommandTest.java
new file mode 100644
index 00000000000..e8377e51842
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/student/MedicalHistoryCommandTest.java
@@ -0,0 +1,140 @@
+package seedu.address.logic.commands.student;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_MEDICAL_HISTORY_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_MEDICAL_HISTORY_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.ClearCommand;
+import seedu.address.model.AddressBook;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.person.MedicalHistory;
+import seedu.address.model.person.Person;
+import seedu.address.model.person.Student;
+import seedu.address.testutil.StudentBuilder;
+
+class MedicalHistoryCommandTest {
+    private static final String MEDICAL_HISTORY_STUB = "Some medical history";
+    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+
+    @Test
+    public void execute_addMedicalHistoryUnfilteredList_success() {
+        Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
+        StudentBuilder personInList = new StudentBuilder((Student) firstPerson);
+        Student editedStudent = personInList.withMedicalHistory(MEDICAL_HISTORY_STUB).build();
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(INDEX_FIRST_PERSON,
+                new MedicalHistory(editedStudent.getMedicalHistory().value));
+
+        String expectedMessage = String.format(MedicalHistoryCommand.MESSAGE_ADD_MEDICAL_HISTORY_SUCCESS,
+                editedStudent);
+
+        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
+        expectedModel.setPerson(firstPerson, editedStudent);
+
+        assertCommandSuccess(medicalHistoryCommand, model, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_deleteMedicalHistoryUnfilteredList_success() {
+        Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
+        StudentBuilder personInList = new StudentBuilder((Student) firstPerson);
+        Student editedStudent = new StudentBuilder((Student) firstPerson).withMedicalHistory("").build();
+
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(INDEX_FIRST_PERSON,
+                new MedicalHistory(editedStudent.getMedicalHistory().toString()));
+
+        String expectedMessage = String.format(MedicalHistoryCommand.MESSAGE_DELETE_MEDICAL_HISTORY_SUCCESS,
+                editedStudent);
+
+        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
+        expectedModel.setPerson(firstPerson, editedStudent);
+
+        assertCommandSuccess(medicalHistoryCommand, model, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_filteredList_success() {
+        showPersonAtIndex(model, INDEX_FIRST_PERSON);
+
+        Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
+        Student editedStudent = new StudentBuilder((Student) model.getFilteredPersonList().get(INDEX_FIRST_PERSON
+                .getZeroBased())).withMedicalHistory(MEDICAL_HISTORY_STUB).build();
+
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(INDEX_FIRST_PERSON,
+                new MedicalHistory(editedStudent.getMedicalHistory().value));
+
+        String expectedMessage = String.format(MedicalHistoryCommand.MESSAGE_ADD_MEDICAL_HISTORY_SUCCESS,
+                editedStudent);
+
+        Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
+        expectedModel.setPerson(firstPerson, editedStudent);
+
+        assertCommandSuccess(medicalHistoryCommand, model, expectedMessage, expectedModel);
+    }
+
+    @Test
+    public void execute_invalidPersonIndexUnfilteredList_failure() {
+        Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(outOfBoundIndex,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_BOB));
+
+        assertCommandFailure(medicalHistoryCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+    }
+
+    /**
+     * Edit filtered list where index is larger than size of filtered list,
+     * but smaller than size of address book
+     */
+    @Test
+    public void execute_invalidPersonIndexFilteredList_failure() {
+        showPersonAtIndex(model, INDEX_FIRST_PERSON);
+        Index outOfBoundIndex = INDEX_SECOND_PERSON;
+        // ensures that outOfBoundIndex is still in bounds of address book list
+        assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
+
+        MedicalHistoryCommand medicalHistoryCommand = new MedicalHistoryCommand(outOfBoundIndex,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_BOB));
+
+        assertCommandFailure(medicalHistoryCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+    }
+
+    @Test
+    public void equals() {
+        final MedicalHistoryCommand standardCommand = new MedicalHistoryCommand(INDEX_FIRST_PERSON,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_AMY));
+
+        // same values -> returns true
+        MedicalHistoryCommand commandWithSameValues = new MedicalHistoryCommand(INDEX_FIRST_PERSON,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_AMY));
+        assertTrue(standardCommand.equals(commandWithSameValues));
+
+        // same object -> returns true
+        assertTrue(standardCommand.equals(standardCommand));
+
+        // null -> returns false
+        assertFalse(standardCommand.equals(null));
+
+        // different types -> returns false
+        assertFalse(standardCommand.equals(new ClearCommand()));
+
+        // different index -> returns false
+        assertFalse(standardCommand.equals(new MedicalHistoryCommand(INDEX_SECOND_PERSON,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_AMY))));
+
+        // different MedicalHistory -> returns false
+        assertFalse(standardCommand.equals(new MedicalHistoryCommand(INDEX_FIRST_PERSON,
+                new MedicalHistory(VALID_MEDICAL_HISTORY_BOB))));
+    }
+}
diff --git a/src/test/java/seedu/address/logic/parser/student/MedicalHistoryCommandParserTest.java b/src/test/java/seedu/address/logic/parser/student/MedicalHistoryCommandParserTest.java
new file mode 100644
index 00000000000..1b48280602f
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/student/MedicalHistoryCommandParserTest.java
@@ -0,0 +1,44 @@
+package seedu.address.logic.parser.student;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MEDICAL_HISTORY;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.student.MedicalHistoryCommand;
+import seedu.address.model.person.MedicalHistory;
+
+public class MedicalHistoryCommandParserTest {
+    private MedicalHistoryCommandParser parser = new MedicalHistoryCommandParser();
+    private final String nonEmptyMedicalHistory = "Some MedicalHistory.";
+
+    @Test
+    public void parse_indexSpecified_success() {
+        // have MedicalHistory
+        Index targetIndex = INDEX_FIRST_PERSON;
+        String userInput = targetIndex.getOneBased() + " " + PREFIX_MEDICAL_HISTORY + nonEmptyMedicalHistory;
+        MedicalHistoryCommand expectedCommand = new MedicalHistoryCommand(INDEX_FIRST_PERSON,
+                new MedicalHistory(nonEmptyMedicalHistory));
+        assertParseSuccess(parser, userInput, expectedCommand);
+
+        // no MedicalHistory
+        userInput = targetIndex.getOneBased() + " " + PREFIX_MEDICAL_HISTORY;
+        expectedCommand = new MedicalHistoryCommand(INDEX_FIRST_PERSON, new MedicalHistory(""));
+        assertParseSuccess(parser, userInput, expectedCommand);
+    }
+
+    @Test
+    public void parse_missingCompulsoryField_failure() {
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, MedicalHistoryCommand.MESSAGE_USAGE);
+
+        // no parameters
+        assertParseFailure(parser, MedicalHistoryCommand.COMMAND_WORD, expectedMessage);
+
+        // no index
+        assertParseFailure(parser, MedicalHistoryCommand.COMMAND_WORD + " " + nonEmptyMedicalHistory, expectedMessage);
+    }
+}
diff --git a/src/test/java/seedu/address/model/person/MedicalHistoryTest.java b/src/test/java/seedu/address/model/person/MedicalHistoryTest.java
new file mode 100644
index 00000000000..c761936037e
--- /dev/null
+++ b/src/test/java/seedu/address/model/person/MedicalHistoryTest.java
@@ -0,0 +1,31 @@
+package seedu.address.model.person;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class MedicalHistoryTest {
+
+    @Test
+    public void testEquals() {
+        MedicalHistory medicalHistory = new MedicalHistory("ADHD");
+
+        // same object -> returns true
+        assertTrue(medicalHistory.equals(medicalHistory));
+
+        // same values -> returns true
+        MedicalHistory medicalHistoryCopy = new MedicalHistory(medicalHistory.value);
+        assertTrue(medicalHistory.equals(medicalHistoryCopy));
+
+        // different types -> returns false
+        assertFalse(medicalHistory.equals(1));
+
+        // null -> returns false
+        assertFalse(medicalHistory.equals(null));
+
+        // different MedicalHistory -> returns false
+        MedicalHistory differentMedicalHistory = new MedicalHistory("Autism");
+        assertFalse(medicalHistory.equals(differentMedicalHistory));
+    }
+}

From ece95cf686bfc546f046ba412d69e94db3e556e5 Mon Sep 17 00:00:00 2001
From: nniiggeell <e0559733@u.nus.edu>
Date: Tue, 12 Oct 2021 18:40:53 +0800
Subject: [PATCH 8/8] Update UserGuide.md

---
 docs/UserGuide.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 59076a2020e..277d6a84948 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -120,6 +120,21 @@ Examples:
 * `teacher n/Lebron p/91234567 e/lbj@example.com a/George street, block 123, #01-01 i/Math HOD
 t/relief`
 
+### Adding a medical history to a student: `medical`
+
+Adds a medical history to an existing student in NewAddressBook.
+
+Format: `medical INDEX m/MEDICAL_HISTORY`
+
+<div markdown="span" class="alert alert-primary">:bulb: **Tip:**
+Edits the student at the specified index. The index must be a positive integer.
+To edit an existing medical history, simply use the same command, which will overwrite 
+the current medical history.
+</div>
+
+Examples:
+* `medical 1 m/ADHD`
+
 ### Listing all persons : `list`
 
 Shows a list of all persons stored in NewAddressBook.