Merge pull request nus-cs2103-AY1718S2#69 from Aquarinte/master

Implement full parsing logic for Add command

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

@@ -2,17 +2,27 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NRIC;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PET_PATIENT_BLOODTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PET_PATIENT_BREED;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PET_PATIENT_COLOUR;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PET_PATIENT_SPECIES;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_REMARK;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.appointment.Appointment;
+import seedu.address.model.appointment.exceptions.DuplicateAppointmentException;
+import seedu.address.model.person.Nric;
 import seedu.address.model.person.Person;
 import seedu.address.model.person.exceptions.DuplicatePersonException;
 import seedu.address.model.petpatient.PetPatient;
+import seedu.address.model.petpatient.PetPatientName;
+import seedu.address.model.petpatient.exceptions.DuplicatePetPatientException;
 
 /**
  * Adds a person to the address book.
@@ -22,6 +32,7 @@ public class AddCommand extends UndoableCommand {
     public static final String COMMAND_WORD = "add";
     public static final String COMMAND_ALIAS = "a";
 
+    //NEED TO UPDATE THE MESSAGE_USAGE (CONSOLIDATE)
     public static final String MESSAGE_USAGE = COMMAND_WORD + " -o : Adds a person to the address book. "
             + "Parameters: "
             + PREFIX_NAME + "NAME "
@@ -39,12 +50,47 @@ public class AddCommand extends UndoableCommand {
             + PREFIX_TAG + "friends "
             + PREFIX_TAG + "owesMoney";
 
+    public static final String MESSAGE_APPOINTMENT = COMMAND_WORD + " -a : Adds an appointment. "
+            + "Parameters: "
+            + PREFIX_DATE + "DATE "
+            + PREFIX_REMARK + "REMARK "
+            + "[" + PREFIX_TAG + "TYPE OF APPOINTMENT]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_DATE + "2018-12-31 12:30 "
+            + PREFIX_REMARK + "nil "
+            + PREFIX_TAG + "checkup "
+            + PREFIX_TAG + "vaccination";
+
+    public static final String MESSAGE_PETPATIENT = COMMAND_WORD + " -p : Adds a pet patient to the address book. "
+            + "Parameters: "
+            + PREFIX_NAME + "NAME "
+            + PREFIX_PET_PATIENT_SPECIES + "SPECIES "
+            + PREFIX_PET_PATIENT_BREED + "BREED "
+            + PREFIX_PET_PATIENT_COLOUR + "COLOUR "
+            + PREFIX_PET_PATIENT_BLOODTYPE + "BLOOD_TYPE "
+            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_NAME + "Jewel "
+            + PREFIX_PET_PATIENT_SPECIES + "Cat "
+            + PREFIX_PET_PATIENT_BREED + "Persian Ragdoll "
+            + PREFIX_PET_PATIENT_COLOUR + "Calico "
+            + PREFIX_PET_PATIENT_BLOODTYPE + "AB";
+
     public static final String MESSAGE_SUCCESS = "New person added: %1$s\n";
-    public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
+    public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in Medeina.";
+    public static final String MESSAGE_DUPLICATE_APPOINTMENT = "This particular appointment already exists in Medeina.";
+    public static final String MESSAGE_DUPLICATE_PET_PATIENT = "This pet patient already exists in Medeina";
+    public static final String MESSAGE_INVALID_NRIC = "The specified NRIC does not belong to anyone in Medeina."
+            + " Please add a new person.";
+    public static final String MESSAGE_INVALID_PET_PATIENT = "The specified pet cannot be found under the specified "
+            + "owner in Medeina. Please add a new pet patient.";
 
     private Person toAddOwner;
     private PetPatient toAddPet;
     private Appointment toAddAppt;
+    private Nric ownerNric;
+    private PetPatientName petPatientName;
+    private int type;
     private String message = "New person added: %1$s\n";
 
     /**
@@ -57,28 +103,35 @@ public AddCommand(Person owner, PetPatient pet, Appointment appt) {
         toAddOwner = owner;
         toAddPet = pet;
         toAddAppt = appt;
-        message += "New pet patient added: " + toAddPet.toString()
-                + "\nNew appointment made: " + toAddAppt.toString();
-        System.out.println("ADDED ALL THREE");
+        type = 1;
+        message += "New pet patient added: %2$s\nNew appointment made: %3$s";
     }
 
     /**
-     * Creates an AddCommand to add the specified {@code Person} and {@code PetPatient}
+     * Creates an AddCommand to add the specified {@code Person} and {@code PetPatient} and {@code Appointment}
      */
