Merge pull request #85 from AY1920S1-CS2103T-W12-3/develop

Develop-branch to Master

.gitignore

@@ -19,3 +19,9 @@ src/test/data/sandbox/
 
 # MacOS custom attributes files created by Finder
 .DS_Store
+
+# VSCode Settings
+/.settings
+/bin/
+/.project
+/.classpath

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

@@ -0,0 +1,52 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.transaction.Transaction;
+
+/**
+ * Adds an income to the bank account.
+ */
+public class OutCommand extends Command {
+
+    public static final String COMMAND_WORD = "out";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a transaction to the bank account. "
+            + "Parameters: "
+            + PREFIX_NAME + "NAME "
+            + PREFIX_PHONE + "PHONE "
+            + PREFIX_EMAIL + "EMAIL "
+            + PREFIX_ADDRESS + "ADDRESS "
+            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_NAME + "John Doe "
+            + PREFIX_PHONE + "98765432 "
+            + PREFIX_EMAIL + "johnd@example.com "
+            + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
+            + PREFIX_TAG + "friends "
+            + PREFIX_TAG + "owesMoney";
+
+    public static final String MESSAGE_SUCCESS = "Out transaction added: %1$s";
+
+    private final Transaction transaction;
+
+    public OutCommand(Transaction transaction) {
+        this.transaction = transaction;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+
+        model.addTransaction(transaction);
+
+        return new CommandResult(String.format(MESSAGE_SUCCESS, transaction));
+    }
+}

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

@@ -5,11 +5,11 @@
 
 import javafx.collections.ObservableList;
 import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Date;
 import seedu.address.model.Model;
 import seedu.address.model.Projection;
 import seedu.address.model.transaction.DateComparator;
 import seedu.address.model.transaction.Transaction;
+import seedu.address.model.util.Date;
 
 /**
  * Projects user's future balance based on income/outflow history

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

@@ -1,29 +1,47 @@
 package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SHARE;
 
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.transaction.Transaction;
+import seedu.address.model.transaction.SplitTransaction;
 
 /**
  * Splits an amount into smaller different amounts.
  */
 public class SplitCommand extends Command {
 
-    public static final String MESSAGE_SUCCESS = "Split amount successful";
     public static final String COMMAND_WORD = "split";
-    private final Transaction transaction;
-
-    public SplitCommand(Transaction transaction) {
+    public static final String MESSAGE_SUCCESS = "Split successful";
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Splits an expenditure between people and add that transaction to the bank account. "
+            + "Parameters: "
+            + PREFIX_AMOUNT + "AMOUNT "
+            + "[" + PREFIX_NAME + "NAME]...\n"
+            + "[" + PREFIX_SHARE + "SHARE]...\n"
+            + "Example: " + COMMAND_WORD + " "
+            + PREFIX_AMOUNT + "600"
+            + PREFIX_NAME + "John Doe "
+            + PREFIX_NAME + "John Soe"
+            + PREFIX_NAME + "John Moe "
+            + PREFIX_SHARE + "1"
+            + PREFIX_SHARE + "2"
+            + PREFIX_SHARE + "3";
+
+    private final SplitTransaction transaction;
+
+    public SplitCommand(SplitTransaction transaction) {
         this.transaction = transaction;
     }
 
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
 
-        model.addTransaction(transaction);
+        model.addSplit(transaction);
 
         return new CommandResult(String.format(MESSAGE_SUCCESS, transaction));
     }

src/main/java/seedu/address/logic/parser/BankAccountParser.java

@@ -14,9 +14,11 @@
 import seedu.address.logic.commands.HelpCommand;
 import seedu.address.logic.commands.InCommand;
 import seedu.address.logic.commands.ListCommand;
+import seedu.address.logic.commands.OutCommand;
 import seedu.address.logic.commands.ProjectCommand;
 import seedu.address.logic.commands.RedoCommand;
 import seedu.address.logic.commands.SetCommand;
+import seedu.address.logic.commands.SplitCommand;
 import seedu.address.logic.commands.UndoCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
@@ -46,11 +48,16 @@ public Command parseCommand(String userInput) throws ParseException {
         final String arguments = matcher.group("arguments");
 
         switch (commandWord) {
-        // case SplitCommand.COMMAND_WORD:
-        //    return new SplitCommand(arguments);
+
+        case SplitCommand.COMMAND_WORD:
+            return new SplitCommandParser().parse(arguments);
+
         case InCommand.COMMAND_WORD:
             return new InCommandParser().parse(arguments);
 
+        case OutCommand.COMMAND_WORD:
+            return new OutCommandParser().parse(arguments);
+
         case FilterCommand.COMMAND_WORD:
             return new FilterCommandParser().parse(arguments);
 

src/main/java/seedu/address/logic/parser/CliSyntax.java

@@ -11,7 +11,8 @@ public class CliSyntax {
     public static final Prefix PREFIX_EMAIL = new Prefix("e/");
     public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
     public static final Prefix PREFIX_AMOUNT = new Prefix("$/");
-    public static final Prefix PREFIX_TAG = new Prefix("t/");
+    public static final Prefix PREFIX_TAG = new Prefix("c/");
     public static final Prefix PREFIX_DATE = new Prefix("d/");
     public static final Prefix PREFIX_TIME = new Prefix("t/");
+    public static final Prefix PREFIX_SHARE = new Prefix("s/");
 }

src/main/java/seedu/address/logic/parser/InCommandParser.java

@@ -12,12 +12,12 @@
 import seedu.address.logic.commands.InCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
-import seedu.address.model.Date;
 import seedu.address.model.person.Name;
 import seedu.address.model.tag.Tag;
 import seedu.address.model.transaction.Amount;
 import seedu.address.model.transaction.InTransaction;
 import seedu.address.model.transaction.Transaction;
+import seedu.address.model.util.Date;
 
 /**
  * Parses input arguments and creates a new InCommand object.
@@ -33,7 +33,6 @@ public InCommand parse(String args) throws ParseException {
                 || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, InCommand.MESSAGE_USAGE));
         }
-
         Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
         Amount amount = ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT).get());
         Date date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());

src/main/java/seedu/address/logic/parser/OutCommandParser.java

@@ -0,0 +1,56 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+
+import java.util.Set;
+import java.util.stream.Stream;
+
+import seedu.address.logic.commands.OutCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+import seedu.address.model.person.Name;
+import seedu.address.model.tag.Tag;
+import seedu.address.model.transaction.Amount;
+import seedu.address.model.transaction.OutTransaction;
+import seedu.address.model.transaction.Transaction;
+import seedu.address.model.util.Date;
+
+/**
+ * Parses input arguments and creates a new OutCommand object
+ */
+public class OutCommandParser implements Parser<OutCommand> {
+
+    @Override
+    public OutCommand parse(String args) throws ParseException {
+        ArgumentMultimap argMultimap =
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_AMOUNT, PREFIX_DATE);
+
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_AMOUNT, PREFIX_DATE)
+                || !argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, OutCommand.MESSAGE_USAGE));
+        }
+
+        Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
+        Amount amount = ParserUtil.parseAmount("-" + argMultimap.getValue(PREFIX_AMOUNT).get());
+        Date date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());
+
+        Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
+
+        Transaction transaction = new OutTransaction(amount, date);
+
+        return new OutCommand(transaction);
+
+    }
+
+    /**
+     * Returns true if none of the prefixes contains empty {@code Optional} values in the given
+     * {@code ArgumentMultimap}.
+     */
+    private static boolean arePrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
+        return Stream.of(prefixes).allMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
+    }
+}