Merge branch 'master' into master

Author: IronBiscuit

docs/UserGuide.md

@@ -52,11 +52,15 @@ Format: `sell_inventory i/ITEM n/NUMBER`
 
 
 ### List inventory records: `list_inventory`
-
-Adds and stores finance records into finance records
+Shows the items in the current Inventory
 
 Format: `list_inventory`
 
+### List inventory records: `view_inventory_records`
+Shows the movement of inventory
+
+Format: `view_inventory_records`
+
 
 ### Add finance records: `add_finance`
 Adds and stores finance records into finance records

src/main/java/nustorage/logic/commands/ListFinanceRecordsCommand.java

@@ -0,0 +1,24 @@
+package nustorage.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import nustorage.logic.commands.exceptions.CommandException;
+import nustorage.model.Model;
+
+public class ListFinanceRecordsCommand extends Command {
+
+    public static final String COMMAND_WORD = "list_finance";
+
+    public static final String MESSAGE_SUCCESS = "Listed all finance records:\n %1$s";
+
+    public static final String MESSAGE_EMPTY_LIST = "No finance records listed";
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+        if (model.viewFinanceRecords().isEmpty()) {
+            return new CommandResult(MESSAGE_EMPTY_LIST);
+        }
+        return new CommandResult(String.format(MESSAGE_SUCCESS, model.viewFinanceRecords()));
+    }
+}

src/main/java/nustorage/logic/parser/AddressBookParser.java

@@ -19,6 +19,7 @@
 import nustorage.logic.commands.HelpCommand;
 import nustorage.logic.commands.ListCommand;
 import nustorage.logic.commands.ListInventoryCommand;
+import nustorage.logic.commands.ListFinanceRecordsCommand;
 import nustorage.logic.parser.exceptions.ParseException;
 
 /**
@@ -68,6 +69,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case DeleteCommand.COMMAND_WORD:
             return new DeleteCommandParser().parse(arguments);
 
+        case ListFinanceRecordsCommand.COMMAND_WORD:
+            return new ListFinanceRecordsCommand();
+
         case ClearCommand.COMMAND_WORD:
             return new ClearCommand();
 

src/main/java/nustorage/model/FinanceAccount.java

@@ -21,6 +21,10 @@ public FinanceAccount(List<FinanceRecord> financeRecords) {
         this.financeRecords = financeRecords;
     }
 
+    public List<FinanceRecord> getFinanceRecords() {
+        return this.financeRecords;
+    }
+
     public void addRecord(FinanceRecord record) {
         financeRecords.add(record);
     }
@@ -59,6 +63,10 @@ public List<FinanceRecord> filterRecords (Predicate<FinanceRecord> filter) {
         return financeRecords.stream().filter(filter).collect(Collectors.toList());
     }
 
+    public boolean isEmpty() {
+        return financeRecords.isEmpty();
+    }
+
     @Override
     public String toString() {
         return financeRecords.stream()

src/main/java/nustorage/model/Model.java

@@ -1,6 +1,7 @@
 package nustorage.model;
 
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
 
@@ -41,6 +42,8 @@ public interface Model {
 
     void addFinanceRecord(FinanceRecord newRecord);
 
+    List<FinanceRecord> viewFinanceRecords();
+
     Optional<FinanceRecord> deleteFinanceRecord(Index targetIndex);
 
     void addInventoryRecord(InventoryRecord inventoryRecord);

src/main/java/nustorage/model/ModelManager.java

@@ -4,6 +4,7 @@
 import static nustorage.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
@@ -114,6 +115,11 @@ public void addFinanceRecord(FinanceRecord newRecord) {
         financeAccount.addRecord(newRecord);
     }
 
+    @Override
+    public List<FinanceRecord> viewFinanceRecords() {
+        return financeAccount.getFinanceRecords();
+    }
+
     @Override
     public Optional<FinanceRecord> deleteFinanceRecord(Index targetIndex) {
         return financeAccount.removeRecord(targetIndex);

src/test/java/nustorage/logic/commands/AddCommandTest.java

@@ -9,6 +9,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
 
@@ -115,6 +116,11 @@ public void addFinanceRecord(FinanceRecord newRecord) {
 
         }
 
+        @Override
+        public List<FinanceRecord> viewFinanceRecords() {
+            return null;
+        }
+
         @Override
         public Optional<FinanceRecord> deleteFinanceRecord(Index targetIndex) {
             return Optional.empty();