Merge pull request #61 from FionaQY/fix-tier-bugs

Fix Tier bugs
AY2425S1-CS2103T-T14-4 · Oct 16, 2024 · bf30d68 · bf30d68
2 parents 0d02ae1 + 59e16ce
commit bf30d68
Show file tree

Hide file tree

Showing 23 changed files with 119 additions and 121 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
@@ -8,7 +8,7 @@
 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_REMARK;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TIER;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
@@ -31,15 +31,15 @@ public class AddCommand extends Command {
             + PREFIX_ADDRESS + "ADDRESS "
             + PREFIX_JOB + "JOB "
             + PREFIX_INCOME + "INCOME "
-            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "[" + PREFIX_TIER + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
             + PREFIX_EMAIL + "[email protected] "
             + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
             + PREFIX_JOB + "doctor "
             + PREFIX_INCOME + "300 "
-            + PREFIX_TAG + "GOLD "
+            + PREFIX_TIER + "GOLD "
             + PREFIX_REMARK + "owesMoney";
 
     public static final String MESSAGE_SUCCESS = "New person added: %1$s";

diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -7,7 +7,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_JOB;
 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_TIER;
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
 
 import java.util.List;
@@ -47,7 +47,7 @@ public class EditCommand extends Command {
             + "[" + PREFIX_ADDRESS + "ADDRESS] "
             + "[" + PREFIX_JOB + "JOB] "
             + "[" + PREFIX_INCOME + "INCOME] "
-            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "[" + PREFIX_TIER + "TAG]...\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_PHONE + "91234567 "
             + PREFIX_EMAIL + "[email protected]";

diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
@@ -7,7 +7,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_JOB;
 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_TIER;
 
 import java.util.stream.Stream;
 
@@ -36,7 +36,7 @@ public class AddCommandParser implements Parser<AddCommand> {
     public AddCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_JOB,
-                        PREFIX_INCOME, PREFIX_TAG);
+                        PREFIX_INCOME, PREFIX_TIER);
 
         if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_ADDRESS, PREFIX_JOB, PREFIX_PHONE, PREFIX_EMAIL,
                 PREFIX_INCOME)
@@ -45,14 +45,14 @@ public AddCommand parse(String args) throws ParseException {
         }
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_JOB,
-                PREFIX_INCOME);
+                PREFIX_INCOME, PREFIX_TIER);
         Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
         Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
         Job job = ParserUtil.parseJob(argMultimap.getValue(PREFIX_JOB).get());
         Income income = ParserUtil.parseIncome(argMultimap.getValue(PREFIX_INCOME).get());
-        Tier tier = ParserUtil.parseTag(argMultimap.getValue(PREFIX_TAG).orElse("NA"));
+        Tier tier = ParserUtil.parseTier(argMultimap.getValue(PREFIX_TIER).orElse("NA"));
         Remark remark = new Remark(""); // add command does not allow adding remarks straight away
         Person person = new Person(name, phone, email, address, job, income, tier, remark);
         return new AddCommand(person);

diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -12,7 +12,7 @@ public class CliSyntax {
     public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
     public static final Prefix PREFIX_JOB = new Prefix("j/");
     public static final Prefix PREFIX_INCOME = new Prefix("i/");
-    public static final Prefix PREFIX_TAG = new Prefix("t/");
+    public static final Prefix PREFIX_TIER = new Prefix("t/");
     public static final Prefix PREFIX_REMARK = new Prefix("r/");
 
 }
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -8,7 +8,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_JOB;
 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_TIER;
 
 import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.EditCommand;
@@ -29,7 +29,7 @@ public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
-                        PREFIX_INCOME, PREFIX_JOB, PREFIX_TAG);
+                        PREFIX_INCOME, PREFIX_JOB, PREFIX_TIER);
 
         Index index;
 
@@ -40,7 +40,7 @@ public EditCommand parse(String args) throws ParseException {
         }
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
-                PREFIX_INCOME, PREFIX_JOB);
+                PREFIX_INCOME, PREFIX_JOB, PREFIX_TIER);
 
         EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
 
