Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused exception handling and Refactor the function name #80

Merged
merged 3 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/budgetbuddy/BudgetBuddy.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void run() {
} catch (InvalidArgumentSyntaxException e){
UserInterface.printInvalidArgumentSyntax(e.getMessage());
} catch (Exception e) {
UserInterface.printUnknownError(e.getMessage());
UserInterface.printExceptionErrorMessage(e.getMessage());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/budgetbuddy/parser/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public Transaction parseUserInputToTransaction(String input, Account account)
}

//@@author Vavinan
public Transaction parseTransactionType(String newTransaction, Account account) throws InvalidEditTransactionData {
public Transaction parseEditTransaction(String newTransaction, Account account) throws InvalidEditTransactionData {
String[] parts = newTransaction.split(" \\| ");

String type = parts[0].trim();
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/budgetbuddy/transaction/TransactionList.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ public void removeTransaction(String input, AccountManager accountManager) throw
throw new EmptyArgumentException("delete index");
}
String data = input.substring(DELETE_BEGIN_INDEX).trim();
if (isNotInteger(data)) {
throw new NumberFormatException(data);
}
int id = Integer.parseInt(data) - INDEX_OFFSET;
int size = transactions.size();
if (id >= LOWER_BOUND && id < size) {
Expand Down Expand Up @@ -222,7 +219,7 @@ public void processEditTransaction(String input, AccountManager accountManager)
Transaction transaction = transactions.get(index);
Account account = accountManager.getAccountByAccountNumber(transaction.getAccountNumber());
String newTransaction = UserInterface.getEditInformation(transaction.toString());
Transaction t = parser.parseTransactionType(newTransaction, account);
Transaction t = parser.parseEditTransaction(newTransaction, account);
transactions.set(index, t);
UserInterface.printUpdatedTransaction(t);
} else {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/budgetbuddy/ui/UserInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,11 @@ public static void printInvalidIndex(String message, int id) {
System.out.println(LINE);
}

public static void printUnknownError(String message) {
public static void printExceptionErrorMessage(String message) {
System.out.println(LINE);
System.out.println(TAB_SPACE + "Unknown error occurred with message: " + message);
System.out.println(TAB_SPACE + "An error occurred with the message: " + message);
System.out.println(TAB_SPACE + "Please check your command Syntax. \n" + TAB_SPACE +
" If you need assistance use `help` command to know further about each command syntax.");
System.out.println(LINE);
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/budgetbuddy/parser/ParserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void testParseTransactionType() throws InvalidEditTransactionData, Invali

// Test case for valid income transaction
String incomeTransactionString = "income | test1 | 10-11-2022 | 1000.00 | 1";
Transaction incomeTransaction = parser.parseTransactionType(incomeTransactionString, account);
Transaction incomeTransaction = parser.parseEditTransaction(incomeTransactionString, account);
assertEquals("test1", incomeTransaction.getDescription());
assertEquals(1000.00, incomeTransaction.getAmount(), 0.001);
assertEquals("Dining", incomeTransaction.getCategory().getCategoryName());
Expand All @@ -42,7 +42,7 @@ public void testParseTransactionType() throws InvalidEditTransactionData, Invali

// Test case for valid expense transaction
String expenseTransactionString = "expense | Grocery | 12-11-2022 | 50.00 | 2";
Transaction expenseTransaction = parser.parseTransactionType(expenseTransactionString, account);
Transaction expenseTransaction = parser.parseEditTransaction(expenseTransactionString, account);
assertEquals("Grocery", expenseTransaction.getDescription());
assertEquals(-50.00, expenseTransaction.getAmount(), 0.001);
assertEquals("Groceries", expenseTransaction.getCategory().getCategoryName());
Expand Down
Loading