List personloans

src/main/java/eggventory/Eggventory.java

@@ -3,6 +3,7 @@
 import eggventory.logic.commands.Command;
 import eggventory.commons.enums.CommandType;
 import eggventory.logic.parsers.Parser;
+import eggventory.model.LoanList;
 import eggventory.model.PersonList;
 import eggventory.model.StockList;
 import eggventory.storage.Storage;
@@ -21,6 +22,7 @@ public class Eggventory {
     private static Parser parser;
     private static Ui ui;
     private static StockList stockList;
+    private static LoanList loanList;
     private static PersonList personList;
     //private static LoanList loanList;
 
@@ -37,7 +39,7 @@ public static void main(String[] args) {
         storage = new Storage(stockFilePath, stockTypesFilePath);
         parser = new Parser();
         stockList = storage.load();
-        //loanList = new LoanList();
+        loanList = new LoanList();
         personList = new PersonList();
 
         /*

src/main/java/eggventory/logic/commands/CommandDictionary.java

@@ -39,6 +39,7 @@ public CommandDictionary() {
         commandDict.add(new Pair<>("list template", null));
         commandDict.add(new Pair<>("list lost", null));
         commandDict.add(new Pair<>("list person", null));
+        commandDict.add(new Pair<>("list person", "<MatricNo>"));
 
         // Find Commands
         commandDict.add(new Pair<>("find stock", "<Query>"));

src/main/java/eggventory/logic/commands/add/AddLoanCommand.java

@@ -21,21 +21,28 @@ public class AddLoanCommand extends Command {
      * @param matricNo the matric number of the person making the loan.
      * @param quantity the quantity loaned.
      */
-    public AddLoanCommand(CommandType type, String stockCode, String matricNo, int quantity) {
+    public AddLoanCommand(CommandType type, String matricNo, String stockCode, int quantity) {
         super(type);
         this.stockCode = stockCode;
         this.matricNo = matricNo;
         this.quantity = quantity;
     }
 
-    private boolean sufficientStock() {
-        if (quantity - LoanList.getStockLoanedQuantity(stockCode) < 0) {
+    private boolean stockExists() {
+        if (LoanList.getStockLoanedQuantity(stockCode) == -1) {
             return false;
         }
 
         return true;
     }
 
+    private boolean sufficientStock() {
+        if (LoanList.getStockLoanedQuantity(stockCode) - quantity < 0) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Method to execute the AddLoanCommand.
      * @param list the stockList.
@@ -45,16 +52,18 @@ private boolean sufficientStock() {
      */
     public String execute(StockList list, Ui ui, Storage storage) {
         String output = "";
-        if (sufficientStock()) {
+        if (!stockExists()) {
+            output += "OOPS that stock does not exist!";
+        } else if (!sufficientStock()) {
+            output = ("OOPS there is insufficient stock to loan out!");
+        } else {
             LoanList.addLoan(stockCode, matricNo, quantity);
             output = (String.format("Nice, I have added this loan for you: \n"
                     + "Stock: %s | Person: %s | Quantity: %d", stockCode, matricNo, quantity));
-
-            ui.print(output);
-        } else {
-            output = ("OOPS there is insufficient stock to loan out!");
         }
 
+        ui.print(output);
+
         return output;
     }
 }

src/main/java/eggventory/logic/commands/add/AddStockCommand.java

@@ -1,5 +1,6 @@
 package eggventory.logic.commands.add;
 
+import eggventory.model.LoanList;
 import eggventory.model.StockList;
 import eggventory.logic.commands.Command;
 import eggventory.commons.exceptions.BadInputException;
@@ -69,5 +70,6 @@ public String execute(StockList list, Ui ui, Storage storage) throws BadInputExc
      */
     public void execute(StockList list) {
         list.addStock(stockType, stockCode, quantity, description);
+        LoanList.addStock(stockCode, quantity);
     }
 }

src/main/java/eggventory/logic/commands/delete/DeleteLoanCommand.java

@@ -25,7 +25,7 @@ public DeleteLoanCommand(CommandType type, String stockCode, String matricNo) {
         super(type);
         this.stockCode = stockCode;
         this.matricNo = matricNo;
-        this.quantity = LoanList.getLoanQuantity(stockCode, matricNo);
+        this.quantity = LoanList.getPersonLoanQuantity(stockCode, matricNo);
     }
 
     @Override

src/main/java/eggventory/logic/commands/list/ListPersonCommand.java

@@ -9,6 +9,7 @@
 
 //@@author Deculsion
 public class ListPersonCommand extends Command {
+
     public ListPersonCommand(CommandType type) {
         super(type);
     }

src/main/java/eggventory/logic/commands/list/ListPersonLoansCommand.java

@@ -0,0 +1,38 @@
+package eggventory.logic.commands.list;
+
+import eggventory.commons.enums.CommandType;
+import eggventory.commons.exceptions.BadInputException;
+import eggventory.logic.commands.Command;
+import eggventory.model.LoanList;
+import eggventory.model.PersonList;
+import eggventory.model.StockList;
+import eggventory.storage.Storage;
+import eggventory.ui.Ui;
+
+//@@author Deculsion
+public class ListPersonLoansCommand extends Command {
+    String matricNo;
+
+    public ListPersonLoansCommand(CommandType type, String matricNo) {
+        super(type);
+        this.matricNo = matricNo;
+    }
+
+    /**
+     * Executes the command.
+     * @param list The stock list.
+     * @param ui The ui.
+     * @param storage The Storage.
+     */
+    @Override
+    public String execute(StockList list, Ui ui, Storage storage) throws BadInputException {
+        String output = "";
+
+        output += LoanList.printPersonLoans(matricNo);
+
+        ui.drawTable(LoanList.getPersonLoansStruct(matricNo));
+        ui.print(output);
+
+        return output;
+    }
+}

src/main/java/eggventory/logic/parsers/ParseList.java

@@ -3,9 +3,10 @@
 import eggventory.commons.exceptions.InsufficientInfoException;
 import eggventory.logic.commands.Command;
 import eggventory.logic.commands.CommandDictionary;
-import eggventory.logic.commands.list.ListPersonCommand;
 import eggventory.logic.commands.list.ListStockCommand;
 import eggventory.logic.commands.list.ListStockTypeCommand;
+import eggventory.logic.commands.list.ListPersonLoansCommand;
+import eggventory.logic.commands.list.ListPersonCommand;
 import eggventory.commons.enums.CommandType;
 import eggventory.commons.exceptions.BadInputException;
 
@@ -29,12 +30,28 @@ private Command processListStockType(String input) throws BadInputException {
     }
 
     private Command processListPerson(String input) throws BadInputException {
-        String[] inputArr = input.split(" +");
+        String[] inputArr = input.split(" ");
+
         if (inputArr.length > 1) {
             throw new BadInputException(CommandDictionary.getCommandUsage("list person"));
         }
 
         return new ListPersonCommand(CommandType.LIST);
+    }
+
+    private Command processListLoan(String input) throws BadInputException {
+        String[] inputArr = input.split(" +");
+
+        switch (inputArr.length) {
+        case 1:
+            throw new BadInputException(CommandDictionary.getCommandUsage("list loan"));
+            //return new ListLoanCommand(CommandType.LIST);
+        case 2:
+            return new ListPersonLoansCommand(CommandType.LIST, inputArr[1]);
+
+        default:
+            throw new BadInputException(CommandDictionary.getCommandUsage("list loan"));
+        }
 
     }
 
@@ -68,11 +85,16 @@ public Command parse(String inputString) throws BadInputException, InsufficientI
             listCommand = processListPerson(inputArr[0]);
             break;
 
+        case "loan":
+            listCommand = processListLoan(inputString);
+            break;
+
         default:
             throw new BadInputException(CommandDictionary.getCommandUsage("list"));
         }
 
         return listCommand;
     }
+
 }
 //@@author

src/main/java/eggventory/model/LoanList.java

@@ -2,6 +2,7 @@
 
 import eggventory.model.loans.Loan;
 import eggventory.model.loans.LoanPair;
+import eggventory.ui.TableStruct;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -70,23 +71,37 @@ public static boolean deleteLoan(String stockCode, String matricNo) {
     }
 
     /**
-     * Returns the Loan quantity of a queried Loan.
-     * The map requires the exact same instance of the key in order to access the quantity.
-     * Therefore constructing the key (pair of matricNo/stockCode) cannot directly access the value (the Loan).
-     * Rather, we have to compare the pairs using .equals and then use the original instance to access the Loan.
+     * Adds a new stock to track in LoanList.
+     * @param stockCode The code of the stock
+     * @param quantity The starting quantity of the stock
+     */
+    public static void addStock(String stockCode, int quantity) {
+        updateStockLoaned(stockCode, quantity);
+    }
+
+    /**
+     * Returns the quantity of a certain Stock that a Person has loaned out.
      * @param stockCode the stockCode of the Stock involved.
      * @param matricNo the matric number of the Person involved.
-     * @return the quantity.
+     * @return the quantity loaned out by a person.
      */
-    public static int getLoanQuantity(String stockCode, String matricNo) {
+    public static int getPersonLoanQuantity(String stockCode, String matricNo) {
         Loan loan = findLoan(stockCode, matricNo);
         if (loan == null) {
             return -1;
         }
         return loan.getQuantity();
     }
 
+    /**
+     * Returns the total quantity of a certain Stock has been loaned out.
+     * @param stockCode stockCode of the Stock to check
+     * @return The quantity loaned out
+     */
     public static int getStockLoanedQuantity(String stockCode) {
+        if (stockLoaned.get(stockCode) == null) {
+            return -1;
+        }
         return stockLoaned.get(stockCode);
     }
 
@@ -182,6 +197,26 @@ public static String printStockLoans(String stockCode) {
         return output;
     }
 
+    /**
+     * Returns all of a person's loans as a TableStruct.
+     * @param matricNo Matriculation number of person to output.
+     */
+    public static TableStruct getPersonLoansStruct(String matricNo) {
+        TableStruct dataTable = new TableStruct("Loans of " + matricNo);
+        dataTable.setTableColumns("Stock Code", "Quantity Loaned");
+
+        ArrayList<Loan> loans = getPersonLoans(matricNo);
+        ArrayList<ArrayList<String>> dataList = new ArrayList<>();
+
+        for (Loan loan : loans) {
+            dataList.add(loan.getStockDataAsArray());
+        }
+
+        dataTable.setTableData(dataList);
+
+        return dataTable;
+    }
+
     //@@author
 
 }

src/main/java/eggventory/model/loans/Loan.java

@@ -1,5 +1,6 @@
 package eggventory.model.loans;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 
 //@@author cyanoei
@@ -84,6 +85,18 @@ public String toString() {
         return getMatricNo() + " loaned " + getQuantity() + " of " + getStockCode() + ".";
     }
 
+    /**
+     * Gets the data of this stock as an arraylist.
+     */
+    public ArrayList<String> getStockDataAsArray() {
+        ArrayList<String> data = new ArrayList<>();
+
+        data.add(stockCode);
+        data.add(String.valueOf(quantity));
+
+        return data;
+    }
+
     //@@author