@@ -62,8 +62,8 @@ public EditCommand parse(String args) throws ParseException {
         if (argMultimap.getValue(PREFIX_INCOME).isPresent()) {
             editPersonDescriptor.setIncome(ParserUtil.parseIncome(argMultimap.getValue(PREFIX_INCOME).get()));
         }
-        if (argMultimap.getValue(PREFIX_TAG).isPresent()) {
-            editPersonDescriptor.setTier(ParserUtil.parseTag(argMultimap.getValue(PREFIX_TAG).get()));
+        if (argMultimap.getValue(PREFIX_TIER).isPresent()) {
+            editPersonDescriptor.setTier(ParserUtil.parseTier(argMultimap.getValue(PREFIX_TIER).get()));
         }
         if (!editPersonDescriptor.isAnyFieldEdited()) {
             throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);

diff --git a/src/main/java/seedu/address/logic/parser/FilterCommandParser.java b/src/main/java/seedu/address/logic/parser/FilterCommandParser.java
@@ -9,7 +9,7 @@
 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_REMARK;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TIER;
 
 import java.util.Arrays;
 
@@ -36,14 +36,14 @@ public FilterCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
-                        PREFIX_INCOME, PREFIX_JOB, PREFIX_REMARK, PREFIX_TAG);
+                        PREFIX_INCOME, PREFIX_JOB, PREFIX_REMARK, PREFIX_TIER);
 
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
-                PREFIX_INCOME, PREFIX_JOB, PREFIX_REMARK, PREFIX_TAG);
+                PREFIX_INCOME, PREFIX_JOB, PREFIX_REMARK, PREFIX_TIER);
 
         // Filtering by multiple fields/flags has not been implemented yet
         long numberOfFiltersUsed = countPrefixesUsed(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
-                PREFIX_ADDRESS, PREFIX_JOB, PREFIX_INCOME, PREFIX_REMARK, PREFIX_TAG);
+                PREFIX_ADDRESS, PREFIX_JOB, PREFIX_INCOME, PREFIX_REMARK, PREFIX_TIER);
         if (numberOfFiltersUsed > 1) {
             throw new ParseException(FilterCommand.MULTIPLE_FILTERS_NOT_IMPLEMENTED);
         }

diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -146,10 +146,13 @@ public static Remark parseRemark(String remark) throws ParseException {
      *
      * @throws ParseException if the given {@code tag} is invalid.
      */
-    public static Tier parseTag(String tag) throws ParseException {
+    public static Tier parseTier(String tag) throws ParseException {
         requireNonNull(tag);
         String trimmedTag = tag.trim();
-        if (!Tier.isValidTagName(trimmedTag)) {
+        if (trimmedTag.isEmpty()) {
+            trimmedTag = Tier.TierEnum.NA.toString();
+        }
+        if (!Tier.isValidTierName(trimmedTag)) {
             throw new ParseException(Tier.MESSAGE_CONSTRAINTS);
         }
         return new Tier(trimmedTag);

diff --git a/src/main/java/seedu/address/model/tier/Tier.java b/src/main/java/seedu/address/model/tier/Tier.java
@@ -5,7 +5,7 @@
 
 /**
  * Represents a Tag in the address book.
- * Guarantees: immutable; name is valid as declared in {@link #isValidTagName(String)}
+ * Guarantees: immutable; name is valid as declared in {@link #isValidTierName(String)}
  */
 public class Tier {
 
@@ -21,14 +21,17 @@ public class Tier {
      */
     public Tier(String tagName) {
         requireNonNull(tagName);
-        checkArgument(isValidTagName(tagName), MESSAGE_CONSTRAINTS);
-        this.tagName = TierEnum.valueOf(tagName.toUpperCase());;
+        if (tagName.isEmpty()) {
+            tagName = TierEnum.NA.toString();
+        }
+        checkArgument(isValidTierName(tagName), MESSAGE_CONSTRAINTS);
+        this.tagName = TierEnum.valueOf(tagName.toUpperCase());
     }
 
     /**
      * Returns true if a given string is a valid tag name.
      */
-    public static boolean isValidTagName(String test) {
+    public static boolean isValidTierName(String test) {
         for (TierEnum c : TierEnum.values()) {
             if (c.name().equals(test.toUpperCase())) {
                 return true;

diff --git a/src/main/java/seedu/address/storage/JsonAdaptedTag.java b/src/main/java/seedu/address/storage/JsonAdaptedTag.java
@@ -39,7 +39,7 @@ public String getTagName() {
      * @throws IllegalValueException if there were any data constraints violated in the adapted tag.
      */
     public Tier toModelType() throws IllegalValueException {
-        if (!Tier.isValidTagName(tagName)) {
+        if (!Tier.isValidTierName(tagName)) {
             throw new IllegalValueException(Tier.MESSAGE_CONSTRAINTS);
         }
         return new Tier(tagName);

diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -8,7 +8,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_JOB;
 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_TIER;
 import static seedu.address.testutil.Assert.assertThrows;
 
 import java.util.ArrayList;
@@ -54,8 +54,8 @@ public class CommandTestUtil {
     public static final String JOB_DESC_BOB = " " + PREFIX_JOB + VALID_JOB_BOB;
     public static final String INCOME_DESC_AMY = " " + PREFIX_INCOME + VALID_INCOME_AMY;
     public static final String INCOME_DESC_BOB = " " + PREFIX_INCOME + VALID_INCOME_BOB;
-    public static final String TAG_DESC_REJECT = " " + PREFIX_TAG + VALID_TIER_REJECT;
-    public static final String TAG_DESC_GOLD = " " + PREFIX_TAG + VALID_TIER_GOLD;
+    public static final String TIER_DESC_REJECT = " " + PREFIX_TIER + VALID_TIER_REJECT;
+    public static final String TIER_DESC_GOLD = " " + PREFIX_TIER + VALID_TIER_GOLD;
 
     public static final String INVALID_NAME_DESC = " " + PREFIX_NAME + "James&"; // '&' not allowed in names
     public static final String INVALID_PHONE_DESC = " " + PREFIX_PHONE + "911a"; // 'a' not allowed in phones
@@ -64,7 +64,7 @@ public class CommandTestUtil {
     public static final String INVALID_JOB_DESC = " " + PREFIX_JOB; // empty string not allowed for job
     public static final String INVALID_INCOME_DESC = " " + PREFIX_INCOME + "-999"; // negative numbers should not be
     // allowed
-    public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags
+    public static final String INVALID_TIER_DESC = " " + PREFIX_TIER + "platinum"; // not one of the 4 TierEnums
 
     public static final String PREAMBLE_WHITESPACE = "\t  \r  \n";
     public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble";
@@ -79,12 +79,12 @@ public class CommandTestUtil {
         DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
                 .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
                 .withJob(VALID_JOB_AMY).withIncome(Integer.parseInt(VALID_INCOME_AMY))
-                .withTiers(VALID_TIER_GOLD).build();
+                .withTier(VALID_TIER_GOLD).build();
 
         DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
                 .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
                 .withJob(VALID_JOB_BOB).withIncome(Integer.parseInt(VALID_INCOME_BOB))
-                .withTiers(VALID_TIER_REJECT).build();
+                .withTier(VALID_TIER_REJECT).build();
     }
     /**
      * Executes the given {@code command}, confirms that <br>

diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
@@ -56,10 +56,10 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
 
         PersonBuilder personInList = new PersonBuilder(lastPerson);
         Person editedPerson = personInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
-                .withTiers(VALID_TIER_REJECT).build();
+                .withTier(VALID_TIER_REJECT).build();
 
         EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
-                .withPhone(VALID_PHONE_BOB).withTiers(VALID_TIER_REJECT).build();
+                .withPhone(VALID_PHONE_BOB).withTier(VALID_TIER_REJECT).build();
         EditCommand editCommand = new EditCommand(indexLastPerson, descriptor);
 
         String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));

diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
@@ -63,7 +63,7 @@ public void equals() {
         assertFalse(DESC_AMY.equals(editedAmy));
 
         // different tags -> returns false
-        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withTiers(VALID_TIER_REJECT).build();
+        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withTier(VALID_TIER_REJECT).build();
         assertFalse(DESC_AMY.equals(editedAmy));
     }