-    public AddCommand(Person owner, PetPatient pet) {
-        requireNonNull(owner);
-        requireNonNull(pet);
-        toAddOwner = owner;
-        toAddPet = pet;
-        message += "New pet patient added: " + toAddPet.toString();
+    public AddCommand(Appointment appt, Nric ownerNric, PetPatientName petPatientName) {
+        requireNonNull(appt);
+        requireNonNull(ownerNric);
+        requireNonNull(petPatientName);
+        toAddAppt = appt;
+        this.ownerNric = ownerNric;
+        this.petPatientName = petPatientName;
+        type = 2;
+        message = "New appointment made: %1$s\nunder owner: %2$s\nfor pet patient: %3$s";
     }
 
     /**
-     * Creates an AddCommand to add the specified {@code PetPatient}
+     * Creates an AddCommand to add the specified {@code PetPatient} if an existing Person object has Nric equivalent
+     * to {@code Nric}
      */
-    public AddCommand(PetPatient pet) {
+    public AddCommand(PetPatient pet, Nric ownerNric) {
         requireNonNull(pet);
+        requireNonNull(ownerNric);
         toAddPet = pet;
+        this.ownerNric = ownerNric;
+        type = 3;
+        message = "New pet patient added: %1$s \nunder owner: %2$s";
     }
 
     /**
@@ -87,22 +140,85 @@ public AddCommand(PetPatient pet) {
     public AddCommand(Person owner) {
         requireNonNull(owner);
         toAddOwner = owner;
+        type = 4;
     }
 
     public String getMessage() {
         return message;
     }
 
+    public Person getPersonOfNric() {
+        for (Person p : model.getAddressBook().getPersonList()) {
+            if (p.getNric().equals(ownerNric)) {
+                return p;
+            }
+        }
+        return null;
+    }
+
+    public PetPatient getPetPatientOfNricAndName() {
+        for (PetPatient p : model.getAddressBook().getPetPatientList()) {
+            if (p.getOwner().equals(ownerNric) && p.getName().equals(petPatientName)) {
+                return p;
+            }
+        }
+        return null;
+    }
+
     @Override
     public CommandResult executeUndoableCommand() throws CommandException {
         requireNonNull(model);
         try {
-            model.addPerson(toAddOwner);
-            return new CommandResult(String.format(message, toAddOwner));
+            switch (type) {
+            case 1: //add new owner, new pet patient, and new appointment
+                model.addPerson(toAddOwner);
+                model.addPetPatient(toAddPet);
+                model.addAppointment(toAddAppt);
+                return new CommandResult(String.format(message, toAddOwner, toAddPet, toAddAppt));
+
+            case 2: //add new appointment for pet patient under an existing owner
+                Person owner = getPersonOfNric();
+                PetPatient pet = getPetPatientOfNricAndName();
+                if (owner != null) {
+                    toAddAppt.setOwnerNric(ownerNric);
+                } else {
+                    throw new CommandException(MESSAGE_INVALID_NRIC);
+                }
+
+                if (pet != null) {
+                    toAddAppt.setPetPatientName(petPatientName);
+                } else {
+                    throw new CommandException(MESSAGE_INVALID_PET_PATIENT);
+                }
+
+                toAddAppt.setPetPatientName(petPatientName);
+                model.addAppointment(toAddAppt);
+                return new CommandResult(String.format(message, toAddAppt, owner));
+
+            case 3: //add new pet patient under an existing person
+                Person p = getPersonOfNric();
+                if (p != null) {
+                    toAddPet.setOwnerNric(ownerNric);
+                    model.addPetPatient(toAddPet);
+                    return new CommandResult(String.format(message, toAddPet, p));
+                }
+                throw new CommandException(MESSAGE_INVALID_NRIC);
+
+            case 4: //add Person only
+                model.addPerson(toAddOwner);
+                return new CommandResult(String.format(message, toAddOwner));
+
+            default:
+                throw new CommandException(MESSAGE_USAGE);
+            }
+
         } catch (DuplicatePersonException e) {
             throw new CommandException(MESSAGE_DUPLICATE_PERSON);
+        } catch (DuplicatePetPatientException e) {
+            throw new CommandException(MESSAGE_DUPLICATE_PET_PATIENT);
+        } catch (DuplicateAppointmentException e) {
+            throw new CommandException(MESSAGE_DUPLICATE_APPOINTMENT);
         }
-
     }
 
     @Override