Merge pull request #93 from cshao02/shaoheng/update-edit-telegram

Update edit telegram username
AY2425S1-CS2103T-F09-2 · Oct 17, 2024 · 8a666b7 · 8a666b7
2 parents 9ece7ff + e0bf42a
commit 8a666b7
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 11 deletions.
diff --git a/src/main/java/seedu/address/logic/Messages.java b/src/main/java/seedu/address/logic/Messages.java
@@ -52,8 +52,9 @@ public static String format(Person person) {
     }
 
     private static void appendTelegramUsernameToMsg(Person person, StringBuilder builder) {
+        builder.append("; Telegram username: ");
         if (person.getTelegramUsername().toString() != null) {
-            builder.append("; Telegram username: ").append(person.getTelegramUsername());
+            builder.append(person.getTelegramUsername());
         }
     }
 

diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -114,9 +114,6 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         TelegramUsername updatedTeleUsername = editPersonDescriptor.getTelegramUsername()
                 .orElse(personToEdit.getTelegramUsername());
 
-        //Role[] updatedRoles = (editPersonDescriptor.getRoles().orElse(personToEdit.getRoles())).toArray(new Role[0]);
-
-
         Set<Role> updatedRoles = editPersonDescriptor.getRoles().orElse(personToEdit.getRoles());
 
         return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress,

diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
@@ -49,7 +49,7 @@ public AddCommand parse(String args) throws ParseException {
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
         Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
         TelegramUsername telegramUsername = ParserUtil
-                .parseTele(argMultimap.getValue(PREFIX_TELEGRAM).orElse(null)); // null to represent input absent
+                .parseTeleOnAdd(argMultimap.getValue(PREFIX_TELEGRAM).orElse(null)); // null to represent input absent
 
         //Set <Role> roleList = ParserUtil.parseRoles(argMultimap.getAllValues(PREFIX_ROLE));
 

diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -39,7 +39,6 @@ public EditCommand parse(String args) throws ParseException {
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS,
                         PREFIX_TELEGRAM, PREFIX_ROLE);
 
-
         Index index;
 
         try {
@@ -66,11 +65,10 @@ public EditCommand parse(String args) throws ParseException {
             editPersonDescriptor.setAddress(ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get()));
         }
         if (argMultimap.getValue(PREFIX_TELEGRAM).isPresent()) {
-            editPersonDescriptor.setTelegramUsername(ParserUtil.parseTele(argMultimap.getValue(PREFIX_TELEGRAM)
-                    .orElse(null)));
+            editPersonDescriptor.setTelegramUsername(ParserUtil.parseTeleOnEdit(argMultimap.getValue(PREFIX_TELEGRAM)
+                    .get()));
         }
 
-
         parseRolesForEdit(argMultimap.getAllValues(PREFIX_ROLE)).ifPresent(editPersonDescriptor::setRoles);
         if (!editPersonDescriptor.isAnyFieldEdited()) {
             throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);

diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -84,15 +84,15 @@ public static Address parseAddress(String address) throws ParseException {
     }
 
     /**
-     * Parses the given {@code String telegramUsername} and returns a {@code TelegramUsername} object.
+     * Parses the given {@code String telegramUsername} on add command and returns a {@code TelegramUsername} object.
      * Leading and trailing spaces will be trimmed.
      *
      * @param telegramUsername The username string to be parsed. Can be {@code null}.
      * @return A {@code TelegramUsername} object with the trimmed username.
      * @throws ParseException if the provided {@code telegramUsername} is invalid according to the
      *         {@code TelegramUsername#isValidUsername(String)} method.
      */
-    public static TelegramUsername parseTele(String telegramUsername) throws ParseException {
+    public static TelegramUsername parseTeleOnAdd(String telegramUsername) throws ParseException {
         if (telegramUsername == null) {
             return new TelegramUsername(telegramUsername);
         }
@@ -103,6 +103,27 @@ public static TelegramUsername parseTele(String telegramUsername) throws ParseEx
         return new TelegramUsername(trimmedTelegramUsername);
     }
 
+    /**
+     * Parses the given {@code String telegramUsername} on edit command and returns a {@code TelegramUsername} object.
+     * Leading and trailing spaces will be trimmed. Difference between this parse and the one for add command is that
+     * this parse method allows removal of telegram username when user input empty input.
+     *
+     * @param telegramUsername The username string to be parsed
+     * @return A {@code TelegramUsername} object with the trimmed username.
+     * @throws ParseException if the provided {@code telegramUsername} is invalid according to the
+     *         {@code TelegramUsername#isValidUsername(String)} method.
+     */
+    public static TelegramUsername parseTeleOnEdit(String telegramUsername) throws ParseException {
+        if (telegramUsername.isEmpty()) {
+            return new TelegramUsername(null);
+        }
+        String trimmedTelegramUsername = telegramUsername.trim();
+        if (!TelegramUsername.isValidUsername(trimmedTelegramUsername)) {
+            throw new ParseException(TelegramUsername.MESSAGE_CONSTRAINTS);
+        }
+        return new TelegramUsername(trimmedTelegramUsername);
+    }
+
     /**
      * Parses a {@code String email} into an {@code Email}.
      * Leading and trailing whitespaces will be trimmed.

diff --git a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
@@ -18,6 +18,7 @@
 import seedu.address.model.person.Email;
 import seedu.address.model.person.Name;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.TelegramUsername;
 import seedu.address.model.role.Role;
 import seedu.address.model.role.RoleHandler;
 
@@ -26,12 +27,14 @@ public class ParserUtilTest {
     private static final String INVALID_PHONE = "+651234";
     private static final String INVALID_ADDRESS = " ";
     private static final String INVALID_EMAIL = "example.com";
+    private static final String INVALID_TELE = "a";
     private static final String INVALID_ROLE = "owner";
 
     private static final String VALID_NAME = "Rachel Walker";
     private static final String VALID_PHONE = "123456";
     private static final String VALID_ADDRESS = "123 Main Street #0505";
     private static final String VALID_EMAIL = "[email protected]";
+    private static final String VALID_TELE = "rachel";
 
     private static final String VALID_ROLE_1 = "vendor";
     private static final String VALID_ROLE_2 = "sponsor";
@@ -150,6 +153,54 @@ public void parseEmail_validValueWithWhitespace_returnsTrimmedEmail() throws Exc
         assertEquals(expectedEmail, ParserUtil.parseEmail(emailWithWhitespace));
     }
 
+    @Test
+    public void parseTeleOnAdd_nullTelegramUsername() throws ParseException {
+        TelegramUsername expectedTelegramUsername = new TelegramUsername(null);
+        assertEquals(expectedTelegramUsername, ParserUtil.parseTeleOnAdd(null));
+    }
+
+    @Test
+    public void parseTeleOnAdd_invalidTelegramUsername_throwsParseException() {
+        assertThrows(ParseException.class, () -> ParserUtil.parseTeleOnAdd(INVALID_TELE));
+    }
+
+    @Test
+    public void parseTeleOnAdd_validValueWithWhitespace_returnsTrimmedTele() throws ParseException {
+        String teleWithWhitespace = WHITESPACE + VALID_TELE + WHITESPACE;
+        TelegramUsername expectedTelegramUsername = new TelegramUsername(VALID_TELE);
+        assertEquals(expectedTelegramUsername, ParserUtil.parseTeleOnAdd(teleWithWhitespace));
+    }
+
+    @Test
+    public void parseTeleOnAdd_validValueWithoutWhitespace_returnsTele() throws Exception {
+        TelegramUsername expectedTelegramUsername = new TelegramUsername(VALID_TELE);
+        assertEquals(expectedTelegramUsername, ParserUtil.parseTeleOnAdd(VALID_TELE));
+    }
+
+    @Test
+    public void parseTeleOnEdit_emptyTelegramUsername_removesTele() throws ParseException {
+        TelegramUsername expectedTelegramUsername = new TelegramUsername(null);
+        assertEquals(expectedTelegramUsername, ParserUtil.parseTeleOnEdit(""));
+    }
+
+    @Test
+    public void parseTeleOnEdit_invalidTelegramUsername_throwsParseException() {
+        assertThrows(ParseException.class, () -> ParserUtil.parseTeleOnEdit(INVALID_TELE));
+    }
+
+    @Test
+    public void parseTeleOnEdit_validValueWithWhitespace_returnsTrimmedTele() throws ParseException {
+        String teleWithWhitespace = WHITESPACE + VALID_TELE + WHITESPACE;
+        TelegramUsername expectedTelegramUsername = new TelegramUsername(VALID_TELE);
+        assertEquals(expectedTelegramUsername, ParserUtil.parseTeleOnEdit(teleWithWhitespace));
+    }
+
+    @Test
+    public void parseTeleOnEdit_validValueWithoutWhitespace_returnsTele() throws Exception {
+        TelegramUsername expectedTelegramUsername = new TelegramUsername(VALID_TELE);
+        assertEquals(expectedTelegramUsername, ParserUtil.parseTeleOnEdit(VALID_TELE));
+    }
+
     @Test
     public void parseRole_null_throwsNullPointerException() {
         assertThrows(NullPointerException.class, () -> ParserUtil.parseRole((String) null));