Merge pull request #293 from Bandov/phone-number-attr-fix

fixed the error message
AY2324S2-CS2103T-T11-1 · Apr 10, 2024 · 1564108 · 1564108
2 parents ae1a541 + 86ebed3
commit 1564108
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/AttributeUtil.java b/src/main/java/seedu/address/logic/commands/AttributeUtil.java
@@ -48,10 +48,12 @@ public static Attribute createAttribute(String attributeName, String attributeVa
                 if (phoneNumber < 0) {
                     throw new CommandException("Phone number cannot be negative for " + attributeName + ".");
                 }
+                if (attributeValue.length() > 8) {
+                    throw new CommandException("Phone number for " + attributeName + " must be lesser than 9 digits.");
+                }
             } catch (NumberFormatException e) {
                 throw new CommandException("Phone number for " + attributeName + " must be a number. "
-                        + "A number is only valid if it is a positive integer. "
-                        + "Additionally, please make sure the phone number is lesser than 9 digits.");
+                        + "A number is only valid if it is a positive integer. ");
             }
             attribute = new PhoneNumberAttribute("Phone", phoneNumber);
             break;

diff --git a/src/test/java/seedu/address/logic/commands/AttributeUtilTest.java b/src/test/java/seedu/address/logic/commands/AttributeUtilTest.java
@@ -92,4 +92,14 @@ public void sex_validSex_female() throws CommandException {
     public void sex_attributeValueNull_throwsError() {
         assertThrows(CommandException.class, () -> AttributeUtil.createAttribute("Sex", null));
     }
+
+    @Test
+    public void phone_invalidPhone_throwsError() {
+        assertThrows(CommandException.class, () -> AttributeUtil.createAttribute("phone", "-1"));
+    }
+
+    @Test
+    public void phone_invalidPhoneLength_throwsError() {
+        assertThrows(CommandException.class, () -> AttributeUtil.createAttribute("phone", "123456789"));
+    }
 }