Merge pull request nus-cs2103-AY2021S1#82 from yyutong/view-expense-command

View expense command

Author: yuming7144

src/main/java/seedu/address/logic/commands/ViewCommand.java

@@ -20,7 +20,7 @@ public class ViewCommand extends Command {
             + "Parameters: INDEX (must be a positive integer)\n"
             + "Example: " + COMMAND_WORD + " 1";
 
-    public static final String MESSAGE_VIEW_EXPENSE_SUCCESS = "View Expense: %1$s";
+    public static final String MESSAGE_VIEW_EXPENSE_SUCCESS = "View Expense: %s";
 
     private final Index targetIndex;
 
@@ -37,9 +37,9 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         Expense expenseToView = lastShownList.get(targetIndex.getZeroBased());
-        String message = targetIndex.toString() + "\n" + expenseToView.toString();
-//        model.viewExpense(targetIndex);
-        return new CommandResult(String.format(MESSAGE_VIEW_EXPENSE_SUCCESS, message));
+        String prefix = String.format(MESSAGE_VIEW_EXPENSE_SUCCESS, targetIndex.getZeroBased());
+        String message = prefix + "\n" + expenseToView.toString();
+        return new CommandResult(message);
     }
 
     @Override

src/main/java/seedu/address/model/ExpenseModelManager.java

@@ -120,15 +120,6 @@ public void setExpense(Expense target, Expense editedExpense) {
         expenseBook.setExpense(target, editedExpense);
     }
 
-    /**
-     * View the detals of a certain expense.
-     *
-     * @param index The index of the expense to be viewed in the ExpenseBook.
-     */
-    @Override
-    public void viewExpense(Index index) {
-        expenseBook.viewExpense(index);
-    }
 
     //=========== Filtered Expense List Accessors =============================================================
 

src/main/java/seedu/address/model/person/Expense.java

@@ -89,23 +89,26 @@ public String toString() {
         if (description.isEmpty()) {
             builder.append(" Amount: ")
                     .append(this.getAmount())
+                    .append("\n")
                     .append(" Date: ")
                     .append(this.getDate())
+                    .append("\n")
                     .append(" Category: ")
-                    .append(this.getCategory());
+                    .append(this.getCategory())
+                    .append("\n");
             return builder.toString();
         } else {
             builder.append(" Amount: ")
                     .append(this.getAmount())
-                    .append("/n")
+                    .append("\n")
                     .append(" Date: ")
                     .append(this.getDate())
                     .append(" Category: ")
-                    .append("/n")
                     .append(this.getCategory())
+                    .append("\n")
                     .append(" Description: ")
                     .append(this.getDescription())
-                    .append("/n");
+                    .append("\n");
             return builder.toString();
         }
     }