Move duplicate message to PublicAddressComposition

AY2425S1-CS2103T-T08-1 · Nov 10, 2024 · 6195d17 · 6195d17
1 parent 3b216b9
commit 6195d17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/AddPublicAddressCommand.java b/src/main/java/seedu/address/logic/commands/AddPublicAddressCommand.java
@@ -3,6 +3,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PUBLIC_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PUBLIC_ADDRESS_LABEL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PUBLIC_ADDRESS_NETWORK;
+import static seedu.address.model.addresses.PublicAddressesComposition.MESSAGE_DUPLICATE_PUBLIC_ADDRESS;
 
 import java.util.List;
 import java.util.Set;
@@ -37,7 +38,6 @@ public class AddPublicAddressCommand extends AbstractEditCommand {
         + "wallet1 " + PREFIX_PUBLIC_ADDRESS + "1a1zp1ep5qgefi2dmptftl5slmv7divfna";
 
     public static final String MESSAGE_ADDPA_SUCCESS = "Added Person's Public Address: %1$s";
-    public static final String MESSAGE_DUPLICATE_PUBLIC_ADDRESS = "Invalid: duplicate label or public address\n%1$s\n";
 
     private EditPersonDescriptor editPersonDescriptor;
 

diff --git a/src/main/java/seedu/address/model/addresses/PublicAddressesComposition.java b/src/main/java/seedu/address/model/addresses/PublicAddressesComposition.java
@@ -29,6 +29,8 @@ public class PublicAddressesComposition {
     public static final String MESSAGE_DUPLICATE_LABEL =
         "Label %1$s under the network %2$s already exists.";
 
+    public static final String MESSAGE_DUPLICATE_PUBLIC_ADDRESS = "Invalid: duplicate label or public address\n%1$s\n";
+
     private final Map<Network, Set<PublicAddress>> publicAddresses;
 
     /**

diff --git a/src/test/java/seedu/address/logic/commands/AddPublicAddressCommandTest.java b/src/test/java/seedu/address/logic/commands/AddPublicAddressCommandTest.java
@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.model.addresses.PublicAddressesComposition.MESSAGE_DUPLICATE_PUBLIC_ADDRESS;
 import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
 import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
 import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
@@ -98,7 +99,7 @@ public void execute_duplicateAddressLabel_throwsCommandException() {
         }
 
         // Expected message
-        String expectedMessage = String.format(AddPublicAddressCommand.MESSAGE_DUPLICATE_PUBLIC_ADDRESS,
+        String expectedMessage = String.format(MESSAGE_DUPLICATE_PUBLIC_ADDRESS,
             String.format(
                 PublicAddressesComposition.MESSAGE_DUPLICATE_LABEL,
                 duplicateLabel,
@@ -142,7 +143,7 @@ public void execute_duplicateAddress_throwsCommandException() {
         }
 
         // Expected message
-        String expectedMessage = String.format(AddPublicAddressCommand.MESSAGE_DUPLICATE_PUBLIC_ADDRESS,
+        String expectedMessage = String.format(MESSAGE_DUPLICATE_PUBLIC_ADDRESS,
                 duplicateAddressString.toLowerCase()
         );