Merge pull request AY2324S2-CS2103T-T08-1#122 from NatLeong/fix-comma…

…nd-results Fix command results
NatLeong · Apr 4, 2024 · d1ded35 · d1ded35
2 parents 1a8c241 + 0425680
commit d1ded35
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 26 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/AddVisitCommand.java b/src/main/java/seedu/address/logic/commands/AddVisitCommand.java
@@ -20,16 +20,16 @@ public class AddVisitCommand extends Command {
     public static final String COMMAND_WORD = "addvisit";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a visit to a patient."
-            + "Parameters: "
+            + "\nParameters: "
             + PREFIX_NRIC + "NRIC "
             + PREFIX_DATEOFVISIT + "DATEOFVISIT "
             + PREFIX_SYMPTOM + "SYMPTOM "
             + PREFIX_DIAGNOSIS + "DIAGNOSIS "
             + PREFIX_STATUS + "STATUS "
-            + "Example: " + COMMAND_WORD + " "
-            + PREFIX_NRIC + "S1234567A "
-            + PREFIX_DATEOFVISIT + "2024-01-04"
-            + PREFIX_SYMPTOM + "Headache, Runny nose"
+            + "\nExample: " + COMMAND_WORD + " "
+            + PREFIX_NRIC + "S0123456A "
+            + PREFIX_DATEOFVISIT + "2024-01-04 "
+            + PREFIX_SYMPTOM + "Fever, Rhinorrhea "
             + PREFIX_DIAGNOSIS + "Common Flu "
             + PREFIX_STATUS + "PENDING ";
 

diff --git a/src/main/java/seedu/address/logic/commands/CreateCommand.java b/src/main/java/seedu/address/logic/commands/CreateCommand.java
@@ -14,7 +14,6 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_SEX;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_SYMPTOM;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
@@ -28,8 +27,8 @@
 public class CreateCommand extends Command {
     public static final String COMMAND_WORD = "create";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Creates a patient to the Immunimate System. "
-            + "Parameters: "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Creates a person in Immunimate. "
+            + "\nParameters: "
             + PREFIX_NRIC + "NRIC "
             + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
@@ -38,23 +37,19 @@ public class CreateCommand extends Command {
             + PREFIX_SEX + "SEX "
             + PREFIX_STATUS + "STATUS "
             + PREFIX_EMAIL + "EMAIL "
-            + "[" + PREFIX_TAG + "TAG]...\n"
             + PREFIX_ALLERGIES + "ALLERGIES "
             + PREFIX_BLOODTYPE + "BLOODTYPE "
             + PREFIX_CONDITION + "CONDITION "
             + PREFIX_SYMPTOM + "SYMPTOM "
             + PREFIX_DIAGNOSIS + "DIAGNOSIS "
-            + "Example: " + COMMAND_WORD + " "
+            + "\nExample: " + COMMAND_WORD + " "
             + PREFIX_NRIC + "S0123456A "
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
-            + PREFIX_EMAIL + "[email protected] "
             + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
             + PREFIX_DATEOFBIRTH + "1990-01-01 "
             + PREFIX_SEX + "M "
-            + PREFIX_STATUS + "PENDING "
-            + PREFIX_TAG + "Long term medication "
-            + PREFIX_TAG + "High blood pressure ";
+            + PREFIX_STATUS + "PENDING ";
 
     public static final String MESSAGE_SUCCESS = "New patient added ->\n%1$s";
     public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the system";

diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
@@ -22,7 +22,7 @@ public class DeleteCommand extends Command {
             + "Parameters: NRIC\n"
             + "Example: " + COMMAND_WORD + " S0123456A";
 
-    public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Patient ->\n%1$s";
+    public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person ->\n%1$s";
 
     private final Nric targetNric;
     //TODO test cases

diff --git a/src/main/java/seedu/address/logic/commands/FindCommand.java b/src/main/java/seedu/address/logic/commands/FindCommand.java
@@ -20,12 +20,13 @@ public class FindCommand extends Command {
 
     public static final String COMMAND_WORD = "find";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons whose names contain any of "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons whose names, addresses or conditions"
+            + " contain any of "
             + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
             + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
             + "Example (name): " + COMMAND_WORD + " " + PREFIX_NAME + " alice bob charlie"
-            + "Example (address): " + COMMAND_WORD + " " + PREFIX_ADDRESS + " tampines street, geylang road"
-            + "Example (condition): " + COMMAND_WORD + " " + PREFIX_CONDITION + " diabetes, high blood pressure";
+            + "\nExample (address): " + COMMAND_WORD + " " + PREFIX_ADDRESS + " tampines street, geylang road"
+            + "\nExample (condition): " + COMMAND_WORD + " " + PREFIX_CONDITION + " diabetes, high blood pressure";
 
     private final Predicate<Person> predicate;
     //TODO: add nric contains keywords

diff --git a/src/main/java/seedu/address/logic/commands/ReadCommand.java b/src/main/java/seedu/address/logic/commands/ReadCommand.java
@@ -21,11 +21,12 @@ public class ReadCommand extends Command {
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Reads the details of the person identified "
             + "by the NRIC specified. "
-            + "Example: " + COMMAND_WORD
+            + "\nParameters: "
+            + PREFIX_NRIC + "NRIC "
+            + "\nExample: " + COMMAND_WORD
             + PREFIX_NRIC + "S0123456A";
 
     public static final String MESSAGE_READ_PERSON_SUCCESS = "Read Person ->\n%1$s";
-    public static final String MESSAGE_NOT_READ = "NRIC to be specified.";
     private final Nric nric;
 
     /**

diff --git a/src/main/java/seedu/address/logic/commands/UpdateCommand.java b/src/main/java/seedu/address/logic/commands/UpdateCommand.java
@@ -2,10 +2,19 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ALLERGIES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_BLOODTYPE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_CONDITION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_COUNTRY;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DATEOFADMISSION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DATEOFBIRTH;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DIAGNOSIS;
 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_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SYMPTOM;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
 
 import java.util.Collections;
@@ -53,10 +62,20 @@ public class UpdateCommand extends Command {
             + "Parameters: NRIC "
             + "[" + PREFIX_NAME + "NAME] "
             + "[" + PREFIX_PHONE + "PHONE] "
-            + "[" + PREFIX_EMAIL + "EMAIL] "
             + "[" + PREFIX_ADDRESS + "ADDRESS] "
-            + "[" + PREFIX_TAG + "TAG]...\n"
-            + "Example: " + COMMAND_WORD + " S0123456A "
+            + "[" + PREFIX_DATEOFBIRTH + "DATEOFBIRTH] "
+            + "[" + PREFIX_SEX + "SEX] "
+            + "[" + PREFIX_STATUS + "STATUS] "
+            + "[" + PREFIX_EMAIL + "EMAIL] "
+            + "[" + PREFIX_COUNTRY + "COUNTRY] "
+            + "[" + PREFIX_ALLERGIES + "ALLERGIES] "
+            + "[" + PREFIX_BLOODTYPE + "BLOODTYPE] "
+            + "[" + PREFIX_EMAIL + "EMAIL] "
+            + "[" + PREFIX_CONDITION + "CONDITION] "
+            + "[" + PREFIX_DATEOFADMISSION + "DATEOFADMISSION] "
+            + "[" + PREFIX_DIAGNOSIS + "DIAGNOSIS] "
+            + "[" + PREFIX_SYMPTOM + "SYMPTOM] "
+            + "\nExample: " + COMMAND_WORD + " S0123456A "
             + PREFIX_PHONE + "91234567 "
             + PREFIX_EMAIL + "[email protected]";
 

diff --git a/src/main/java/seedu/address/logic/parser/ReadCommandParser.java b/src/main/java/seedu/address/logic/parser/ReadCommandParser.java
@@ -21,7 +21,7 @@ public ReadCommand parse(String args) throws ParseException {
         String trimmedArg = args.trim().toUpperCase();
         if (trimmedArg.isEmpty()) {
             throw new ParseException(
-                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, ReadCommand.MESSAGE_NOT_READ));
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, ReadCommand.MESSAGE_USAGE));
         }
 
         return new ReadCommand(new Nric(trimmedArg));

diff --git a/src/test/java/seedu/address/logic/parser/ReadCommandParserTest.java b/src/test/java/seedu/address/logic/parser/ReadCommandParserTest.java
@@ -14,7 +14,7 @@ public class ReadCommandParserTest {
     @Test
     public void parse_emptyArg_throwsParseException() {
         assertParseFailure(parser, " ",
-                String.format(MESSAGE_INVALID_COMMAND_FORMAT, ReadCommand.MESSAGE_NOT_READ));
+                String.format(MESSAGE_INVALID_COMMAND_FORMAT, ReadCommand.MESSAGE_USAGE));
     }
 
     @Test