diff --git a/.github/check-eof-newline.sh b/.github/check-eof-newline.sh
index b771f3988dd..436c77aa818 100755
--- a/.github/check-eof-newline.sh
+++ b/.github/check-eof-newline.sh
@@ -1,5 +1,6 @@
#!/bin/sh
# Checks that all text files end with a newline.
+echo "Checking for newline at EOF..."
ret=0
diff --git a/.github/check-line-endings.sh b/.github/check-line-endings.sh
index 3de67ea87f6..c5759f006c0 100755
--- a/.github/check-line-endings.sh
+++ b/.github/check-line-endings.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# Checks for prohibited line endings.
# Prohibited line endings: \r\n
+echo "Checking for prohibited line endings..."
git grep --cached -I -n --no-color -P '\r$' -- ':/' |
awk '
diff --git a/.github/check-trailing-whitespace.sh b/.github/check-trailing-whitespace.sh
index 33841caa81f..005d652c288 100755
--- a/.github/check-trailing-whitespace.sh
+++ b/.github/check-trailing-whitespace.sh
@@ -1,5 +1,6 @@
#!/bin/sh
# Checks for trailing whitespace
+echo "Checking for trailing whitespace..."
git grep --cached -I -n --no-color -P '[ \t]+$' -- ':/' |
awk '
@@ -9,16 +10,8 @@ awk '
ret = 0
}
{
- # Only warn for markdown files (*.md) to accomodate text editors
- # which do not properly handle trailing whitespace.
- # (e.g. GitHub web editor)
- if ($1 ~ /\.md$/) {
- severity = "WARN"
- } else {
- severity = "ERROR"
- ret = 1
- }
- print severity, $1, $2, " trailing whitespace."
+ ret = 1
+ print "ERROR", $1, $2, " trailing whitespace."
}
END {
exit ret
diff --git a/.github/run-checks.sh b/.github/run-checks.sh
index 7aad1e96220..13c55c6435e 100755
--- a/.github/run-checks.sh
+++ b/.github/run-checks.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# Runs all check-* scripts, and returns a non-zero exit code if any of them fail.
+echo "Running formatting checks..."
dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) &&
ret=0 &&
for checkscript in "$dir"/check-*; do
diff --git a/.github/workflows/build-jekyll.yml b/.github/workflows/build-jekyll.yml
new file mode 100644
index 00000000000..87d7ee812dc
--- /dev/null
+++ b/.github/workflows/build-jekyll.yml
@@ -0,0 +1,49 @@
+name: Build and Deploy to GitHub Pages
+
+on:
+ push:
+ branches:
+ - master
+
+defaults:
+ run:
+ working-directory: docs
+
+jobs:
+ build_and_deploy:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+
+ # Set up Ruby
+ - uses: actions/setup-ruby@v1
+ with:
+ ruby-version: '2.7'
+
+ # Cache dependencies on server
+ - uses: actions/cache@v2
+ with:
+ path: vendor/bundle
+ key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-gems-
+
+ # Install dependencies
+ - name: Install dependencies
+ run: |
+ gem install bundler
+ bundle config path vendor/bundle
+ bundle install --jobs 4 --retry 3
+
+ # Build Jekyll site
+ - name: Build
+ env:
+ JEKYLL_ENV: production
+ run: bundle exec jekyll build --baseurl /${{ github.event.repository.name }} # Set the repo name as the base URL
+
+ # Deploy to GitHub Pages
+ - name: Deploy
+ uses: peaceiris/actions-gh-pages@v3
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ publish_dir: ./docs/_site
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index ce1a0f882e0..1be2e161bf9 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -43,3 +43,41 @@ jobs:
with:
file: ${{ github.workspace }}/build/reports/jacoco/coverage/coverage.xml
fail_ci_if_error: true
+
+ pitest:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Set up repository
+ uses: actions/checkout@master
+
+ - name: Set up repository
+ uses: actions/checkout@master
+ with:
+ ref: master
+
+ - name: Merge to master
+ run: git checkout --progress --force ${{ github.sha }}
+
+ - name: Run repository-wide tests
+ if: runner.os == 'Linux'
+ working-directory: ${{ github.workspace }}/.github
+ run: ./run-checks.sh
+
+ - name: Validate Gradle Wrapper
+ uses: gradle/wrapper-validation-action@v1
+
+ - name: Setup JDK 11
+ uses: actions/setup-java@v1
+ with:
+ java-version: '11'
+ java-package: jdk+fx
+
+ - name: Run Pitest
+ run: ./gradlew pitest
+
+ - name: Upload Pitest report
+ uses: actions/upload-artifact@v2
+ with:
+ name: pitest
+ path: build/reports/pitest/
diff --git a/.gitignore b/.gitignore
index 71c9194e8bd..343123b3e27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ src/main/resources/docs/
/.idea/
/out/
/*.iml
+src/main/main.iml
# Storage/log files
/data/
@@ -20,3 +21,4 @@ src/test/data/sandbox/
# MacOS custom attributes files created by Finder
.DS_Store
docs/_site/
+docs/.sass-cache/
diff --git a/README.md b/README.md
index 13f5c77403f..752631576f4 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,26 @@
-[](https://github.com/se-edu/addressbook-level3/actions)
+[](https://github.com/AY2021S1-CS2103T-W16-3/tp/actions)
+[](https://codecov.io/gh/AY2021S1-CS2103T-W16-3/tp)
-* This is **a sample project for Software Engineering (SE) students**.
- Example usages:
- * as a starting point of a course project (as opposed to writing everything from scratch)
- * as a case study
-* The project simulates an ongoing software project for a desktop application (called _AddressBook_) used for managing contact details.
- * It is **written in OOP fashion**. It provides a **reasonably well-written** code base **bigger** (around 6 KLoC) than what students usually write in beginner-level SE modules, without being overwhelmingly big.
- * It comes with a **reasonable level of user and developer documentation**.
-* It is named `AddressBook Level 3` (`AB3` for short) because it was initially created as a part of a series of `AddressBook` projects (`Level 1`, `Level 2`, `Level 3` ...).
-* For the detailed documentation of this project, see the **[Address Book Product Website](https://se-education.org/addressbook-level3)**.
-* This project is a **part of the se-education.org** initiative. If you would like to contribute code to this project, see [se-education.org](https://se-education.org#https://se-education.org/#contributing) for more info.
+* Fine$$e is a desktop app for **managing finances, optimized for use via a Command Line Interface (CLI)** while still having the benefits of a Graphical User Interface (GUI). If you can type fast, Fine\$\$e can track and help you cultivate good financial habits faster than traditional GUI apps.
+
+Site Map
+==
+
+* [User Guide](https://ay2021s1-cs2103t-w16-3.github.io/tp/UserGuide.html)
+* [Developer Guide](https://ay2021s1-cs2103t-w16-3.github.io/tp/DeveloperGuide.html)
+* [About Us](https://ay2021s1-cs2103t-w16-3.github.io/tp/AboutUs.html)
+
+Acknowledgments
+==
+
+* This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).
+* Libraries used:
+ * [Git Hooks Gradle Plugin](https://plugins.gradle.org/plugin/com.github.jakemarsden.git-hooks) *(licensed under the [MIT License](https://github.com/jakemarsden/git-hooks-gradle-plugin/blob/master/LICENSE))*
+ * [Gradle plugin for PIT Mutation Testing](https://plugins.gradle.org/plugin/info.solidsoft.pitest)
+ * [JavaFX](https://openjfx.io/)
+ * [Jackson](https://github.com/FasterXML/jackson)
+ * [Jekyll Spaceship](https://rubygems.org/gems/jekyll-spaceship) *(licensed under the [MIT License](https://github.com/jakemarsden/git-hooks-gradle-plugin/blob/master/LICENSE))*
+ * [JUnit5](https://github.com/junit-team/junit5)
+ * [PlantUML](https://plantuml.com/)
diff --git a/build.gradle b/build.gradle
index be2d2905dde..688521e5734 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,11 @@ plugins {
id 'com.github.johnrengelman.shadow' version '4.0.4'
id 'application'
id 'jacoco'
+ id 'info.solidsoft.pitest' version '1.5.2'
+ id 'com.github.jakemarsden.git-hooks' version '0.0.2'
}
-mainClassName = 'seedu.address.Main'
+mainClassName = 'ay2021s1_cs2103_w16_3.finesse.Main'
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
@@ -30,9 +32,9 @@ task coverage(type: JacocoReport) {
classDirectories.from files(sourceSets.main.output)
executionData.from files(jacocoTestReport.executionData)
afterEvaluate {
- classDirectories.from files(classDirectories.files.collect {
- fileTree(dir: it, exclude: ['**/*.jar'])
- })
+ classDirectories.setFrom(files(classDirectories.files.collect {
+ fileTree(dir: it, exclude: ['ay2021s1_cs2103_w16_3/finesse/ui/**/*', '**/*.jar'])
+ }))
}
reports {
html.enabled = true
@@ -40,6 +42,22 @@ task coverage(type: JacocoReport) {
}
}
+pitest {
+ targetClasses = ['ay2021s1_cs2103_w16_3.finesse.*']
+ junit5PluginVersion = '0.12'
+ threads = 4
+ excludedClasses = ['ay2021s1_cs2103_w16_3.finesse.ui.*']
+}
+
+gitHooks {
+ hooksDirectory = file('.git/hooks')
+ gradleCommand = './gradlew'
+ hooks = [
+ // Git hooks run in a bash environment regardless of OS.
+ 'pre-push': 'clean check && .github/run-checks.sh'
+ ]
+}
+
dependencies {
String jUnitVersion = '5.4.0'
String javaFxVersion = '11'
@@ -56,6 +74,12 @@ dependencies {
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
+ implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'win'
+ implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'mac'
+ implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'linux'
+ implementation group: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'win'
+ implementation group: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'mac'
+ implementation group: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'linux'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
@@ -66,7 +90,11 @@ dependencies {
}
shadowJar {
- archiveName = 'addressbook.jar'
+ archiveFileName = 'finesse.jar'
+}
+
+run {
+ enableAssertions = true
}
defaultTasks 'clean', 'test'
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 4c001417aea..10731793567 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -91,7 +91,7 @@
-
+
diff --git a/config/travis/check-eof-newline.sh b/config/travis/check-eof-newline.sh
deleted file mode 100755
index b771f3988dd..00000000000
--- a/config/travis/check-eof-newline.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Checks that all text files end with a newline.
-
-ret=0
-
-# Preserve filename with spaces by only splitting on newlines.
-IFS='
-'
-
-for filename in $(git grep --cached -I -l -e '' -- ':/'); do
- if [ "$(tail -c 1 "./$filename")" != '' ]; then
- line="$(wc -l "./$filename" | cut -d' ' -f1)"
- echo "ERROR:$filename:$line: no newline at EOF."
- ret=1
- fi
-done
-
-exit $ret
diff --git a/config/travis/check-line-endings.sh b/config/travis/check-line-endings.sh
deleted file mode 100755
index 3de67ea87f6..00000000000
--- a/config/travis/check-line-endings.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# Checks for prohibited line endings.
-# Prohibited line endings: \r\n
-
-git grep --cached -I -n --no-color -P '\r$' -- ':/' |
-awk '
- BEGIN {
- FS = ":"
- OFS = ":"
- ret = 0
- }
- {
- ret = 1
- print "ERROR", $1, $2, " prohibited \\r\\n line ending, use \\n instead."
- }
- END {
- exit ret
- }
-'
diff --git a/config/travis/check-trailing-whitespace.sh b/config/travis/check-trailing-whitespace.sh
deleted file mode 100755
index 33841caa81f..00000000000
--- a/config/travis/check-trailing-whitespace.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Checks for trailing whitespace
-
-git grep --cached -I -n --no-color -P '[ \t]+$' -- ':/' |
-awk '
- BEGIN {
- FS = ":"
- OFS = ":"
- ret = 0
- }
- {
- # Only warn for markdown files (*.md) to accomodate text editors
- # which do not properly handle trailing whitespace.
- # (e.g. GitHub web editor)
- if ($1 ~ /\.md$/) {
- severity = "WARN"
- } else {
- severity = "ERROR"
- ret = 1
- }
- print severity, $1, $2, " trailing whitespace."
- }
- END {
- exit ret
- }
-'
diff --git a/config/travis/run-checks.sh b/config/travis/run-checks.sh
deleted file mode 100755
index 7aad1e96220..00000000000
--- a/config/travis/run-checks.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Runs all check-* scripts, and returns a non-zero exit code if any of them fail.
-
-dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) &&
-ret=0 &&
-for checkscript in "$dir"/check-*; do
- if ! "$checkscript"; then
- ret=1
- fi
-done
-exit $ret
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
index 1c9514e966a..ccc8bb523ff 100644
--- a/docs/AboutUs.md
+++ b/docs/AboutUs.md
@@ -5,55 +5,55 @@ title: About Us
We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).
-You can reach us at the email `seer[at]comp.nus.edu.sg`
+You can reach us at the email
## Project team
-### John Doe
+### Ian Yong
-
+
-[[homepage](http://www.comp.nus.edu.sg/~damithch)]
-[[github](https://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](https://github.com/ianyong)]
+[[portfolio](team/ianyong.md)]
-* Role: Project Advisor
+* Role: Team Co-Lead
+* Responsibilities: Testing
-### Jane Doe
+### Tan Wei Liang
-
+
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/wltan)]
+[[portfolio](team/wltan.md)]
-* Role: Team Lead
-* Responsibilities: UI
+* Role: Team Co-Lead
+* Responsibilities: Git/CI Expert, Integration
-### Johnny Doe
+### Siddarth Nandanahosur Suresh
-
+
-[[github](http://github.com/johndoe)] [[portfolio](team/johndoe.md)]
+[[github](http://github.com/siddarth2824)] [[portfolio](team/siddarth2824.md)]
* Role: Developer
-* Responsibilities: Data
+* Responsibilities: Scheduling and Tracking, User Interface
-### Jean Doe
+### Zhao Jingjing
-
+
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/zhaojj2209)]
+[[portfolio](team/zhaojj2209.md)]
* Role: Developer
-* Responsibilities: Dev Ops + Threading
+* Responsibilities: Documentation, Model, Logic
-### James Doe
+### Yong Ping
-
+
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/yongping827)]
+[[portfolio](team/yongping827.md)]
* Role: Developer
-* Responsibilities: UI
+* Responsibilities: Code Quality, Storage
diff --git a/docs/Configuration.md b/docs/Configuration.md
deleted file mode 100644
index 13cf0faea16..00000000000
--- a/docs/Configuration.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: page
-title: Configuration guide
----
-
-Certain properties of the application can be controlled (e.g user preferences file location, logging level) through the configuration file (default: `config.json`).
diff --git a/docs/DevOps.md b/docs/DevOps.md
deleted file mode 100644
index 4414eea3344..00000000000
--- a/docs/DevOps.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-layout: page
-title: DevOps guide
----
-
-* Table of Contents
-{:toc}
-
---------------------------------------------------------------------------------------------------------------------
-
-## Build automation
-
-This project uses Gradle for **build automation and dependency management**. **You are recommended to read [this Gradle Tutorial from the se-edu/guides](https://se-education.org/guides/tutorials/gradle.html)**.
-
-
-Given below are how to use Gradle for some important project tasks.
-
-
-* **`clean`**: Deletes the files created during the previous build tasks (e.g. files in the `build` folder).
- e.g. `./gradlew clean`
-
-* **`shadowJar`**: Uses the ShadowJar plugin to creat a fat JAR file in the `build/lib` folder, *if the current file is outdated*.
- e.g. `./gradlew shadowJar`.
-
-* **`run`**: Builds and runs the application.
- **`runShadow`**: Builds the application as a fat JAR, and then runs it.
-
-* **`checkstyleMain`**: Runs the code style check for the main code base.
- **`checkstyleTest`**: Runs the code style check for the test code base.
-
-* **`test`**: Runs all tests.<
- * `./gradlew test` — Runs all tests
- * `./gradlew clean test` — Cleans the project and runs tests
-
---------------------------------------------------------------------------------------------------------------------
-
-## Continuous integration (CI)
-
-This project uses GitHub Actions for CI. The project comes with the necessary GitHub Actions configurations files (in the `.github/workflows` folder). No further setting up required.
-
-### Code coverage
-
-As part of CI, this project uses Codecov to generate coverage reports. Here are the steps to set up CodeCov for a fork of this repository.
-
-1. Sign up with Codecov using your GitHub account [here](https://codecov.io/signup).
-1. Once you are inside Codecov web app, add your fork to CodeCov.
-1. Get the Markdown code for the Codecov badge provided in `Settings > Badges` and update the `docs/index.md` of your repo with it so that the badge [](https://codecov.io/gh/se-edu/addressbook-level3) in that page reflects the coverage of your project.
-
-### Repository-wide checks
-
-In addition to running Gradle checks, CI includes some repository-wide checks. Unlike the Gradle checks which only cover files used in the build process, these repository-wide checks cover all files in the repository. They check for repository rules which are hard to enforce on development machines such as line ending requirements.
-
-These checks are implemented as POSIX shell scripts, and thus can only be run on POSIX-compliant operating systems such as macOS and Linux. To run all checks locally on these operating systems, execute the following in the repository root directory:
-
-`./config/travis/run-checks.sh`
-
-Any warnings or errors will be printed out to the console.
-
-**If adding new checks:**
-
-* Checks are implemented as executable `check-*` scripts within the `.github` directory. The `run-checks.sh` script will automatically pick up and run files named as such. That is, you can add more such files if you need and the CI will do the rest.
-
-* Check scripts should print out errors in the format `SEVERITY:FILENAME:LINE: MESSAGE`
- * SEVERITY is either ERROR or WARN.
- * FILENAME is the path to the file relative to the current directory.
- * LINE is the line of the file where the error occurred and MESSAGE is the message explaining the error.
-
-* Check scripts must exit with a non-zero exit code if any errors occur.
-
---------------------------------------------------------------------------------------------------------------------
-
-## Making a release
-
-Here are the steps to create a new release.
-
-1. Update the version number in [`MainApp.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/MainApp.java).
-1. Generate a fat JAR file using Gradle (i.e., `gradlew shadow`).
-1. Tag the repo with the version number. e.g. `v0.1`
-1. [Create a new release using GitHub](https://help.github.com/articles/creating-releases/). Upload the JAR file you created.
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
index 4829fe43011..7054afffffe 100644
--- a/docs/DeveloperGuide.md
+++ b/docs/DeveloperGuide.md
@@ -7,12 +7,6 @@ title: Developer Guide
--------------------------------------------------------------------------------------------------------------------
-## **Setting up, getting started**
-
-Refer to the guide [_Setting up and getting started_](SettingUp.md).
-
---------------------------------------------------------------------------------------------------------------------
-
## **Design**
### Architecture
@@ -21,28 +15,22 @@ Refer to the guide [_Setting up and getting started_](SettingUp.md).
The ***Architecture Diagram*** given above explains the high-level design of the App. Given below is a quick overview of each component.
-
-
-:bulb: **Tip:** The `.puml` files used to create diagrams in this document can be found in the [diagrams](https://github.com/se-edu/addressbook-level3/tree/master/docs/diagrams/) folder. Refer to the [_PlantUML Tutorial_ at se-edu/guides](https://se-education.org/guides/tutorials/plantUml.html) to learn how to create and edit diagrams.
-
-
-
-**`Main`** has two classes called [`Main`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/Main.java) and [`MainApp`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/MainApp.java). It is responsible for,
-* At app launch: Initializes the components in the correct sequence, and connects them up with each other.
-* At shut down: Shuts down the components and invokes cleanup methods where necessary.
+**`Main`** has two classes called [`Main`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/Main.java) and [`MainApp`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/MainApp.java). It is responsible for:
+* on app launch - initializing the components in the correct sequence, and connecting them to each other.
+* on shut down - shutting down the components and invoking cleanup methods where necessary.
[**`Commons`**](#common-classes) represents a collection of classes used by multiple other components.
The rest of the App consists of four components.
-* [**`UI`**](#ui-component): The UI of the App.
+* [**`UI`**](#ui-component): The App's User Interface.
* [**`Logic`**](#logic-component): The command executor.
* [**`Model`**](#model-component): Holds the data of the App in memory.
* [**`Storage`**](#storage-component): Reads data from, and writes data to, the hard disk.
-Each of the four components,
+Each of the four components:
-* defines its *API* in an `interface` with the same name as the Component.
+* defines its *API* in an `interface` with the same name as the component.
* exposes its functionality using a concrete `{Component Name}Manager` class (which implements the corresponding API `interface` mentioned in the previous point.
For example, the `Logic` component (see the class diagram given below) defines its API in the `Logic.java` interface and exposes its functionality using the `LogicManager.java` class which implements the `Logic` interface.
@@ -51,7 +39,7 @@ For example, the `Logic` component (see the class diagram given below) defines i
**How the architecture components interact with each other**
-The *Sequence Diagram* below shows how the components interact with each other for the scenario where the user issues the command `delete 1`.
+The *sequence diagram* below shows how the components interact with each other for the scenario where the user issues the command `delete 1`.
@@ -62,31 +50,43 @@ The sections below give more details of each component.
**API** :
-[`Ui.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/ui/Ui.java)
+[`Ui.java`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/Ui.java)
-The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `PersonListPanel`, `StatusBarFooter` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class.
+The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `TransactionListPanel`, `OverviewTabPane` etc.
+All of these, including `MainWindow`, inherit from the abstract `UiPart` class.
-The `UI` component uses JavaFx UI framework. The layout of these UI parts are defined in matching `.fxml` files that are in the `src/main/resources/view` folder. For example, the layout of the [`MainWindow`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/ui/MainWindow.java) is specified in [`MainWindow.fxml`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/resources/view/MainWindow.fxml)
+There are 5 tab panes which are contained within `MainWindow`:
+* `OverviewTabPane` - Displays an overview of the most recent transactions (both incomes and expenses) along with the savings goals.
+ * Contains `TransactionListPanel` and `SavingsGoalPanel`.
+* `IncomeTabPane` - Displays a list of incomes along with bookmark incomes.
+ * Contains `IncomePanel` and `BookmarkIncomePanel`.
+* `ExpenseTabPane` - Displays a list of expenses along with bookmark expenses.
+ * Contains `ExpensePanel` and `BookmarkExpensePanel`.
+* `AnalyticsTabPane` - Displays statistics.
+* `UserGuideTabPane` - Displays the user guide.
-The `UI` component,
+The `UI` component uses the JavaFx UI framework. The layout of these UI parts is defined in matching `.fxml` files that are in the `src/main/resources/view` folder.
+For example, the layout of [`MainWindow`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/MainWindow.java) is specified in [`MainWindow.fxml`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/resources/view/MainWindow.fxml).
-* Executes user commands using the `Logic` component.
-* Listens for changes to `Model` data so that the UI can be updated with the modified data.
+The `UI` component:
+
+* executes user commands using the `Logic` component.
+* listens for changes to `Model` data so that the UI can be updated with the modified data.
### Logic component
**API** :
-[`Logic.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/logic/Logic.java)
+[`Logic.java`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/Logic.java)
-1. `Logic` uses the `AddressBookParser` class to parse the user command.
-1. This results in a `Command` object which is executed by the `LogicManager`.
-1. The command execution can affect the `Model` (e.g. adding a person).
-1. The result of the command execution is encapsulated as a `CommandResult` object which is passed back to the `Ui`.
-1. In addition, the `CommandResult` object can also instruct the `Ui` to perform certain actions, such as displaying help to the user.
+1. `Logic` uses the `FinanceTrackerParser` class to parse the user command.
+1. This results in a `Command` object which is executed by `LogicManager`.
+1. The command execution can affect `Model` (e.g. adding a transaction).
+1. The result of the command execution is encapsulated as a `CommandResult` object which is passed back to `Ui`.
+1. In addition, the `CommandResult` object can also instruct `Ui` to perform certain actions, such as displaying the help message to the user.
-Given below is the Sequence Diagram for interactions within the `Logic` component for the `execute("delete 1")` API call.
+Below is the sequence diagram for interactions within the `Logic` component for the `execute("delete 1")` API call.
@@ -97,35 +97,91 @@ Given below is the Sequence Diagram for interactions within the `Logic` componen
-**API** : [`Model.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/model/Model.java)
+**API** : [`Model.java`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/Model.java)
-The `Model`,
+The `Model`:
* stores a `UserPref` object that represents the user’s preferences.
-* stores the address book data.
-* exposes an unmodifiable `ObservableList` that can be 'observed' e.g. the UI can be bound to this list so that the UI automatically updates when the data in the list change.
-* does not depend on any of the other three components.
-
+* stores a `CommandHistory` object that keeps track of the 50 most recent commands entered.
+* stores the finance tracker data in the following components:
+ * a `TransactionList` containing `Transaction`s.
+ * a `BookmarkExpenseList` and `BookmarkIncomeList`, each containing `BookmarkTransaction`s.
+ * a `MonthlyBudget`.
+* exposes `MonthlyBudget`, which can be 'observed' e.g. the UI can be bound to the values in the class so that the UI automatically updates when the values in the class changes.
+* exposes an unmodifiable `ObservableList`, `ObservableList`, `ObservableList`, `ObservableList` and `ObservableList` each, which can be 'observed' e.g. the UI can be bound to these lists so that the UI automatically updates when the data in the lists change.
+* does not depend on any of the other three components (`UI`, `Logic`, `Storage`).
+
+A `Transaction`:
+* represents a unit of user data of transactions within the finance tracker.
+* is either an `Expense` or an `Income`.
+* is composed of a `Title`, an `Amount`, a `Date`, and any number of `Category`s. These are known as *data fields*.
+
+A `BookmarkTransaction`:
+* represents a unit of user data of bookmark transactions within the finance tracker.
+* is either a `BookmarkExpense` or a `BookmarkIncome`.
+* is composed of a `Title`, an `Amount`, and any number of `Category`s.
+
+The *data fields* `Title`, `Amount`, `Date`, and `Category` are encapsulations of an underlying Java data type.
+
+| Data Field | Underlying Java Data Type |
+| ----------- | ------------------------- |
+| `Title` | `java.lang.String` |
+| `Amount` | `java.math.BigDecimal` |
+| `Date` | `java.time.LocalDate` |
+| `Category` | `java.lang.String` |
+
+The underlying Java data types allow more operations to be done on `Transaction` objects, such as filtering `Transaction`s by `Date`, or aggregating the `Amount`s of `Expense`s and `Income`s.
+
+
:information_source:
+**Note:** All data fields take in a `String` in their constructor, regardless of the underlying Java data type.
+Within the constructor, data validation takes place to ensure that the `String` correctly represents a valid data field.
+If the `String` given is not valid, an `IllegalArgumentException` will be thrown.
+Otherwise, the `String` is parsed into the underlying Java data type.
+The reason for this is that when a data field object needs to be created, it is generally from a `String`
+(such as when a user command parsed from the `Logic` component, or when a transaction is loaded from the `Storage` component).
+This abstraction is maintained so that the implementation of other components (`Logic` and `Storage`) is independent of
+the underlying Java data type choices in the `Model` component.
+
-
:information_source: **Note:** An alternative (arguably, a more OOP) model is given below. It has a `Tag` list in the `AddressBook`, which `Person` references. This allows `AddressBook` to only require one `Tag` object per unique `Tag`, instead of each `Person` needing their own `Tag` object.
-
+The `FinanceTracker` has the following fields:
+* a `TransactionList` field which stores all `Expense` and `Income` objects together.
+* a `BookmarkExpenseList` field which stores all `BookmarkExpense` objects.
+* a `BookmarkIncomeList` field which stores all `BookmarkIncome` objects.
+* a `MonthlyBudget` field which stores the user's set monthly expense limit and monthly savings goal, as well as all calculated values for the user's statistics.
-
+The `ModelManager` has the following fields:
+* three `FilteredList` fields which point to the same `ObservableList` obtained from `FinanceTracker::getTransactionList`. The `Predicate` fields in the three `FilteredList` fields are set such that:
+ * `filteredTransactions` shows a view of all `Transaction` objects.
+ * `filteredExpenses` shows a view of all `Transaction` objects of type `Expense`.
+ * `filteredIncomes` shows a view of all `Transaction` objects of type `Income`.
+ The motivation behind having three lists is due to the fact that there are three tabs in the user interface which display transactions, each having its own list while at the same time retrieving data from the same transaction list.
+* two `ObservableList` fields, `castFilteredExpenses` and `castFilteredIncomes` that contain the same objects as that in `filteredExpenses` and `filteredIncomes` respectively. This is so that the UI can automatically update when the values in the two lists change.
+* two `FilteredList` fields, `FilteredBookmarkExpenses` and `FilteredBookmarkIncomes` that point to the `ObservableList`s obtained from `FinanceTracker::getBookmarkExpenseList` and `FinanceTracker::getBookmarkIncomeList` respectively.
+* a `MonthlyBudget` field which is the same as the `MonthlyBudget` stored in `FinanceTracker`.
### Storage component
-**API** : [`Storage.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/storage/Storage.java)
+**API** : [`Storage.java`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/Storage.java)
-The `Storage` component,
-* can save `UserPref` objects in json format and read it back.
-* can save the address book data in json format and read it back.
+The `Storage` component:
+
+* can save `UserPref` objects in `JSON` format and read it back.
+* can save the finance tracker data in `JSON` format and read it back.
+
+`JsonAdaptedExpense` and `JsonAdaptedIncome` are `JSON`-friendly adaptations of `Expense` and `Income` respectively.
+However, unlike `Expense` and `Income`, all the fields in `JsonAdaptedExpense` and `JsonAdaptedIncome` are `String` objects.
+This is so that the fields are compatible with the `JSON` format.
+
+`JsonSerializableFinanceTracker` contains two `List` fields, one containing all `JsonAdaptedExpense` objects and the other containing all `JsonAdaptedIncome` objects.
+Despite the similarities between `Expense` and `Income`, and despite the fact that objects of both types are put into the same list in `FinanceTracker`,
+the motivation behind keeping them separately is to ensure that they are separately listed in the `JSON` data file.
### Common classes
-Classes used by multiple components are in the `seedu.addressbook.commons` package.
+Classes used by multiple components are in the `ay2021s1_cs2103_w16_3.finesse.commons` package.
--------------------------------------------------------------------------------------------------------------------
@@ -133,145 +189,643 @@ Classes used by multiple components are in the `seedu.addressbook.commons` packa
This section describes some noteworthy details on how certain features are implemented.
-### \[Proposed\] Undo/redo feature
+### Tabs
-#### Proposed Implementation
+#### Programmatically switch selected tab
-The proposed undo/redo mechanism is facilitated by `VersionedAddressBook`. It extends `AddressBook` with an undo/redo history, stored internally as an `addressBookStateList` and `currentStatePointer`. Additionally, it implements the following operations:
+##### Overview
-* `VersionedAddressBook#commit()` — Saves the current address book state in its history.
-* `VersionedAddressBook#undo()` — Restores the previous address book state from its history.
-* `VersionedAddressBook#redo()` — Restores a previously undone address book state from its history.
+Fine$$e supports the ability to switch tabs programmatically.
+The following is a list of commands that utilise this ability:
+* `help` - Opens the [user guide](UserGuide.md).
+* `tab` - Switches to the tab corresponding to the index entered by the user.
+* `add-expense` - Adds an expense to the finance tracker and switches to the Expenses tab.
+* `ls-expense` - Shows a list of all expenses in the finance tracker by switching to the Expenses tab.
+* `add-income` - Adds an income to the finance tracker and switches to the Incomes tab.
+* `ls-income` - Shows a list of all incomes in the finance tracker by switching to the Incomes tab.
+* `add-bookmark-expense` - Adds a bookmark expense to the finance tracker and switches to the Expenses tab.
+* `add-bookmark-income` - Adds a bookmark income to the finance tracker and switches to the Incomes tab.
-These operations are exposed in the `Model` interface as `Model#commitAddressBook()`, `Model#undoAddressBook()` and `Model#redoAddressBook()` respectively.
+##### Implementation of feature
-Given below is an example usage scenario and how the undo/redo mechanism behaves at each step.
+The ability to programmatically update the selected tab is implemented via `CommandResult`.
+Upon the successful execution of a command, a `CommandResult` is generated and passed back to `MainWindow`.
+This `CommandResult` contains the necessary information which the `MainWindow` needs to update the user interface, such as:
+* The feedback to be displayed to the user;
+* Whether to exit the application; and
+* Whether to programmatically switch to a different tab in the user interface.
-Step 1. The user launches the application for the first time. The `VersionedAddressBook` will be initialized with the initial address book state, and the `currentStatePointer` pointing to that single address book state.
+`MainWindow` will then select the tab specified in `CommandResult` as the active tab if applicable.
-
+##### Switching tabs
-Step 2. The user executes `delete 5` command to delete the 5th person in the address book. The `delete` command calls `Model#commitAddressBook()`, causing the modified state of the address book after the `delete 5` command executes to be saved in the `addressBookStateList`, and the `currentStatePointer` is shifted to the newly inserted address book state.
+The following sequence diagram shows how the `CommandResult` is created and returned upon the execution of any command.
+If the command in question is one of those listed above, the UI will switch to the specified tab.
-
+
-Step 3. The user executes `add n/David …` to add a new person. The `add` command also calls `Model#commitAddressBook()`, causing another modified address book state to be saved into the `addressBookStateList`.
+##### Design considerations
-
+The alternative implementations considered, as well as the rationale behind our current implementation are as follows:
-
:information_source: **Note:** If a command fails its execution, it will not call `Model#commitAddressBook()`, so the address book state will not be saved into the `addressBookStateList`.
+| Alternative considered | Current implementation and rationale |
+| ----------- | ------------------------- |
+| Add a method in `MainWindow` which can be called to programmatically switch tabs in the user interface upon execution of the command. | Encapsulate the tab switching information within `CommandResult` to prevent tight coupling of `Logic` and `UI` components. |
-
-Step 4. The user now decides that adding the person was a mistake, and decides to undo that action by executing the `undo` command. The `undo` command will call `Model#undoAddressBook()`, which will shift the `currentStatePointer` once to the left, pointing it to the previous address book state, and restores the address book to that state.
+### Transactions
-
+#### Add transactions feature
-
:information_source: **Note:** If the `currentStatePointer` is at index 0, pointing to the initial AddressBook state, then there are no previous AddressBook states to restore. The `undo` command uses `Model#canUndoAddressBook()` to check if this is the case. If so, it will return an error to the user rather
-than attempting to perform the undo.
+##### Overview
+The add transactions feature allows users to add transactions into the `FinanceTracker`.
+Each new transaction must have the data fields `Title`, `Amount`, `Date`, and `Category`.
-
+Below is the class diagram of the components involved in the add transactions feature.
-The following sequence diagram shows how the undo operation works:
+
-
+##### Implementation of feature
-
:information_source: **Note:** The lifeline for `UndoCommand` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline reaches the end of diagram.
+The add transactions feature is implemented via `AddExpenseCommand` and `AddIncomeCommand`, which are created from `AddExpenseCommandParser` and `AddIncomeCommandParser` respectively.
-
+1. `AddExpenseCommandParser` and `AddIncomeCommandParser` take in the argument string and parses it into an `ArgumentMultimap` that contains all the different data fields mapped (as strings) to their respective prefix.
+1. The strings are then parsed to create the data fields within the Model component (dependency arrows omitted in the above diagram for simplicity).
+1. The parsers use the data fields to create `Expense` or `Income` objects, which are then used to create `AddExpenseCommand` or `AddIncomeCommand` objects.
-The `redo` command does the opposite — it calls `Model#redoAddressBook()`, which shifts the `currentStatePointer` once to the right, pointing to the previously undone state, and restores the address book to that state.
+`FinanceTrackerParser` decides whether `AddExpenseCommandParser` or `AddIncomeCommandParser` is used.
+* On an `add-expense` or `adde` command, `AddExpenseCommandParser` is used.
+* On an `add-income` or `addi` command, `AddIncomeCommandParser` is used.
+* On an `add` command:
+ * `AddExpenseCommandParser` is used if the user is currently on the Expenses tab.
+ * `AddIncomeCommandParser` is used if the user is currently on the Incomes tab.
+ * A `ParseException` is thrown if the user is currently on neither of the above tabs.
-
:information_source: **Note:** If the `currentStatePointer` is at index `addressBookStateList.size() - 1`, pointing to the latest address book state, then there are no undone AddressBook states to restore. The `redo` command uses `Model#canRedoAddressBook()` to check if this is the case. If so, it will return an error to the user rather than attempting to perform the redo.
+##### Adding transactions
-
+Below is the sequence diagram for interactions within the `Logic` and `Model` components when the user inputs the `adde t/Bubble Tea a/5 d/03/10/2020 c/Food & Beverage` command while on the Expenses tab.
+Note that the arguments in the full command string have been abbreviated to `...`.
-Step 5. The user then decides to execute the command `list`. Commands that do not modify the address book, such as `list`, will usually not call `Model#commitAddressBook()`, `Model#undoAddressBook()` or `Model#redoAddressBook()`. Thus, the `addressBookStateList` remains unchanged.
+
-
+When `AddIncomeCommandParser` is used, the sequence diagram is similar, but all occurrences of `Expense` are replaced with `Income`.
-Step 6. The user executes `clear`, which calls `Model#commitAddressBook()`. Since the `currentStatePointer` is not pointing at the end of the `addressBookStateList`, all address book states after the `currentStatePointer` will be purged. Reason: It no longer makes sense to redo the `add n/David …` command. This is the behavior that most modern desktop applications follow.
+The following activity diagram summarizes what happens within `FinanceTrackerParser` when the user executes a new add command:
-
+
-The following activity diagram summarizes what happens when a user executes a new command:
+*Note: The diagram contains many repetitive processes. However, it cannot be simplified due to the limitations of PlantUML.*
-
+##### Design considerations
-#### Design consideration:
+The alternative implementations considered, as well as the rationale behind our current implementation are as follows:
-##### Aspect: How undo & redo executes
+| Alternative considered | Current implementation and rationale |
+| ----------- | ------------------------- |
+| Collapse both `AddExpenseCommandParser` and `AddIncomeCommandParser` into a single `AddTransactionCommandParser` whose result can then be used to create `AddExpenseCommand` or `AddIncomeCommand`. | Keep two separate parsers `AddExpenseCommandParser` and `AddIncomeCommandParser`. Although the `add` command can result in either `AddExpenseCommand` or `AddIncomeCommand`, `adde` will always create `AddExpenseCommand` while `addi` will always create `AddIncomeCommand`. It is more apt to use a specific parser in the latter cases. |
+| Implement either `add` or `adde` + `addi` but not both. This reduces the amount of development work needed. | Both options are implemented to provide the user with a choice for whichever command they feel is most convenient. `add` can be used to add to the currently active tab, while `adde` and `addi` can be used on any tab. |
-* **Alternative 1 (current choice):** Saves the entire address book.
- * Pros: Easy to implement.
- * Cons: May have performance issues in terms of memory usage.
-* **Alternative 2:** Individual command knows how to undo/redo by
- itself.
- * Pros: Will use less memory (e.g. for `delete`, just save the person being deleted).
- * Cons: We must ensure that the implementation of each individual command are correct.
+#### Edit transactions feature
+##### Overview
+The edit transactions feature allows users to edit existing transactions in the `FinanceTracker`.
+At least one of the data fields `Title`, `Amount`, `Date`, and `Category` must be modified.
-_{more aspects and alternatives to be added}_
+Below is the class diagram of the components involved in the edit transactions feature.
-### \[Proposed\] Data archiving
+
-_{Explain here how the data archiving feature will be implemented}_
+##### Implementation of feature
+The edit transactions feature is implemented via `EditCommandParser`, which returns an `EditCommand` that is then used to create `EditExpenseCommand` or `EditIncomeCommand`.
---------------------------------------------------------------------------------------------------------------------
+1. `EditCommandParser` takes in the argument string and parses it into an `ArgumentMultimap` that contains all the different data fields mapped (as strings) to their respective prefix.
+1. The index is parsed into an `Index`, which is used to locate the transaction to be modified during command execution.
+1. The remaining strings are then parsed to create the data fields within the Model component (dependency arrows omitted in the above diagram for simplicity).
+1. The data fields are used to create an `EditTransactionDescriptor` describing all of the new data fields.
+1. The `Index` is combined with the `EditTransactionDescriptor` to return an `EditCommand`.
-## **Documentation, logging, testing, configuration, dev-ops**
+`FinanceTrackerParser` decides whether `EditExpenseCommand` or `EditIncomeCommand` is created from the resulting `EditCommand`.
+* `EditExpenseCommand` is used if the user is currently on the Expenses tab.
+* `EditIncomeCommand` is used if the user is currently on the Incomes tab.
-* [Documentation guide](Documentation.md)
-* [Testing guide](Testing.md)
-* [Logging guide](Logging.md)
-* [Configuration guide](Configuration.md)
-* [DevOps guide](DevOps.md)
+##### Editing transactions
---------------------------------------------------------------------------------------------------------------------
+Below is the sequence diagram for interactions within the `Logic` and `Model` components when the user inputs the `edit 1 a/5` command while on the Expenses tab.
+It is split into two diagrams, one for parsing and one for execution.
+
+
+
+
+
+When `EditExpenseCommand` is used, the sequence diagram is similar, but all occurrences of `Expense` are replaced with `Income`.
+
+The following activity diagram summarizes what happens within `FinanceTrackerParser` when the user executes a new edit command:
+
+
+
+#### Delete transactions feature
+##### Overview
+The delete transactions feature allows users to remove transactions from the `FinanceTracker`.
+
+Below is the class diagram of the components involved in the delete transactions feature.
+
+
+
+##### Implementation of feature
+
+The edit transactions feature is implemented via `DeleteCommandParser`, which returns an `DeleteCommand` that is then used to create `DeleteExpenseCommand` or `DeleteIncomeCommand`.
+
+1. `DeleteCommandParser` take in the argument string and parses the index into an `Index`, which is used to locate the transaction to be deleted during command execution.
+1. The `Index` is used to return a `DeleteCommand`.
+
+`FinanceTrackerParser` decides whether `DeleteExpenseCommand` or `DeleteIncomeCommand` is created from the resulting `DeleteCommand`.
+* `DeleteExpenseCommand` is used if the user is currently on the Expenses tab.
+* `DeleteIncomeCommand` is used if the user is currently on the Incomes tab.
+
+##### Deleting transactions
+
+Below is the sequence diagram for interactions within the `Logic` and `Model` components when the user inputs the `delete 1` command while on the Expenses tab.
+
+
+
+When `DeleteExpenseCommand` is used, the sequence diagram is similar, but all occurrences of `Expense` are replaced with `Income`.
+
+The following activity diagram summarizes what happens within `FinanceTrackerParser` when the user executes a new delete command:
+
+
+
+#### Find transactions feature
+##### Overview
+
+The find transactions feature allows users to search for transactions in the `FinanceTracker` by various search parameters.
+Each search parameter corresponds to a different predicate which will be used to filter transactions in the various `FilteredList`s.
+
+Below is the class diagram of the components involved in the find transactions feature.
+
+
+
+##### Implementation of feature
+
+The find transactions feature is implemented via `FindCommandParser`, as well as the following commands:
+
+* `FindCommand`, the base command that is returned when the command is parsed.
+* `FindTransactionCommand`, to be executed when the user inputs the command on the Overview tab.
+* `FindExpenseCommand`, to be executed when the user inputs the command on the Expenses tab.
+* `FindIncomeCommand`, to be executed when the user inputs the command on the Incomes tab.
+
+`FindCommandParser` takes in the argument string and parses it into an `ArgumentMultimap` that contains all the different search parameters mapped to their respective prefix.
+
+Depending on the parameters present, `FindCommandParser` then creates a `List>` containing the predicates that will be used to filter the transactions.
+It then returns a `FindCommand` containing the list of predicates.
+
+Depending on the UI tab the user inputted the command in, a `FindXYZCommand` (`FindTransactionCommand`, `FindExpenseCommand` or `FindIncomeCommand`) will be created from the base `FindCommand`.
+When executed, the `FindXYZCommand` will combine all of the predicates in the list into a `combinedPredicate`, then sets the predicate of the respective `FilteredList` in `ModelManager` so that only the transactions matching the `combinedPredicate` will be displayed in the UI.
+
+The list of predicates that can be used to filter the `FilteredList`s are as follows:
+* `TitleContainsKeyphrasesPredicate` checks if any of the given keyphrases is present in the transaction's title.
+* `HasExactAmountPredicate` checks if the transaction's amount is equal to the given amount.
+* `OnExactDatePredicate` checks if the transaction's date is equal to the given date.
+* `HasCategoriesPredicate` checks if the transaction's categories contains any of the given categories.
+* `InAmountRangePredicate` checks if the transaction's amount is within the given amount range.
+* `InDateRangePredicate` checks if the transaction's date is within the given date range.
+
+##### Finding transactions
+
+Below is the sequence diagram for interactions within the `Logic` and `Model` components when the user inputs the `"find t/tea a/5"` command while on the Overview tab.
+
+
+
+The following activity diagram summarizes what happens when the user executes a new find command:
+
+
+
+##### Design considerations
+
+The alternative implementations considered, as well as the rationale behind our current implementation are as follows:
+
+| Alternative considered | Current implementation and rationale |
+| ----------- | ------------------------- |
+| Having separate command parsers for each tab in which the find command can be input, e.g. `FindTransactionCommandParser`, `FindExpenseCommandParser` and `FindIncomeCommandParser`, which return a `FindTransactionCommand`, a `FindExpenseCommand` and a `FindIncomeCommand` respectively. | Use only one `FindCommandParser`, which returns a `FindCommand` that is then further split into the respective `FindXYZCommand`. This is because the parsing for the input is similar same regardless of the tab the user is on. |
+| Have `FindCommandParser` take in an `Index` corresponding to the parameter being searched. | Make the input of similar format to that of adding transactions, so that the input can be parsed into an `ArgumentMultimap` which is then used generate the relevant `Predicate`s. This is so that multiple search parameters can be employed in one command. |
+
+### Budgeting
+##### Overview
+
+The budgeting feature allows users to track their remaining budget and current savings based on their set monthly expense limit and monthly savings goal.
+The user sets the monthly expense limit and monthly savings goal, and the remaining budget and current savings will automatically be calculated based on the transactions in the `FinanceTracker`.
+
+The class diagram below depicts the components involved in the budget feature.
+
+
+
+##### Implementation of feature
+
+The budgeting feature is implemented via `MonthlyBudget`, which contains the following fields:
+
+* Two `ObjectProperty` fields for `monthlyExpenseLimit` and `monthlySavingsGoal`.
+* Two `ObjectProperty` fields for `remainingBudget` and `currentSavings`.
+* Three `ObservableList` fields for `monthlyExpenses`, `monthlyIncomes` and `monthlySavings`, which are used for the [Analytics feature](#analytics).
+* An `ObservableList` of `months`, to determine which elements in the `ObservableList` corresponds to which month.
+
+`CalculatedAmount` differs from `Amount` in that a `CalculatedAmount` can be negative, and supports addition and subtraction.
+
+The method that is integral to the `MonthlyBudget` is the `calculateBudgetInfo` method.
+It takes in the current `TransactionList` in the `FinanceTracker` and an integer `numOfMonths`, and recalculates all `CalculatedAmount`s in the `MonthlyBudget` as follows:
+* Sum the amounts of all `Expense`s in the `TransactionList` dated in the current month, subtracts it from `monthlyExpenseLimit`, and sets it as the `remainingBudget`.
+* Sums the amounts of all `Expense`s in the `TransactionList` dated in the current month, subtracts it from the sum of all `Income`s dated in the current month, and sets it as the `currentSavings`.
+* For the past number of months indicated by `numOfMonths` (including the current month), calculate the total expenses, total incomes and total savings for each month and add them to the corresponding `ObservableList`.
+
+The commands that trigger a call of `calculateBudgetInfo` are as follows:
+* `AddExpenseCommand`, `AddIncomeCommand`, `DeleteExpenseCommand` and `DeleteIncomeCommand`, which change the total expenses/incomes of the `Transaction`s in the `TransactionList`.
+* `EditExpenseCommand` and `EditIncomeCommand`, if the `Amount` is edited.
+* `SetExpenseLimitCommand`, which changes the `Amount` in `monthlyExpenseLimit`.
+* `SetSavingsGoalCommand`, which changes the `Amount` in `monthlySavingsGoal`.
+
+`calculateBudgetInfo` is also called by `Storage` whenever the finance tracker data is loaded upon startup.
+
+##### Set monthly spending limit
+
+`SetExpenseLimitCommand` and `SetSavingsGoalCommand` work in similar ways.
+Below is the sequence diagram for interactions within the `Logic` and `Model` components when the user inputs the `"setel a/500"` command.
+
+
+
+The following activity diagram summarizes what happens when the user executes any command that changes the calculated values in `MonthlyBudget` (e.g. setting expense limit):
+
+
+
+##### Design considerations
+
+The alternative implementations considered, as well as the rationale behind our current implementation are as follows:
+
+| Alternative considered | Current implementation and rationale |
+| ----------- | ------------------------- |
+| Use the `Amount` class for calculated amounts. | Use a separate class `CalculatedAmount` for calculated amounts, so as to avoid breaking abstraction and support negative values.
+
+### Bookmark transaction
+
+A bookmark transaction is a template that allows users to create transactions that they make frequently, such as paying phone bills monthly or receiving stipend for being a teaching assistant.
+This feature reduces the hassle of keying in information repeatedly for identical transactions that occur frequently.
+
+A `BookmarkTransaction` is made up of 3 fields: `Title`, `Amount` and `Category`.
+The class diagram below depicts the structure of the `BookmarkTransaction`, `BookmarkExpense`, `BookmarkIncome`, `BookmarkExpenseList` and `BookmarkIncomeList` in the Model component.
+
+
+
+{:.image-caption}
+Class diagram for bookmark transaction model component
+
+#### Add bookmark transactions
+
+##### Overview
+
+The add bookmark transactions feature allows users to add bookmark transactions into the `FinanceTracker`.
+Each new bookmark transaction must have the data fields `Title`, `Amount`, and `Category`.
+
+Below is the class diagram of the components involved in the add transactions feature.
+
+
+
+##### Implementation of feature
+
+The add bookmark transaction feature is implemented via `AddBookmarkExpenseCommand` and `AddBookmarkIncomeCommand`, which are created from `AddBookmarkExpenseCommandParser` and `AddBookmarkIncomeCommandParser` respectively.
+
+1. `AddBookmarkExpenseCommandParser` and `AddBookmarkIncomeCommandParser` take in the argument string and parses it into an `ArgumentMultiMap` that contains all the different data fields mapped (as strings) to their respective prefix.
+
+2. The strings are then parsed to create the data fields within the Model component (dependency arrows omitted in the above diagram for simplicity).
+
+3. The parsers use the data fields to create `BookmarkExpense` or `BookmarkIncome` objects, which are then used to create `AddBookmarkExpenseCommand` or `AddBookmarkIncomeCommand` objects.
+
+
+The following is a detailed elaboration of how `AddBookmarkExpenseCommand` operates.
+
+**Step 1**. After the successful parsing of user input, the `AddBookmarkExpenseCommand#execute(Model model)` method is executed.
+
+**Step 2**. `ModelManager#addBookmarkExpense(toAdd)` is invoked to add the new bookmark expense.
+
+**Step 3**. The new bookmark expense is added into `FinanceTracker#bookmarkExpenses`, via the `FinanceTracker#addBookmarkExpense(BookmarkExpense bookmarkExpense)`.
+
+**Step 4**. This will then call the `BookmarkExpenseList#add(BookmarkExpense toAdd)` method which will check if the title of the new bookmark expense already exists in `BookmarkExpenseList#internalBookmarkExpenseList` via `BookmarkExpenseList#contains(BookmarkExpense toCheck)` before adding it.
+If the title does exist already, the `DuplicateBookmarkTransactionException` will be thrown otherwise the new bookmark expense will be added.
+
+**Step 5**. After successfully adding the new bookmark expense, the command box will be reflected with `AddBookmarkExpenseCommand#MESSAGE_SUCCESS` constant and a new `CommandResult` will be returned with the message.
+
+
+
+{:.image-caption}
+Sequence diagram for adding bookmark expenses
+
+
+
+{:.image-caption}
+Reference frame for sequence diagram
+
+#### Edit bookmark transaction
+
+##### Overview
+
+The edit bookmark transaction feature allows users to edit the details of a specified bookmark transaction in the `FinanceTracker`.
+
+Below is the class diagram of the components involved in the edit bookmark transaction feature.
+
+
+
+{:.image-caption}
+Class diagram of components involved in edit bookmark transaction feature
+
+##### Implementation of feature
+
+> :information_source: `EditBookmarkExpenseCommand` and `EditBookmarkIncomeCommand` work in similar ways.
+
+Following is a detailed elaboration of how `EditBoomarkExpenseCommand` operates.
+
+> :information_source: This command can only be executed on the Expenses tab.
+
+**Step 1**. After the successful parsing of user input, the `EditBookmarkExpenseCommand#execute(Model model)` method is called which checks if the `Index` defined as an argument when instantiating `EditBookmarkCommand(Index targetIndex, EditBookmarkTransactionDescriptor editBookmarkTransactionDescriptor)` is valid.
+It uses `EditBookmarkTransactionDescriptor` to create a new edited bookmark expense.
+Since it is optional for the users to input fields, the fields which are not entered will reuse the existing values that are currently stored and defined in the `BookmarkExpense` object.
+
+> :information_source: The `Index` must be within the bounds of the list of bookmark expenses.
+
+**Step 2**. A new `BookmarkExpense` with the newly updated attributes will be created which replaces the existing `BookmarkExpense` object using `Model#setBookmarkExpense(BookmarkExpense target, BookmarkExpense editedBookmarkExpense)` method.
+
+**Step 3**. The filtered bookmark expense list is then updated with the new `BookmarkExpense` with the `Model#updateFilteredBookmarkExpenseList(PREDICATE_SHOW_ALL_BOOKMARK_EXPENSES)` method.
+
+**Step 4**. The command box will be reflected with the `EditBookmarkExpenseCommand#MESSAGE_EDIT_BOOKMARK_EXPENSE_SUCCESS` constant and a new `CommandResult` will be returned with the success message.
+
+#### Delete bookmark transaction
+
+##### Overview
+
+The delete bookmark transaction feature allows users to delete a specified bookmark transaction in the `FinanceTracker`.
+
+Below is the class diagram of the components involved in the delete bookmark transaction feature.
+
+
+
+{:.image-caption}
+Class diagram of components involved in delete bookmark transaction feature
+
+##### Implementation of feature
+
+> :information_source: `DeleteBookmarkExpenseCommand` and `DeleteBookmarkIncomeCommand` work in similar ways.
+
+Following is a detailed elaboration of how `DeleteBoomarkExpenseCommand` operates.
+
+> :information_source: This command can only be executed on the Expenses tab.
-## **Appendix: Requirements**
+**Step 1**. After the successful parsing of user input, the `DeleteBookmarkExpenseCommand#execute(Model model)` method is called which checks if the `Index` is defined when instantiating the `DeleteBookmarkCommand(Index index)` constructor is valid.
-### Product scope
+> :information_source: The `Index` must be within the bounds of the list of bookmark expenses.
+
+**Step 2**. The `BookmarkExpense` at the specified `Index` is then removed from the `BookmarkExpenseList#internalBookmarkExpenseList` observable list using the `Model#deleteBookmarkExpense(BookmarkExpense bookmarkExpense)` method.
+
+**Step 3**. The command box will be reflected with the `DeleteBookmarkExpenseCommand#MESSAGE_DELETE_BOOKMARK_EXPENSE_SUCCESS` constant and a new `CommandResult` will be returned with the success message.
+
+The following activity diagram summarizes what happens when the user executes any command that deletes a specified bookmark expense:
+
+
+
+{:.image-caption}
+Activity diagram for deleting bookmark expense
+
+#### Convert bookmark transaction
+
+##### Overview
+
+The convert bookmark transaction feature converts a specified bookmark transaction into a transaction and adds it to the `FinanceTracker`.
+
+Below is the class diagram of the components involved in the convert bookmark transaction feature.
+
+
+
+{:.image-caption}
+Class diagram of components involved in convert bookmark transaction feature
+
+##### Implementation of feature
+
+> :information_source: `ConvertBookmarkExpenseCommand` and `ConvertBookmarkIncomeCommand` work in similar ways.
+
+Following is a detailed elaboration of how `ConvertBoomarkExpenseCommand` operates.
+
+> :information_source: This command can only be executed on the Expenses tab.
+
+**Step 1**. After the successful parsing of user input, the `ConvertBookmarkExpenseCommand#execute(Model model)` method is called which checks if the `Index` is defined when instantiating the `ConvertBookmarkCommand(Index index)` constructor is valid.
+
+> :information_source: The `Index` must be within the bounds of the list of bookmark expenses.
+
+**Step 2**. The list of bookmark expenses will then be retrieved by calling `Model#getFilteredBookmarkExpenseList()`.
+
+**Step 3**. The program will then retrieve the specified bookmark expense from the list of bookmark expenses. It will
+then call `BookmarkExpense#convert` on the bookmark expense together with the date the user has inputted and convert
+it to an `Expense` object.
+
+**Step 4**. After converting the `BookmarkExpense` object to an `Expense` object, it will call `Model#addExpense` to add the
+`Expense` object to the expense list in the finance tracker.
+
+**Step 5**. The command box will be reflected with the `ConvertBookmarkExpenseCommand#MESSAGE_CONVERT_BOOKMARK_EXPENSE_SUCCESS` constant and a new `CommandResult` will be returned with the success message.
+
+
+
+{:.image-caption}
+Sequence diagram for converting bookmark expense to expense
+
+
+
+### Analytics
+
+##### Overview
+
+The Analytics feature allows the user to view their spending and saving trends over a period of time.
+Based on the current transaction lists, the total monthly expenses, incomes and savings over the past three months are calculated and displayed in the Analytics Tab in the form of bar charts.
+
+##### Implementation of feature
+
+
+
+When the constructor for `AnalyticsTabPane` is called:
+1. `AnalyticsTabPane` constructor takes in a `MonthlyBudget` object from `Model`.
+1. The `BarChart` objects (`expenseAnalyticsBarChart`, `incomeAnalyticsBarChart` and `savingsAnalyticsBarChart`) are constructed and `Axis` objects are added to them.
+1. The method `AnalyticsTabPane#populateData` is called and takes in the `MonthlyBudget` object.
+ The following fields from `MonthlyBudget` are accessed:
+ * `ObservableList` fields: `monthlyExpenses`, `monthlyIncomes` and `monthlySavings`
+ * `ObservableList` field: `months`
+
+ The method `AnalyticsTabPane#populateDataIn` is called for each `BarChart` object.
+1. In the method `AnalyticsTabPane#populateDataIn`, the values from the above fields in *step 3* are accessed to construct `XY.Data` objects.
+1. The `XY.Data` objects are added to the `BarChart` objects.
+
+##### Design considerations
+
+* An external library, [Data2Viz](https://data2viz.io/), was considered, rather than *JavaFX Charts*, but the former was rejected due to difficulty in implementation.
+
+### Command history
+
+##### Overview
+
+In order to fully replicate the Command Line Interface (CLI) experience, Fine$$e features the ability to navigate through the last 50 commands entered.
+This is done by pressing the ↑ or ↓ arrow keys on the keyboard while focused on the command input box.
+
+The class diagram below depicts the components involved in the command history feature.
+
+
+
+##### Implementation of feature
+
+The command history feature is implemented via `CommandHistory`.
+Whenever the user inputs a command, the command is added to the `CommandHistory` so as to be tracked.
+Note that for this section on the command history, all mentions of 'command' refer to the user input, and not the various `Command`s present in the codebase.
+
+`CommandHistory` is backed by an `EvictingStack`, a data structure that works similarly to a normal Last In First Out (LIFO) stack.
+However, when the `EvictingStack` is full, the bottom-most element of the stack is removed (or in other words, evicted).
+This behaviour is achieved by maintaining a doubly-linked list made out of `Node`s.
+
+Each `Node` keeps track of the following information:
+* Its value, which corresponds to a command in this context.
+* A reference to the next `Node` in the linked list.
+* A reference to the previous `Node` in the linked list.
+
+For the `EvictingStack`, it keeps track of not only the `Node` at the top of the stack, but also the `Node` at the bottom.
+This is so that the bottom-most element can be removed in Θ(1) time.
+Due to the linked list being doubly-linked, we can then also find the next bottom-most element of the `EvictingStack` in constant time.
+
+In addition, `CommandHistory` maintains an internal navigation state that gets reset whenever a new command is entered.
+This internal navigation state keeps track of the current position while traversing the command history using the ↑ and ↓ arrow keys, much like a typical CLI.
+
+##### Navigating the command history
+
+When the ↑ arrow key is pressed, there are two possible scenarios:
+1. The current command in the navigation state is the earliest tracked command.
+ * Nothing happens.
+1. The current command in the navigation state is not the earliest tracked command.
+ * The command immediately preceding the current command is retrieved.
+
+The following activity diagram summarizes what happens when the user presses the ↑ arrow key.
+
+
+
+Similarly, when the ↓ arrow key is pressed, there are two possible scenarios:
+1. The current command in the navigation state is the latest tracked command.
+ * The command input box is cleared.
+1. The current command in the navigation state is not the latest tracked command.
+ * The command immediately succeeding the current command is retrieved.
+
+The following activity diagram summarizes what happens when the user presses the ↓ arrow key.
+
+
+
+##### Design considerations
+
+The alternative implementations considered, as well as the rationale behind our current implementation are as follows:
+
+| Alternative considered | Current implementation and rationale |
+| ----------- | ------------------------- |
+| Use Java's in-built `Stack` class in `CommandHistory`. | Use a custom `EvictingStack` instead, so as to prevent potentially running out of memory if an extremely large number of commands are entered. |
+
+### Data integrity safeguards
+
+##### Overview
+
+Since Fine$$e is an offline desktop application, it is reliant on the system time to perform date validations.
+This makes it vulnerable to changes in the system time while it is running.
+In particular, if the system time were to be changed to an earlier time, the existing data might get corrupted.
+
+##### Implementation of feature
+
+To safeguard against potential loss or corruption of data, Fine$$e tracks the system time across actions via `Timekeeper`, which keeps track of the last observed time.
+Upon launching the application, `Timekeeper` is instantiated with the current system time.
+Subsequently, every time a command is entered by the user, the last observed time in `Timekeeper` is validated against the current system time.
+
+If the current system time is earlier than the last observed time, Fine\$\$e disables itself to prevent data loss.
+A prompt is shown to the user to ensure that their system time is correct before restarting Fine$$e in order to continue using the application.
+Upon relaunching the application, the data file is validated by `JsonFinanceTrackerParser`.
+
+Should the current system time be later than or equals to the last observed time, the last observed time in `Timekeeper` is updated to the current system time.
+
+##### Validating the time whenever a command is executed
+
+The following sequence diagram shows what happens when a command is entered by the user.
+
+
+
+##### Design considerations
+
+The alternative implementations considered, as well as the rationale behind our current implementation are as follows:
+
+| Alternative considered | Current implementation and rationale |
+| ----------- | ------------------------- |
+| Query and use the time from some remote server rather than the system time. | Keep track of the last observed system time so that there is no need for an internet connection to use the application. |
+
+--------------------------------------------------------------------------------------------------------------------
+
+## **Appendix A: Product scope**
**Target user profile**:
-* has a need to manage a significant number of contacts
-* prefer desktop apps over other types
-* can type fast
-* prefers typing to mouse interactions
-* is reasonably comfortable using CLI apps
+* Tertiary student
+* Has a need to track everyday expenses/incomes
+* Wishes to cultivate good saving habits
+* Prefers desktop apps
+* Prefers typing to mouse interactions
-**Value proposition**: manage contacts faster than a typical mouse/GUI driven app
+**Value proposition**: Manage finances and cultivate good financial habits (such as saving) efficiently by typing in CLI commands
+--------------------------------------------------------------------------------------------------------------------
-### User stories
+## **Appendix B: User stories**
Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unlikely to have) - `*`
-| Priority | As a … | I want to … | So that I can… |
-| -------- | ------------------------------------------ | ------------------------------ | ---------------------------------------------------------------------- |
-| `* * *` | new user | see usage instructions | refer to instructions when I forget how to use the App |
-| `* * *` | user | add a new person | |
-| `* * *` | user | delete a person | remove entries that I no longer need |
-| `* * *` | user | find a person by name | locate details of persons without having to go through the entire list |
-| `* *` | user | hide private contact details | minimize chance of someone else seeing them by accident |
-| `*` | user with many persons in the address book | sort persons by name | locate a person easily |
+| Priority | As a … | I want to … | So that I can… |
+| -------- | ------------------------ | ------------------------------- | --------------------------------------------------------------------------- |
+| `* * *` | new user | see usage instructions | refer to instructions when I forget how to use the app |
+| `* * *` | user | add an expense | |
+| `* * *` | user | add an income | |
+| `* * *` | user | view a list of past transactions | keep track of my past expenses/incomes |
+| `* * *` | user | edit a transaction | update expenses/incomes that were entered wrongly |
+| `* * *` | user | delete a transaction | remove expenses/incomes that were entered wrongly |
+| `* * *` | user | group transactions by categories | keep track of my past expenses/incomes across various categories |
+| `* * *` | user | search for transactions | easily find related expenses/incomes |
+| `* * *` | user | bookmark expenses | easily add recurring expenses |
+| `* * *` | user | bookmark incomes | easily add recurring incomes |
+| `* *` | user | set a monthly spending limit | plan the maximum amount I wish to spend for the month |
+| `* *` | user | set a monthly saving goal | work towards saving consistently and reaching my savings goals |
+| `* *` | user | see my remaining monthly budget | track how much I have left to spend for the month |
+| `* *` | user | set a current monthly savings | track how much I have to save to hit my savings goal |
+| `* *` | user | view my saving trends | better plan my future expenses |
+
+--------------------------------------------------------------------------------------------------------------------
+
+## **Appendix C: Use cases**
+
+(For all use cases below, the **System** is `Fine$$e` and the **Actor** is the `user`, unless specified otherwise)
+
+**Use case: UC01 - Add an expense**
+
+**MSS**
+
+1. User requests to add an expense.
+2. Fine$$e adds the expense.
+
+ Use case ends.
+
+**Extensions**
-*{More to be added}*
+* 1a. The given data fields are invalid.
-### Use cases
+ * 1a1. Fine$$e shows an error message.
-(For all use cases below, the **System** is the `AddressBook` and the **Actor** is the `user`, unless specified otherwise)
+ Use case ends.
-**Use case: Delete a person**
+**Use case: UC02 - Edit an expense**
**MSS**
-1. User requests to list persons
-2. AddressBook shows a list of persons
-3. User requests to delete a specific person in the list
-4. AddressBook deletes the person
+1. User requests to list expenses.
+2. Fine$$e shows a list of expenses.
+3. User requests to edit a specific expense.
+4. Fine$$e edits the expense.
Use case ends.
@@ -283,74 +837,709 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
* 3a. The given index is invalid.
- * 3a1. AddressBook shows an error message.
+ * 3a1. Fine$$e shows an error message.
Use case resumes at step 2.
-*{More to be added}*
+* 3b. No data fields are specified.
-### Non-Functional Requirements
+ * 3b1. Fine$$e shows an error message.
-1. Should work on any _mainstream OS_ as long as it has Java `11` or above installed.
-2. Should be able to hold up to 1000 persons without a noticeable sluggishness in performance for typical usage.
-3. A user with above average typing speed for regular English text (i.e. not code, not system admin commands) should be able to accomplish most of the tasks faster using commands than using the mouse.
+ Use case resumes at step 2.
-*{More to be added}*
+* 3c. The given data fields are invalid.
-### Glossary
+ * 3c1. Fine$$e shows an error message.
-* **Mainstream OS**: Windows, Linux, Unix, OS-X
-* **Private contact detail**: A contact detail that is not meant to be shared with others
+ Use case resumes at step 2.
---------------------------------------------------------------------------------------------------------------------
+**Use case: UC03 - Delete an expense**
-## **Appendix: Instructions for manual testing**
+**MSS**
-Given below are instructions to test the app manually.
+1. User requests to list expenses.
+2. Fine$$e shows a list of expenses.
+3. User requests to delete a specific expense.
+4. Fine$$e deletes the expense.
-
:information_source: **Note:** These instructions only provide a starting point for testers to work on;
-testers are expected to do more *exploratory* testing.
+ Use case ends.
-
+**Extensions**
-### Launch and shutdown
+* 2a. The list is empty.
-1. Initial launch
+ Use case ends.
- 1. Download the jar file and copy into an empty folder
+* 3a. The given index is invalid.
- 1. Double-click the jar file Expected: Shows the GUI with a set of sample contacts. The window size may not be optimum.
+ * 3a1. Fine$$e shows an error message.
-1. Saving window preferences
+ Use case resumes at step 2.
- 1. Resize the window to an optimum size. Move the window to a different location. Close the window.
+**Use case: UC04 - Add an income**
- 1. Re-launch the app by double-clicking the jar file.
- Expected: The most recent window size and location is retained.
+**MSS**
-1. _{ more test cases … }_
+1. User requests to add an income
+2. Fine$$e adds the income
-### Deleting a person
+ Use case ends.
-1. Deleting a person while all persons are being shown
+**Extensions**
- 1. Prerequisites: List all persons using the `list` command. Multiple persons in the list.
+* 1a. The given data fields are invalid.
- 1. Test case: `delete 1`
- Expected: First contact is deleted from the list. Details of the deleted contact shown in the status message. Timestamp in the status bar is updated.
+ * 1a1. Fine$$e shows an error message.
- 1. Test case: `delete 0`
- Expected: No person is deleted. Error details shown in the status message. Status bar remains the same.
+ Use case ends.
- 1. Other incorrect delete commands to try: `delete`, `delete x`, `...` (where x is larger than the list size)
- Expected: Similar to previous.
+**Use case: UC05 - Edit an income**
-1. _{ more test cases … }_
+**MSS**
-### Saving data
+1. User requests to list incomes.
+2. Fine$$e shows a list of incomes.
+3. User requests to edit a specific income.
+4. Fine$$e edits the income.
+
+ Use case ends.
+
+**Extensions**
+
+* 2a. The list is empty.
+
+ Use case ends.
+
+* 3a. The given index is invalid.
+
+ * 3a1. Fine$$e shows an error message.
+
+ Use case resumes at step 2.
+
+* 3b. No data fields are specified.
+
+ * 3b1. Fine$$e shows an error message.
+
+ Use case resumes at step 2.
+
+* 3c. The given data fields are invalid.
+
+ * 3c1. Fine$$e shows an error message.
+
+ Use case resumes at step 2.
+
+**Use case: UC06 - Delete an income**
+
+**MSS**
+
+1. User requests to list incomes.
+2. Fine$$e shows a list of incomes.
+3. User requests to delete a specific income.
+4. Fine$$e deletes the income.
+
+ Use case ends.
+
+**Extensions**
+
+* 2a. The list is empty.
+
+ Use case ends.
+
+* 3a. The given index is invalid.
+
+ * 3a1. Fine$$e shows an error message.
+
+ Use case resumes at step 2.
+
+**Use case: UC07 - Set the expense limit**
+
+**MSS**
+
+1. User requests to set the expense limit to a specific amount.
+2. Fine$$e sets the expense limit.
+3. Fine$$e recalculates budget information.
+
+ Use case ends.
+
+**Extensions**
+
+* 2a. The given data field is invalid.
+
+ * 2a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC08 - Set the savings goal**
+
+**MSS**
+
+1. User requests to set the savings goal to a specific amount.
+2. Fine$$e sets the savings goal.
+3. Fine$$e recalculates budget information.
+
+ Use case ends.
+
+**Extensions**
+
+* 2a. The given data field is invalid.
+
+ * 2a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC09 - Add Bookmark Expense**
+
+**MSS**
+
+1. User enters command, together with a title, expense amount and categories related to the bookmark expense.
+2. Fine$$e displays the feedback that a new bookmark expense has been added.
+3. Fine$$e bookmark expenses list panel will reflect the updated bookmark expenses list.
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. Command is invalid.
+
+ * 1a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1b. Title of the new bookmark expense already exists in the bookmark expenses list.
+
+ * 1b1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC10 - Edit Bookmark Expense**
+
+**MSS**
+
+1. User enters command, together with an index of the bookmark expense to edit, and fields to update.
+2. Fine$$e displays feedback that the specific bookmark expense chosen has been edited.
+3. Fine$$e bookmark expenses list will display the updated bookmark expenses list.
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. Command is invalid.
+
+ * 1a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1b. Index given is invalid.
+
+ * 1b1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1c. Title of edited expense already exists in the bookmark expenses list.
+
+ * 1c1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC11 - Delete Bookmark Expense**
+
+**MSS**
+
+1. User enters command, together with index of the bookmark expense to delete.
+2. Fine$$e displays the feedback that the specified bookmark expense is deleted.
+3. Fine$$e’s bookmark expenses list will display the updated bookmark expenses list.
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. Command is invalid.
+
+ * 1a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1b. Bookmark expenses list is empty.
+
+ * 1b1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1c. Index given is invalid.
+
+ * 1c1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC12 - Convert Bookmark Expense**
+
+**MSS**
+
+1. User enters command, together with the index of the bookmark expense to convert and the date of when the user intends to convert the bookmark expense to an expense.
+2. Fine$$e displays the feedback that the specified bookmark expense has been converted and added to the expenses list.
+3. Fine$$e’s expense list will display the updated expenses list.
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. Command is invalid.
+
+ * 1a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1b. Bookmark expenses list is empty.
+
+ * 1b1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1c. Index given is invalid.
+
+ * 1c1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC13 - Add Bookmark Income**
+
+**MSS**
+
+1. User enters command, together with a title, income amount and categories related to the bookmark income.
+2. Fine$$e displays the feedback that a new bookmark income has been added.
+3. Fine$$e bookmark incomes list panel will reflect the updated bookmark incomes list.
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. Command is invalid.
+
+ * 1a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1b. Title of the new bookmark income already exists in the bookmark incomes list.
+
+ * 1b1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC14 - Edit Bookmark Income**
+
+**MSS**
+
+1. User enters command, together with an index of the bookmark income to edit, and fields to update.
+2. Fine$$e displays feedback that the specific bookmark income chosen has been edited.
+3. Fine$$e bookmark incomes list will display the updated bookmark incomes list.
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. Command is invalid.
+
+ * 1a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1b. Index given is invalid.
+
+ * 1b1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1c. Title of edited income already exists in the bookmark incomes list.
+
+ * 1c1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC15 - Delete Bookmark Income**
+
+**MSS**
+
+1. User enters command, together with index of the bookmark income to delete.
+2. Fine$$e displays the feedback that the specified bookmark income is deleted.
+3. Fine$$e’s bookmark incomes list will display the updated bookmark incomes list.
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. Command is invalid.
+
+ * 1a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1b. Bookmark incomes list is empty.
+
+ * 1b1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1c. Index given is invalid.
+
+ * 1c1. Fine$$e shows an error message.
+
+ Use case ends.
+
+**Use case: UC16 - Convert Bookmark Income**
+
+**MSS**
+
+1. User enters command, together with the index of the bookmark income to convert and the date of when the user intends to convert the bookmark income to an income.
+2. Fine$$e displays the feedback that the specified bookmark income has been converted and added to the incomes list.
+3. Fine$$e’s incomes list will display the updated incomes list.
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. Command is invalid.
+
+ * 1a1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1b. Bookmark incomes list is empty.
+
+ * 1b1. Fine$$e shows an error message.
+
+ Use case ends.
+
+* 1c. Index given is invalid.
+
+ * 1c1. Fine$$e shows an error message.
+
+ Use case ends.
+
+--------------------------------------------------------------------------------------------------------------------
+
+## **Appendix D: Non-Functional Requirements**
+
+1. Should work on any mainstream OS as long as it has Java `11` or above installed.
+2. Should be able to hold up to 1000 expenses/incomes without a noticeable sluggishness in performance for typical usage.
+3. A user with above average typing speed for regular English text (i.e. not code, not system admin commands) should be able to accomplish most of the tasks faster using commands than using the mouse.
+4. The data should be stored locally and should be in a human-editable text file.
+5. The data should not be stored in a Database Management System (DBMS).
+6. Should not require an installer.
+7. Should not depend on any remote server.
+
+--------------------------------------------------------------------------------------------------------------------
+
+## **Appendix E: Glossary**
+
+* **Expense**: A single transaction that results in a decrease in cash
+* **Income**: A single transaction that results in an increase in cash
+* **Mainstream OS**: Windows, Linux, Unix, OS-X
+* **Savings**: Net gain (positive) or loss (negative) in cash over a set period of time
+* **Data Fields**: The title, amount, date, and categories that make up an Expense or Income.
+
+--------------------------------------------------------------------------------------------------------------------
+
+## **Appendix F: Instructions for manual testing**
+
+Given below are instructions to test the app manually.
+
+
:information_source: **Note:** These instructions only provide a starting point for testers to work on;
+testers are expected to do more *exploratory* testing.
+
+
+
+### Launch and shutdown
+
+1. Initial launch
+
+ 1. Download the jar file and copy into an empty folder.
+
+ 1. Double-click the jar file.
+ Expected: Shows the GUI with a set of sample data. The window size may not be optimum.
+
+1. Saving window preferences
+
+ 1. Resize the window to an optimum size. Move the window to a different location. Close the window.
+
+ 1. Re-launch the app by double-clicking the jar file.
+ Expected: The most recent window size and location is retained.
+
+### Help and switching tabs
+
+1. View help
+
+ 1. Test case: `help`
+ Expected: UI switches to the user guide.
+
+ 1. Test case: `help me`
+ Expected: There is no change to the UI. An error message is shown as the command cannot have any arguments.
+
+1. Switching tabs
+
+ 1. Test case: `tab 2`
+ Expected: UI switches to the Expenses tab.
+
+ 1. Test case: `tab overview`
+ Expected: UI does not switch tabs. An error message is shown as the command format is invalid.
+
+ 1. Test case: `tab 5`
+ Expected: UI does not switch tabs. An error message is shown as the specified tab does not exist.
+
+### Transactions
+
+1. Adding an expense
+
+ 1. Test case: `add-expense t/Bubble Tea a/5 d/03/10/2020 c/Food & Beverage`
+ Expected: An expense titled `Bubble Tea` is added with the given details. UI switches to the Expenses tab.
+
+ 1. Test case: `add-expense t/Bubble Tea a/5 c/Food c/Beverage`
+ Expected: An expense titled `Bubble Tea` is added with the current date and two categories. UI switches to the Expenses tab.
+
+ 1. Test case: `add-expense t/Bubble Tea`
+ Expected: No expense is added. An error message is shown as the command format is invalid.
+
+ 1. Test case: `add-expense t/Bubble Tea a/5.000 d/03/10/2020 c/Food & Beverage`
+ Expected: No expense is added. An error message is shown as the parameter format is wrong.
+
+ 1. Test case: `add-expense t/ a/5.00 d/03/10/2020 c/Food & Beverage`
+ Expected: No expense is added. An error message is shown as the parameter is empty.
+
+1. Adding an income
+
+ 1. Test case: `add-income t/Internship a/560 d/03/10/2020 c/Work`
+ Expected: An income titled `Internship` is added with the given details. UI switches to the Incomes tab.
+
+ 1. Test case: `add-income t/Internship a/560 c/Work c/Internship`
+ Expected: An expense titled `Internship` is added with the current date and two categories. UI switches to the Incomes tab.
+
+ 1. Test case: `add-income t/Internship`
+ Expected: No expense is added. An error message is shown as the command format is invalid.
+
+ 1. Test case: `add-income t/Internship a/560 d/03-10-2020 c/Work`
+ Expected: No expense is added. An error message is shown as the parameter format is wrong.
+
+ 1. Test case: `add-income t/Internship a/ d/03/10/2020 c/Work`
+ Expected: No expense is added. An error message is shown as the parameter is empty.
+
+1. Editing a transaction
+
+ 1. Prerequisite: UI is on Expenses or Incomes tab. List displayed contains less than 5 transactions.
+
+ 1. Test case: `edit 1 t/Taxi a/10 d/31/10/2020 c/Transport`
+ Expected: First transaction in the list is edited with all details changed.
+
+ 1. Test case: `edit 1 c/`
+ Expected: First transaction in the list is edited with all categories cleared.
+
+ 1. Test case: `edit t/Taxi`
+ Expected: No transaction is edited. An error message is shown as the command format is invalid.
+
+ 1. Test case: `edit 5 a/10`
+ Expected: No transaction is edited. An error message is shown as the index provided is invalid.
+
+ 1. Test case: `edit 1 d/10/31/2020`
+ Expected: No transaction is edited. An error message is shown as the parameter format is wrong.
+
+ 1. Test case: `edit 1 d/`
+ Expected: No transaction is edited. An error message is shown as the parameter is empty.
+
+ 1. Test case: `edit 1`
+ Expected: No transaction is edited. An error message is shown as at least one parameter must be supplied.
+
+1. Deleting a transaction
+
+ 1. Prerequisite: UI is on Expenses or Incomes tab. List displayed contains less than 5 transactions.
+
+ 1. Test case: `delete 1`
+ Expected: First transaction in the list is deleted.
+
+ 1. Test case: `delete first`
+ Expected: No transaction is deleted. An error message is shown as the command format is invalid.
+
+ 1. Test case: `delete 5`
+ Expected: No transaction is deleted. An error message is shown as the index provided is invalid.
+
+1. Listing transactions
+
+ 1. Test case: `ls-expense`
+ Expected: UI switches to Expenses tab. All expenses are listed.
+
+ 1. Test case: `ls-income`
+ Expected: UI switches to Incomes tab. All incomes are listed.
+
+ 1. Test case: `ls-income all`
+ Expected: There is no change in the UI. An error message is shown as the command cannot have any arguments.
+
+1. Finding transactions
+
+ 1. Prerequisite: UI is on Overview, Expenses or Incomes tab.
+
+ 1. Test case: `find t/Bubble Tea`
+ Expected: All transactions in the displayed list containing the keyphrase `Bubble Tea` (case-insensitive) are displayed.
+
+ 1. Test case: `find af/5 c/Food`
+ Expected: All transactions in the displayed list with the category `Food` and amount greater than or equal to `$5.00` are displayed.
+
+ 1. Test case: `find df/01/09/2020 dt/30/09/2020`
+ Expected: All transactions in the displayed list in September 2020 are displayed.
+
+ 1. Test case: `find tea`
+ Expected: There is no change in the UI. An error message is shown as the command format is wrong.
+
+ 1. Test case: `find d/`
+ Expected: There is no change in the UI. An error message is shown as the parameter is empty.
+
+ 1. Test case: `find af/10 at/5`
+ Expected: There is no change in the UI. An error message is shown as the range provided is invalid.
+
+### Budgeting
+
+1. Setting expense limit
+
+ 1. Test case: `set-expense-limit a/500`
+ Expected: UI switches to Overview tab. Monthly expense limit is changed to `$500.00`. Remaining monthly budget is recalculated.
+
+ 1. Test case: `set-expense-limit 500`
+ Expected: Monthly expense limit remains unchanged. An error message is shown as the command format is invalid.
+
+ 1. Test case: `set-expense-limit a/`
+ Expected: Monthly expense limit remains unchanged. An error message is shown as the parameter cannot be empty.
+
+1. Setting savings goal
+
+ 1. Test case: `set-savings-goal a/500`
+ Expected: UI switches to Overview tab. Monthly savings goal is changed to `$500.00`.
+
+ 1. Test case: `set-savings-goal 500`
+ Expected: Monthly savings goal remains unchanged. An error message is shown as the command format is invalid.
+
+ 1. Test case: `set-savings-goal a/`
+ Expected: Monthly savings goal remains unchanged. An error message is shown as the parameter cannot be empty.
+
+### Bookmark transactions
+
+1. Adding a bookmark expense
+
+ 1. Test case: `add-bookmark-expense t/Phone Bill a/24 c/Utilities`
+ Expected: A bookmark expense titled `Phone Bill` is added with the given details. UI switches to the Expenses tab.
+
+ 1. Test case: `add-bookmark-expense t/Phone Bill`
+ Expected: No bookmark expense is added. An error message is shown as the command format is invalid.
+
+ 1. Test case: `add-bookmark-expense t/Phone Bill a/24.0 c/Utilities`
+ Expected: No bookmark expense is added. An error message is shown as the parameter format is wrong.
+
+ 1. Test case: `add-bookmark-expense t/ a/24 c/Utilities`
+ Expected: No bookmark expense is added. An error message is shown as the parameter is empty.
+
+ 1. Test case: `add-bookmark-expense t/Phone Bill a/24 d/10/10/2020 c/Utilities`
+ Expected: No bookmark expense is added. An error message is shown as bookmark expenses should not contain dates.
+
+ 1. Test case: `add-bookmark-expense t/Phone Bill a/24 c/Utilities` (again)
+ Expected: No bookmark expense is added. An error message is shown as duplicate bookmark expenses cannot be added.
+
+1. Adding a bookmark income
+
+ 1. Test case: `add-bookmark-income t/Summer Internship a/1000 c/Work`
+ Expected: A bookmark income titled `Summer Internship` is added with the given details. UI switches to the Income tab.
+
+ 1. Test case: `add-bookmark-income a/1000 c/Work`
+ Expected: No bookmark income is added. An error message is shown as the command format is invalid.
+
+ 1. Test case: `add-bookmark-income t/Summer Internship a/1000.000 c/Work`
+ Expected: No bookmark income is added. An error message is shown as the parameter format is wrong.
+
+ 1. Test case: `add-bookmark-income t/Summer Internship a/ c/Work`
+ Expected: No bookmark income is added. An error message is shown as the parameter is empty.
+
+ 1. Test case: `add-bookmark-income t/Summer Internship a/1000 d/10/10/2020 c/Work`
+ Expected: No bookmark income is added. An error message is shown as bookmark incomes should not contain dates.
+
+ 1. Test case: `add-bookmark-income t/Summer Internship a/1000 c/Work` (again)
+ Expected: No bookmark income is added. An error message is shown as duplicate bookmark incomes cannot be added.
+
+1. Editing a bookmark transaction
+
+ 1. Prerequisite: UI is on Expenses or Incomes tab. List displayed contains less than 5 bookmark transactions.
+
+ 1. Test case: `edit-bookmark 1 t/Taxi a/10 c/Transport`
+ Expected: First bookmark transaction in the list is edited with all details changed.
+
+ 1. Test case: `edit-bookmark 1 c/`
+ Expected: First bookmark transaction in the list is edited with all categories cleared.
+
+ 1. Test case: `edit-bookmark t/Taxi`
+ Expected: No bookmark transaction is edited. An error message is shown as the command format is invalid.
+
+ 1. Test case: `edit-bookmark 5 a/10`
+ Expected: No bookmark transaction is edited. An error message is shown as the index provided is invalid.
+
+ 1. Test case: `edit-bookmark 1 a/12.345`
+ Expected: No bookmark transaction is edited. An error message is shown as the parameter format is wrong.
+
+ 1. Test case: `edit-bookmark 1 d/`
+ Expected: No bookmark transaction is edited. An error message is shown as the parameter is empty.
+
+ 1. Test case: `edit 1`
+ Expected: No bookmark transaction is edited. An error message is shown as at least one parameter must be supplied.
+
+1. Deleting a bookmark transaction
+
+ 1. Prerequisite: UI is on Expenses or Incomes tab. List displayed contains less than 5 bookmark transactions.
+
+ 1. Test case: `delete-bookmark 1`
+ Expected: First bookmark transaction in the list is deleted.
+
+ 1. Test case: `delete-bookmark first`
+ Expected: No bookmark transaction is deleted. An error message is shown as the command format is invalid.
+
+ 1. Test case: `delete-bookmark 5`
+ Expected: No bookmark transaction is deleted. An error message is shown as the index provided is invalid.
+
+1. Converting a bookmark transaction
+
+ 1. Prerequisite: UI is on Expenses or Incomes tab. List displayed contains less than 5 bookmark transactions.
+
+ 1. Test case: `convert-bookmark 1 d/10/10/2020`
+ Expected: First bookmark transaction in the list is converted to a transaction with the given date.
+
+ 1. Test case: `convert-bookmark 1 c/`
+ Expected: First bookmark transaction in the list is converted to a transaction with the current date.
+
+ 1. Test case: `convert-bookmark d/10/10/2020`
+ Expected: No bookmark transaction is converted. An error message is shown as the command format is invalid.
+
+ 1. Test case: `convert-bookmark 5 d/10/10/2020`
+ Expected: No bookmark transaction is converted. An error message is shown as the index provided is invalid.
+
+ 1. Test case: `convert-bookmark 1 d/10/31/2020`
+ Expected: No bookmark transaction is converted. An error message is shown as the parameter format is wrong.
+
+ 1. Test case: `convert-bookmark 1 d/`
+ Expected: No bookmark transaction is converted. An error message is shown as the parameter is empty.
+
+### Saving data
+
+1. Dealing with missing data files
+
+ 1. Delete the file `fine$$e.json` in the `data` folder.
+
+ 1. Launch the app by double-clicking the jar file.
+ Expected: Shows the GUI with a set of sample data.
+
+1. Dealing with corrupted data files
+
+ 1. Replace the contents of `fine$$e.json` in the `data` folder with the text `File Corrupted`.
+
+ 1. Launch the app by double-clicking the jar file.
+ Expected: Shows the GUI with no data.
+
+1. Deleting data file while app is running
+
+ 1. Launch the app by double-clicking the jar file.
-1. Dealing with missing/corrupted data files
+ 1. While the app is running, delete the file `fine$$e.json` in the `data` folder.
- 1. _{explain how to simulate a missing/corrupted file, and the expected behavior}_
+ 1. Close the app.
+ Expected: `fine$$e.json` is regenerated with the data from the app.
-1. _{ more test cases … }_
diff --git a/docs/Documentation.md b/docs/Documentation.md
deleted file mode 100644
index 77c5ba73f66..00000000000
--- a/docs/Documentation.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: page
-title: Documentation guide
----
-
-**Setting up and maintaining the project website:**
-
-* We use [**Jekyll**](https://jekyllrb.com/) to manage documentation.
-* The `docs/` folder is used for documentation.
-* To learn how set it up and maintain the project website, follow the guide [_[se-edu/guides] **Using Jekyll for project documentation**_](https://se-education.org/guides/tutorials/jekyll.html).
-
-
-**Style guidance:**
-
-* Follow the [**_Google developer documentation style guide_**](https://developers.google.com/style).
-
-* Also relevant is the [_[se-edu/guides] **Markdown coding standard**_](https://se-education.org/guides/conventions/markdown.html)
-
-**Diagrams:**
-
-* See the [_[se-edu/guides] **Using PlantUML**_](https://se-education.org/guides/tutorials/plantUml.html)
-
-**Converting a document to the PDF format:**
-
-* See the guide [_[se-edu/guides] **Saving web documents as PDF files**_](https://se-education.org/guides/tutorials/savingPdf.html)
diff --git a/docs/GanttChart.md b/docs/GanttChart.md
new file mode 100644
index 00000000000..2461964b42d
--- /dev/null
+++ b/docs/GanttChart.md
@@ -0,0 +1,7 @@
+---
+layout: chart
+title: Gantt Chart
+---
+
+
diff --git a/docs/Gemfile b/docs/Gemfile
index 999a7099d8d..696877ea7c5 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -5,5 +5,15 @@ source "https://rubygems.org"
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
gem 'jekyll'
-gem 'github-pages', group: :jekyll_plugins
+gem 'minima'
+gem 'jekyll-coffeescript'
+gem 'jekyll-default-layout'
+gem 'jekyll-gist'
+gem 'jekyll-github-metadata'
+gem 'jekyll-optional-front-matter'
+gem 'jekyll-paginate'
+gem 'jekyll-readme-index'
+gem 'jekyll-titles-from-headings'
+gem 'jekyll-relative-links'
gem 'wdm', '~> 0.1.0' if Gem.win_platform?
+gem 'jekyll-spaceship', git: 'https://github.com/AY2021S1-CS2103T-W16-3/jekyll-spaceship.git'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 4caff5b900c..ae25549aa28 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,88 +1,34 @@
+GIT
+ remote: https://github.com/AY2021S1-CS2103T-W16-3/jekyll-spaceship.git
+ revision: 710f3039aa9a7f344079cb9bd9532778805eb7b8
+ specs:
+ jekyll-spaceship (0.9.2)
+ gemoji (~> 4.0.0.rc2)
+ jekyll (>= 3.6, < 5.0)
+ nokogiri (~> 1.6)
+ rainbow (~> 3.0)
+
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.0.3.1)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.11.1)
+ coffee-script-source (1.12.2)
colorator (1.1.0)
- commonmarker (0.17.13)
- ruby-enum (~> 0.5)
concurrent-ruby (1.1.6)
- dnsruby (1.61.3)
- addressable (~> 2.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
- ethon (0.12.0)
- ffi (>= 1.3.0)
eventmachine (1.2.7-x64-mingw32)
execjs (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.12.2-x64-mingw32)
forwardable-extended (2.6.0)
- gemoji (3.0.1)
- github-pages (204)
- github-pages-health-check (= 1.16.1)
- jekyll (= 3.8.5)
- jekyll-avatar (= 0.7.0)
- jekyll-coffeescript (= 1.1.1)
- jekyll-commonmark-ghpages (= 0.1.6)
- jekyll-default-layout (= 0.1.4)
- jekyll-feed (= 0.13.0)
- jekyll-gist (= 1.5.0)
- jekyll-github-metadata (= 2.13.0)
- jekyll-mentions (= 1.5.1)
- jekyll-optional-front-matter (= 0.3.2)
- jekyll-paginate (= 1.1.0)
- jekyll-readme-index (= 0.3.0)
- jekyll-redirect-from (= 0.15.0)
- jekyll-relative-links (= 0.6.1)
- jekyll-remote-theme (= 0.4.1)
- jekyll-sass-converter (= 1.5.2)
- jekyll-seo-tag (= 2.6.1)
- jekyll-sitemap (= 1.4.0)
- jekyll-swiss (= 1.0.0)
- jekyll-theme-architect (= 0.1.1)
- jekyll-theme-cayman (= 0.1.1)
- jekyll-theme-dinky (= 0.1.1)
- jekyll-theme-hacker (= 0.1.1)
- jekyll-theme-leap-day (= 0.1.1)
- jekyll-theme-merlot (= 0.1.1)
- jekyll-theme-midnight (= 0.1.1)
- jekyll-theme-minimal (= 0.1.1)
- jekyll-theme-modernist (= 0.1.1)
- jekyll-theme-primer (= 0.5.4)
- jekyll-theme-slate (= 0.1.1)
- jekyll-theme-tactile (= 0.1.1)
- jekyll-theme-time-machine (= 0.1.1)
- jekyll-titles-from-headings (= 0.5.3)
- jemoji (= 0.11.1)
- kramdown (= 1.17.0)
- liquid (= 4.0.3)
- mercenary (~> 0.3)
- minima (= 2.5.1)
- nokogiri (>= 1.10.4, < 2.0)
- rouge (= 3.13.0)
- terminal-table (~> 1.4)
- github-pages-health-check (1.16.1)
- addressable (~> 2.3)
- dnsruby (~> 1.60)
- octokit (~> 4.0)
- public_suffix (~> 3.0)
- typhoeus (~> 1.3)
- html-pipeline (2.12.3)
- activesupport (>= 2)
- nokogiri (>= 1.4)
+ gemoji (4.0.0.rc2)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
@@ -99,18 +45,9 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
- jekyll-avatar (0.7.0)
- jekyll (>= 3.0, < 5.0)
- jekyll-coffeescript (1.1.1)
+ jekyll-coffeescript (2.0.0)
coffee-script (~> 2.2)
- coffee-script-source (~> 1.11.1)
- jekyll-commonmark (1.3.1)
- commonmarker (~> 0.14)
- jekyll (>= 3.7, < 5.0)
- jekyll-commonmark-ghpages (0.1.6)
- commonmarker (~> 0.17.6)
- jekyll-commonmark (~> 1.2)
- rouge (>= 2.0, < 4.0)
+ coffee-script-source (~> 1.12)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.13.0)
@@ -120,77 +57,21 @@ GEM
jekyll-github-metadata (2.13.0)
jekyll (>= 3.4, < 5.0)
octokit (~> 4.0, != 4.4.0)
- jekyll-mentions (1.5.1)
- html-pipeline (~> 2.3)
- jekyll (>= 3.7, < 5.0)
jekyll-optional-front-matter (0.3.2)
jekyll (>= 3.0, < 5.0)
jekyll-paginate (1.1.0)
jekyll-readme-index (0.3.0)
jekyll (>= 3.0, < 5.0)
- jekyll-redirect-from (0.15.0)
- jekyll (>= 3.3, < 5.0)
jekyll-relative-links (0.6.1)
jekyll (>= 3.3, < 5.0)
- jekyll-remote-theme (0.4.1)
- addressable (~> 2.0)
- jekyll (>= 3.5, < 5.0)
- rubyzip (>= 1.3.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
- jekyll-sitemap (1.4.0)
- jekyll (>= 3.7, < 5.0)
- jekyll-swiss (1.0.0)
- jekyll-theme-architect (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-cayman (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-dinky (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-hacker (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-leap-day (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-merlot (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-midnight (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-minimal (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-modernist (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-primer (0.5.4)
- jekyll (> 3.5, < 5.0)
- jekyll-github-metadata (~> 2.9)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-slate (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-tactile (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-time-machine (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
jekyll-titles-from-headings (0.5.3)
jekyll (>= 3.3, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
- jemoji (0.11.1)
- gemoji (~> 3.0)
- html-pipeline (~> 2.2)
- jekyll (>= 3.0, < 5.0)
kramdown (1.17.0)
liquid (4.0.3)
listen (3.2.1)
@@ -202,9 +83,8 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
- minitest (5.14.1)
multipart-post (2.1.1)
- nokogiri (1.10.9-x64-mingw32)
+ nokogiri (1.10.10-x64-mingw32)
mini_portile2 (~> 2.4.0)
octokit (4.18.0)
faraday (>= 0.9)
@@ -212,13 +92,11 @@ GEM
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
+ rainbow (3.0.0)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.13.0)
- ruby-enum (0.8.0)
- i18n
- rubyzip (2.3.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
@@ -228,23 +106,24 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
- terminal-table (1.8.0)
- unicode-display_width (~> 1.1, >= 1.1.1)
- thread_safe (0.3.6)
- typhoeus (1.4.0)
- ethon (>= 0.9.0)
- tzinfo (1.2.7)
- thread_safe (~> 0.1)
- unicode-display_width (1.7.0)
wdm (0.1.1)
- zeitwerk (2.3.0)
PLATFORMS
x64-mingw32
DEPENDENCIES
- github-pages
jekyll
+ jekyll-coffeescript
+ jekyll-default-layout
+ jekyll-gist
+ jekyll-github-metadata
+ jekyll-optional-front-matter
+ jekyll-paginate
+ jekyll-readme-index
+ jekyll-relative-links
+ jekyll-spaceship!
+ jekyll-titles-from-headings
+ minima
wdm (~> 0.1.0)
BUNDLED WITH
diff --git a/docs/Logging.md b/docs/Logging.md
deleted file mode 100644
index 5e4fb9bc217..00000000000
--- a/docs/Logging.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: page
-title: Logging guide
----
-
-* We are using `java.util.logging` package for logging.
-* The `LogsCenter` class is used to manage the logging levels and logging destinations.
-* The `Logger` for a class can be obtained using `LogsCenter.getLogger(Class)` which will log messages according to the specified logging level.
-* Log messages are output through the console and to a `.log` file.
-* The output logging level can be controlled using the `logLevel` setting in the configuration file (See the [Configuration guide](Configuration.md) section).
-* **When choosing a level for a log message**, follow the conventions given in [_[se-edu/guides] Java: Logging conventions_](https://se-education.org/guides/conventions/java/logging.html).
diff --git a/docs/Minutes.md b/docs/Minutes.md
new file mode 100644
index 00000000000..6a8d4a3e867
--- /dev/null
+++ b/docs/Minutes.md
@@ -0,0 +1,15 @@
+---
+layout: page
+title: Meeting Minutes
+---
+
+
+ {% assign sorted_minutes = site.pages | sort: "date" | reverse %}
+ {% for page in sorted_minutes %}
+ {% if page.layout == "minutes" %}
+
diff --git a/docs/NoExternalSite.html b/docs/NoExternalSite.html
new file mode 100644
index 00000000000..393ada70906
--- /dev/null
+++ b/docs/NoExternalSite.html
@@ -0,0 +1,13 @@
+---
+layout: widescreen
+title: No External Site
+---
+
+
+
+ Not allowed to navigate to external sites.
+
+
+ Click on any link in the header to navigate back.
+
+
diff --git a/docs/SettingUp.md b/docs/SettingUp.md
deleted file mode 100644
index b89b691fed9..00000000000
--- a/docs/SettingUp.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-layout: page
-title: Setting up and getting started
----
-
-* Table of Contents
-{:toc}
-
-
---------------------------------------------------------------------------------------------------------------------
-
-## Setting up the project in your computer
-
-
:exclamation: **Caution:**
-
-Follow the steps in the following guide precisely. Things will not work out if you deviate in some steps.
-
-
-First, **fork** this repo, and **clone** the fork into your computer.
-
-If you plan to use Intellij IDEA (highly recommended):
-1. **Configure the JDK**: Follow the guide [_[se-edu/guides] IDEA: Configuring the JDK_](https://se-education.org/guides/tutorials/intellijJdk.html) to to ensure Intellij is configured to use **JDK 11**.
-1. **Import the project as a Gradle project**: Follow the guide [_[se-edu/guides] IDEA: Importing a Gradle project_](https://se-education.org/guides/tutorials/intellijImportGradleProject.html) to import the project into IDEA.
- :exclamation: Note: Importing a Gradle project is slightly different from importing a normal Java project.
-1. **Verify the setup**:
- 1. Run the `seedu.address.Main` and try a few commands.
- 1. [Run the tests](Testing.md) to ensure they all pass.
-
---------------------------------------------------------------------------------------------------------------------
-
-## Before writing code
-
-1. **Configure the coding style**
-
- If using IDEA, follow the guide [_[se-edu/guides] IDEA: Configuring the code style_](https://se-education.org/guides/tutorials/checkstyle.html) to set up IDEA's coding style to match ours.
-
-
:bulb: **Tip:**
-
- Optionally, you can follow the guide [_[se-edu/guides] Using Checkstyle_](https://se-education.org/guides/tutorials/checkstyle.html) to find how to use the CheckStyle within IDEA e.g., to report problems _as_ you write code.
-
-
-1. **Set up CI**
-
- This project comes with a GitHub Actions config files (in `.github/workflows` folder). When GitHub detects those files, it will run the CI for your project automatically at each push to the `master` branch or to any PR. No set up required.
-
-1. **Learn the design**
-
- When you are ready to start coding, we recommend that you get some sense of the overall design by reading about [AddressBook’s architecture](DeveloperGuide.md#architecture).
-
-1. **Do the tutorials**
- These tutorials will help you get acquainted with the codebase.
-
- * [Tracing code](tutorials/TracingCode.md)
- * [Removing fields](tutorials/RemovingFields.md)
- * [Adding a new command](tutorials/AddRemark.md)
diff --git a/docs/Testing.md b/docs/Testing.md
deleted file mode 100644
index 8a99e82438a..00000000000
--- a/docs/Testing.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-layout: page
-title: Testing guide
----
-
-* Table of Contents
-{:toc}
-
---------------------------------------------------------------------------------------------------------------------
-
-## Running tests
-
-There are two ways to run tests.
-
-* **Method 1: Using IntelliJ JUnit test runner**
- * To run all tests, right-click on the `src/test/java` folder and choose `Run 'All Tests'`
- * To run a subset of tests, you can right-click on a test package,
- test class, or a test and choose `Run 'ABC'`
-* **Method 2: Using Gradle**
- * Open a console and run the command `gradlew clean test` (Mac/Linux: `./gradlew clean test`)
-
-
:link: **Link**: Read [this Gradle Tutorial from the se-edu/guides](https://se-education.org/guides/tutorials/gradle.html) to learn more about using Gradle.
-
-
---------------------------------------------------------------------------------------------------------------------
-
-## Types of tests
-
-This project has three types of tests:
-
-1. *Unit tests* targeting the lowest level methods/classes.
- e.g. `seedu.address.commons.StringUtilTest`
-1. *Integration tests* that are checking the integration of multiple code units (those code units are assumed to be working).
- e.g. `seedu.address.storage.StorageManagerTest`
-1. Hybrids of unit and integration tests. These test are checking multiple code units as well as how the are connected together.
- e.g. `seedu.address.logic.LogicManagerTest`
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index b91c3bab04d..7a169dfe04f 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -3,176 +3,1084 @@ layout: page
title: User Guide
---
-AddressBook Level 3 (AB3) is a **desktop app for managing contacts, optimized for use via a Command Line Interface** (CLI) while still having the benefits of a Graphical User Interface (GUI). If you can type fast, AB3 can get your contact management tasks done faster than traditional GUI apps.
+
+ * Table of Contents
+ {:toc}
+
+
+--------------------------------------------------------------------------------------------------------------------
+## 1. Introduction
+
+### 1.1 About Fine$$e
+
+Welcome to Fine$$e - your personal finance tracker!
+
+Looking for an all-in-one solution to help you develop good financial habits? Look no further!
+
+Fine\\$\\$e is an integrated platform fully customized for tertiary (including university) students with the aim of helping you to track your finances effectively.
+Fine\\$\\$e allows you to keep track of your incomes, expenses and savings with a few simple commands.
+Furthermore, to help you cultivate good financial habits, Fine$$e allows you to budget your finances by setting an expense limit and savings goal, as well as viewing your past spending and saving trends.
+
+Commands can be input easily via the Command Line Interface (CLI), and the information you provide Fine$$e with will be displayed on our sleek Graphical User Interface (GUI).
+
+If you wish to better manage your finances while cultivating good financial habits, then Fine\$\$e is definitely the application for you!
-* Table of Contents
-{:toc}
+Explore our User Guide to find out more about Fine\$\$e’s amazing features.
+
+### 1.2 Navigating the User Guide
+
+The aim of the User Guide is to provide you with all the necessary information required for you to fully utilize Fine$$e.
+We have ensured that the information provided is concise, accessible and easily readable.
+
+Head to [Section 2. "Quick Start"](#2-quick-start) for help on setting up.
+
+[Section 3. "Overview of Features"](#3-overview-of-features) provides a brief overview of Fine\$\$e's myriad of features, while [Section 4. "Features"](#4-features) contains an in-depth breakdown of all the features that Fine\$\$e has to offer.
+
+If you have forgotten the input format for a particular command, fret not as [Section 5. "Command Summary"](#5-command-summary) contains a list of all Fine$$e's command input formats.
+
+A list of the terms used in this user guide as well as their definitions is available in [Section 6. Glossary](#6-glossary).
+
+If you have any questions regarding Fine$$e, do check out [Section 7. FAQ](#7-faq).
+
+
+
+Do take note of the following symbols and formatting used throughout this document:
+
+`Code in code blocks are for user input, Fine$$e data values, or file names.`
+
+:bulb: This is used to indicate useful tips and tricks.
+
+:information_source: This indicates useful information.
+
+:warning: This indicates important information.
+
+
--------------------------------------------------------------------------------------------------------------------
+## 2. Quick start
+
+This section contains a step-by-step guide on how to install Fine\\$\\$e and get it to work on your computer.
+It also shows the various components that make up Fine\\$\\$e's user interface.
+
+Let's get started!
-## Quick start
+### 2.1 Installation
-1. Ensure you have Java `11` or above installed in your Computer.
+1. Ensure you have Java 11 or above installed in your computer.
-1. Download the latest `addressbook.jar` from [here](https://github.com/se-edu/addressbook-level3/releases).
+1. Download the latest version of `finesse.jar` from [here](https://github.com/AY2021S1-CS2103T-W16-3/tp/releases).
-1. Copy the file to the folder you want to use as the _home folder_ for your AddressBook.
+1. Copy the file to the folder you want to use as the *home folder* for Fine$$e.
+
+1. Double-click the file to start the app.
+The Fine$$e GUI should appear in a few seconds, with sample data included, similar to the below image.
-1. Double-click the file to start the app. The GUI similar to the below should appear in a few seconds. Note how the app contains some sample data.
-1. Type the command in the command box and press Enter to execute it. e.g. typing **`help`** and pressing Enter will open the help window.
+1. Type a command in the command box and press Enter to execute it.
+ e.g. typing `help` and pressing Enter will bring up this user guide in the finance tracker.
Some example commands you can try:
- * **`list`** : Lists all contacts.
+ * `list`: Lists all transactions in the current list.
+
+ * `add-expense t/Bubble Tea a/5 d/03/10/2020 c/Food & Beverage`:
+ Adds an expense with the title `Bubble Tea`, amount `$5.00`, date `03/10/2020` and category `Food & Beverage` to the finance tracker. The UI switches to the [Expenses tab](#223-expenses-tab).
+
+ * `tab 3`: Switches to the [Expenses tab](#223-expenses-tab).
+
+ * `delete 3`: Deletes the 3rd transaction shown in the current list.
+ Note that this command only works in the [Expenses tab](#223-expenses-tab) and the [Incomes tab](#222-incomes-tab).
+
+ * `exit`: Exits the app.
+
+1. Once you are comfortable with the various features in Fine\\$\\$e, [clear the sample data](#410-clear-data-clear) by typing `clear`, pressing Enter,
+typing `clear` again, and pressing Enter again.
+
+1. Start tracking your own finances with Fine\\$\\$e!
+
+### 2.2 Layout of Fine$$e's Interface
- * **`add`**`n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01` : Adds a contact named `John Doe` to the Address Book.
+The user interface of Fine$$e is divided into 4 tabs, each serving a specific purpose.
- * **`delete`**`3` : Deletes the 3rd contact shown in the current list.
+#### 2.2.1 Overview Tab
- * **`clear`** : Deletes all contacts.
+Displays a list of all recent transactions (both [incomes](#44-income) and [expenses](#43-expense)), along with your [expense limit](#47-expense-limit), [savings goal](#48-savings-goal), remaining budget and current savings.
- * **`exit`** : Exits the app.
+> :information_source: Transaction amounts are prepended with either `+` or `-` so as to distinguish between [incomes](#44-income) and [expenses](#43-expense) respectively.
+> In the case of the latter, the amount is also highlighted in red.
+> This applies only to the Overview tab.
-1. Refer to the [Features](#features) below for details of each command.
+
+
+#### 2.2.2 Incomes Tab
+
+Displays a list of [incomes](#44-income) and [bookmark incomes](#46-bookmark-income).
+
+
+
+#### 2.2.3 Expenses Tab
+
+Displays a list of [expenses](#43-expense) and [bookmark expenses](#45-bookmark-expense).
+
+
+
+#### 2.2.4 Analytics Tab
+
+Displays chart visualizations of your monthly expenses, incomes and savings.
+
+
--------------------------------------------------------------------------------------------------------------------
-## Features
+## 3. Overview of Features
+
+This section will provide you with a brief overview of Fine\\$\\$e, so that you may get a better sense of Fine\\$\\$e’s basic functionalities before diving into its specific commands.
+1. Manage your incomes and expenses easily
+ * Track incomes/expenses by entering their details e.g title, amount, date
+ * Categorize your incomes and expenses to better organize your finances
+ * Search for incomes/expenses easily by keywords
+1. Add bookmark transactions
+ * Create templates for transactions that occur regularly so that frequent expenses/incomes can be added to the finance tracker more conveniently
+1. Budgeting
+ * Set a monthly expense limit to track your remaining budget for the month
+ * Set a monthly savings goal to help you cultivate good saving habits
+1. Analytics
+ * View trends in your finances to analyze your spending and saving habits and better plan for the future
+
+--------------------------------------------------------------------------------------------------------------------
+
+## 4. Features
+
+This section aims to provide you with in-depth details of Fine\$\$e's unique features, with relevant examples.
-**:information_source: Notes about the command format:**
+**:information_source: Notes about the command format:**
* Words in `UPPER_CASE` are the parameters to be supplied by the user.
- e.g. in `add n/NAME`, `NAME` is a parameter which can be used as `add n/John Doe`.
+ e.g. in `add-expense t/TITLE`, `TITLE` is a parameter which can be used as `add t/Bubble Tea`.
-* Items in square brackets are optional.
- e.g `n/NAME [t/TAG]` can be used as `n/John Doe t/friend` or as `n/John Doe`.
+* Items in square brackets (`[]`) are optional.
+ e.g `t/TITLE [c/CATEGORY]` can be used as `t/Bubble Tea c/Food & Beverage` or as `t/Bubble Tea`.
-* Items with `…` after them can be used multiple times including zero times.
- e.g. `[t/TAG]…` can be used as ` ` (i.e. 0 times), `t/friend`, `t/friend t/family` etc.
+* Items in square brackets, with `...` after the parameter, can be used multiple times (including zero times).
+ e.g. `[c/CATEGORY...]` can be used as `c/Food & Beverage`, `c/Food & Beverage c/Tea` etc, or even omitted completely.
* Parameters can be in any order.
- e.g. if the command specifies `n/NAME p/PHONE_NUMBER`, `p/PHONE_NUMBER n/NAME` is also acceptable.
+ e.g. if the command specifies `t/TITLE a/AMOUNT`, `a/AMOUNT t/TITLE` is also acceptable.
+
+* Any leading/trailing whitespaces for the parameters or the user input as a whole will be ignored.
+ e.g. ` find t/Bubble Tea`, `find t/ Bubble Tea` and `find t/Bubble Tea ` will be treated as `find t/Bubble Tea`.
-### Viewing help : `help`
+
+
+**:warning: IMPORTANT :warning:**
+
+The formats of the parameters used in the rest of the document are as follows:
+* `TITLE`, `TITLE_KEYPHRASE` and `CATEGORY` should consist of printable ASCII characters.
+ * The set of printable ASCII characters consists of alphanumeric characters, space, and several special characters.
+ Below is an exhaustive list of printable ASCII characters (excluding line breaks):
+ ```
+ 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijkl
+ mnopqrstuvwxyz !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
+ ```
+* `AMOUNT`, `AMOUNT_FROM` and `AMOUNT_TO` should each be a non-negative number with up to 8 digits before the decimal point and with 0 or 2 decimal places.
+ An optional `$` may be included in front as well.
+* `DATE`, `DATE_FROM` and `DATE_TO` should each be a valid calendar date in `dd/mm/yyyy` format, representing day, month, and year respectively.
+ * Valid ranges for days and months are governed by the rules of the [Gregorian Calendar](https://en.wikipedia.org/wiki/Gregorian_calendar#Description).
+ * Months should only range from 1 to 12 (inclusive), representing the 12 months in a year.
+ * Days should only range from 1 to 28, 29, 30, or 31 (all inclusive),
+ depending on the number of days in the given month and whether the given year is a leap year.
+ * For day and month values, single-digit values must be padded with leading zeroes, meaning that a value of 5 should be written as `05` instead of `5`.
+ * For year values, it must be written in the standard 4-digit format, so 2019 should be written as `2019` and not just `19`.
+ * Dates cannot be earlier than 1 January 1970 (`01/01/1970`).
+ * Dates cannot be later than the current date.
+* `INDEX` should be a positive integer.
+
+Unless stated otherwise, only one input per parameter is allowed for each command.
+
+Furthermore, within each command, any other parameters other than the ones listed in each command format are considered invalid.
+The command will not be executed, and an error message will be displayed, if any invalid parameters are present.
+
+
-Shows a message explaning how to access the help page.
+### 4.1 View Help: `help`
-
+Brings up the user guide.
Format: `help`
+Example Usage:
+```
+help
+```
-### Adding a person: `add`
+Expected Outcome:
+```
+Opened help window.
+```
-Adds a person to the address book.
+
-Format: `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…`
+The user guide is shown in the application.
-
:bulb: **Tip:**
-A person can have any number of tags (including 0)
-
+### 4.2 Switch Tabs: `tab`
+
+Switches the current tab on Fine$$e.
+
+Format: `tab INDEX`
+* Switches to the tab corresponding to the specified `INDEX`. For the `tab` command, `INDEX` **must be 1, 2, 3 or 4**.
+ * Index 1 switches to the [Overview tab](#221-overview-tab).
+ * Index 2 switches to the [Incomes tab](#222-incomes-tab).
+ * Index 3 switches to the [Expenses tab](#223-expenses-tab).
+ * Index 4 switches to the [Analytics tab](#224-analytics-tab).
+
+Example:
+* `tab 3`
+
+Example Usage:
+```
+tab 1
+```
+
+Expected Outcome:
+```
+Switched to overview tab.
+```
+The application switches to the Overview tab.
+
+### 4.3 Expense
+
+An **expense** represents you *paying money for something*.
+It could be textbooks for the new semester, that cup of bubble tea you drank the other day, or even taking public transport.
+
+To help you manage your finances, Fine\$\$e records the following information about each of your expenses:
+1. **Title**: A descriptive title, to remind you what the expense was about.
+1. **Amount**: How much money you paid, to calculate how much you have spent in total.
+1. **Date**: The date the payment took place, to track your spending over periods of time.
+1. **Categories**: Any number of categories, to help you group related expenses together.
+
+#### 4.3.1 Add Expense: `add-expense`
+
+Adds an expense to the finance tracker.
+
+> :information_source: After executing this command, the UI will automatically switch to the [Expenses tab](#223-expenses-tab).
+
+Format: `add-expense t/TITLE a/AMOUNT [d/DATE] [c/CATEGORY...]`
+
+* `DATE` is optional; if `DATE` is not given, the current date is used.
+* `CATEGORY` is optional. Multiple `c/` prefixes can be used to specify multiple categories.
+
+Shortcuts: `adde`; (when on the [Expenses tab](#223-expenses-tab)) `add`
+
+Examples:
+* `add-expense t/Starbucks Coffee a/8.90 d/25/10/2020`
+* `adde t/Taxi Home from School a/$13 c/Transport c/School`
+
+Example Usage:
+```
+add-expense t/Bubble Tea a/5 d/03/10/2020 c/Food & Beverage
+```
+
+Expected Outcome:
+```
+New expense added: Bubble Tea Amount: $5.00 Date: 03/10/2020 Categories: [Food & Beverage]
+```
+
+
+
+Adds a new expense titled `Bubble Tea`, with amount `$5.00`, date `03/10/2020`, and a single category `Food & Beverage`.
+
+#### 4.3.2 Edit Expense: `edit`
+
+Edits an expense in the finance tracker.
+
+Format: (when on the [Expenses tab](#223-expenses-tab)) `edit INDEX [t/TITLE] [a/AMOUNT] [d/DATE] [c/CATEGORY...]`
+
+* `INDEX` allows you to choose which expense to edit by specifying its position in the currently displayed expenses list.
+* `TITLE`, `AMOUNT`, `DATE` and `CATEGORY` allow you to specify the expense information to update.
+ None of them are mandatory, but at least one must be specified.
+ If any `CATEGORY` is specified, it will replace all of the expense's categories.
+ For parameters that have been omitted, the value will remain unchanged.
+
+> :bulb: To remove all categories from an expense, simply use `c/` with no category name following it.
+
+Examples:
+* `edit 1 t/Shopee Internship d/24/10/2020`
+* `edit 3 a/$2000 c/`
+
+Example Usage:
+```
+edit 2 a/5 d/22/09/2020
+```
+
+Expected Outcome:
+```
+Edited Expense: Artificial Intelligence: A Modern Approach Amount: $5.00 Date: 22/09/2020 Categories: [Textbook]
+```
+
+
+
+Edits the second expense in the currently displayed expenses list to have amount `$5.00` and date `22/09/2020`.
+The rest of the expense information remains unchanged.
+
+> :information_source: After executing this command, any filtering done on the expenses list via the `find` command will be reset, and the expenses list will display all expenses.
+
+#### 4.3.3 Delete Expense: `delete`
+
+Deletes the specified expense from the finance tracker.
+
+Format: (when on the [Expenses tab](#223-expenses-tab)) `delete INDEX`
+
+* `INDEX` allows you to choose which expense to delete by specifying its position in the currently displayed expenses list.
+
+Example:
+* `delete 3`
+
+Example Usage:
+```
+delete 1
+```
+
+Expected Outcome:
+```
+Deleted Expense: Bubble Tea Amount: $5.00 Date: 22/09/2020 Categories: [Food & Beverage]
+```
+Deletes the first expense in the currently displayed expenses list.
+
+#### 4.3.4 List Expense: `ls-expense`
+
+Shows a list of all expenses in the finance tracker.
+This effectively resets any current filtering of the expenses list, such as those made by `find`.
+
+> :information_source: After executing this command, the UI will automatically switch to the [Expenses tab](#223-expenses-tab).
+
+Format: `ls-expense`
+
+Shortcuts: `lse`; (when on the [Expenses tab](#223-expenses-tab)) `list`
+
+> :bulb: When on the [Overview tab](#221-overview-tab), you can use `list` to list all transactions.
+
+Example Usage:
+```
+list
+```
+
+Expected Outcome:
+```
+Listed all expenses.
+```
+Lists all expenses in the finance tracker.
+
+#### 4.3.5 Find Expense: `find`
+
+Finds expenses that match any of the given search parameters, and displays the list of matching expenses.
+
+Format: (when on the [Expenses tab](#223-expenses-tab)) `find [t/TITLE_KEYPHRASE...] [a/AMOUNT] [d/DATE] [c/CATEGORY...] [af/AMOUNT_FROM] [at/AMOUNT_TO] [df/DATE_FROM] [dt/DATE_TO]`
+
+> :bulb: When on the [Overview tab](#221-overview-tab), you can use `find` to search for all transactions (expenses and incomes).
+
+The available search parameters and their uses are as follows:
+
+* `t/TITLE_KEYPHRASE`: Searches for all expenses with titles containing the specified `TITLE_KEYPHRASE` keyphrase.
+ * The search is case-insensitive. e.g `t/taxi` will match `Taxi`.
+ * A keyphrase can contain more than one word. e.g. `t/bubble tea` is considered as one keyphrase.
+ * The order of the keyphrases does not matter. e.g. `t/Bus t/Train` will match `Train Bus`.
+ * Partial matches are accepted. e.g. `t/Snack` will match `Snacks`.
+ * Titles matching at least one keyphrase will be returned (i.e. `OR` search).
+ e.g. `t/Tea t/Coffee` will return `Bubble Tea`, `Starbucks Coffee`.
+* `a/AMOUNT`: Searches for all expenses with the specified amount.
+* `d/DATE`: Searches for all expenses that occurred on the specified date.
+* `c/CATEGORY`: Searches for all expenses labelled with the specified category.
+ * The search is case-insensitive. e.g `taxi` will match `Taxi`.
+ * More than one category can be given; the search will return expenses with any of the input categories.
+* `af/AMOUNT_FROM`: Searches for all expenses with amounts more than or equal to the specified amount.
+* `at/AMOUNT_TO`: Searches for all expenses with amounts less than or equal to the specified amount.
+* `df/DATE_FROM`: Searches for all expenses that occurred on or later than the specified date.
+* `dt/DATE_TO`: Searches for all expenses that occurred on or before the specified date.
+
+None of the search parameters are mandatory, but at least one must be specified.
Examples:
-* `add n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01`
-* `add n/Betsy Crowe t/friend e/betsycrowe@example.com a/Newgate Prison p/1234567 t/criminal`
+* `find t/tea d/22/09/2000`
+* `find c/Food & drink af/10`
+
+Example Usage:
+```
+find t/tea t/coffee a/5 df/01/09/2020 dt/30/09/2020
+```
+
+Expected Outcome:
+```
+2 transactions listed!
+```
+Lists all expenses with titles containing `tea` and/or `coffee`, with amount equal to `$5.00`, in September 2020.
-### Listing all persons : `list`
+### 4.4 Income
-Shows a list of all persons in the address book.
+An **income** represents you *receiving money for something*.
+It could be your internship allowance, prize money you won from a pitch competition, or even red packets that you received over Chinese New Year.
-Format: `list`
+To help you manage your finances, Fine\$\$e records the following information about each of your incomes:
+1. **Title**: A descriptive title, to remind you what the income was about.
+1. **Amount**: How much money you received, to calculate how much you have received in total.
+1. **Date**: The date you received the money, to track your income over periods of time.
+1. **Categories**: Any number of categories, to help you group related incomes together.
-### Editing a person : `edit`
+#### 4.4.1 Add Income: `add-income`
-Edits an existing person in the address book.
+Adds an income to the finance tracker.
-Format: `edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…`
+> :information_source: After executing this command, the UI will automatically switch to the [Incomes tab](#222-incomes-tab).
-* Edits the person at the specified `INDEX`. The index refers to the index number shown in the displayed person list. The index **must be a positive integer** 1, 2, 3, …
-* At least one of the optional fields must be provided.
-* Existing values will be updated to the input values.
-* When editing tags, the existing tags of the person will be removed i.e adding of tags is not cumulative.
-* You can remove all the person’s tags by typing `t/` without
- specifying any tags after it.
+Format: `add-income t/TITLE a/AMOUNT d/DATE [c/CATEGORY...]`
+
+* `DATE` is optional; if `DATE` is not given, the current date is used.
+* `CATEGORY` is optional. Multiple `c/` prefixes can be used to specify multiple categories.
+
+Shortcuts: `addi`; (when on the [Incomes tab](#222-incomes-tab)) `add`
Examples:
-* `edit 1 p/91234567 e/johndoe@example.com` Edits the phone number and email address of the 1st person to be `91234567` and `johndoe@example.com` respectively.
-* `edit 2 n/Betsy Crower t/` Edits the name of the 2nd person to be `Betsy Crower` and clears all existing tags.
+* `add-income t/Waitressing a/80 c/Work`
+* `addi t/Angpao money a/$20 d/25/01/2020 c/CNY c/Gift`
+
+Example Usage:
+```
+add-income t/Shopee Internship a/560 d/03/10/2020 c/Work
+```
+
+Expected Outcome:
+```
+New income added: Shopee Internship Amount: $560.00 Date: 03/10/2020 Categories: [Work]
+```
-### Locating persons by name: `find`
+
-Finds persons whose names contain any of the given keywords.
+Adds a new income titled `Shopee Internship`, with amount `$560.00`, date `03/10/2020`, and a single category `Work`.
-Format: `find KEYWORD [MORE_KEYWORDS]`
+#### 4.4.2 Edit Income: `edit`
-* The search is case-insensitive. e.g `hans` will match `Hans`
-* The order of the keywords does not matter. e.g. `Hans Bo` will match `Bo Hans`
-* Only the name is searched.
-* Only full words will be matched e.g. `Han` will not match `Hans`
-* Persons matching at least one keyword will be returned (i.e. `OR` search).
- e.g. `Hans Bo` will return `Hans Gruber`, `Bo Yang`
+Edits an expense in the finance tracker.
+
+Format: (when on the [Incomes tab](#222-incomes-tab)) `edit INDEX [t/TITLE] [a/AMOUNT] [d/DATE] [c/CATEGORY...]`
+
+* `INDEX` allows you to choose which income to edit by specifying its position in the currently displayed incomes list.
+* `TITLE`, `AMOUNT`, `DATE` and `CATEGORY` allow you to specify the updated income information.
+ None of them are mandatory, but at least one must be specified.
+ If any `CATEGORY` is specified, it will replace all of the income's existing categories.
+ For parameters that have been omitted, the value will remain unchanged.
+
+> :bulb: To remove all categories from an income, simply use `c/` with no category name following it.
Examples:
-* `find John` returns `john` and `John Doe`
-* `find alex david` returns `Alex Yeoh`, `David Li`
- 
+* `edit 2 t/October Allowance c/Allowance`
+* `edit 1 a/5 d/22/09/2020`
+
+Example Usage:
+```
+edit 3 a/$2000 c/
+```
+
+Expected Outcome:
+```
+Edited Income: Start-up Funding Amount: $2000.00 Date: 01/10/2020 Categories:
+```
+
+
+
+Edits the third income in the currently displayed incomes list to have amount `$2000.00` and no categories.
+The rest of the income information remains unchanged.
+
+> :information_source: After executing this command, any filtering done on the incomes list via the `find` command will be reset, and the incomes list will display all incomes.
+
+#### 4.4.3 Delete Income: `delete`
+
+Deletes the specified income from the finance tracker.
+
+Format: (when on the [Incomes tab](#222-incomes-tab)) `delete INDEX`
+
+* `INDEX` allows you to choose which income to delete by specifying its position in the currently displayed incomes list.
+
+Example:
+* `delete 3`
+
+Example Usage:
+```
+delete 1
+```
+
+Expected Outcome:
+```
+Deleted Income: Teaching Assistant Amount: $1920.00 Date: 18/10/2020 Categories: [CS2103T][CS1101S]
+```
+Deletes the second income in the currently displayed incomes list.
+
+#### 4.4.4 List Income: `ls-income`
+
+Shows a list of all the incomes in the finance tracker.
+This effectively resets any current filtering of the incomes list, such as those made by `find`.
+
+> :information_source: After executing this command, the UI will automatically switch to the [Incomes tab](#222-incomes-tab).
+
+Format: `ls-income`
+
+Shortcuts: `lsi`; (when on the [Incomes tab](#222-incomes-tab)) `list`
+
+> :bulb: When on the [Overview tab](#221-overview-tab), you can use `list` to list all transactions.
+
+Example Usage:
+```
+list
+```
+
+Expected Outcome:
+```
+Listed all incomes.
+```
+Lists all incomes in the finance tracker.
+
+#### 4.4.5 Find Income: `find`
+
+Finds incomes that match any of the given search parameters, and displays the list of matching incomes.
+
+Format: (when on the [Incomes tab](#222-incomes-tab)) `find [t/TITLE_KEYPHRASE...] [a/AMOUNT] [d/DATE] [c/CATEGORY...] [af/AMOUNT_FROM] [at/AMOUNT_TO] [df/DATE_FROM] [dt/DATE_TO]`
-### Deleting a person : `delete`
+> :bulb: When on the [Overview tab](#221-overview-tab), you can use `find` to search for all transactions (expenses and incomes).
-Deletes the specified person from the address book.
+The available search parameters and their uses are as follows:
-Format: `delete INDEX`
+* `t/TITLE_KEYPHRASE`: Searches for all incomes with titles containing the specified `TITLE_KEYPHRASE` keyphrase.
+ * The search is case-insensitive. e.g `t/work` will match `Work`.
+ * A keyphrase can contain more than one word. e.g. `t/Shopee internship` is considered as one keyphrase.
+ * The order of the keyphrases does not matter. e.g. `t/TA t/part-time` will match `part-time TA`.
+ * Partial matches are accepted. e.g. `t/intern` will match `internship`.
+ * Titles matching at least one keyphrase will be returned (i.e. `OR` search).
+ e.g. `t/allowance t/prize` will return `Laptop Allowance`, `Hackathon Prize`.
+* `a/AMOUNT`: Searches for all incomes with the specified amount.
+* `d/DATE`: Searches for all incomes that occurred on the specified date.
+* `c/CATEGORY`: Searches for all incomes labelled with the specified category.
+ * The search is case-insensitive. e.g `work` will match `Work`.
+ * More than one category can be given; the search will return incomes with any of the input categories.
+* `af/AMOUNT_FROM`: Searches for all incomes with amounts more than or equal to the specified amount.
+* `at/AMOUNT_TO`: Searches for all incomes with amounts less than or equal to the specified amount.
+* `df/DATE_FROM`: Searches for all incomes that occurred on or later than the specified date.
+* `dt/DATE_TO`: Searches for all incomes that occurred on or before the specified date.
-* Deletes the person at the specified `INDEX`.
-* The index refers to the index number shown in the displayed person list.
-* The index **must be a positive integer** 1, 2, 3, …
+None of the search parameters are mandatory, but at least one must be specified.
Examples:
-* `list` followed by `delete 2` deletes the 2nd person in the address book.
-* `find Betsy` followed by `delete 1` deletes the 1st person in the results of the `find` command.
+* `find t/allowance d/01/10/2020`
+* `find c/angpao at/20`
-### Clearing all entries : `clear`
+Example Usage:
+```
+find c/prize c/gift af/10 at/100
+```
-Clears all entries from the address book.
+Expected Outcome:
+```
+2 transactions listed!
+```
+Lists all incomes with the category `prize` and/or `gift`, with amounts between `$10.00` and `$100.00` inclusive.
+
+### 4.5 Bookmark Expense
+
+A **bookmark expense** is a template that allows you to create expenses that you make frequently, such as paying phone bills monthly or buying bubble tea weekly.
+You can convert a bookmark expense repeatedly to create as many expenses as you want, and the created expenses will automatically be added to Fine$$e's expenses list.
+
+To help you manage your finances, Fine\$\$e records the following information about each of your bookmark expenses:
+1. **Title**: A descriptive title, to remind you what the bookmark expense is about.
+1. **Amount**: How much money you will spend each time you convert the bookmark expense into an expense.
+1. **Categories**: Any number of categories, to help you group related incomes together.
+
+
+
+{:.image-caption}
+Bookmark Expenses List Panel in the Expenses Tab
+
+#### 4.5.1 Add Bookmark Expense: `add-bookmark-expense`
+
+Adds a bookmark expense to the finance tracker.
+
+> :information_source: After executing this command, the UI will automatically switch to the [Expenses tab](#223-expenses-tab).
+
+Format: `add-bookmark-expense t/TITLE a/AMOUNT [c/CATEGORY...]`
+
+Shortcut: `addbe t/TITLE a/AMOUNT [c/CATEGORY...]`
+
+* `CATEGORY` is optional. Multiple `c/` prefixes can be used to specify multiple categories.
+
+> :warning: Adding of duplicate bookmark expenses is not allowed.
+> Bookmark expenses with the same titles are considered to be duplicates of each other.
+> Contiguous whitespace characters between words in the title will be treated as a single whitespace character.
+> e.g. `Phone Bill` and `Phone Bill` are considered to be the same title, while `Phone Bill` and `PhoneBill` are not considered to be the same title.
+
+Examples:
+* `add-bookmark-expense t/Phone Bill a/60 c/Utilities c/Personal`
+* `add-bookmark-expense t/Spotify Subscription a/$9 c/Others`
+* `addbe t/Bubble Tea a/$4.50 c/Food & Beverage`
+* `addbe t/Lunch a/$5.00`
+
+Example Usage:
+```
+add-bookmark-expense t/Netflix Subscription a/11.98 c/Entertainment
+```
+
+Expected Outcome:
+```
+New bookmark expense added: Netflix Subscription Amount: $11.98 Categories: [Entertainment]
+```
+
+
+
+Adds a bookmark expense titled `Netflix Subscription` with amount `$11.98` and one category `Entertainment`.
+
+#### 4.5.2 Edit Bookmark Expense: `edit-bookmark`
+
+Edits a bookmark expense in the finance tracker.
+
+> :warning: This command can only be executed on the [Expenses tab](#223-expenses-tab).
+
+> :warning: Bookmark expenses with the same titles are considered to be duplicates of each other.
+> Therefore, editing the title of a bookmark expense to an already existing title in the bookmark expenses list is not allowed.
+> Contiguous whitespace characters between words in the title will be treated as a single whitespace character.
+
+Format: `edit-bookmark INDEX [t/TITLE] [a/AMOUNT] [c/CATEGORY...]`
+
+* `INDEX` allows you to choose which bookmark expense to edit by specifying its position in the bookmark expenses list.
+* `TITLE`, `AMOUNT` and `CATEGORY` allow you to specify the updated bookmark expense information.
+ None of them are mandatory, but at least one must be specified.
+ If any `CAEGORY` is specified, it will replace all of the bookmark expense's existing categories.
+ For parameters that have been omitted, the value will remain unchanged.
+
+> :bulb: To remove all categories from a bookmark expense, simply use `c/` with no category name following it.
+
+Examples:
+* `edit-bookmark 1 a/65`
+* `edit-bookmark 2 t/Part Time a/400 c/Work`
+* `edit-bookmark 3 c/Others`
+
+Example Usage:
+```
+edit-bookmark 3 a/15 c/Entertainment c/Personal
+```
+
+Expected Outcome:
+```
+Edited Bookmark Expense: Netflix Subscription Amount: $15.00 Categories: [Entertainment][Personal]
+```
+
+
+
+Edits the third bookmark expense in the bookmark expenses list to have an amount of `$15.00` and two categories `Entertainment` and `Personal`.
+
+#### 4.5.3 Delete Bookmark Expense: `delete-bookmark`
+
+Deletes the specified bookmark expense from the finance tracker.
+
+> :warning: This command can only be executed on the [Expenses tab](#223-expenses-tab).
+
+Format: `delete-bookmark INDEX`
+
+* `INDEX` allows you to choose which bookmark expense to delete by specifying its position in the bookmark expenses list.
+
+Example:
+* `delete-bookmark 2`
+
+Example Usage:
+```
+delete-bookmark 3
+```
+
+Expected Outcome:
+```
+Deleted Bookmark Expense: Phone Bill Amount: $60.00 Categories: [Utilities]
+```
+Deletes the third bookmark expense in the bookmark expenses list.
+
+#### 4.5.4 Convert Bookmark Expense: `convert-bookmark`
+
+Converts a bookmark expense into an expense, and adds it to the expenses list.
+
+> :warning: This command can only be executed on the [Expense tab](#223-expenses-tab).
+
+Format: `convert-bookmark INDEX [d/DATE]`
+
+Shortcut: `convertb INDEX [d/DATE]`
+
+* `INDEX` allows you to choose which bookmark expense to convert by specifying its position in the bookmark expenses list.
+* `DATE` is optional; if `DATE` is not specified, the current date is used.
+
+Examples:
+* `convert-bookmark 2 d/10/10/2020`
+* `convertb 1 d/05/05/2020`
+
+Example Usage:
+```
+convert-bookmark 3 d/10/08/2020
+```
+
+Expected Outcome:
+```
+Bookmark expense has been converted and successfully added to finance tracker: Netflix Subscription Amount: $15.00 Date: 10/08/2020 Categories: [Entertainment][Personal]
+```
+
+
+
+Converts the third bookmark expense in the bookmark expenses list into an expense with the information of the
+specified bookmark expense and date `10/08/2020`, and adds it to the expenses list in the finance tracker.
+
+### 4.6 Bookmark Income
+
+A **bookmark income** is a template that allows you to create incomes that you make frequently, such as monthly salary or stipend for being a teaching assistant.
+You can convert a bookmark income repeatedly to create as many incomes as you want, and the created incomes will automatically be added to Fine$$e's incomes list.
+
+To help you manage your finances, Fine\$\$e records the following information about each of your bookmark incomes:
+1. **Title**: A descriptive title, to remind you what the bookmark income is about.
+1. **Amount**: How much money you will receive each time you convert the bookmark income into an income.
+1. **Categories**: Any number of categories, to help you group related incomes together.
+
+
+
+{:.image-caption}
+Bookmark Incomes List Panel in the Incomes Tab
+
+#### 4.6.1 Add Bookmark Income: `add-bookmark-income`
+
+Adds a bookmark income to the finance tracker.
+
+> :information_source: After executing this command, the UI will automatically switch to the [Incomes tab](#222-incomes-tab).
+
+Format: `add-bookmark-income t/TITLE a/AMOUNT [c/CATEGORY...]`
+
+Shortcut: `addbi t/TITLE a/AMOUNT [c/CATEGORY...]`
+
+* `CATEGORY` is optional. Multiple `c/` prefixes can be used to specify multiple categories.
+
+> :warning: Adding of duplicate bookmark incomes is not allowed.
+> Bookmark incomes with the same titles are considered to be duplicates of each other.
+> Contiguous whitespace characters between words in the title will be treated as a single whitespace character.
+> e.g. `Part Time` and `Part Time` are considered to be the same title, while `Part Time` and `PartTime` are not considered to be the same title.
+
+Examples:
+* `add-bookmark-income t/Internship a/$1000 c/Work`
+* `add-bookmark-income t/Part Time a/450 c/Work c/Startup`
+* `addbi t/Investments a/400 c/Personal c/Dividends`
+* `addbi t/Monthly Allowance a/300`
+
+Example Usage:
+```
+add-bookmark-income t/Part Time a/400 c/Work
+```
+
+Expected Outcome:
+```
+New bookmark income added: Part Time Amount: $400.00 Categories: [Work]
+```
+
+
+
+Adds a bookmark income titled `Part Time` with amount `$400.00` and one category `Work`.
+
+#### 4.6.2 Edit Bookmark Income: `edit-bookmark`
+
+Edits a bookmark income in the finance tracker.
+
+> :warning: This command can only be executed on the [Incomes tab](#222-incomes-tab).
+
+> :warning: Bookmark incomes with the same titles are considered to be duplicates of each other.
+> Therefore, editing the title of a bookmark income to an already existing title in the bookmark incomes list is not allowed.
+> Contiguous whitespace characters between words in the title will be treated as a single whitespace character.
+
+Format: `edit-bookmark INDEX [t/TITLE] [a/AMOUNT] [c/CATEGORY...]`
+
+* `INDEX` allows you to choose which bookmark income to edit by specifying its position in the bookmark incomes list.
+* `TITLE`, `AMOUNT` and `CATEGORY` allow you to specify the updated bookmark income information.
+ None of them are mandatory, but at least one must be specified.
+ If any `CATEGORY` is specified, it will replace all of the bookmark income's existing categories.
+ For parameters that have been omitted, the value will remain unchanged.
+
+> :bulb: To remove all categories from a bookmark income, simply use `c/` with no category name following it.
+
+Examples:
+* `edit-bookmark 1 t/Monthly Tuition c/Work c/Part Time`
+* `edit-bookmark 2 a/1200`
+* `edit-bookmark 3 t/Investments a/$300.00`
+
+Example Usage:
+```
+edit-bookmark 3 a/500 c/Work c/Part Time Intern
+```
+
+Expected Outcome:
+```
+Edited Bookmark Income: Part Time Amount: $500.00 Categories: [Work][Part Time Intern]
+```
+
+
+
+Edits the third bookmark income in the bookmark incomes list to have an amount of `$500.00` and two categories `Work` and `Part Time Intern`.
+
+#### 4.6.3 Delete Bookmark Income: `delete-bookmark`
+
+Deletes the bookmark income and all of its information from the bookmark income list in Fine$$e.
+
+> :warning: This command can only be executed on the [Incomes tab](#222-incomes-tab).
+
+Format: `delete-bookmark INDEX`
+
+* `INDEX` allows you to choose which bookmark income to delete by specifying its position in the bookmark incomes list.
+
+Example:
+* `delete-bookmark 1`
+
+Example Usage:
+```
+delete-bookmark 2
+```
+
+Expected Outcome:
+```
+Deleted Bookmark Income: Teaching Assistant Amount: $1890.00 Categories: [CS1101S][CS1231S]
+```
+Deletes the second bookmark expense in the bookmark incomes list.
+
+#### 4.6.4 Convert Bookmark Income: `convert-bookmark`
+
+Converts a bookmark income into an income, and adds it to the incomes list.
+
+> :warning: This command can only be executed on the [Incomes tab](#222-incomes-tab).
+
+Format: `convert-bookmark INDEX [d/DATE]`
+
+Shortcut: `convertb INDEX [d/DATE]`
+
+* `INDEX` refers to the index number of the bookmark income shown in the bookmark incomes list.
+* `DATE` is optional; if `DATE` is not specified, the current date is used.
+
+Examples:
+* `convert-bookmark 1 d/10/10/2020`
+* `convertb 2 d/15/10/2020`
+
+Example Usage:
+```
+convert-bookmark 3 d/03/08/2020
+```
+
+Expected Outcome:
+```
+Bookmark income has been converted and successfully added to finance tracker: Part Time Amount: $500.00 Date: 03/08/2020 Categories: [Work][Part Time Intern]
+```
+
+
+
+Converts the third bookmark income in the bookmark incomes list into an income with the information of the
+specified bookmark income and date `03/08/2020`, then adds it to the incomes list in the finance tracker.
+
+### 4.7 Expense Limit
+
+Ever feel like your wallet just won't stop bleeding? Try setting a monthly expense limit!
+The expense limit feature allows you to limit your spending by setting a budget for the month.
+The monthly expense limit is visible on the Overview tab along with your remaining budget for this month, which is automatically calculated based on the expenses in the finance tracker.
+
+#### 4.7.1 Set Expense Limit: `set-expense-limit`
+
+Sets the monthly expense limit in the finance tracker.
+
+> :information_source: After executing this command, the UI will automatically switch to the [Overview tab](#221-overview-tab).
+
+Format: `set-expense-limit a/AMOUNT`
+
+Shortcut: `setel a/AMOUNT`
+
+Example:
+* `set-expense-limit a/500`
+
+Example Usage:
+```
+setel a/$400.00
+```
+
+Expected Outcome:
+```
+New monthly expense limit set: $400.00
+```
+
+
+
+Sets the monthly expense limit in the finance tracker to be `$400.00`.
+
+### 4.8 Savings Goal
+
+Want to save up for the new PlayStation 5 but can't seem to no matter what? Fine$$e has you covered!
+The savings goal feature allows you to save consistently by setting a monthly savings goal, so that you can save up bit by bit and build good financial habits.
+The monthly savings goal visible on the Overview tab along with your current savings for this month, which is automatically calculated based on the expenses and incomes in the finance tracker.
+
+#### 4.8.1 Set Savings Goal: `set-savings-goal`
+
+Sets the monthly savings goal in the finance tracker.
+
+> :information_source: After executing this command, the UI will automatically switch to the [Overview tab](#221-overview-tab).
+
+Format: `set-savings-goal a/AMOUNT`
+
+Shortcut: `setsg a/AMOUNT`
+
+Example:
+* `set-savings-goal a/100`
+
+Example Usage:
+```
+setsg a/$50.00
+```
+
+Expected Outcome:
+```
+New monthly savings goal set: $50.00
+```
+
+
+
+Sets the monthly savings goal in the finance tracker to be `$50.00`.
+
+### 4.9 Analytics
+
+Want to see your spending/saving trends?
+The Analytics feature will allow you to view a variety of trends based on the incomes/expenses you have entered into the finance tracker.
+These analytics will give you a better overview of your incomes/expenses and help you better understand them, so that you can make targeted changes to your habits if need be.
+
+There are three bar charts that show the following data over the past three months:
+* Total monthly expenses
+* Total monthly incomes
+* Total monthly savings
+
+Whenever you switch to the [Analytics tab](#224-analytics-tab), the data in the bar charts is automatically updated to include any recent modifications you have made in the finance tracker.
+This ensures that you will always see the latest information about your spending and saving trends.
+
+### 4.10 Clear Data: `clear`
+
+Ready to start using Fine\\$\\$e after fiddling with the sample data? Want to start over your finance tracking journey on a clean slate?
+This command allows you to clear *all* existing data inside the finance tracker. That includes:
+* Expenses and incomes
+* Bookmark expenses and bookmark incomes
+* Monthly expense limit
+* Monthly savings goal
Format: `clear`
-### Exiting the program : `exit`
+> :warning: This is a powerful command. You might lose your precious data if you are not careful with it.
+
+> :bulb: If there is any data you would like to keep before clearing, save it somewhere so that you can re-enter it later.
+
+To protect against accidental usage, this command needs to be entered **twice in succession** before it takes effect.
+A single `clear` command is nullified when not followed by another `clear` command.
+
+Here are some example scenarios to illustrate:
+* Scenario A: Enter `clear`.
+ * The finance tracker data is unchanged.
+ * Fine\\$\\$e requests for a second `clear` command as confirmation.
+* Scenario B: Enter `clear`, then enter `clear` again.
+ * The finance tracker data is cleared.
+* Scenario C: Enter `clear`, then enter `lsi` (a valid command), then enter `clear` again.
+ * The finance tracker data is unchanged.
+ * The first `clear` command has been nullified, so Fine\\$\\$e requests for a second `clear` command as confirmation.
+* Scenario D: Enter `clear`, then enter `foo` (an invalid command), then enter `clear` again.
+ * The finance tracker data is unchanged.
+ * The first `clear` command has been nullified, so Fine\\$\\$e requests for a second `clear` command as confirmation.
+* Scenario E: Enter `clear`, then enter `lsi`, then enter `clear` again, then enter `clear` again.
+ * The finance tracker data is cleared.
+
+Example Usage:
+```
+clear
+```
+
+Expected Outcome:
+```
+Please enter 'clear' again to confirm your decision.
+```
+
+Example Usage (continued):
+```
+clear
+```
+
+Expected Outcome:
+```
+Finance tracker has been cleared!
+```
+All data in the finance tracker is cleared.
+
+### 4.11 Exit the Program: `exit`
Exits the program.
Format: `exit`
-### Saving the data
+### 4.12 Command History
+
+Accidentally entered the wrong command and wish to modify it without typing it out again fully?
+Simply press the ↑ or ↓ arrow keys on your keyboard to navigate through your command history.
+
+* The command history keeps track of the latest 50 commands entered in the current session.
+* The command input box must be focused on, i.e. ensure that the text cursor is blinking in the command input box.
+* Press the ↑ arrow key to retrieve the previous commands.
+ * Each press of the ↑ arrow key retrieves the command immediately preceding the current command.
+ * If the current command is the earliest command that is being tracked, then pressing the ↑ arrow key does nothing.
+* Press the ↓ arrow key to retrieve the next commands.
+ * Each press of the ↓ arrow key retrieves the command immediately succeeding the current command.
+ * If the current command is the latest command that has been entered, then the command input box will be cleared upon pressing the ↓ arrow key.
+
+> :warning: Pressing either the ↑ or ↓ arrow keys will cause whatever text is currently in the command box to be overwritten.
-AddressBook data are saved in the hard disk automatically after any command that changes the data. There is no need to save manually.
+### 4.13 Saving the Data
-### Archiving data files `[coming in v2.0]`
+Fine$$e data is saved in the hard disk automatically after any command that changes the data.
+There is no need to save manually.
-_{explain the feature here}_
+--------------------------------------------------------------------------------------------------------------------
+
+## 5. Command Summary
+
+Action | Format | Examples
+------|------|--------
+Add Expense | `add-expense t/TITLE a/AMOUNT [d/DATE] [c/CATEGORY...]` `adde t/TITLE a/AMOUNT [d/DATE] [c/CATEGORY...]` (On Expenses tab) `add t/TITLE a/AMOUNT [d/DATE] [c/CATEGORY...]` | `add-expense t/Bubble Tea a/5 d/03/10/2020 c/Food & Beverage` `adde t/Taxi Home from School a/$13.50 d/10/10/2020 c/Transport c/School`
+Add Income | `add-income t/TITLE a/AMOUNT [d/DATE] [c/CATEGORY...]` `addi t/TITLE a/AMOUNT [d/DATE] [c/CATEGORY...]` (On Income tab) `add t/TITLE a/AMOUNT [d/DATE] [c/CATEGORY...]` | `add-income t/Internship a/560 d/03/10/2020 c/Work` `addi t/Angpao money a/$20 d/10/10/2020 c/CNY c/Gift`
+List Expenses | `ls-expense` `lse` (On Expenses tab) `list`
+List Incomes | `ls-income` `lsi` (On Incomes tab) `list`
+Find | `find [t/TITLE_KEYPHRASE...] [a/AMOUNT] [d/DATE] [c/CATEGORY...] [af/AMOUNT_FROM] [at/AMOUNT_TO] [df/DATE_FROM] [dt/DATE_TO]` | `find c/Food & drink af/10` `find t/allowance d/01/10/2020`
+Edit | `edit INDEX [t/TITLE] [a/AMOUNT] [d/DATE] [c/CATEGORY...]`| `edit 1 t/Brunch d/22/09/2020` `edit 2 a/500 c/`
+Delete | `delete INDEX` | `delete 1`
+Add Bookmark Expense | `add-bookmark-expense t/TITLE a/AMOUNT [c/CATEGORY...]` `addbe t/TITLE a/AMOUNT [c/CATEGORY...]` | `add-bookmark-expense t/Phone Bill a/60 c/Utilities c/Personal` `addbe t/Bubble Tea a/$4.50 c/Food & Beverage`
+Add Bookmark Income | `add-bookmark-income t/TITLE a/AMOUNT [c/CATEGORY...]` `addbi t/TITLE a/AMOUNT [c/CATEGORY...]` | `add-bookmark-income t/Internship a/$1000 c/Work` `addbi t/Investments a/400 c/Personal c/Dividends`
+Edit Bookmark | `edit-bookmark INDEX [t/TITLE] [a/AMOUNT] [c/CATEGORY...]`| `edit-bookmark 1 t/Monthly Tuition c/Work c/Part Time` `edit-bookmark 2 a/1200`
+Delete Bookmark | `delete-bookmark INDEX` | `delete-bookmark 2`
+Convert Bookmark | `convert-bookmark INDEX [d/DATE]` `convertb INDEX [d/DATE]` | `convert-bookmark 2 d/10/10/2020` `convertb 1 d/05/05/2020`
+Set Expense Limit | `set-expense-limit a/AMOUNT` `setel a/AMOUNT` | `set-expense-limit a/500` `setel a/$400.00`
+Set Savings Goal | `set-savings-goal a/AMOUNT` `setsg a/AMOUNT` | `set-savings-goal a/100` `setsg a/$50.00`
+Tab | `tab INDEX` | `tab 2`
+Help | `help`
+Exit | `exit`
--------------------------------------------------------------------------------------------------------------------
-## FAQ
+## 6. Glossary
-**Q**: How do I transfer my data to another Computer?
-**A**: Install the app in the other computer and overwrite the empty data file it creates with the file that contains the data of your previous AddressBook home folder.
+Term | Definition
+-----|-----------
+Bookmark Expense | A template for an expense, which can be used to create expenses that are added to the finance tracker.
+Bookmark Income | A template for an income, which can be used to create incomes that are added to the finance tracker.
+Current Date | The system date on the computer on which Fine$$e is set up.
+Expense | A one-time transaction that results in a decrease in the amount of money you have.
+Income | A one-time transaction that results in an increase in the amount of money you have.
+Text Cursor | A blinking vertical line that indicates where text will be placed when entered.
--------------------------------------------------------------------------------------------------------------------
-## Command summary
-
-Action | Format, Examples
---------|------------------
-**Add** | `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…` e.g., `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 t/friend t/colleague`
-**Clear** | `clear`
-**Delete** | `delete INDEX` e.g., `delete 3`
-**Edit** | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [t/TAG]…` e.g.,`edit 2 n/James Lee e/jameslee@example.com`
-**Find** | `find KEYWORD [MORE_KEYWORDS]` e.g., `find James Jake`
-**List** | `list`
-**Help** | `help`
+## 7. FAQ
+
+**Q**: How do I transfer my data to another computer?
+
+**A**: Install the app on the other computer and overwrite the empty data file it creates with the file that contains the data of your previous Fine$$e finance tracker in the home folder.
diff --git a/docs/_config.yml b/docs/_config.yml
index 6bd245d8f4e..813c173d726 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,15 +1,30 @@
-title: "AB-3"
+title: "Fine$$e"
theme: minima
header_pages:
+ - GanttChart.md
+ - Minutes.md
- UserGuide.md
- DeveloperGuide.md
- AboutUs.md
markdown: kramdown
-repository: "se-edu/addressbook-level3"
+kramdown:
+ parse_block_html: true
+
+repository: "AY2021S1-CS2103T-W16-3/tp"
github_icon: "images/github-icon.png"
plugins:
- - jemoji
+ - jekyll-coffeescript
+ - jekyll-default-layout
+ - jekyll-gist
+ # Disabled since we are building the files manually.
+ # - jekyll-github-metadata
+ - jekyll-optional-front-matter
+ - jekyll-paginate
+ - jekyll-readme-index
+ - jekyll-titles-from-headings
+ - jekyll-relative-links
+ - jekyll-spaceship
diff --git a/docs/_includes/custom-head.html b/docs/_includes/custom-head.html
index 8559a67ffad..6427a801b2d 100644
--- a/docs/_includes/custom-head.html
+++ b/docs/_includes/custom-head.html
@@ -4,3 +4,5 @@
1. Head over to https://realfavicongenerator.net/ to add your own favicons.
2. Customize default _includes/custom-head.html in your source directory and insert the given code snippet.
{% endcomment %}
+
+
diff --git a/docs/_includes/head.html b/docs/_includes/head.html
index 83ac5326933..9fc1a64416f 100644
--- a/docs/_includes/head.html
+++ b/docs/_includes/head.html
@@ -7,6 +7,10 @@
{%- include custom-head.html -%}
- {{page.title}}
+ {% if page.layout == 'minutes' %}
+ Minutes for {{ page.date | date: "%-d %B %Y" }}
+ {% else %}
+ {{page.title}}
+ {% endif %}
diff --git a/docs/_layouts/chart.html b/docs/_layouts/chart.html
new file mode 100644
index 00000000000..4770216cd3e
--- /dev/null
+++ b/docs/_layouts/chart.html
@@ -0,0 +1,14 @@
+---
+layout: widescreen
+---
+
+
+
diff --git a/docs/_layouts/widescreen.html b/docs/_layouts/widescreen.html
new file mode 100644
index 00000000000..a0cef963fa7
--- /dev/null
+++ b/docs/_layouts/widescreen.html
@@ -0,0 +1,18 @@
+
+
+
+{%- include head.html -%}
+
+
+
+{%- include header.html -%}
+
+
+
+ {{ content }}
+
+
+
+
+
+
diff --git a/docs/_sass/minima/_base.scss b/docs/_sass/minima/_base.scss
index 06e47f23762..09e181ef9bb 100644
--- a/docs/_sass/minima/_base.scss
+++ b/docs/_sass/minima/_base.scss
@@ -213,6 +213,24 @@ pre {
}
+/**
+ * Wide Wrapper
+ */
+.wide-wrapper {
+ width: calc(#{$content-width} - (#{$spacing-unit}));
+ margin-right: auto;
+ margin-left: auto;
+ padding-right: $spacing-unit / 2;
+ padding-left: $spacing-unit / 2;
+ @extend %clearfix;
+
+ @media screen and (min-width: $on-large) {
+ width: 90vw;
+ padding-right: $spacing-unit;
+ padding-left: $spacing-unit;
+ }
+}
+
/**
* Clearfix
diff --git a/docs/_sass/minima/_layout.scss b/docs/_sass/minima/_layout.scss
index ca99f981701..48cdc03ca32 100644
--- a/docs/_sass/minima/_layout.scss
+++ b/docs/_sass/minima/_layout.scss
@@ -176,7 +176,7 @@
.post-content {
margin-bottom: $spacing-unit;
- h1, h2, h3 { margin-top: $spacing-unit * 2 }
+ h1, h2, h3 { margin-top: $spacing-unit }
h4, h5, h6 { margin-top: $spacing-unit }
h2 {
@@ -261,3 +261,52 @@
width: calc(50% - (#{$spacing-unit} / 2));
}
}
+
+
+
+/**
+ * Table of Contents without bullet points
+ */
+.toc-no-bullet-points ul, .toc-no-bullet-points ol {
+ list-style-type: none;
+}
+
+
+
+/**
+ * Center element
+ */
+.center {
+ margin: 0;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ -ms-transform: translate(-50%, -50%);
+ transform: translate(-50%, -50%);
+}
+
+
+
+/**
+ * Styling for text on the 'no external navigation' page
+ */
+.no-navigation {
+ color: #E46C0A;
+ text-align: center;
+ font-size: 40px;
+}
+
+.no-navigation-subtext {
+ text-align: center;
+ margin-bottom: 0px;
+}
+
+
+
+/**
+ * Image caption
+ */
+.image-caption {
+ text-align: center;
+ font-style: italic;
+}
diff --git a/docs/assets/favicon.png b/docs/assets/favicon.png
new file mode 100644
index 00000000000..b4394d69af0
Binary files /dev/null and b/docs/assets/favicon.png differ
diff --git a/docs/diagrams/AddTransactionActivityDiagram.puml b/docs/diagrams/AddTransactionActivityDiagram.puml
new file mode 100644
index 00000000000..a2efada393b
--- /dev/null
+++ b/docs/diagrams/AddTransactionActivityDiagram.puml
@@ -0,0 +1,42 @@
+@startuml
+start
+:User executes add command;
+
+if () then ([add])
+ if () then ([user is not on Expenses or Incomes tab])
+ :Throw a ParseException;
+ stop
+ else ([else])
+ if () then ([user is on Expenses tab])
+ :Use AddExpenseCommandParser;
+ :Add new expense to model;
+ :Display updated expenses list;
+ else ([user is on Incomes tab])
+ :Use AddIncomeCommandParser;
+ :Add new income to model;
+ :Display updated incomes list;
+ endif
+ endif
+
+else ([add-expense or add-income])
+ if () then ([add-expense])
+ :Use AddExpenseCommandParser;
+ :Add new expense to model;
+ if () then ([user is on Expenses tab])
+ else ([else])
+ :Switch to Expenses tab;
+ endif
+ :Display updated expenses list;
+ else ([add-income])
+ :Use AddIncomeCommandParser;
+ :Add new income to model;
+ if () then ([user is on Incomes tab])
+ else ([else])
+ :Switch to Incomes tab;
+ endif
+ :Display updated incomes list;
+ endif
+endif
+
+stop
+@enduml
diff --git a/docs/diagrams/AddTransactionClassDiagram.puml b/docs/diagrams/AddTransactionClassDiagram.puml
new file mode 100644
index 00000000000..db47d3d74b6
--- /dev/null
+++ b/docs/diagrams/AddTransactionClassDiagram.puml
@@ -0,0 +1,55 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor LOGIC_COLOR_T4
+skinparam classBackgroundColor LOGIC_COLOR
+
+package Logic {
+
+package Parser {
+Class FinanceTrackerParser
+Class AddExpenseCommandParser
+Class AddIncomeCommandParser
+}
+
+package Command {
+Class AddExpenseCommand
+Class AddIncomeCommand
+}
+}
+
+
+package Model {
+
+package Transaction {
+Class Expense MODEL_COLOR
+Class Income MODEL_COLOR
+Class "{abstract}\nTransaction" as Transaction MODEL_COLOR
+Class Title MODEL_COLOR
+Class Amount MODEL_COLOR
+Class Date MODEL_COLOR
+}
+package Category {
+Class Category MODEL_COLOR
+}
+}
+
+FinanceTrackerParser ..> AddExpenseCommandParser: creates >
+FinanceTrackerParser ..> AddIncomeCommandParser: creates >
+
+AddExpenseCommandParser ..> AddExpenseCommand: creates >
+AddExpenseCommandParser ..> Expense: creates >
+AddIncomeCommandParser ..> AddIncomeCommand: creates >
+AddIncomeCommandParser ..> Income: creates >
+
+AddExpenseCommand --> "1" Expense
+AddIncomeCommand --> "1" Income
+
+Expense --|> Transaction MODEL_COLOR
+Income --|> Transaction MODEL_COLOR
+Transaction *--> "1" Amount MODEL_COLOR
+Transaction *--> "1" Title MODEL_COLOR
+Transaction *--> "1" Date MODEL_COLOR
+Transaction *--> "*" Category MODEL_COLOR
+
+@enduml
diff --git a/docs/diagrams/AddTransactionSequenceDiagram.puml b/docs/diagrams/AddTransactionSequenceDiagram.puml
new file mode 100644
index 00000000000..621636dddec
--- /dev/null
+++ b/docs/diagrams/AddTransactionSequenceDiagram.puml
@@ -0,0 +1,81 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":FinanceTrackerParser" as FinanceTrackerParser LOGIC_COLOR
+participant ":AddExpenseCommandParser" as AddExpenseCommandParser LOGIC_COLOR
+participant "cmd:AddExpenseCommand" as AddExpenseCommand LOGIC_COLOR
+participant "result:CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "e:Expense" as Expense MODEL_COLOR
+participant ":ModelManager" as ModelManager MODEL_COLOR
+end box
+
+[-> LogicManager : execute("adde ...", uiState)
+activate LogicManager
+
+LogicManager -> FinanceTrackerParser : parseCommand("adde ...", uiState)
+activate FinanceTrackerParser
+
+create AddExpenseCommandParser
+FinanceTrackerParser -> AddExpenseCommandParser
+activate AddExpenseCommandParser
+
+AddExpenseCommandParser --> FinanceTrackerParser
+deactivate AddExpenseCommandParser
+
+FinanceTrackerParser -> AddExpenseCommandParser : parse("...")
+activate AddExpenseCommandParser
+
+ref over AddExpenseCommandParser: Parse user input
+
+' TODO parsing data fields takes place here
+
+create Expense
+AddExpenseCommandParser -> Expense
+activate Expense
+Expense --> AddExpenseCommandParser
+deactivate Expense
+
+create AddExpenseCommand
+AddExpenseCommandParser -> AddExpenseCommand
+activate AddExpenseCommand
+
+AddExpenseCommand --> AddExpenseCommandParser
+deactivate AddExpenseCommand
+
+AddExpenseCommandParser --> FinanceTrackerParser: cmd
+
+deactivate AddExpenseCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+AddExpenseCommandParser -[hidden]-> FinanceTrackerParser
+destroy AddExpenseCommandParser
+
+FinanceTrackerParser --> LogicManager : cmd
+deactivate FinanceTrackerParser
+
+LogicManager -> AddExpenseCommand : execute(model)
+activate AddExpenseCommand
+
+AddExpenseCommand -> ModelManager : addExpense(e)
+activate ModelManager
+
+ModelManager --> AddExpenseCommand
+deactivate ModelManager
+
+create CommandResult
+AddExpenseCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> AddExpenseCommand
+deactivate CommandResult
+
+AddExpenseCommand --> LogicManager : result
+deactivate AddExpenseCommand
+
+[<--LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/AnalyticsTabObjectDiagram.puml b/docs/diagrams/AnalyticsTabObjectDiagram.puml
new file mode 100644
index 00000000000..2a2bb9da3c4
--- /dev/null
+++ b/docs/diagrams/AnalyticsTabObjectDiagram.puml
@@ -0,0 +1,56 @@
+@startuml
+left to right direction
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor UI_COLOR_T4
+skinparam classBackgroundColor UI_COLOR
+
+Package UI <>{
+Object ":AnalyticsTabPane" as atp
+Object "expenseAnalyticsBarChart:BarChart" as eabc
+Object "incomeAnalyticsBarChart:BarChart" as iabc
+Object "savingsAnalyticsBarChart:BarChart" as sabc
+Object ":XYChart.Data" as edata
+Object ":XYChart.Data" as idata
+Object ":XYChart.Data" as sdata
+}
+
+Package Budget <>{
+Object ":MonthlyBudget" as mb
+Object "monthlyExpenses:ObservableList" as me
+Object "monthlyIncomes:ObservableList" as mi
+Object "monthlySavings:ObservableList" as ms
+Object "months:ObservableList" as mths
+Object ":CalculatedAmount" as meca
+Object ":CalculatedAmount" as mica
+Object ":CalculatedAmount" as msca
+Object ":String" as mth
+}
+
+atp *-left-> eabc
+atp *-left-> iabc
+atp *-left-> sabc
+
+eabc --> edata
+iabc --> idata
+sabc --> sdata
+
+mb *--> me
+mb *--> mi
+mb *--> ms
+mb *--> mths
+
+me -up-> meca
+mi -up-> mica
+ms -up-> msca
+mths -up-> mth
+
+edata ..> meca
+edata ..> mth
+idata ..> mica
+idata ..> mth
+sdata ..> msca
+sdata ..> mth
+atp ..> mb
+
+@enduml
diff --git a/docs/diagrams/ArchitectureSequenceDiagram.puml b/docs/diagrams/ArchitectureSequenceDiagram.puml
index ef81d18c337..26da955062e 100644
--- a/docs/diagrams/ArchitectureSequenceDiagram.puml
+++ b/docs/diagrams/ArchitectureSequenceDiagram.puml
@@ -13,13 +13,13 @@ activate ui UI_COLOR
ui -[UI_COLOR]> logic : execute("delete 1")
activate logic LOGIC_COLOR
-logic -[LOGIC_COLOR]> model : deletePerson(p)
+logic -[LOGIC_COLOR]> model : deleteTransaction(target)
activate model MODEL_COLOR
model -[MODEL_COLOR]-> logic
deactivate model
-logic -[LOGIC_COLOR]> storage : saveAddressBook(addressBook)
+logic -[LOGIC_COLOR]> storage : saveFinanceTracker(financeTracker)
activate storage STORAGE_COLOR
storage -[STORAGE_COLOR]> storage : Save to file
diff --git a/docs/diagrams/BetterModelClassDiagram.puml b/docs/diagrams/BetterModelClassDiagram.puml
deleted file mode 100644
index 29076104af3..00000000000
--- a/docs/diagrams/BetterModelClassDiagram.puml
+++ /dev/null
@@ -1,21 +0,0 @@
-@startuml
-!include style.puml
-skinparam arrowThickness 1.1
-skinparam arrowColor MODEL_COLOR
-skinparam classBackgroundColor MODEL_COLOR
-
-AddressBook *-right-> "1" UniquePersonList
-AddressBook *-right-> "1" UniqueTagList
-UniqueTagList -[hidden]down- UniquePersonList
-UniqueTagList -[hidden]down- UniquePersonList
-
-UniqueTagList *-right-> "*" Tag
-UniquePersonList o-right-> Person
-
-Person -up-> "*" Tag
-
-Person *--> Name
-Person *--> Phone
-Person *--> Email
-Person *--> Address
-@enduml
diff --git a/docs/diagrams/BudgetActivityDiagram.puml b/docs/diagrams/BudgetActivityDiagram.puml
new file mode 100644
index 00000000000..75182b25664
--- /dev/null
+++ b/docs/diagrams/BudgetActivityDiagram.puml
@@ -0,0 +1,11 @@
+@startuml
+start
+:User executes command;
+
+if () then ([amount changes])
+ :Calculates all budget values;
+ :Displays updated budget values;
+else ()
+endif
+stop
+@enduml
diff --git a/docs/diagrams/BudgetClassDiagram.puml b/docs/diagrams/BudgetClassDiagram.puml
new file mode 100644
index 00000000000..27ccc32af1f
--- /dev/null
+++ b/docs/diagrams/BudgetClassDiagram.puml
@@ -0,0 +1,36 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor MODEL_COLOR
+skinparam classBackgroundColor MODEL_COLOR
+
+Package Model <>{
+Class FinanceTracker
+Class ModelManager
+
+Package Transaction {
+Class Amount
+Class CalculatedAmount
+Class TransactionList
+}
+
+Package Budget {
+Class MonthlyBudget
+}
+}
+
+ModelManager o--> FinanceTracker
+
+FinanceTracker *--> TransactionList
+
+FinanceTracker *--> MonthlyBudget
+CalculatedAmount ..> Amount
+MonthlyBudget --> CalculatedAmount
+MonthlyBudget --> Amount
+MonthlyBudget ..> TransactionList
+
+ModelManager o--> MonthlyBudget
+
+CalculatedAmount -[hidden]right-> Amount
+
+@enduml
diff --git a/docs/diagrams/CommandHistoryClassDiagram.puml b/docs/diagrams/CommandHistoryClassDiagram.puml
new file mode 100644
index 00000000000..41ff1021767
--- /dev/null
+++ b/docs/diagrams/CommandHistoryClassDiagram.puml
@@ -0,0 +1,24 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor MODEL_COLOR
+skinparam classBackgroundColor MODEL_COLOR
+
+Package Model <>{
+ Class ModelManager
+
+ Package CommandHistory {
+ Class CommandHistory
+ Class EvictingStack
+ Class Node
+ }
+}
+
+ModelManager o--> "1" CommandHistory
+CommandHistory o--> "1" EvictingStack
+EvictingStack --> "0..1" Node : Top node
+EvictingStack --> "0..1" Node : Bottom node
+Node --> "0..1" Node : Next node
+Node --> "0..1" Node : Previous node
+
+@enduml
diff --git a/docs/diagrams/CommandHistoryDownActivityDiagram.puml b/docs/diagrams/CommandHistoryDownActivityDiagram.puml
new file mode 100644
index 00000000000..a3085b98782
--- /dev/null
+++ b/docs/diagrams/CommandHistoryDownActivityDiagram.puml
@@ -0,0 +1,10 @@
+@startuml
+start
+:User presses the ↓ arrow key;
+If () then ([current command is the latest tracked command])
+ :Clear command input box;
+else ([else])
+ :Retrieve the command succeeding the current command;
+endif
+stop
+@enduml
diff --git a/docs/diagrams/CommandHistoryUpActivityDiagram.puml b/docs/diagrams/CommandHistoryUpActivityDiagram.puml
new file mode 100644
index 00000000000..be8ae0890db
--- /dev/null
+++ b/docs/diagrams/CommandHistoryUpActivityDiagram.puml
@@ -0,0 +1,10 @@
+@startuml
+start
+:User presses the ↑ arrow key;
+If () then ([current command is the earliest tracked command])
+ :Do nothing;
+else ([else])
+ :Retrieve the command preceding the current command;
+endif
+stop
+@enduml
diff --git a/docs/diagrams/CommandResultSequenceDiagram.puml b/docs/diagrams/CommandResultSequenceDiagram.puml
new file mode 100644
index 00000000000..878be1baae2
--- /dev/null
+++ b/docs/diagrams/CommandResultSequenceDiagram.puml
@@ -0,0 +1,45 @@
+@startuml
+!include style.puml
+
+actor User USER_COLOR
+
+box Ui UI_COLOR_T1
+participant ":MainWindow" as MainWindow UI_COLOR
+end box
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant "c:XYZCommand" as XYZCommand LOGIC_COLOR
+participant ":CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+note right of XYZCommand : XYZCommand =\nAddExpenseCommand,\nFindCommand, etc
+
+User -> MainWindow : input command string
+activate MainWindow
+
+MainWindow -> LogicManager : execute()
+activate LogicManager
+
+ref over LogicManager, XYZCommand : Parse user input
+
+LogicManager -> XYZCommand : execute()
+activate XYZCommand
+
+create CommandResult
+XYZCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> XYZCommand : result
+deactivate CommandResult
+
+XYZCommand --> LogicManager : result
+deactivate XYZCommand
+
+LogicManager --> MainWindow : result
+deactivate LogicManager
+
+MainWindow --> User
+deactivate MainWindow
+
+@enduml
diff --git a/docs/diagrams/CommitActivityDiagram.puml b/docs/diagrams/CommitActivityDiagram.puml
deleted file mode 100644
index 7f8fe407f89..00000000000
--- a/docs/diagrams/CommitActivityDiagram.puml
+++ /dev/null
@@ -1,15 +0,0 @@
-@startuml
-start
-:User executes command;
-
-'Since the beta syntax does not support placing the condition outside the
-'diamond we place it as the true branch instead.
-
-if () then ([command commits AddressBook])
- :Purge redunant states;
- :Save AddressBook to
- addressBookStateList;
-else ([else])
-endif
-stop
-@enduml
diff --git a/docs/diagrams/ConvertBookmarkExpenseSequenceDiagram.puml b/docs/diagrams/ConvertBookmarkExpenseSequenceDiagram.puml
new file mode 100644
index 00000000000..66a9342be7f
--- /dev/null
+++ b/docs/diagrams/ConvertBookmarkExpenseSequenceDiagram.puml
@@ -0,0 +1,66 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ConvertBookmarkExpenseCommand" as ConvertBookmarkExpenseCommand LOGIC_COLOR
+participant ":CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":ModelManager" as ModelManager MODEL_COLOR
+end box
+
+box BookmarkExpense BOOKMARK_TRANSACTION__COLOR_T1
+participant ":BookmarkExpenseList" as BookmarkExpenseList BOOKMARK_TRANSACTION_COLOR
+participant ":BookmarkExpense" as BookmarkExpense BOOKMARK_TRANSACTION_COLOR
+end box
+
+[->LogicManager: execute(command)
+activate LogicManager
+
+ref over LogicManager : parse user input to create ConvertBookmarkExpenseCommand
+
+create ConvertBookmarkExpenseCommand
+LogicManager -> ConvertBookmarkExpenseCommand: execute(model)
+activate ConvertBookmarkExpenseCommand
+
+ConvertBookmarkExpenseCommand -> ModelManager: getFilteredBookmarkExpenseList()
+activate ModelManager
+
+ModelManager --> ConvertBookmarkExpenseCommand: bookmarkExpenseList
+deactivate ModelManager
+
+ConvertBookmarkExpenseCommand -> BookmarkExpenseList: bookmarkExpenseList.get()
+activate BookmarkExpenseList
+
+BookmarkExpenseList --> ConvertBookmarkExpenseCommand: bookmarkExpenseToConvert
+deactivate BookmarkExpenseList
+
+ConvertBookmarkExpenseCommand -> BookmarkExpense: bookmarkExpenseToConvert.convert()
+activate BookmarkExpense
+
+BookmarkExpense --> ConvertBookmarkExpenseCommand: newConvertedExpense
+deactivate BookmarkExpense
+
+ConvertBookmarkExpenseCommand -> ModelManager: addExpense(newConvertedExpense)
+activate ModelManager
+
+ModelManager --> ConvertBookmarkExpenseCommand
+deactivate ModelManager
+
+create CommandResult
+ConvertBookmarkExpenseCommand -> CommandResult
+activate CommandResult
+
+
+CommandResult --> ConvertBookmarkExpenseCommand
+deactivate CommandResult
+
+ConvertBookmarkExpenseCommand --> LogicManager: result
+deactivate ConvertBookmarkExpenseCommand
+
+[<-- LogicManager: result
+deactivate LogicManager
+
+@enduml
diff --git a/docs/diagrams/DeleteSequenceDiagram.puml b/docs/diagrams/DeleteSequenceDiagram.puml
index 1dc2311b245..011b50f0a3e 100644
--- a/docs/diagrams/DeleteSequenceDiagram.puml
+++ b/docs/diagrams/DeleteSequenceDiagram.puml
@@ -3,66 +3,83 @@
box Logic LOGIC_COLOR_T1
participant ":LogicManager" as LogicManager LOGIC_COLOR
-participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":FinanceTrackerParser" as FinanceTrackerParser LOGIC_COLOR
participant ":DeleteCommandParser" as DeleteCommandParser LOGIC_COLOR
-participant "d:DeleteCommand" as DeleteCommand LOGIC_COLOR
+participant ":DeleteCommand" as DeleteCommand LOGIC_COLOR
+participant "cmd:DeleteExpenseCommand" as DeleteExpenseCommand LOGIC_COLOR
participant ":CommandResult" as CommandResult LOGIC_COLOR
end box
box Model MODEL_COLOR_T1
-participant ":Model" as Model MODEL_COLOR
+participant ":ModelManager" as ModelManager MODEL_COLOR
end box
[-> LogicManager : execute("delete 1")
activate LogicManager
-LogicManager -> AddressBookParser : parseCommand("delete 1")
-activate AddressBookParser
+LogicManager -> FinanceTrackerParser : parseCommand("delete 1")
+activate FinanceTrackerParser
create DeleteCommandParser
-AddressBookParser -> DeleteCommandParser
+FinanceTrackerParser -> DeleteCommandParser
activate DeleteCommandParser
-DeleteCommandParser --> AddressBookParser
+DeleteCommandParser --> FinanceTrackerParser
deactivate DeleteCommandParser
-AddressBookParser -> DeleteCommandParser : parse("1")
+FinanceTrackerParser -> DeleteCommandParser : parse("1")
activate DeleteCommandParser
create DeleteCommand
DeleteCommandParser -> DeleteCommand
activate DeleteCommand
-DeleteCommand --> DeleteCommandParser : d
+DeleteCommand --> DeleteCommandParser
deactivate DeleteCommand
-DeleteCommandParser --> AddressBookParser : d
+DeleteCommandParser --> FinanceTrackerParser
deactivate DeleteCommandParser
'Hidden arrow to position the destroy marker below the end of the activation bar.
-DeleteCommandParser -[hidden]-> AddressBookParser
+DeleteCommandParser -[hidden]-> FinanceTrackerParser
destroy DeleteCommandParser
-AddressBookParser --> LogicManager : d
-deactivate AddressBookParser
+create DeleteExpenseCommand
+FinanceTrackerParser -> DeleteExpenseCommand
+activate DeleteExpenseCommand
-LogicManager -> DeleteCommand : execute()
+DeleteExpenseCommand -> DeleteCommand : getTargetIndex()
activate DeleteCommand
-DeleteCommand -> Model : deletePerson(1)
-activate Model
+DeleteCommand --> DeleteExpenseCommand
+deactivate DeleteCommand
+
+DeleteCommand -[hidden]-> FinanceTrackerParser
+destroy DeleteCommand
+
+DeleteExpenseCommand --> FinanceTrackerParser : cmd
+deactivate DeleteExpenseCommand
+
+FinanceTrackerParser --> LogicManager : cmd
+deactivate FinanceTrackerParser
-Model --> DeleteCommand
-deactivate Model
+LogicManager -> DeleteExpenseCommand : execute()
+activate DeleteExpenseCommand
+
+DeleteExpenseCommand -> ModelManager : getFilteredExpenseList()
+activate ModelManager
+
+ModelManager --> DeleteExpenseCommand
+deactivate ModelManager
create CommandResult
-DeleteCommand -> CommandResult
+DeleteExpenseCommand -> CommandResult
activate CommandResult
-CommandResult --> DeleteCommand
+CommandResult --> DeleteExpenseCommand
deactivate CommandResult
-DeleteCommand --> LogicManager : result
-deactivate DeleteCommand
+DeleteExpenseCommand --> LogicManager : result
+deactivate DeleteExpenseCommand
[<--LogicManager
deactivate LogicManager
diff --git a/docs/diagrams/DeleteTransactionActivityDiagram.puml b/docs/diagrams/DeleteTransactionActivityDiagram.puml
new file mode 100644
index 00000000000..08137813a25
--- /dev/null
+++ b/docs/diagrams/DeleteTransactionActivityDiagram.puml
@@ -0,0 +1,21 @@
+@startuml
+start
+:User executes delete command;
+
+if () then ([user is not on Expenses or Incomes tab])
+ :Throw a ParseException;
+ stop
+else ([else])
+ if () then ([user is on Expenses tab])
+ :Use DeleteExpenseCommand;
+ :Delete target expense;
+ :Display updated expenses list;
+ else ([user is on Incomes tab])
+ :Use DeleteIncomeCommand;
+ :Delete target income;
+ :Display updated incomes list;
+ endif
+endif
+
+stop
+@enduml
diff --git a/docs/diagrams/DeleteTransactionClassDiagram.puml b/docs/diagrams/DeleteTransactionClassDiagram.puml
new file mode 100644
index 00000000000..dd3c00eef89
--- /dev/null
+++ b/docs/diagrams/DeleteTransactionClassDiagram.puml
@@ -0,0 +1,45 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor LOGIC_COLOR_T4
+skinparam classBackgroundColor LOGIC_COLOR
+
+package Logic {
+
+package Parser {
+Class FinanceTrackerParser
+Class DeleteCommandParser
+}
+
+package Command {
+Class DeleteCommand
+Class DeleteExpenseCommand
+Class DeleteIncomeCommand
+}
+}
+
+
+package Model {
+
+package Transaction {
+Class Expense MODEL_COLOR
+Class Income MODEL_COLOR
+Class "{abstract}\nTransaction" as Transaction MODEL_COLOR
+}
+}
+
+FinanceTrackerParser .> DeleteCommandParser: creates >
+DeleteCommandParser .> DeleteCommand: creates >
+
+FinanceTrackerParser ..> DeleteExpenseCommand: creates >
+FinanceTrackerParser ..> DeleteIncomeCommand: creates >
+
+DeleteExpenseCommand --|> DeleteCommand
+DeleteIncomeCommand --|> DeleteCommand
+DeleteCommand *----> "1" Transaction: deletes >
+note bottom on link: Reference is stored in\nthe form of an Index
+
+Expense -up-|> Transaction MODEL_COLOR
+Income -up-|> Transaction MODEL_COLOR
+
+@enduml
diff --git a/docs/diagrams/EditTransactionActivityDiagram.puml b/docs/diagrams/EditTransactionActivityDiagram.puml
new file mode 100644
index 00000000000..565165c3df9
--- /dev/null
+++ b/docs/diagrams/EditTransactionActivityDiagram.puml
@@ -0,0 +1,21 @@
+@startuml
+start
+:User executes edit command;
+
+if () then ([user is not on Expenses or Incomes tab])
+ :Throw a ParseException;
+ stop
+else ([else])
+ if () then ([user is on Expenses tab])
+ :Use EditExpenseCommand;
+ :Edit target expense;
+ :Display updated expenses list;
+ else ([user is on Incomes tab])
+ :Use EditIncomeCommand;
+ :Edit target income;
+ :Display updated incomes list;
+ endif
+endif
+
+stop
+@enduml
diff --git a/docs/diagrams/EditTransactionClassDiagram.puml b/docs/diagrams/EditTransactionClassDiagram.puml
new file mode 100644
index 00000000000..8078dd3f543
--- /dev/null
+++ b/docs/diagrams/EditTransactionClassDiagram.puml
@@ -0,0 +1,63 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor LOGIC_COLOR_T4
+skinparam classBackgroundColor LOGIC_COLOR
+
+package Logic {
+
+package Parser {
+Class FinanceTrackerParser
+Class EditCommandParser
+}
+
+package Command {
+Class EditCommand
+Class EditExpenseCommand
+Class EditIncomeCommand
+Class EditTransactionDescriptor
+}
+}
+
+
+package Model {
+
+package Transaction {
+Class Expense MODEL_COLOR
+Class Income MODEL_COLOR
+Class "{abstract}\nTransaction" as Transaction MODEL_COLOR
+Class Title MODEL_COLOR
+Class Amount MODEL_COLOR
+Class Date MODEL_COLOR
+}
+package Category {
+Class Category MODEL_COLOR
+}
+}
+
+FinanceTrackerParser .> EditCommandParser: creates >
+EditCommandParser .> EditCommand: creates >
+
+FinanceTrackerParser ..> EditExpenseCommand: creates >
+FinanceTrackerParser ..> EditIncomeCommand: creates >
+
+EditExpenseCommand --|> EditCommand
+EditIncomeCommand --|> EditCommand
+EditCommand *-> "1" EditTransactionDescriptor
+EditCommand *----> "1" Transaction: modifies >
+
+note bottom on link: Reference is stored in\nthe form of an Index
+
+EditTransactionDescriptor --> "0..1" Title
+EditTransactionDescriptor --> "0..1" Amount
+EditTransactionDescriptor --> "0..1" Date
+EditTransactionDescriptor --> "*" Category
+
+Expense -up-|> Transaction MODEL_COLOR
+Income -up-|> Transaction MODEL_COLOR
+Transaction *-> "1" Title MODEL_COLOR
+Transaction *-> "1" Amount MODEL_COLOR
+Transaction *-> "1" Date MODEL_COLOR
+Transaction *-> "*" Category MODEL_COLOR
+
+@enduml
diff --git a/docs/diagrams/EditTransactionSequenceDiagram.puml b/docs/diagrams/EditTransactionSequenceDiagram.puml
new file mode 100644
index 00000000000..5a67d73002c
--- /dev/null
+++ b/docs/diagrams/EditTransactionSequenceDiagram.puml
@@ -0,0 +1,80 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":FinanceTrackerParser" as FinanceTrackerParser LOGIC_COLOR
+participant ":EditCommandParser" as EditCommandParser LOGIC_COLOR
+participant ":EditTransactionDescriptor" as EditTransactionDescriptor LOGIC_COLOR
+participant ":EditCommand" as EditCommand LOGIC_COLOR
+participant "cmd:EditExpenseCommand" as EditExpenseCommand LOGIC_COLOR
+end box
+
+[-> LogicManager : execute("edit 1 a/5", uiState)
+activate LogicManager
+
+LogicManager -> FinanceTrackerParser : parseCommand("edit 1 a/5", uiState)
+activate FinanceTrackerParser
+
+create EditCommandParser
+FinanceTrackerParser -> EditCommandParser
+activate EditCommandParser
+
+EditCommandParser --> FinanceTrackerParser
+deactivate EditCommandParser
+
+FinanceTrackerParser -> EditCommandParser : parse("...")
+activate EditCommandParser
+
+ref over EditCommandParser: Parse user input
+
+' TODO parsing data fields takes place here
+
+create EditTransactionDescriptor
+EditCommandParser -> EditTransactionDescriptor
+activate EditTransactionDescriptor
+EditTransactionDescriptor --> EditCommandParser
+deactivate EditTransactionDescriptor
+
+create EditCommand
+EditCommandParser -> EditCommand
+activate EditCommand
+
+EditCommand --> EditCommandParser
+deactivate EditCommand
+
+EditCommandParser --> FinanceTrackerParser
+
+deactivate EditCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+EditCommandParser -[hidden]-> FinanceTrackerParser
+destroy EditCommandParser
+
+create EditExpenseCommand
+FinanceTrackerParser -> EditExpenseCommand
+activate EditExpenseCommand
+
+EditExpenseCommand -> EditCommand: getTargetIndex()
+activate EditCommand
+EditCommand --> EditExpenseCommand
+deactivate EditCommand
+
+EditExpenseCommand -> EditCommand: getEditTransactionDescriptor()
+activate EditCommand
+EditCommand --> EditExpenseCommand
+deactivate EditCommand
+
+EditCommand -[hidden]-> FinanceTrackerParser
+destroy EditCommand
+
+EditExpenseCommand --> FinanceTrackerParser
+deactivate EditExpenseCommand
+
+FinanceTrackerParser --> LogicManager : cmd
+deactivate FinanceTrackerParser
+
+ref over LogicManager: Execute edit command
+
+[<--LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/EditTransactionSequenceDiagram2.puml b/docs/diagrams/EditTransactionSequenceDiagram2.puml
new file mode 100644
index 00000000000..4c9c1c8f686
--- /dev/null
+++ b/docs/diagrams/EditTransactionSequenceDiagram2.puml
@@ -0,0 +1,87 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":EditTransactionDescriptor" as EditTransactionDescriptor LOGIC_COLOR
+participant "cmd:EditExpenseCommand" as EditExpenseCommand LOGIC_COLOR
+participant "result:CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "edited:Expense" as Expense MODEL_COLOR
+participant ":ModelManager" as ModelManager MODEL_COLOR
+end box
+
+[-> LogicManager : execute("edit 1 a/5", uiState)
+activate LogicManager
+
+ref over LogicManager, EditTransactionDescriptor, EditExpenseCommand: Parse command
+
+
+LogicManager -> EditExpenseCommand : execute(model)
+activate EditExpenseCommand
+
+EditExpenseCommand -> ModelManager : getFilteredExpenseList()
+activate ModelManager
+
+ModelManager --> EditExpenseCommand
+deactivate ModelManager
+
+EditExpenseCommand -> EditExpenseCommand: createEditedExpense(descriptor)
+activate EditExpenseCommand
+
+EditExpenseCommand -> EditTransactionDescriptor: descriptor.getTitle()
+activate EditTransactionDescriptor
+
+EditTransactionDescriptor --> EditExpenseCommand: title
+deactivate EditTransactionDescriptor
+
+EditExpenseCommand -> EditTransactionDescriptor: descriptor.getAmount()
+activate EditTransactionDescriptor
+
+EditTransactionDescriptor --> EditExpenseCommand: amount
+deactivate EditTransactionDescriptor
+
+EditExpenseCommand -> EditTransactionDescriptor: descriptor.getDate()
+activate EditTransactionDescriptor
+
+EditTransactionDescriptor --> EditExpenseCommand: date
+deactivate EditTransactionDescriptor
+
+EditExpenseCommand -> EditTransactionDescriptor: descriptor.getCategories()
+activate EditTransactionDescriptor
+
+EditTransactionDescriptor --> EditExpenseCommand: categories
+deactivate EditTransactionDescriptor
+
+
+create Expense
+EditExpenseCommand -> Expense
+activate Expense
+
+Expense --> EditExpenseCommand
+deactivate Expense
+
+EditExpenseCommand --> EditExpenseCommand: edited
+deactivate EditExpenseCommand
+
+EditExpenseCommand -> ModelManager : setTransaction(toEdit, edited)
+activate ModelManager
+
+ModelManager --> EditExpenseCommand
+deactivate ModelManager
+
+create CommandResult
+EditExpenseCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> EditExpenseCommand
+deactivate CommandResult
+
+EditExpenseCommand --> LogicManager : result
+deactivate EditExpenseCommand
+
+[<--LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/FindActivityDiagram.puml b/docs/diagrams/FindActivityDiagram.puml
new file mode 100644
index 00000000000..63c95200a08
--- /dev/null
+++ b/docs/diagrams/FindActivityDiagram.puml
@@ -0,0 +1,14 @@
+@startuml
+start
+:User executes find command;
+
+if () then ([user is on Overview tab])
+ :Filters all transactions;
+elseif () then ([user is on Expenses tab])
+ :Filters all expenses;
+else ([user is on Incomes tab])
+ :Filters all incomes;
+endif
+ :Displays filtered list on current tab;
+stop
+@enduml
diff --git a/docs/diagrams/FindClassDiagram.puml b/docs/diagrams/FindClassDiagram.puml
new file mode 100644
index 00000000000..ece242c67f0
--- /dev/null
+++ b/docs/diagrams/FindClassDiagram.puml
@@ -0,0 +1,39 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor LOGIC_COLOR_T4
+skinparam classBackgroundColor LOGIC_COLOR
+
+package Logic {
+
+package Parser {
+Class FinanceTrackerParser
+Class FindCommandParser
+}
+
+package Command {
+Class FindCommand
+Class FindXYZCommand
+}
+}
+
+package Model{
+package Predicate {
+Class HiddenModel #FFFFFF
+}
+}
+
+Class HiddenOutside #FFFFFF
+
+FinanceTrackerParser ..> FindCommandParser: creates >
+FinanceTrackerParser ..> FindXYZCommand: creates >
+
+FindCommandParser ..> FindCommand : creates >
+FindCommandParser ..> Predicate : creates >
+FindXYZCommand -up-|> FindCommand
+
+FindCommand o--> "*" Predicate
+
+note left of FindXYZCommand: FindXYZCommand = FindExpenseCommand, \nFindIncomeCommand, FindTransactionCommand
+
+@enduml
diff --git a/docs/diagrams/FindSequenceDiagram.puml b/docs/diagrams/FindSequenceDiagram.puml
new file mode 100644
index 00000000000..f9c51f307f3
--- /dev/null
+++ b/docs/diagrams/FindSequenceDiagram.puml
@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":FinanceTrackerParser" as FinanceTrackerParser LOGIC_COLOR
+participant ":FindCommandParser" as FindCommandParser LOGIC_COLOR
+participant "b:FindCommand" as FindCommand LOGIC_COLOR
+participant "f:FindTransactionCommand" as FindTransactionCommand LOGIC_COLOR
+participant ":CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":ModelManager" as ModelManager MODEL_COLOR
+end box
+
+[-> LogicManager : execute("find t/tea a/5", uiState)
+activate LogicManager
+
+LogicManager -> FinanceTrackerParser : parseCommand("find t/tea a/5", uiState)
+activate FinanceTrackerParser
+
+create FindCommandParser
+FinanceTrackerParser -> FindCommandParser
+activate FindCommandParser
+
+FindCommandParser --> FinanceTrackerParser
+deactivate FindCommandParser
+
+FinanceTrackerParser -> FindCommandParser : parse(" t/tea a/5")
+activate FindCommandParser
+
+create FindCommand
+FindCommandParser -> FindCommand
+activate FindCommand
+
+FindCommand --> FindCommandParser : b
+deactivate FindCommand
+
+FindCommandParser --> FinanceTrackerParser : b
+
+deactivate FindCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+FindCommandParser -[hidden]-> FinanceTrackerParser
+destroy FindCommandParser
+
+create FindTransactionCommand
+FinanceTrackerParser -> FindTransactionCommand : FindTransactionCommand(b)
+activate FindTransactionCommand
+
+FindTransactionCommand --> FinanceTrackerParser : f
+deactivate FindTransactionCommand
+
+FinanceTrackerParser --> LogicManager : f
+deactivate FinanceTrackerParser
+
+LogicManager -> FindTransactionCommand : execute()
+activate FindTransactionCommand
+
+FindTransactionCommand -> ModelManager : updateFilteredTransactionList(f.getPredicates())
+activate ModelManager
+
+ModelManager --> FindTransactionCommand
+deactivate ModelManager
+
+create CommandResult
+FindTransactionCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> FindTransactionCommand
+deactivate CommandResult
+
+FindTransactionCommand --> LogicManager : result
+deactivate FindTransactionCommand
+
+[<--LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/LogicClassDiagram.puml b/docs/diagrams/LogicClassDiagram.puml
index 016ef33e2e2..9f17e4ae553 100644
--- a/docs/diagrams/LogicClassDiagram.puml
+++ b/docs/diagrams/LogicClassDiagram.puml
@@ -5,10 +5,11 @@ skinparam arrowColor LOGIC_COLOR_T4
skinparam classBackgroundColor LOGIC_COLOR
package Logic {
+class Timekeeper
package Parser {
Interface Parser <>
-Class AddressBookParser
+Class FinanceTrackerParser
Class XYZCommandParser
Class CliSyntax
Class ParserUtil
@@ -35,8 +36,9 @@ Class HiddenOutside #FFFFFF
HiddenOutside ..> Logic
LogicManager .up.|> Logic
-LogicManager -->"1" AddressBookParser
-AddressBookParser .left.> XYZCommandParser: creates >
+LogicManager -->"1" FinanceTrackerParser
+LogicManager -left-> "1" Timekeeper
+FinanceTrackerParser .left.> XYZCommandParser: creates >
XYZCommandParser ..> XYZCommand : creates >
XYZCommandParser ..|> Parser
@@ -53,7 +55,7 @@ LogicManager .left.> Command : executes >
LogicManager --> Model
Command .right.> Model
-note right of XYZCommand: XYZCommand = AddCommand, \nFindCommand, etc
+note right of XYZCommand: XYZCommand = AddExpenseCommand, \nFindCommand, etc
Logic ..> CommandResult
LogicManager .down.> CommandResult
diff --git a/docs/diagrams/ModelClassDiagram.puml b/docs/diagrams/ModelClassDiagram.puml
index e85a00d4107..e327e18af14 100644
--- a/docs/diagrams/ModelClassDiagram.puml
+++ b/docs/diagrams/ModelClassDiagram.puml
@@ -5,52 +5,70 @@ skinparam arrowColor MODEL_COLOR
skinparam classBackgroundColor MODEL_COLOR
Package Model <>{
-Interface ReadOnlyAddressBook <>
+Interface ReadOnlyFinanceTracker <>
Interface Model <>
-Interface ObservableList <>
-Class AddressBook
-Class ReadOnlyAddressBook
+Interface ReadOnlyUserPrefs <>
+Class FinanceTracker
Class Model
Class ModelManager
Class UserPrefs
-Class ReadOnlyUserPrefs
-
-Package Person {
-Class Person
-Class Address
-Class Email
-Class Name
-Class Phone
-Class UniquePersonList
+class CommandHistory
+
+Package Transaction {
+Class "{abstract}\nTransaction" as Transaction
+Class Expense
+Class Income
+Class Amount
+Class Date
+Class Title
+Class TransactionList
+}
+
+Package Category {
+Class Category
+}
+
+Package Budget {
+Class MonthlyBudget
}
-Package Tag {
-Class Tag
+Package Bookmark {
+Class BookmarkExpenseList
+Class BookmarkIncomeList
}
}
Class HiddenOutside #FFFFFF
HiddenOutside ..> Model
-AddressBook .up.|> ReadOnlyAddressBook
+FinanceTracker .up.|> ReadOnlyFinanceTracker
ModelManager .up.|> Model
-Model .right.> ObservableList
-ModelManager o--> "1" AddressBook
+ModelManager o--> "1" FinanceTracker
+ModelManager o-left-> "1" CommandHistory
ModelManager o-left-> "1" UserPrefs
UserPrefs .up.|> ReadOnlyUserPrefs
-AddressBook *--> "1" UniquePersonList
-UniquePersonList o--> "*" Person
-Person *--> Name
-Person *--> Phone
-Person *--> Email
-Person *--> Address
-Person *--> "*" Tag
+FinanceTracker *--> "1" TransactionList
+TransactionList o--> "*" Transaction
+Expense -left-|> Transaction
+Income -right-|> Transaction
+Transaction *--> "1" Title
+Transaction *--> "1" Amount
+Transaction *--> "1" Date
+Transaction *--> "*" Category
+
+FinanceTracker *--> "1" BookmarkExpenseList
+FinanceTracker *--> "1" BookmarkIncomeList
+
+FinanceTracker *--> "1" MonthlyBudget
+
+TransactionList -[hidden]right-> BookmarkExpenseList
+BookmarkIncomeList -[hidden]down-> BookmarkExpenseList
+BookmarkExpenseList -[hidden]down-> MonthlyBudget
+ModelManager -[hidden]right-> FinanceTracker
-Name -[hidden]right-> Phone
-Phone -[hidden]right-> Address
-Address -[hidden]right-> Email
+ModelManager --> "*" Transaction : filtered list
+ModelManager o--> "1" MonthlyBudget
-ModelManager -->"1" Person : filtered list
@enduml
diff --git a/docs/diagrams/SetExpenseLimitSequenceDiagram.puml b/docs/diagrams/SetExpenseLimitSequenceDiagram.puml
new file mode 100644
index 00000000000..e4941df0f3e
--- /dev/null
+++ b/docs/diagrams/SetExpenseLimitSequenceDiagram.puml
@@ -0,0 +1,69 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":FinanceTrackerParser" as FinanceTrackerParser LOGIC_COLOR
+participant ":SetExpenseLimitCommandParser" as SetExpenseLimitCommandParser LOGIC_COLOR
+participant "s:SetExpenseLimitCommand" as SetExpenseLimitCommand LOGIC_COLOR
+participant ":CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":ModelManager" as ModelManager MODEL_COLOR
+end box
+
+[-> LogicManager : execute("setel a/500")
+activate LogicManager
+
+LogicManager -> FinanceTrackerParser : parseCommand("setel a/500")
+activate FinanceTrackerParser
+
+create SetExpenseLimitCommandParser
+FinanceTrackerParser -> SetExpenseLimitCommandParser
+activate SetExpenseLimitCommandParser
+
+SetExpenseLimitCommandParser --> FinanceTrackerParser
+deactivate SetExpenseLimitCommandParser
+
+FinanceTrackerParser -> SetExpenseLimitCommandParser : parse("a/500")
+activate SetExpenseLimitCommandParser
+
+create SetExpenseLimitCommand
+SetExpenseLimitCommandParser -> SetExpenseLimitCommand : SetExpenseLimitCommand(amount)
+activate SetExpenseLimitCommand
+
+SetExpenseLimitCommand --> SetExpenseLimitCommandParser : s
+deactivate SetExpenseLimitCommand
+
+SetExpenseLimitCommandParser --> FinanceTrackerParser : s
+deactivate SetExpenseLimitCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+SetExpenseLimitCommandParser -[hidden]-> FinanceTrackerParser
+destroy SetExpenseLimitCommandParser
+
+FinanceTrackerParser --> LogicManager : s
+deactivate FinanceTrackerParser
+
+LogicManager -> SetExpenseLimitCommand : execute()
+activate SetExpenseLimitCommand
+
+SetExpenseLimitCommand -> ModelManager : setExpenseLimit(amount)
+activate ModelManager
+
+ModelManager --> SetExpenseLimitCommand
+deactivate ModelManager
+
+create CommandResult
+SetExpenseLimitCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> SetExpenseLimitCommand
+deactivate CommandResult
+
+SetExpenseLimitCommand --> LogicManager : result
+deactivate SetExpenseLimitCommand
+
+[<--LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/StorageClassDiagram.puml b/docs/diagrams/StorageClassDiagram.puml
index 6adb2e156bf..7d17654683a 100644
--- a/docs/diagrams/StorageClassDiagram.puml
+++ b/docs/diagrams/StorageClassDiagram.puml
@@ -6,19 +6,21 @@ skinparam classBackgroundColor STORAGE_COLOR
Interface Storage <>
Interface UserPrefsStorage <>
-Interface AddressBookStorage <>
+Interface FinanceTrackerStorage <>
Class StorageManager
Class JsonUserPrefsStorage
-Class JsonAddressBookStorage
+Class JsonFinanceTrackerStorage
StorageManager .left.|> Storage
StorageManager o-right-> UserPrefsStorage
-StorageManager o--> AddressBookStorage
+StorageManager o--> FinanceTrackerStorage
JsonUserPrefsStorage .left.|> UserPrefsStorage
-JsonAddressBookStorage .left.|> AddressBookStorage
-JsonAddressBookStorage .down.> JsonSerializableAddressBookStorage
-JsonSerializableAddressBookStorage .right.> JsonSerializablePerson
-JsonSerializablePerson .right.> JsonAdaptedTag
+JsonFinanceTrackerStorage .left.|> FinanceTrackerStorage
+JsonFinanceTrackerStorage .down.> JsonSerializableFinanceTracker
+JsonSerializableFinanceTracker --> "*" JsonAdaptedExpense
+JsonSerializableFinanceTracker --> "*" JsonAdaptedIncome
+JsonAdaptedExpense --> "*" JsonAdaptedCategory
+JsonAdaptedIncome --> "*" JsonAdaptedCategory
@enduml
diff --git a/docs/diagrams/TimekeeperSequenceDiagram.puml b/docs/diagrams/TimekeeperSequenceDiagram.puml
new file mode 100644
index 00000000000..27ea0ff5e48
--- /dev/null
+++ b/docs/diagrams/TimekeeperSequenceDiagram.puml
@@ -0,0 +1,48 @@
+@startuml
+!include style.puml
+
+actor User USER_COLOR
+
+box Ui UI_COLOR_T1
+participant ":MainWindow" as MainWindow UI_COLOR
+end box
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":Timekeeper" as Timekeeper LOGIC_COLOR
+participant "c:XYZCommand" as XYZCommand LOGIC_COLOR
+end box
+
+note right of XYZCommand : XYZCommand =\nAddExpenseCommand,\nFindCommand, etc
+
+User -> MainWindow : input command string
+activate MainWindow
+
+MainWindow -> LogicManager : execute()
+activate LogicManager
+
+LogicManager -> Timekeeper : checkIn()
+activate Timekeeper
+
+alt current system time is later or equals to the last observed time
+ ref over LogicManager, XYZCommand : Parse and execute user input
+
+ Timekeeper --> LogicManager : result
+
+ LogicManager --> MainWindow : result
+else else
+ Timekeeper --> LogicManager : TemporalException()
+ deactivate Timekeeper
+
+ LogicManager --> MainWindow : TemporalException()
+ deactivate Timekeeper
+
+ MainWindow -> MainWindow : disableApplication()
+ activate MainWindow
+
+ MainWindow --> MainWindow
+ deactivate MainWindow
+end
+MainWindow --> User
+deactivate MainWindow
+@enduml
diff --git a/docs/diagrams/UiClassDiagram.puml b/docs/diagrams/UiClassDiagram.puml
index 92746f9fcf7..c764bda80b0 100644
--- a/docs/diagrams/UiClassDiagram.puml
+++ b/docs/diagrams/UiClassDiagram.puml
@@ -9,12 +9,36 @@ Interface Ui <>
Class "{abstract}\nUiPart" as UiPart
Class UiManager
Class MainWindow
-Class HelpWindow
Class ResultDisplay
-Class PersonListPanel
-Class PersonCard
-Class StatusBarFooter
+Class TransactionListPanel
+Class TransactionCard
Class CommandBox
+Class SavingsGoalPanel
+Class UiState
+Class DisabledWindow
+
+package Tabs {
+Class TwoColumnTabPane
+Class OverviewTabPane
+Class IncomeTabPane
+Class ExpenseTabPane
+Class AnalyticsTabPane
+Class UserGuideTabPane
+}
+
+package Expense {
+Class ExpensePanel
+}
+
+package Income {
+Class IncomePanel
+}
+
+package Bookmark {
+Class BookmarkIncomePanel
+Class BookmarkExpensePanel
+Class BookmarkTransactionCard
+}
}
package Model <> {
@@ -30,31 +54,68 @@ HiddenOutside ..> Ui
UiManager .left.|> Ui
UiManager -down-> MainWindow
-MainWindow --> HelpWindow
+UiManager --> UiState
+MainWindow --> UiState
MainWindow *-down-> CommandBox
MainWindow *-down-> ResultDisplay
-MainWindow *-down-> PersonListPanel
-MainWindow *-down-> StatusBarFooter
+MainWindow *-up-> DisabledWindow
-PersonListPanel -down-> PersonCard
+MainWindow *-down-> OverviewTabPane
+MainWindow *-down-> IncomeTabPane
+MainWindow *-down-> ExpenseTabPane
+MainWindow *-down-> AnalyticsTabPane
+MainWindow *-down-> UserGuideTabPane
+
+OverviewTabPane *-down-> TransactionListPanel
+OverviewTabPane *-down-> SavingsGoalPanel
+
+IncomeTabPane *-down-> IncomePanel
+IncomeTabPane *-down-> BookmarkIncomePanel
+
+ExpenseTabPane *-down-> ExpensePanel
+ExpenseTabPane *-down-> BookmarkExpensePanel
+
+TransactionListPanel -down-> TransactionCard
+ExpensePanel -down-> TransactionCard
+IncomePanel -down-> TransactionCard
+
+BookmarkExpensePanel -down-> BookmarkTransactionCard
+BookmarkIncomePanel -down-> BookmarkTransactionCard
MainWindow -left-|> UiPart
ResultDisplay --|> UiPart
CommandBox --|> UiPart
-PersonListPanel --|> UiPart
-PersonCard --|> UiPart
-StatusBarFooter --|> UiPart
-HelpWindow -down-|> UiPart
+TransactionListPanel --|> UiPart
+TransactionCard --|> UiPart
+ExpensePanel --|> UiPart
+IncomePanel --|> UiPart
+SavingsGoalPanel --|> UiPart
+BookmarkExpensePanel --|> UiPart
+BookmarkIncomePanel --|> UiPart
+BookmarkTransactionCard --|> UiPart
+
+TwoColumnTabPane --|> UiPart
+OverviewTabPane --|> TwoColumnTabPane
+IncomeTabPane --|> TwoColumnTabPane
+ExpenseTabPane --|> TwoColumnTabPane
+
+AnalyticsTabPane --|> UiPart
+UserGuideTabPane --|> UiPart
-PersonCard ..> Model
-UiManager -right-> Logic
-MainWindow -left-> Logic
+TransactionCard ..> Model
+UiManager -up-> Logic
+MainWindow -up-> Logic
-PersonListPanel -[hidden]left- HelpWindow
-HelpWindow -[hidden]left- CommandBox
CommandBox -[hidden]left- ResultDisplay
-ResultDisplay -[hidden]left- StatusBarFooter
+ExpensePanel -[hidden]left- TransactionListPanel
+IncomePanel -[hidden]left- SavingsGoalPanel
MainWindow -[hidden]-|> UiPart
+AnalyticsTabPane -[hidden]-|> OverviewTabPane
+UserGuideTabPane -[hidden]-|> OverviewTabPane
+TwoColumnTabPane -[hidden]down-|> SavingsGoalPanel
+UiPart -[hidden]down-|> Model
+Logic -[hidden]down-|> UiManager
+TwoColumnTabPane -[hidden]down-|> TransactionListPanel
@enduml
diff --git a/docs/diagrams/UndoRedoState0.puml b/docs/diagrams/UndoRedoState0.puml
deleted file mode 100644
index 96e30744d24..00000000000
--- a/docs/diagrams/UndoRedoState0.puml
+++ /dev/null
@@ -1,20 +0,0 @@
-@startuml
-!include style.puml
-skinparam ClassFontColor #000000
-skinparam ClassBorderColor #000000
-
-title Initial state
-
-package States {
- class State1 as "__ab0:AddressBook__"
- class State2 as "__ab1:AddressBook__"
- class State3 as "__ab2:AddressBook__"
-}
-State1 -[hidden]right-> State2
-State2 -[hidden]right-> State3
-hide State2
-hide State3
-
-class Pointer as "Current State" #FFFFF
-Pointer -up-> State1
-@end
diff --git a/docs/diagrams/UndoRedoState1.puml b/docs/diagrams/UndoRedoState1.puml
deleted file mode 100644
index 01fcb9b2b96..00000000000
--- a/docs/diagrams/UndoRedoState1.puml
+++ /dev/null
@@ -1,22 +0,0 @@
-@startuml
-!include style.puml
-skinparam ClassFontColor #000000
-skinparam ClassBorderColor #000000
-
-title After command "delete 5"
-
-package States <> {
- class State1 as "__ab0:AddressBook__"
- class State2 as "__ab1:AddressBook__"
- class State3 as "__ab2:AddressBook__"
-}
-
-State1 -[hidden]right-> State2
-State2 -[hidden]right-> State3
-
-hide State3
-
-class Pointer as "Current State" #FFFFF
-
-Pointer -up-> State2
-@end
diff --git a/docs/diagrams/UndoRedoState2.puml b/docs/diagrams/UndoRedoState2.puml
deleted file mode 100644
index bccc230a5d1..00000000000
--- a/docs/diagrams/UndoRedoState2.puml
+++ /dev/null
@@ -1,20 +0,0 @@
-@startuml
-!include style.puml
-skinparam ClassFontColor #000000
-skinparam ClassBorderColor #000000
-
-title After command "add n/David"
-
-package States <> {
- class State1 as "__ab0:AddressBook__"
- class State2 as "__ab1:AddressBook__"
- class State3 as "__ab2:AddressBook__"
-}
-
-State1 -[hidden]right-> State2
-State2 -[hidden]right-> State3
-
-class Pointer as "Current State" #FFFFF
-
-Pointer -up-> State3
-@end
diff --git a/docs/diagrams/UndoRedoState3.puml b/docs/diagrams/UndoRedoState3.puml
deleted file mode 100644
index ea29c9483e4..00000000000
--- a/docs/diagrams/UndoRedoState3.puml
+++ /dev/null
@@ -1,20 +0,0 @@
-@startuml
-!include style.puml
-skinparam ClassFontColor #000000
-skinparam ClassBorderColor #000000
-
-title After command "undo"
-
-package States <> {
- class State1 as "__ab0:AddressBook__"
- class State2 as "__ab1:AddressBook__"
- class State3 as "__ab2:AddressBook__"
-}
-
-State1 -[hidden]right-> State2
-State2 -[hidden]right-> State3
-
-class Pointer as "Current State" #FFFFF
-
-Pointer -up-> State2
-@end
diff --git a/docs/diagrams/UndoRedoState4.puml b/docs/diagrams/UndoRedoState4.puml
deleted file mode 100644
index 1b784cece80..00000000000
--- a/docs/diagrams/UndoRedoState4.puml
+++ /dev/null
@@ -1,20 +0,0 @@
-@startuml
-!include style.puml
-skinparam ClassFontColor #000000
-skinparam ClassBorderColor #000000
-
-title After command "list"
-
-package States <> {
- class State1 as "__ab0:AddressBook__"
- class State2 as "__ab1:AddressBook__"
- class State3 as "__ab2:AddressBook__"
-}
-
-State1 -[hidden]right-> State2
-State2 -[hidden]right-> State3
-
-class Pointer as "Current State" #FFFFF
-
-Pointer -up-> State2
-@end
diff --git a/docs/diagrams/UndoRedoState5.puml b/docs/diagrams/UndoRedoState5.puml
deleted file mode 100644
index 88927be32bc..00000000000
--- a/docs/diagrams/UndoRedoState5.puml
+++ /dev/null
@@ -1,21 +0,0 @@
-@startuml
-!include style.puml
-skinparam ClassFontColor #000000
-skinparam ClassBorderColor #000000
-
-title After command "clear"
-
-package States <> {
- class State1 as "__ab0:AddressBook__"
- class State2 as "__ab1:AddressBook__"
- class State3 as "__ab3:AddressBook__"
-}
-
-State1 -[hidden]right-> State2
-State2 -[hidden]right-> State3
-
-class Pointer as "Current State" #FFFFF
-
-Pointer -up-> State3
-note right on link: State ab2 deleted.
-@end
diff --git a/docs/diagrams/UndoSequenceDiagram.puml b/docs/diagrams/UndoSequenceDiagram.puml
deleted file mode 100644
index 410aab4e412..00000000000
--- a/docs/diagrams/UndoSequenceDiagram.puml
+++ /dev/null
@@ -1,53 +0,0 @@
-@startuml
-!include style.puml
-
-box Logic LOGIC_COLOR_T1
-participant ":LogicManager" as LogicManager LOGIC_COLOR
-participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
-participant "u:UndoCommand" as UndoCommand LOGIC_COLOR
-end box
-
-box Model MODEL_COLOR_T1
-participant ":Model" as Model MODEL_COLOR
-participant ":VersionedAddressBook" as VersionedAddressBook MODEL_COLOR
-end box
-[-> LogicManager : execute(undo)
-activate LogicManager
-
-LogicManager -> AddressBookParser : parseCommand(undo)
-activate AddressBookParser
-
-create UndoCommand
-AddressBookParser -> UndoCommand
-activate UndoCommand
-
-UndoCommand --> AddressBookParser
-deactivate UndoCommand
-
-AddressBookParser --> LogicManager : u
-deactivate AddressBookParser
-
-LogicManager -> UndoCommand : execute()
-activate UndoCommand
-
-UndoCommand -> Model : undoAddressBook()
-activate Model
-
-Model -> VersionedAddressBook : undo()
-activate VersionedAddressBook
-
-VersionedAddressBook -> VersionedAddressBook :resetData(ReadOnlyAddressBook)
-VersionedAddressBook --> Model :
-deactivate VersionedAddressBook
-
-Model --> UndoCommand
-deactivate Model
-
-UndoCommand --> LogicManager : result
-deactivate UndoCommand
-UndoCommand -[hidden]-> LogicManager : result
-destroy UndoCommand
-
-[<--LogicManager
-deactivate LogicManager
-@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/AddBookmarkExpenseSequenceDiagram.puml b/docs/diagrams/bookmarkdiagrams/AddBookmarkExpenseSequenceDiagram.puml
new file mode 100644
index 00000000000..de8e03850ea
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/AddBookmarkExpenseSequenceDiagram.puml
@@ -0,0 +1,59 @@
+@startuml
+!include ../style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":AddBookmarkExpenseCommand" as AddBookmarkExpenseCommand LOGIC_COLOR
+participant "e:CommandException" as CommandException LOGIC_COLOR
+participant "result:CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":ModelManager" as ModelManager MODEL_COLOR
+end box
+
+[->LogicManager: execute(command)
+activate LogicManager
+
+ref over LogicManager : parse user input to create AddBookmarkExpenseCommand
+
+create AddBookmarkExpenseCommand
+LogicManager -> AddBookmarkExpenseCommand: execute(model)
+activate AddBookmarkExpenseCommand
+
+AddBookmarkExpenseCommand -> ModelManager: addBookmarkExpense(toAdd)
+activate ModelManager
+
+alt #transparent duplicate BookmarkExpense
+
+ModelManager --> AddBookmarkExpenseCommand
+
+create CommandException
+AddBookmarkExpenseCommand -> CommandException
+activate CommandException
+
+CommandException --> LogicManager: e
+
+[<-- LogicManager: e
+deactivate CommandException
+
+else
+
+ModelManager --> AddBookmarkExpenseCommand
+deactivate ModelManager
+
+create CommandResult
+AddBookmarkExpenseCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> AddBookmarkExpenseCommand: result
+deactivate CommandResult
+
+AddBookmarkExpenseCommand --> LogicManager: result
+deactivate AddBookmarkExpenseCommand
+
+[<-- LogicManager: result
+deactivate LogicManager
+end
+
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/AddBookmarkTransactionClassDiagram.puml b/docs/diagrams/bookmarkdiagrams/AddBookmarkTransactionClassDiagram.puml
new file mode 100644
index 00000000000..909e9154440
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/AddBookmarkTransactionClassDiagram.puml
@@ -0,0 +1,53 @@
+@startuml
+!include ../style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor LOGIC_COLOR_T4
+skinparam classBackgroundColor LOGIC_COLOR
+
+package Logic {
+
+package Parser {
+Class FinanceTrackerParser
+Class AddBookmarkExpenseCommandParser
+Class AddBookmarkIncomeCommandParser
+}
+
+package Command {
+Class AddBookmarkExpenseCommand
+Class AddBookmarkIncomeCommand
+}
+}
+
+
+package Model {
+
+package BookmarkTransaction {
+Class BookmarkExpense MODEL_COLOR
+Class BookmarkIncome MODEL_COLOR
+Class "{abstract}\nBookmarkTransaction" as BookmarkTransaction MODEL_COLOR
+Class Title MODEL_COLOR
+Class Amount MODEL_COLOR
+}
+package Category {
+Class Category MODEL_COLOR
+}
+}
+
+FinanceTrackerParser ..> AddBookmarkExpenseCommandParser: creates >
+FinanceTrackerParser ..> AddBookmarkIncomeCommandParser: creates >
+
+AddBookmarkExpenseCommandParser ..> AddBookmarkExpenseCommand: creates >
+AddBookmarkExpenseCommandParser ..> BookmarkExpense: creates >
+AddBookmarkIncomeCommandParser ..> AddBookmarkIncomeCommand: creates >
+AddBookmarkIncomeCommandParser ..> BookmarkIncome: creates >
+
+AddBookmarkExpenseCommand --> "1" BookmarkExpense
+AddBookmarkIncomeCommand --> "1" BookmarkIncome
+
+BookmarkExpense --|> BookmarkTransaction MODEL_COLOR
+BookmarkIncome --|> BookmarkTransaction MODEL_COLOR
+BookmarkTransaction *--> "1" Amount MODEL_COLOR
+BookmarkTransaction *--> "1" Title MODEL_COLOR
+BookmarkTransaction *--> "*" Category MODEL_COLOR
+
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/BookmarkTransactionClassDiagram.puml b/docs/diagrams/bookmarkdiagrams/BookmarkTransactionClassDiagram.puml
new file mode 100644
index 00000000000..def3358c944
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/BookmarkTransactionClassDiagram.puml
@@ -0,0 +1,43 @@
+@startuml
+
+!include ../style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor MODEL_COLOR
+skinparam classBackgroundColor MODEL_COLOR
+
+Package Model{
+Class ModelManager
+Class FinanceTracker
+
+Package BookmarkTransaction {
+Class "{abstract}\nBookmarkTransaction" as BookmarkTransaction
+Class BookmarkExpenseList
+Class BookmarkIncomeList
+Class BookmarkExpense
+Class BookmarkIncome
+}
+
+Package Transaction {
+Class Transaction
+Class Title
+Class Amount
+}
+
+Package Category{
+Class Category
+}
+}
+ModelManager o--> FinanceTracker
+FinanceTracker *--> BookmarkExpenseList
+FinanceTracker *--> BookmarkIncomeList
+BookmarkExpenseList o--> "*" BookmarkExpense
+BookmarkIncomeList o--> "*" BookmarkIncome
+BookmarkExpense --|> BookmarkTransaction
+BookmarkIncome --|> BookmarkTransaction
+
+BookmarkTransaction ..> Transaction
+BookmarkTransaction *--> "1" Title
+BookmarkTransaction *--> "1" Amount
+BookmarkTransaction *--> "*" Category
+
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/BookmarkTransactionCommandClassDiagram.puml b/docs/diagrams/bookmarkdiagrams/BookmarkTransactionCommandClassDiagram.puml
new file mode 100644
index 00000000000..31af7e2ebe0
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/BookmarkTransactionCommandClassDiagram.puml
@@ -0,0 +1,75 @@
+@startuml
+skinparam classAttributeIconSize 0
+
+class "{abstract}\nCommand" as Command{
++ execute(model: Model): CommandResult
+}
+class AddBookmarkExpenseCommand {
+{static} + COMMAND_WORD: String
+{static} + COMMAND_ALIAS: String
+- toAdd: BookmarkExpense
++ execute(model: Model): CommandResult
+}
+class AddBookmarkIncomeCommand {
+{static} + COMMAND_WORD: String
+{static} + COMMAND_ALIAS: String
+- toAdd: BookmarkIncome
++ execute(model: Model): CommandResult
+}
+class ConvertBookmarkCommand {
+{static} + COMMAND_WORD: String
+{static} + COMMAND_ALIAS: String
+- targetIndex: Index
+- convertedDate: Date
+}
+'class ConvertBookmarkExpenseCommand {
+'{static} + MESSAGE_CONVERT_BOOKMARK_EXPENSE_SUCCESS: String
+'+ execute(model: Model): CommandResult
+'}
+'class ConvertBookmarkIncomeCommand {
+'{static} + MESSAGE_CONVERT_BOOKMARK_INCOME_SUCCESS: String
+'+ execute(model: Model): CommandResult
+'}
+class DeleteBookmarkCommand {
+{static} + COMMAND_WORD: String
+{static} + MESSAGE_USAGE: String
+- targetIndex: Index
+}
+'class DeleteBookmarkExpenseCommand {
+'{static} + MESSAGE_DELETE_BOOKMARK_EXPENSE_SUCCESS: String
+'+ execute(model: Model): CommandResult
+'}
+'class DeleteBookmarkIncomeCommand {
+'{static} + MESSAGE_DELETE_BOOKMARK_INCOME_SUCCESS: String
+'+ execute(model: Model): CommandResult
+'}
+class EditBookmarkCommand {
+{static} + COMMAND_WORD: String
+{static} + MESSAGE_NOT_EDITED: String
+- targetIndex: Index
+- editBookmarkTransactionDescriptor: EditBookmarkTransactionDescriptor
+}
+'class EditBookmarkExpenseCommand {
+'{static} + MESSAGE_EDIT_BOOKMARK_EXPENSE_SUCCESS: String
+'+ execute(model: Model): CommandResult
+'}
+'class EditBookmarkIncomeCommand {
+'{static} + MESSAGE_EDIT_BOOKMARK_INCOME_SUCCESS: String
+'+ execute(model: Model): CommandResult
+'}
+
+
+Command <|-- AddBookmarkExpenseCommand
+Command <|-- AddBookmarkIncomeCommand
+Command <|-- DeleteBookmarkCommand
+Command <|-- ConvertBookmarkCommand
+Command <|-- EditBookmarkCommand
+'DeleteBookmarkCommand <|-- DeleteBookmarkExpenseCommand
+'DeleteBookmarkCommand <|-- DeleteBookmarkIncomeCommand
+'ConvertBookmarkCommand <|-- ConvertBookmarkExpenseCommand
+'ConvertBookmarkCommand <|-- ConvertBookmarkIncomeCommand
+'EditBookmarkCommand <|-- EditBookmarkExpenseCommand
+'EditBookmarkCommand <|-- EditBookmarkIncomeCommand
+
+hide circle
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/ConvertBookmarkTransactionClassDiagram.puml b/docs/diagrams/bookmarkdiagrams/ConvertBookmarkTransactionClassDiagram.puml
new file mode 100644
index 00000000000..12facc01b16
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/ConvertBookmarkTransactionClassDiagram.puml
@@ -0,0 +1,31 @@
+@startuml
+!include ../style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor LOGIC_COLOR_T4
+skinparam classBackgroundColor LOGIC_COLOR
+
+package Logic {
+
+package Parser {
+class FinanceTrackerParser
+class ConvertBookmarkCommandParser
+}
+
+package Command {
+class ConvertBookmarkCommand
+class ConvertBookmarkXYZCommand
+}
+}
+
+Class HiddenOutside #FFFFFF
+
+FinanceTrackerParser ..> ConvertBookmarkCommandParser: creates >
+FinanceTrackerParser ..> ConvertBookmarkXYZCommand: creates >
+
+ConvertBookmarkCommandParser ..> ConvertBookmarkCommand: creates >
+
+ConvertBookmarkXYZCommand -up-|> ConvertBookmarkCommand
+
+note left of ConvertBookmarkXYZCommand: ConvertBookmarkXYZCommand = ConvertBookmarkExpenseCommand, \nConvertBookmarkIncomeCommand
+
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/DeleteBookmarkExpenseActivityDiagram.puml b/docs/diagrams/bookmarkdiagrams/DeleteBookmarkExpenseActivityDiagram.puml
new file mode 100644
index 00000000000..4a761eddd63
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/DeleteBookmarkExpenseActivityDiagram.puml
@@ -0,0 +1,16 @@
+@startuml
+start
+:User executes delete-bookmark on Expense Tab;
+:Command gets parsed by logic component;
+:DeleteBookmarkExpenseCommand gets executed;
+
+if () is ([Valid index provided]) then
+:Deletes specified bookmark expense;
+:Display delete bookmark expense success message;
+
+else ([else])
+:Display invalid index provided message;
+
+endif
+stop
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/DeleteBookmarkTransactionClassDiagram.puml b/docs/diagrams/bookmarkdiagrams/DeleteBookmarkTransactionClassDiagram.puml
new file mode 100644
index 00000000000..168cff37b1f
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/DeleteBookmarkTransactionClassDiagram.puml
@@ -0,0 +1,31 @@
+@startuml
+!include ../style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor LOGIC_COLOR_T4
+skinparam classBackgroundColor LOGIC_COLOR
+
+package Logic {
+
+package Parser {
+class FinanceTrackerParser
+class DeleteBookmarkCommandParser
+}
+
+package Command {
+class DeleteBookmarkCommand
+class DeleteBookmarkXYZCommand
+}
+}
+
+Class HiddenOutside #FFFFFF
+
+FinanceTrackerParser ..> DeleteBookmarkCommandParser: creates >
+FinanceTrackerParser ..> DeleteBookmarkXYZCommand: creates >
+
+DeleteBookmarkCommandParser ..> DeleteBookmarkCommand: creates >
+
+DeleteBookmarkXYZCommand -up-|> DeleteBookmarkCommand
+
+note left of DeleteBookmarkXYZCommand: DeleteBookmarkXYZCommand = DeleteBookmarkExpenseCommand, \nDeleteBookmarkIncomeCommand
+
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/EditBookmarkTransactionClassDiagram.puml b/docs/diagrams/bookmarkdiagrams/EditBookmarkTransactionClassDiagram.puml
new file mode 100644
index 00000000000..bd57d77942d
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/EditBookmarkTransactionClassDiagram.puml
@@ -0,0 +1,31 @@
+@startuml
+!include ../style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor LOGIC_COLOR_T4
+skinparam classBackgroundColor LOGIC_COLOR
+
+package Logic {
+
+package Parser {
+class FinanceTrackerParser
+class EditBookmarkCommandParser
+}
+
+package Command {
+class EditBookmarkCommand
+class EditBookmarkXYZCommand
+}
+}
+
+Class HiddenOutside #FFFFFF
+
+FinanceTrackerParser ..> EditBookmarkCommandParser: creates >
+FinanceTrackerParser ..> EditBookmarkXYZCommand: creates >
+
+EditBookmarkCommandParser ..> EditBookmarkCommand: creates >
+
+EditBookmarkXYZCommand -up-|> EditBookmarkCommand
+
+note left of EditBookmarkXYZCommand: EditBookmarkXYZCommand = EditBookmarkExpenseCommand, \nEditBookmarkIncomeCommand
+
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/ParsingAddBookmarkExpenseInputSequenceDiagram.puml b/docs/diagrams/bookmarkdiagrams/ParsingAddBookmarkExpenseInputSequenceDiagram.puml
new file mode 100644
index 00000000000..e763d07d298
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/ParsingAddBookmarkExpenseInputSequenceDiagram.puml
@@ -0,0 +1,34 @@
+@startuml
+!include ../style.puml
+
+mainframe sd parse user input to create AddBookmarkExpenseCommand
+
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":FinanceTrackerParser" as FinanceTrackerParser LOGIC_COLOR
+participant ":AddBookmarkExpenseCommandParser" as AddBookmarkExpenseCommandParser LOGIC_COLOR
+participant ":AddBookmarkExpenseCommand" as AddBookmarkExpenseCommand LOGIC_COLOR
+
+activate LogicManager
+
+LogicManager -> FinanceTrackerParser: parseCommand(command, uiState)
+activate FinanceTrackerParser
+
+create AddBookmarkExpenseCommandParser
+FinanceTrackerParser -> AddBookmarkExpenseCommandParser: AddBookmarkExpenseCommandParser()
+activate AddBookmarkExpenseCommandParser
+
+AddBookmarkExpenseCommandParser --> FinanceTrackerParser
+deactivate AddBookmarkExpenseCommandParser
+
+create AddBookmarkExpenseCommand
+FinanceTrackerParser -> AddBookmarkExpenseCommand: parse(arguments)
+activate AddBookmarkExpenseCommand
+
+AddBookmarkExpenseCommand --> FinanceTrackerParser: command
+deactivate AddBookmarkExpenseCommand
+
+FinanceTrackerParser --> LogicManager: command
+destroy AddBookmarkExpenseCommandParser
+deactivate FinanceTrackerParser
+
+@enduml
diff --git a/docs/diagrams/bookmarkdiagrams/ParsingConvertBookmarkExpenseInputSequenceDiagram.puml b/docs/diagrams/bookmarkdiagrams/ParsingConvertBookmarkExpenseInputSequenceDiagram.puml
new file mode 100644
index 00000000000..93a386de75f
--- /dev/null
+++ b/docs/diagrams/bookmarkdiagrams/ParsingConvertBookmarkExpenseInputSequenceDiagram.puml
@@ -0,0 +1,45 @@
+@startuml
+!include ../style.puml
+
+mainframe sd parse user input to create ConvertBookmarkExpenseCommand
+
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":FinanceTrackerParser" as FinanceTrackerParser LOGIC_COLOR
+participant ":ConvertBookmarkCommandParser" as ConvertBookmarkCommandParser LOGIC_COLOR
+participant "cbc:ConvertBookmarkCommand" as ConvertBookmarkCommand LOGIC_COLOR
+participant "cbec:ConvertBookmarkExpenseCommand" as ConvertBookmarkExpenseCommand LOGIC_COLOR
+
+activate LogicManager
+
+LogicManager -> FinanceTrackerParser: parseCommand(command, uiState)
+activate FinanceTrackerParser
+
+create ConvertBookmarkCommandParser
+FinanceTrackerParser -> ConvertBookmarkCommandParser: ConvertBookmarkCommandParser()
+activate ConvertBookmarkCommandParser
+
+create ConvertBookmarkCommand
+ConvertBookmarkCommandParser -> ConvertBookmarkCommand: parse(arguments)
+activate ConvertBookmarkCommand
+deactivate ConvertBookmarkCommandParser
+
+ConvertBookmarkCommand --> FinanceTrackerParser: cbc
+deactivate ConvertBookmarkCommand
+
+ConvertBookmarkCommandParser -[hidden]-> FinanceTrackerParser
+destroy ConvertBookmarkCommandParser
+
+create ConvertBookmarkExpenseCommand
+FinanceTrackerParser -> ConvertBookmarkExpenseCommand: ConvertBookmarkExpenseCommand(convertBookmarkCommand)
+activate ConvertBookmarkExpenseCommand
+
+ConvertBookmarkExpenseCommand --> FinanceTrackerParser: cbec
+deactivate ConvertBookmarkExpenseCommand
+
+ConvertBookmarkCommand -[hidden]-> FinanceTrackerParser
+destroy ConvertBookmarkCommand
+
+FinanceTrackerParser --> LogicManager: cbec
+deactivate FinanceTrackerParser
+
+@enduml
diff --git a/docs/diagrams/style.puml b/docs/diagrams/style.puml
index fad8b0adeaa..e213092fa59 100644
--- a/docs/diagrams/style.puml
+++ b/docs/diagrams/style.puml
@@ -31,6 +31,9 @@
!define STORAGE_COLOR_T3 #806600
!define STORAGE_COLOR_T2 #544400
+!define BOOKMARK_TRANSACTION_COLOR #ff4500
+!define BOOKMARK_TRANSACTION__COLOR_T1 #ffc87c
+
!define USER_COLOR #000000
skinparam BackgroundColor #FFFFFFF
diff --git a/docs/diagrams/tracing/LogicSequenceDiagram.puml b/docs/diagrams/tracing/LogicSequenceDiagram.puml
deleted file mode 100644
index fdcbe1c0ccc..00000000000
--- a/docs/diagrams/tracing/LogicSequenceDiagram.puml
+++ /dev/null
@@ -1,21 +0,0 @@
-@startuml
-!include ../style.puml
-
-Participant ":LogicManager" as logic LOGIC_COLOR
-Participant ":AddressBookParser" as abp LOGIC_COLOR
-Participant ":EditCommandParser" as ecp LOGIC_COLOR
-Participant "command:EditCommand" as ec LOGIC_COLOR
-
-[-> logic : execute
-activate logic
-logic -> abp ++: parseCommand(commandText)
-create ecp
-abp -> ecp
-abp -> ecp ++: parse(arguments)
-create ec
-ecp -> ec ++: index, editPersonDescriptor
-ec --> ecp --
-ecp --> abp --: command
-abp --> logic --: command
-
-@enduml
diff --git a/docs/images/AddBookmarkExpenseSequenceDiagram.png b/docs/images/AddBookmarkExpenseSequenceDiagram.png
new file mode 100644
index 00000000000..ce31386d0ed
Binary files /dev/null and b/docs/images/AddBookmarkExpenseSequenceDiagram.png differ
diff --git a/docs/images/AddBookmarkTransactionClassDiagram.png b/docs/images/AddBookmarkTransactionClassDiagram.png
new file mode 100644
index 00000000000..5dcbc301b73
Binary files /dev/null and b/docs/images/AddBookmarkTransactionClassDiagram.png differ
diff --git a/docs/images/AddTransactionActivityDiagram.png b/docs/images/AddTransactionActivityDiagram.png
new file mode 100644
index 00000000000..9ddb9cf4ff1
Binary files /dev/null and b/docs/images/AddTransactionActivityDiagram.png differ
diff --git a/docs/images/AddTransactionClassDiagram.png b/docs/images/AddTransactionClassDiagram.png
new file mode 100644
index 00000000000..989037f202d
Binary files /dev/null and b/docs/images/AddTransactionClassDiagram.png differ
diff --git a/docs/images/AddTransactionSequenceDiagram.png b/docs/images/AddTransactionSequenceDiagram.png
new file mode 100644
index 00000000000..47b0218362d
Binary files /dev/null and b/docs/images/AddTransactionSequenceDiagram.png differ
diff --git a/docs/images/AnalyticsTabObjectDiagram.png b/docs/images/AnalyticsTabObjectDiagram.png
new file mode 100644
index 00000000000..b7ac2820ae1
Binary files /dev/null and b/docs/images/AnalyticsTabObjectDiagram.png differ
diff --git a/docs/images/ArchitectureSequenceDiagram.png b/docs/images/ArchitectureSequenceDiagram.png
index 2f1346869d0..d58c4e39bff 100644
Binary files a/docs/images/ArchitectureSequenceDiagram.png and b/docs/images/ArchitectureSequenceDiagram.png differ
diff --git a/docs/images/BetterModelClassDiagram.png b/docs/images/BetterModelClassDiagram.png
deleted file mode 100644
index bc7ed18ae29..00000000000
Binary files a/docs/images/BetterModelClassDiagram.png and /dev/null differ
diff --git a/docs/images/BookmarkTransactionClassDiagram.png b/docs/images/BookmarkTransactionClassDiagram.png
new file mode 100644
index 00000000000..aca6eb9e3a4
Binary files /dev/null and b/docs/images/BookmarkTransactionClassDiagram.png differ
diff --git a/docs/images/BookmarkTransactionCommandClassDiagram.png b/docs/images/BookmarkTransactionCommandClassDiagram.png
new file mode 100644
index 00000000000..5c9018abe49
Binary files /dev/null and b/docs/images/BookmarkTransactionCommandClassDiagram.png differ
diff --git a/docs/images/BudgetActivityDiagram.png b/docs/images/BudgetActivityDiagram.png
new file mode 100644
index 00000000000..021be458377
Binary files /dev/null and b/docs/images/BudgetActivityDiagram.png differ
diff --git a/docs/images/BudgetClassDiagram.png b/docs/images/BudgetClassDiagram.png
new file mode 100644
index 00000000000..9fc5a28e150
Binary files /dev/null and b/docs/images/BudgetClassDiagram.png differ
diff --git a/docs/images/CommandHistoryClassDiagram.png b/docs/images/CommandHistoryClassDiagram.png
new file mode 100644
index 00000000000..b1cb013d47b
Binary files /dev/null and b/docs/images/CommandHistoryClassDiagram.png differ
diff --git a/docs/images/CommandHistoryDownActivityDiagram.png b/docs/images/CommandHistoryDownActivityDiagram.png
new file mode 100644
index 00000000000..c50826db8c5
Binary files /dev/null and b/docs/images/CommandHistoryDownActivityDiagram.png differ
diff --git a/docs/images/CommandHistoryUpActivityDiagram.png b/docs/images/CommandHistoryUpActivityDiagram.png
new file mode 100644
index 00000000000..0c5b27ce893
Binary files /dev/null and b/docs/images/CommandHistoryUpActivityDiagram.png differ
diff --git a/docs/images/CommandResultSequenceDiagram.png b/docs/images/CommandResultSequenceDiagram.png
new file mode 100644
index 00000000000..32b09fee581
Binary files /dev/null and b/docs/images/CommandResultSequenceDiagram.png differ
diff --git a/docs/images/CommitActivityDiagram.png b/docs/images/CommitActivityDiagram.png
deleted file mode 100644
index 4de4fa4bf2b..00000000000
Binary files a/docs/images/CommitActivityDiagram.png and /dev/null differ
diff --git a/docs/images/ConvertBookmarkExpenseSequenceDiagram.png b/docs/images/ConvertBookmarkExpenseSequenceDiagram.png
new file mode 100644
index 00000000000..c6ea447bfc6
Binary files /dev/null and b/docs/images/ConvertBookmarkExpenseSequenceDiagram.png differ
diff --git a/docs/images/ConvertBookmarkTransactionClassDiagram.png b/docs/images/ConvertBookmarkTransactionClassDiagram.png
new file mode 100644
index 00000000000..f4903f7110e
Binary files /dev/null and b/docs/images/ConvertBookmarkTransactionClassDiagram.png differ
diff --git a/docs/images/DeleteBookmarkExpenseActivityDiagram.png b/docs/images/DeleteBookmarkExpenseActivityDiagram.png
new file mode 100644
index 00000000000..756f5cb823e
Binary files /dev/null and b/docs/images/DeleteBookmarkExpenseActivityDiagram.png differ
diff --git a/docs/images/DeleteBookmarkTransactionClassDiagram.png b/docs/images/DeleteBookmarkTransactionClassDiagram.png
new file mode 100644
index 00000000000..229c0875c2d
Binary files /dev/null and b/docs/images/DeleteBookmarkTransactionClassDiagram.png differ
diff --git a/docs/images/DeleteSequenceDiagram.png b/docs/images/DeleteSequenceDiagram.png
index fa327b39618..6e223b0ed03 100644
Binary files a/docs/images/DeleteSequenceDiagram.png and b/docs/images/DeleteSequenceDiagram.png differ
diff --git a/docs/images/DeleteTransactionActivityDiagram.png b/docs/images/DeleteTransactionActivityDiagram.png
new file mode 100644
index 00000000000..4cdd9267edb
Binary files /dev/null and b/docs/images/DeleteTransactionActivityDiagram.png differ
diff --git a/docs/images/DeleteTransactionClassDiagram.png b/docs/images/DeleteTransactionClassDiagram.png
new file mode 100644
index 00000000000..31d969569e7
Binary files /dev/null and b/docs/images/DeleteTransactionClassDiagram.png differ
diff --git a/docs/images/EditBookmarkTransactionClassDiagram.png b/docs/images/EditBookmarkTransactionClassDiagram.png
new file mode 100644
index 00000000000..05f6c90a007
Binary files /dev/null and b/docs/images/EditBookmarkTransactionClassDiagram.png differ
diff --git a/docs/images/EditTransactionActivityDiagram.png b/docs/images/EditTransactionActivityDiagram.png
new file mode 100644
index 00000000000..4188d667bb7
Binary files /dev/null and b/docs/images/EditTransactionActivityDiagram.png differ
diff --git a/docs/images/EditTransactionClassDiagram.png b/docs/images/EditTransactionClassDiagram.png
new file mode 100644
index 00000000000..25af3529db1
Binary files /dev/null and b/docs/images/EditTransactionClassDiagram.png differ
diff --git a/docs/images/EditTransactionSequenceDiagram.png b/docs/images/EditTransactionSequenceDiagram.png
new file mode 100644
index 00000000000..558b6b2923c
Binary files /dev/null and b/docs/images/EditTransactionSequenceDiagram.png differ
diff --git a/docs/images/EditTransactionSequenceDiagram2.png b/docs/images/EditTransactionSequenceDiagram2.png
new file mode 100644
index 00000000000..7c4dd1f787a
Binary files /dev/null and b/docs/images/EditTransactionSequenceDiagram2.png differ
diff --git a/docs/images/FindActivityDiagram.png b/docs/images/FindActivityDiagram.png
new file mode 100644
index 00000000000..176e280cd47
Binary files /dev/null and b/docs/images/FindActivityDiagram.png differ
diff --git a/docs/images/FindClassDiagram.png b/docs/images/FindClassDiagram.png
new file mode 100644
index 00000000000..646c91b6bce
Binary files /dev/null and b/docs/images/FindClassDiagram.png differ
diff --git a/docs/images/FindSequenceDiagram.png b/docs/images/FindSequenceDiagram.png
new file mode 100644
index 00000000000..904ebf92d3d
Binary files /dev/null and b/docs/images/FindSequenceDiagram.png differ
diff --git a/docs/images/LogicClassDiagram.png b/docs/images/LogicClassDiagram.png
index b9e853cef12..a2fad445f1a 100644
Binary files a/docs/images/LogicClassDiagram.png and b/docs/images/LogicClassDiagram.png differ
diff --git a/docs/images/LogicStorageDIP.png b/docs/images/LogicStorageDIP.png
deleted file mode 100644
index 871157f5a9c..00000000000
Binary files a/docs/images/LogicStorageDIP.png and /dev/null differ
diff --git a/docs/images/ModelClassDiagram.png b/docs/images/ModelClassDiagram.png
index 280064118cf..81871530d65 100644
Binary files a/docs/images/ModelClassDiagram.png and b/docs/images/ModelClassDiagram.png differ
diff --git a/docs/images/ParsingAddBookmarkExpenseInputSequenceDiagram.png b/docs/images/ParsingAddBookmarkExpenseInputSequenceDiagram.png
new file mode 100644
index 00000000000..da7506c0a34
Binary files /dev/null and b/docs/images/ParsingAddBookmarkExpenseInputSequenceDiagram.png differ
diff --git a/docs/images/ParsingConvertBookmarkExpenseInputSequenceDiagram.png b/docs/images/ParsingConvertBookmarkExpenseInputSequenceDiagram.png
new file mode 100644
index 00000000000..990f0732f67
Binary files /dev/null and b/docs/images/ParsingConvertBookmarkExpenseInputSequenceDiagram.png differ
diff --git a/docs/images/SetExpenseLimitSequenceDiagram.png b/docs/images/SetExpenseLimitSequenceDiagram.png
new file mode 100644
index 00000000000..25a15745208
Binary files /dev/null and b/docs/images/SetExpenseLimitSequenceDiagram.png differ
diff --git a/docs/images/StorageClassDiagram.png b/docs/images/StorageClassDiagram.png
index d87c1216820..a5b53835a34 100644
Binary files a/docs/images/StorageClassDiagram.png and b/docs/images/StorageClassDiagram.png differ
diff --git a/docs/images/TimekeeperSequenceDiagram.png b/docs/images/TimekeeperSequenceDiagram.png
new file mode 100644
index 00000000000..f71bda0761b
Binary files /dev/null and b/docs/images/TimekeeperSequenceDiagram.png differ
diff --git a/docs/images/Ui.png b/docs/images/Ui.png
index 5bd77847aa2..5856e676ef9 100644
Binary files a/docs/images/Ui.png and b/docs/images/Ui.png differ
diff --git a/docs/images/UiClassDiagram.png b/docs/images/UiClassDiagram.png
index 7b4b3dbea45..15c10cc0665 100644
Binary files a/docs/images/UiClassDiagram.png and b/docs/images/UiClassDiagram.png differ
diff --git a/docs/images/UndoRedoState0.png b/docs/images/UndoRedoState0.png
deleted file mode 100644
index 8f7538cd884..00000000000
Binary files a/docs/images/UndoRedoState0.png and /dev/null differ
diff --git a/docs/images/UndoRedoState1.png b/docs/images/UndoRedoState1.png
deleted file mode 100644
index df9908d0948..00000000000
Binary files a/docs/images/UndoRedoState1.png and /dev/null differ
diff --git a/docs/images/UndoRedoState2.png b/docs/images/UndoRedoState2.png
deleted file mode 100644
index 36519c1015b..00000000000
Binary files a/docs/images/UndoRedoState2.png and /dev/null differ
diff --git a/docs/images/UndoRedoState3.png b/docs/images/UndoRedoState3.png
deleted file mode 100644
index 19959d01712..00000000000
Binary files a/docs/images/UndoRedoState3.png and /dev/null differ
diff --git a/docs/images/UndoRedoState4.png b/docs/images/UndoRedoState4.png
deleted file mode 100644
index 4c623e4f2c5..00000000000
Binary files a/docs/images/UndoRedoState4.png and /dev/null differ
diff --git a/docs/images/UndoRedoState5.png b/docs/images/UndoRedoState5.png
deleted file mode 100644
index 84ad2afa6bd..00000000000
Binary files a/docs/images/UndoRedoState5.png and /dev/null differ
diff --git a/docs/images/UndoSequenceDiagram.png b/docs/images/UndoSequenceDiagram.png
deleted file mode 100644
index 6addcd3a8d9..00000000000
Binary files a/docs/images/UndoSequenceDiagram.png and /dev/null differ
diff --git a/docs/images/add-remark/$Remark.png b/docs/images/add-remark/$Remark.png
deleted file mode 100644
index 959c634406d..00000000000
Binary files a/docs/images/add-remark/$Remark.png and /dev/null differ
diff --git a/docs/images/add-remark/CommandInterface.png b/docs/images/add-remark/CommandInterface.png
deleted file mode 100644
index b52e7811c52..00000000000
Binary files a/docs/images/add-remark/CommandInterface.png and /dev/null differ
diff --git a/docs/images/add-remark/ContextMenu.png b/docs/images/add-remark/ContextMenu.png
deleted file mode 100644
index 77536724e45..00000000000
Binary files a/docs/images/add-remark/ContextMenu.png and /dev/null differ
diff --git a/docs/images/add-remark/CreateTest.png b/docs/images/add-remark/CreateTest.png
deleted file mode 100644
index 6b7d6dcafec..00000000000
Binary files a/docs/images/add-remark/CreateTest.png and /dev/null differ
diff --git a/docs/images/add-remark/GradleRun.png b/docs/images/add-remark/GradleRun.png
deleted file mode 100644
index 281cc45f098..00000000000
Binary files a/docs/images/add-remark/GradleRun.png and /dev/null differ
diff --git a/docs/images/add-remark/ParserInterface.png b/docs/images/add-remark/ParserInterface.png
deleted file mode 100644
index 60c7892a534..00000000000
Binary files a/docs/images/add-remark/ParserInterface.png and /dev/null differ
diff --git a/docs/images/add-remark/RemarkBound.png b/docs/images/add-remark/RemarkBound.png
deleted file mode 100644
index d335382b286..00000000000
Binary files a/docs/images/add-remark/RemarkBound.png and /dev/null differ
diff --git a/docs/images/add-remark/RemarkComplete.png b/docs/images/add-remark/RemarkComplete.png
deleted file mode 100644
index 124ced2c752..00000000000
Binary files a/docs/images/add-remark/RemarkComplete.png and /dev/null differ
diff --git a/docs/images/add-remark/RemarkFailureOutput.png b/docs/images/add-remark/RemarkFailureOutput.png
deleted file mode 100644
index 351257ea332..00000000000
Binary files a/docs/images/add-remark/RemarkFailureOutput.png and /dev/null differ
diff --git a/docs/images/add-remark/RemarkHello.png b/docs/images/add-remark/RemarkHello.png
deleted file mode 100644
index aad48d02f8f..00000000000
Binary files a/docs/images/add-remark/RemarkHello.png and /dev/null differ
diff --git a/docs/images/add-remark/RemarkNotImplemented.png b/docs/images/add-remark/RemarkNotImplemented.png
deleted file mode 100644
index 1d187f39403..00000000000
Binary files a/docs/images/add-remark/RemarkNotImplemented.png and /dev/null differ
diff --git a/docs/images/findAlexDavidResult.png b/docs/images/findAlexDavidResult.png
deleted file mode 100644
index 235da1c273e..00000000000
Binary files a/docs/images/findAlexDavidResult.png and /dev/null differ
diff --git a/docs/images/helpMessage.png b/docs/images/helpMessage.png
deleted file mode 100644
index b1f70470137..00000000000
Binary files a/docs/images/helpMessage.png and /dev/null differ
diff --git a/docs/images/ianyong.png b/docs/images/ianyong.png
new file mode 100644
index 00000000000..0bd8c922371
Binary files /dev/null and b/docs/images/ianyong.png differ
diff --git a/docs/images/johndoe.png b/docs/images/johndoe.png
deleted file mode 100644
index 1ce7ce16dc8..00000000000
Binary files a/docs/images/johndoe.png and /dev/null differ
diff --git a/docs/images/ppp/ianyong/NoExternalSite.png b/docs/images/ppp/ianyong/NoExternalSite.png
new file mode 100644
index 00000000000..fa0da18e15a
Binary files /dev/null and b/docs/images/ppp/ianyong/NoExternalSite.png differ
diff --git a/docs/images/remove/$address.png b/docs/images/remove/$address.png
deleted file mode 100644
index cf0434e0e83..00000000000
Binary files a/docs/images/remove/$address.png and /dev/null differ
diff --git a/docs/images/remove/SafeDeleteConflicts.png b/docs/images/remove/SafeDeleteConflicts.png
deleted file mode 100644
index 8f0abeffd4d..00000000000
Binary files a/docs/images/remove/SafeDeleteConflicts.png and /dev/null differ
diff --git a/docs/images/remove/UnsafeDelete.png b/docs/images/remove/UnsafeDelete.png
deleted file mode 100644
index 9e376d02a0c..00000000000
Binary files a/docs/images/remove/UnsafeDelete.png and /dev/null differ
diff --git a/docs/images/remove/UnsafeDeleteOnField.png b/docs/images/remove/UnsafeDeleteOnField.png
deleted file mode 100644
index 44d5bb0a442..00000000000
Binary files a/docs/images/remove/UnsafeDeleteOnField.png and /dev/null differ
diff --git a/docs/images/request_access.png b/docs/images/request_access.png
deleted file mode 100644
index 12e8a81bd28..00000000000
Binary files a/docs/images/request_access.png and /dev/null differ
diff --git a/docs/images/siddarth2824.png b/docs/images/siddarth2824.png
new file mode 100644
index 00000000000..dc87a27bbd7
Binary files /dev/null and b/docs/images/siddarth2824.png differ
diff --git a/docs/images/tracing/DebuggerStep1.png b/docs/images/tracing/DebuggerStep1.png
deleted file mode 100644
index 6d088ae63de..00000000000
Binary files a/docs/images/tracing/DebuggerStep1.png and /dev/null differ
diff --git a/docs/images/tracing/EditCommand.png b/docs/images/tracing/EditCommand.png
deleted file mode 100644
index ed34ad08b98..00000000000
Binary files a/docs/images/tracing/EditCommand.png and /dev/null differ
diff --git a/docs/images/tracing/Execute.png b/docs/images/tracing/Execute.png
deleted file mode 100644
index 66b7044e207..00000000000
Binary files a/docs/images/tracing/Execute.png and /dev/null differ
diff --git a/docs/images/tracing/FindUsages.png b/docs/images/tracing/FindUsages.png
deleted file mode 100644
index 16f94a53d09..00000000000
Binary files a/docs/images/tracing/FindUsages.png and /dev/null differ
diff --git a/docs/images/tracing/LeftGutter.png b/docs/images/tracing/LeftGutter.png
deleted file mode 100644
index 571acf99e7b..00000000000
Binary files a/docs/images/tracing/LeftGutter.png and /dev/null differ
diff --git a/docs/images/tracing/LogicSequenceDiagram.png b/docs/images/tracing/LogicSequenceDiagram.png
deleted file mode 100644
index c9b1f6cc232..00000000000
Binary files a/docs/images/tracing/LogicSequenceDiagram.png and /dev/null differ
diff --git a/docs/images/tracing/ShowExecutionPoint.png b/docs/images/tracing/ShowExecutionPoint.png
deleted file mode 100644
index ea72176fa64..00000000000
Binary files a/docs/images/tracing/ShowExecutionPoint.png and /dev/null differ
diff --git a/docs/images/tracing/StepInto.png b/docs/images/tracing/StepInto.png
deleted file mode 100644
index ddfa0e2aeb8..00000000000
Binary files a/docs/images/tracing/StepInto.png and /dev/null differ
diff --git a/docs/images/tracing/StepOver.png b/docs/images/tracing/StepOver.png
deleted file mode 100644
index ed5fb276e29..00000000000
Binary files a/docs/images/tracing/StepOver.png and /dev/null differ
diff --git a/docs/images/tracing/StructureToolWindow.png b/docs/images/tracing/StructureToolWindow.png
deleted file mode 100644
index c377c331d5f..00000000000
Binary files a/docs/images/tracing/StructureToolWindow.png and /dev/null differ
diff --git a/docs/images/tracing/Variables.png b/docs/images/tracing/Variables.png
deleted file mode 100644
index 02ea7b15520..00000000000
Binary files a/docs/images/tracing/Variables.png and /dev/null differ
diff --git a/docs/images/userguide/AddExpense.png b/docs/images/userguide/AddExpense.png
new file mode 100644
index 00000000000..230f1cf9276
Binary files /dev/null and b/docs/images/userguide/AddExpense.png differ
diff --git a/docs/images/userguide/AddIncome.png b/docs/images/userguide/AddIncome.png
new file mode 100644
index 00000000000..58061034923
Binary files /dev/null and b/docs/images/userguide/AddIncome.png differ
diff --git a/docs/images/userguide/AnalyticsTab.png b/docs/images/userguide/AnalyticsTab.png
new file mode 100644
index 00000000000..5296961805a
Binary files /dev/null and b/docs/images/userguide/AnalyticsTab.png differ
diff --git a/docs/images/userguide/EditExpense.png b/docs/images/userguide/EditExpense.png
new file mode 100644
index 00000000000..6ddfa5db5d9
Binary files /dev/null and b/docs/images/userguide/EditExpense.png differ
diff --git a/docs/images/userguide/EditIncome.png b/docs/images/userguide/EditIncome.png
new file mode 100644
index 00000000000..fed04fa7910
Binary files /dev/null and b/docs/images/userguide/EditIncome.png differ
diff --git a/docs/images/userguide/ExpensesTab.png b/docs/images/userguide/ExpensesTab.png
new file mode 100644
index 00000000000..11cd4546e82
Binary files /dev/null and b/docs/images/userguide/ExpensesTab.png differ
diff --git a/docs/images/userguide/IncomesTab.png b/docs/images/userguide/IncomesTab.png
new file mode 100644
index 00000000000..b53bf7d62ea
Binary files /dev/null and b/docs/images/userguide/IncomesTab.png differ
diff --git a/docs/images/userguide/OverviewTab.png b/docs/images/userguide/OverviewTab.png
new file mode 100644
index 00000000000..5856e676ef9
Binary files /dev/null and b/docs/images/userguide/OverviewTab.png differ
diff --git a/docs/images/userguide/SetExpenseLimit.png b/docs/images/userguide/SetExpenseLimit.png
new file mode 100644
index 00000000000..a777c788063
Binary files /dev/null and b/docs/images/userguide/SetExpenseLimit.png differ
diff --git a/docs/images/userguide/SetSavingsGoal.png b/docs/images/userguide/SetSavingsGoal.png
new file mode 100644
index 00000000000..b74ad6c57c7
Binary files /dev/null and b/docs/images/userguide/SetSavingsGoal.png differ
diff --git a/docs/images/userguide/UserGuide.png b/docs/images/userguide/UserGuide.png
new file mode 100644
index 00000000000..9abf18af28b
Binary files /dev/null and b/docs/images/userguide/UserGuide.png differ
diff --git a/docs/images/userguide/bookmark/AnnotatedAddBookmarkExpense.png b/docs/images/userguide/bookmark/AnnotatedAddBookmarkExpense.png
new file mode 100644
index 00000000000..3e31a51b254
Binary files /dev/null and b/docs/images/userguide/bookmark/AnnotatedAddBookmarkExpense.png differ
diff --git a/docs/images/userguide/bookmark/AnnotatedAddBookmarkIncome.png b/docs/images/userguide/bookmark/AnnotatedAddBookmarkIncome.png
new file mode 100644
index 00000000000..eb3a3d329be
Binary files /dev/null and b/docs/images/userguide/bookmark/AnnotatedAddBookmarkIncome.png differ
diff --git a/docs/images/userguide/bookmark/AnnotatedBookmarkExpenseOverview.png b/docs/images/userguide/bookmark/AnnotatedBookmarkExpenseOverview.png
new file mode 100644
index 00000000000..7b4632b0e84
Binary files /dev/null and b/docs/images/userguide/bookmark/AnnotatedBookmarkExpenseOverview.png differ
diff --git a/docs/images/userguide/bookmark/AnnotatedBookmarkIncomeOverview.png b/docs/images/userguide/bookmark/AnnotatedBookmarkIncomeOverview.png
new file mode 100644
index 00000000000..ef96ff92529
Binary files /dev/null and b/docs/images/userguide/bookmark/AnnotatedBookmarkIncomeOverview.png differ
diff --git a/docs/images/userguide/bookmark/AnnotatedConvertBookmarkExpense.png b/docs/images/userguide/bookmark/AnnotatedConvertBookmarkExpense.png
new file mode 100644
index 00000000000..560db020eae
Binary files /dev/null and b/docs/images/userguide/bookmark/AnnotatedConvertBookmarkExpense.png differ
diff --git a/docs/images/userguide/bookmark/AnnotatedConvertBookmarkIncome.png b/docs/images/userguide/bookmark/AnnotatedConvertBookmarkIncome.png
new file mode 100644
index 00000000000..fb14a719efc
Binary files /dev/null and b/docs/images/userguide/bookmark/AnnotatedConvertBookmarkIncome.png differ
diff --git a/docs/images/userguide/bookmark/AnnotatedEditBookmarkExpense.png b/docs/images/userguide/bookmark/AnnotatedEditBookmarkExpense.png
new file mode 100644
index 00000000000..9af46efd81f
Binary files /dev/null and b/docs/images/userguide/bookmark/AnnotatedEditBookmarkExpense.png differ
diff --git a/docs/images/userguide/bookmark/AnnotatedEditBookmarkIncome.png b/docs/images/userguide/bookmark/AnnotatedEditBookmarkIncome.png
new file mode 100644
index 00000000000..1366ee3b69b
Binary files /dev/null and b/docs/images/userguide/bookmark/AnnotatedEditBookmarkIncome.png differ
diff --git a/docs/images/wltan.png b/docs/images/wltan.png
new file mode 100644
index 00000000000..d8b78ed1e8c
Binary files /dev/null and b/docs/images/wltan.png differ
diff --git a/docs/images/yongping827.png b/docs/images/yongping827.png
new file mode 100644
index 00000000000..4e89e509c78
Binary files /dev/null and b/docs/images/yongping827.png differ
diff --git a/docs/images/zhaojj2209.png b/docs/images/zhaojj2209.png
new file mode 100644
index 00000000000..a7a34150faf
Binary files /dev/null and b/docs/images/zhaojj2209.png differ
diff --git a/docs/index.md b/docs/index.md
index 7601dbaad0d..563343ddb37 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,19 +1,26 @@
---
layout: page
-title: AddressBook Level-3
+title: Fine$$e
---
-[](https://github.com/se-edu/addressbook-level3/actions)
-[](https://codecov.io/gh/se-edu/addressbook-level3)
+[](https://github.com/AY2021S1-CS2103T-W16-3/tp/actions)
+[](https://codecov.io/gh/AY2021S1-CS2103T-W16-3/tp)
-**AddressBook is a desktop application for managing your contact details.** While it has a GUI, most of the user interactions happen using a CLI (Command Line Interface).
-
-* If you are interested in using AddressBook, head over to the [_Quick Start_ section of the **User Guide**](UserGuide.html#quick-start).
-* If you are interested about developing AddressBook, the [**Developer Guide**](DeveloperGuide.html) is a good place to start.
+**Fine$$e is a desktop app for managing finances, optimized for use via a Command Line Interface** (CLI) while still having the benefits of a Graphical User Interface (GUI). If you can type fast, Fine\$\$e can track and help you cultivate good financial habits faster than traditional GUI apps.
+* If you are interested in using Fine$$e, head over to the [_Quick Start_ section of the **User Guide**](https://ay2021s1-cs2103t-w16-3.github.io/tp/UserGuide.html#2-quick-start).
+* If you are interested in developing Fine$$e, the [**Developer Guide**](https://ay2021s1-cs2103t-w16-3.github.io/tp/DeveloperGuide.html) is a good place to start.
**Acknowledgements**
-* Libraries used: [JavaFX](https://openjfx.io/), [Jackson](https://github.com/FasterXML/jackson), [JUnit5](https://github.com/junit-team/junit5)
+* This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).
+* Libraries used:
+ * [Git Hooks Gradle Plugin](https://plugins.gradle.org/plugin/com.github.jakemarsden.git-hooks) *(licensed under the [MIT License](https://github.com/jakemarsden/git-hooks-gradle-plugin/blob/master/LICENSE))*
+ * [Gradle plugin for PIT Mutation Testing](https://plugins.gradle.org/plugin/info.solidsoft.pitest)
+ * [JavaFX](https://openjfx.io/)
+ * [Jackson](https://github.com/FasterXML/jackson)
+ * [Jekyll Spaceship](https://rubygems.org/gems/jekyll-spaceship) *(licensed under the [MIT License](https://github.com/jakemarsden/git-hooks-gradle-plugin/blob/master/LICENSE))*
+ * [JUnit5](https://github.com/junit-team/junit5)
+ * [PlantUML](https://plantuml.com/)
diff --git a/docs/minutes/20200829.md b/docs/minutes/20200829.md
new file mode 100644
index 00000000000..bd56dc4dac8
--- /dev/null
+++ b/docs/minutes/20200829.md
@@ -0,0 +1,30 @@
+---
+layout: minutes
+date: 2020-08-29
+---
+
+### Product Name
+
+FINe$$e
+
+### Target user
+
+Young adults aged 18-24 without a steady income who wish to better manage their finances.
+
+### Value Proposition
+
+Allow young adults to manage their expenditure and also have better control over their finances. Furthermore, it will promote better financial habits such as saving.
+
+### Finance tracker
+
+Common features:
+1. Expenditure & Income
+ - Recurring bills/payments: (e.g.: Phone bills, netflix and spotify subscriptions)/ Payment due (owe to friends, other form of payments)
+2. Categories
+ - User can add custom ones
+3. Analytics
+ - Summary (by date, by categories)
+ - Reports based on user’s input
+ - Sankey Diagram
+4. Budgeting (Daily, weekly, monthly, by categories?)
+ - Savings goals
diff --git a/docs/minutes/20200905.md b/docs/minutes/20200905.md
new file mode 100644
index 00000000000..77c652594df
--- /dev/null
+++ b/docs/minutes/20200905.md
@@ -0,0 +1,59 @@
+---
+layout: minutes
+date: 2020-09-05
+---
+
+{:theme-1: style="background-color: #F4CCCC;"}
+{:theme-2: style="background-color: #FCE5CD;"}
+{:theme-3: style="background-color: #FFF2CC;"}
+{:theme-4: style="background-color: #D9EAD3;"}
+{:theme-5: style="background-color: #CFE2F3;"}
+{:theme-6: style="background-color: #D9D2E9;"}
+{:theme-7: style="background-color: #EAD1DC;"}
+
+### User Stories
+
+|No.|As a/an {user type/role}|I can {function}|so that {benefit}|
+|-|-|-|-|
+|Theme: As a user, I can track my everyday expenses {: theme-1}||||
+|1.1|User|Set a daily spending limit to a specified amount|I can track how much I have left to spend for the day|
+|1.2|User|Set a weekly spending limit to a specified amount|I can track how much I have left to spend for the week|
+|1.3|User|Set a monthly spending limit to a specified amount|I can track how much I have left to spend for the month|
+|1.4|User|See how much I have remaining before the limit is reached|I can keep my expenses within that limit|
+|1.5|User|Enter my expenditure after each payment|I can keep track of how much I have spent|
+|1.6|User|Enter a description for each payment|I can keep track of what I spend my money on|
+|1.7|User|Enter a category of each expenditure|I can keep track of what I spend my money on across categories|
+|1.8|Forgetful user|Get reminders of upcoming payments|I can make payments on time|
+|Theme: As a user, I can track my income {: theme-2}||||
+|2.1|User|Enter my regular income|I can track my income|
+|2.2|User|Enter my ad-hoc income|I can track my income|
+|2.3|User|Enter a description for my income|I can keep track of where my income was from|
+|Theme: As a user, I can track my savings {: theme-3}||||
+|3.1|User|Compare my income to my expenditure|I can determine how much I have saved|
+|3.2|User|Set daily saving goals|I can cultivate good saving habits|
+|3.3|User|Set weekly saving goals|I can cultivate good saving habits|
+|3.4|User|Set monthly saving goals|I can cultivate good saving habits|
+|3.5|User|Set specific saving goals|I can save up enough for a specific item or service|
+|Theme: As a user, I can analyze my saving/spending trends {: theme-4}||||
+|4.1|User|See my saving trends in the form of visual data representations|I can better plan my future expenses|
+|4.2|User|See my spending trends in the form of visual data representations|I can gauge my expenses and cut down if needed|
+|Theme: As a user, I can input commands quickly using CLI inputs {: theme-5}||||
+|5.1|User|Autocomplete commands based on what has been typed so far|I can type commands faster|
+|5.2|User|Define shortcuts for tasks|I can save time on frequently performed tasks|
+|Theme: As a user, I can control when and how my data is stored {: theme-6}||||
+|6.1|User|Export and import my data|I can transfer my data from one device to another|
+|6.2|User|Back up my data|I can recover my data in the event it gets lost|
+|Theme: As a user, I would like a sense of pride and accomplishment when working towards my saving goals {: theme-7}||||
+|7.1|User|Complete gamified savings challenges|I can feel rewarded for reaching my savings goals and encouraged to continue reaching more saving goals|
+|7.2|User|See my long-term accomplishments in the form of animated objects|I can feel a sense of satisfaction|
+|7.3|User|Be rewarded for consistently using the application|I am motivated to consistently track my expenses|
+
+### Rejected User Stories
+
+|No.|As a/an {user type/role}|I can {function}|so that {benefit}|Reason for rejection|
+|-|-|-|-|-|
+|1|User|Receive a forfeit for going over expenditure limit|I can feel punished for going over my expenditure limit and discouraged from going over the limit in the future|Encourages the user to not report/ under-report expenditures, which is undesired behaviour|
+|2|User|Select valid commands from a drop-down thingy|I can input commands faster|Focus more on CLI; does not relate well to the user being a fast typist and preferring typing over other means of input|
+|3|User|Interact with the system via a chatbot interface|The application feels more personal|Too much work; does not really contribute to expense tracking|
+|4|User|Synchronisation of application data to the cloud|My data will always be backed up in the cloud|Remote server is not allowed due to project constraints|
+|5|User|Link to bank API|My expenses and income will automatically be tracked by the application|Remote server is not allowed due to project constraints. In addition, banks do not expose such APIs for public consumption due to security concerns|
diff --git a/docs/minutes/20200912.md b/docs/minutes/20200912.md
new file mode 100644
index 00000000000..e062a835dd2
--- /dev/null
+++ b/docs/minutes/20200912.md
@@ -0,0 +1,41 @@
+---
+layout: minutes
+date: 2020-09-12
+---
+
+### Features
+
+- Finance Tracking
+ - Expenses
+ - Adding expense: `add-expense` / `adde`
+ - List expense: `ls-expense` / `lse`
+ - Delete expense: `rm-expense` / `rme`
+ - Income
+ - Adding income: `add-income` / `addi`
+ - List income: `ls-income` / `lsi`
+ - Delete income: `rm-income` / `rmi`
+ - Savings
+ - Check savings: `savings`
+- Exiting the program: `exit`
+- Viewing help: `help`
+- Saving the data
+
+### Actions
+
+- CI job (Wei Liang)
+- Gradle stuff (Ian)
+- Git projects
+ - Create issues (all, based on UG assignment)
+ - Create projects (Yong Ping)
+ - Fine$$e (General)
+ - Finance Tracking (Expenses)
+ - Finance Tracking (Income)
+ - Finance Tracking (Savings)
+ - Assign issues to projects (issue creator)
+ - Assign members to issues (discuss again)
+- Labels (Jingjing)
+ - PR status
+ - Type
+ - Priority
+- Upload the UG (Siddarth)
+
diff --git a/docs/minutes/20200919.md b/docs/minutes/20200919.md
new file mode 100644
index 00000000000..25009178d76
--- /dev/null
+++ b/docs/minutes/20200919.md
@@ -0,0 +1,40 @@
+---
+layout: minutes
+date: 2020-09-19
+---
+
+### Roles
+
+- Ian Yong
+ - Team Co-Lead
+ - Testing
+- Wei Liang
+ - Team Co-Lead
+ - Git/CI Expert, Integration
+- Siddarth
+ - Scheduling and Tracking
+ - User Interface In-Charge
+- Jingjing
+ - Documentation
+ - Model/Logic In-Charge
+- Yong Ping
+ - Code Quality
+ - Storage In-Charge
+
+### v1.1 Tasks
+
+- Project Website
+ - About Us (by Monday night)
+ - Everyone to create PR for themselves
+ - Readme (by Monday night)
+ - UI Mockup basic (Siddarth)
+- User Guide (Done)
+- Developer Guide (Jingjing, Yong Ping)
+ - User stories (Jingjing)
+ - Glossary (Yong Ping)
+ - Non-functional requirements (Yong Ping)
+ - Use cases (Jingjing)
+- Transfer minutes to GitHub Pages (Ian)
+- PIT testing (Wei Liang)
+- Git hooks (Ian)
+- Planning for v1.2 (once all of the above are completed)
diff --git a/docs/minutes/20200925.md b/docs/minutes/20200925.md
new file mode 100644
index 00000000000..ba2d9a520bc
--- /dev/null
+++ b/docs/minutes/20200925.md
@@ -0,0 +1,43 @@
+---
+layout: minutes
+date: 2020-09-25
+---
+
+_\*Foreword: Meetings have been shifted from Saturdays to Fridays_
+
+### Tasks for v1.2 (Due: 11th October)
+
+- Renaming (Yong Ping)
+ - Person → Transaction
+ - Name → Name
+ - Phone → Amount
+ - Tags → Category
+ - Email → Date
+ - Address → (deleted)
+- Slowly fix tests
+ - Test data for Name/Amount/Category
+- UI
+ - Make it look like the mock-up (Siddarth)
+- Models
+ - Set up expenses, income, etc once transaction is up (Jingjing)
+ - Modify AB3 to accommodate two lists (expenses and income)
+- Commands
+ - Expenses (Ian)
+ - Adding expense: `add-expense` / `adde`
+ - List expense: `ls-expense` / `lse`
+ - Delete expense: `rm-expense` / `rme`
+ - Income (Wei Liang)
+ - Adding income: `add-income` / `addi`
+ - List income: `ls-income` / `lsi`
+ - Delete income: `rm-income` / `rmi`
+- To be delegated at a later date:
+ - Savings
+ - Check savings: `savings`
+ - Exiting the program: `exit`
+ - Viewing help: `help`
+ - Delete unused commands
+- Integration
+ - OTOT pull from other teammates' branches to test integration
+- Documentation
+ - UG at the end of v1.2
+ - DG at the end of v1.2
diff --git a/docs/minutes/20201002.md b/docs/minutes/20201002.md
new file mode 100644
index 00000000000..ae90f02e414
--- /dev/null
+++ b/docs/minutes/20201002.md
@@ -0,0 +1,76 @@
+---
+layout: minutes
+date: 2020-10-02
+---
+
+### Standards for Issues and PRs
+
+Issues from user stories:
+- Refer to user story issue in body
+- Create at the start of each iteration, or at the end of each team meeting
+
+Issues from PRs or follow-up from other issues:
+- If you see a possible enhancement or problem while fixing your issue,
+ - If it is dependent on your issue in some way, document it under your issue
+ - If it is not dependent on your issue, create a new issue. Refer to the original issue if you want.
+- If you want to add extensions to the issue in the same PR:
+ - Create a new issue
+ - Rationale: So that others are aware you are working on this extension and will avoid unnecessary double work
+ - Add a new commit for the extension
+ - Rationale: So it is captured in commit message when squashed
+ - Refer to it in the PR
+- Definition of extension:
+ - An enhancement that is not required to meet the specifications of the issue, that modifies the behavior of the program
+ - Rationale:
+ - Behavior changes must be closely monitored to prevent regressions from slipping past reviewers
+ - Try to keep independent behavior changes apart from each other
+ - Definition of behavior:
+ - CLI input or outputs change
+ - GUI input or outputs change
+
+Changes not requiring issues:
+- Can be put under another PR or be a standalone PR without reference to issues
+ - If put under another PR, put in a separate commit (so that it is captured in commit message when squashed)
+- Examples:
+ - Typos
+ - Formatting / style changes
+ - Anything under 10 lines not affecting behavior
+
+### Tasks for v1.2 (11th October)
+*updated*
+- ~~*Renaming (Yong Ping)*~~
+ - ~~*Person → Transaction*~~
+ - ~~*Name → Name*~~
+ - ~~*Phone → Amount*~~
+ - ~~*Tags → Category*~~
+ - ~~*Email → Date*~~
+ - ~~*Delete Address (Ian)*~~
+- Slowly fix tests
+ - Test data for Description/Amount/Category
+- UI
+ - Make it look like the mock-up (Siddarth)
+- ~~*Models*~~
+ - ~~*Set up expenses, income, etc, once transaction is up (Jingjing)*~~
+- Commands
+ - Expenses (Ian)
+ - Adding expense: `add-expense` / `adde`
+ - List expense: `ls-expense` / `lse`
+ - Delete expense: `rm-expense` / `rme`
+ - Income (Wei Liang)
+ - Adding income: `add-income` / `addi`
+ - List income: `ls-income` / `lsi`
+ - Delete income: `rm-income` / `rmi`
+- To be delegated at a later date:
+ - Savings
+ - Check savings: `savings`
+ - Exiting the program: `exit`
+ - Viewing help: `help`
+ - Delete unused commands
+ - *Modify AddressBook to accommodate two lists (expenses and income)*
+- Integration
+ - OTOT pull from other teammates' branches to test integration
+- Documentation
+ - UG at the end of v1.2
+ - DG at the end of v1.2
+
+**Next meeting on Tuesday (6 Oct)**
diff --git a/docs/minutes/20201006.md b/docs/minutes/20201006.md
new file mode 100644
index 00000000000..ef12f71f162
--- /dev/null
+++ b/docs/minutes/20201006.md
@@ -0,0 +1,45 @@
+---
+layout: minutes
+date: 2020-10-06
+---
+
+### Usage of Labels
+
+- Bug :bug: : Unintended behaviour that needs to be addressed
+- Enhancement :+1: : Any improvements to the product
+- Documentation :roll_of_paper: : Improvements or additions to documentation
+- Task :clipboard: : None of the above labels
+
+### Progress Update
+
+- Siddarth
+ - Working on UI styling currently
+ - To put up a PR with the base UI structure as soon as possible so that integration can begin
+- Wei Liang
+ - Fix Amount and Date validation
+ - To put PR by 6 Oct, target to merge by 7 Oct
+- Yong Ping
+ - Added expense and income lists
+ - Currently modifying `FinanceTracker` to include expense and income lists
+ - Require “Fix Amount and Date validation” from Wei Liang
+- Jingjing
+ - Renamed address book
+ - Removed duplicate checks
+- Ian
+ - Done with tasks
+ - Waiting to start work on new features
+
+Pull Request Review SOP
+
+- Clone PR to local machine
+- Run system tests
+- Perform exploratory testing
+- If there are code changes, run **pitest** to make sure the code is properly covered by tests
+ - Compare report with master branch
+- Check diff on github
+ - Make sure there are no unintended changes
+ - Make sure that intended changes are there
+ - Check for typos
+ - Check for AB3 residue (fix-as-you-go policy)
+ - AddressBook names
+ - Javadocs (missing full stop, wrong documentation, grammar problems)
diff --git a/docs/minutes/20201010.md b/docs/minutes/20201010.md
new file mode 100644
index 00000000000..a77e43cf8e1
--- /dev/null
+++ b/docs/minutes/20201010.md
@@ -0,0 +1,37 @@
+---
+layout: minutes
+date: 2020-10-10
+---
+
+_\*Foreword: In lieu of CS2100 midterm assessment, the meeting was postponed to 10 October 2020._
+
+### Updated Architecture
+
+Issue: Need to support UI-dependent behaviour for commands.
+
+Solution: Pass the UI state to the command parser.
+
+### Actionables
+
+Wei Liang:
+- Create {Add, Delete} × {Expense, Income} Command
+ - Generic `AddCommand` that works based on the current `UiState`
+
+Ian:
+- Add UiState (Partially done)
+- Create {Edit, List} × {Expense, Income} Command
+ - Generic `ListCommand` that works based on the current `UiState`
+
+Yong Ping:
+- Edit `ModelManager.getFilteredTransactionList`
+- Remove `TransactionList`
+
+Jingjing:
+- Make `Transaction` abstract
+- Generic `FindCommand` that works based on the current `UiState`
+
+Siddarth:
+- Adding left side panel in the main window
+- Change menu tabs to tab panel
+- Center categories
+- Show expense list and income lists in the respective panels (hook logic to UI)
diff --git a/docs/minutes/20201016.md b/docs/minutes/20201016.md
new file mode 100644
index 00000000000..c0441f10c72
--- /dev/null
+++ b/docs/minutes/20201016.md
@@ -0,0 +1,51 @@
+---
+layout: minutes
+date: 2020-10-16
+---
+
+### v1.2 Postmortem
+*Fine$$e is coming into shape - Ian Yong, 2020*
+
+Our current workflow is working well and everyone is aware of our SOPs. However, we will be making minor workflow adjustments to make the process more convenient.
+
+#### Workflow changes
+ - Allowed to work on upstream branches instead of forks.
+ - Individuals can stick to forks if they want.
+ - Investigate feasibility of UI testing. If not viable, then remove it from the testing suite.
+
+### Actionables
+ - Single List Implementation
+ - `ModelManager`: 3 filteredLists for Transactions, Incomes and Expenses respectively, `FinanceTracker`: 1 transactionList **(Yong Ping)**
+ - Show the differentiation between Incomes, Expenses and Transactions in the Overview Tab **(Siddarth)**
+ - Storage **(Yong Ping)**
+ - 2 lists (expenses and incomes) in json data file
+ - Add frequent expenses and incomes
+ - Analytics **(Ian and Siddarth)**
+ - Check if we can get a POC for using data visualisation tools with Data2Viz and then request if the library can be used **(Siddarth)**
+ - Metrics to be displayed
+ - Monthly Expenses
+ - Monthly Incomes
+ - Monthly Savings
+ - Category expenditure within the month (To show which category the user has spent on the most for the month)
+ - Set monthly budget (budget == expense limit) **(Jingjing)**
+ - Budget class
+ - Monthly saving goals **(Jingjing)**
+ - Frequent monthly expenses and incomes **(Siddarth)**
+ - Add a class to store frequent expenses/incomes (such frequent expenses/incomes will be in a separate list)
+ - Add commands to add, edit, delete frequent expenses/incomes
+ - Add a command to convert frequent expenses/incomes to actual expense/incomes
+ - Check if json data reading validation is present **(Jingjing)**
+ - Dates, amounts, etc must all be in the correct format **(Throw error if someone messes with the data file)**
+ - Standardise transaction amount format **(Wei Liang)**
+ - Change the type of data in `Transaction` from `String` to `Currency`
+ - (Stretch Goal) Command: '$' prefix change to depend on locale
+ - Convert everything to $XX.XX format to read in input, then convert to numbers when calculating to analytics
+ - Standardise date format and add validation **(Wei Liang)**
+ - Prevent user from adding transactions which has a date that is later than the current date of entry
+ - Change the type of data in `Date` from `String` to `LocalDate`
+ - In Analytics, make use of `YearMonth` instead of `LocalDate`
+ - Bring up test coverage **(Ian)**
+ - Add suppression/exclusion for areas that are not feasible to cover
+ - Aim to reach 100% mutation coverage (after suppressions), then set pitest to fail build when coverage drops below 100% - prevent regression in test coverage
+ - Search transactions by field **(Jingjing)**
+ - Edit find commands to be similar to edit commands e.g `find INDEX KEYWORD`
diff --git a/docs/minutes/20201023.md b/docs/minutes/20201023.md
new file mode 100644
index 00000000000..4e49ba04fd0
--- /dev/null
+++ b/docs/minutes/20201023.md
@@ -0,0 +1,29 @@
+---
+layout: minutes
+date: 2020-10-23
+---
+
+### v1.3 Progress update
+- Analytics
+ - UI
+ - Yong Ping and Ian taking over
+ - Get library to work and seek permission for library (Yong Ping)
+ - Refactor how tabs are handled in UI for greater extensibility (Ian)
+ - Resizable window with minimum window size (Ian)
+ - Set up analytics panel
+ - Hook up visualisations to data
+ - Logic/Model (Jingjing)
+ - Monthly expense limit, monthly savings goal: by Saturday morning
+ - Calculation of remaining budget and savings: by Sunday
+ - Today’s date? Check when on analytics tab
+- Issue [#128](https://github.com/AY2021S1-CS2103T-W16-3/tp/issues/128): Expense and income lists no longer update in the UI (Wei Liang)
+ - Pending UI refactor
+- Refactor commands to be consistent
+ - Fix tab exception before parse exception (Wei Liang)
+- Refactor Frequent Expense → Bookmarked Expense (Wei Liang)
+- ~~Frequent~~ Bookmarked Income (Siddarth)
+ - Add Delete command for bookmarked incomes
+ - Add Edit command for bookmarked incomes
+ - Add Convert command for bookmarked incomes
+ - Filter bookmarked incomes by keywords
+ - Filter bookmarked expenses by keywords
diff --git a/docs/minutes/20201031.md b/docs/minutes/20201031.md
new file mode 100644
index 00000000000..6a03b99cd9b
--- /dev/null
+++ b/docs/minutes/20201031.md
@@ -0,0 +1,22 @@
+---
+layout: minutes
+date: 2020-10-31
+---
+
+*Foreword: In lieu of the late release of mock practical exam bug reports, the meeting was postponed to 31 October 2020.*
+
+Happy halloween! :jack_o_lantern: :ghost: :jack_o_lantern: :ghost: :jack_o_lantern:
+
+Mock Practical Exam
+- 16 total issues
+- Nothing too serious
+- Got a time traveller on our hands [#246](https://github.com/AY2021S1-CS2103T-W16-3/tp/issues/246)
+
+To-do for next week:
+- Finish fixing bugs in PE
+- Do PPP
+- Do DG (focus on the features that we have implemented ourselves)
+- If time allows: bring up code coverage
+
+Feature freeze:
+- [#221](https://github.com/AY2021S1-CS2103T-W16-3/tp/issues/221) and [#262](https://github.com/AY2021S1-CS2103T-W16-3/tp/issues/262) should be the final enhancement issues
diff --git a/docs/team/ianyong.md b/docs/team/ianyong.md
new file mode 100644
index 00000000000..7a0ac59d348
--- /dev/null
+++ b/docs/team/ianyong.md
@@ -0,0 +1,59 @@
+---
+layout: page
+title: Ian Yong's Project Portfolio Page
+---
+
+## Project: Fine$$e
+
+### Overview
+
+Fine$$e is a desktop finance tracker that allows tertiary students to better manage their finances, cultivating good financial habits such as saving. It is optimised for CLI users so that expenses and income can be tracked efficiently by typing in commands. It is written in Java, and has a GUI created with JavaFX.
+
+### Summary of Contributions
+
+* **New feature**: Embedded user guide within the application.
+ * What it does: Allows the user to view the [user guide](UserGuide.html) from within the application.
+ * Justification: The barriers to entry of using Fine\$\$e are high for new users as they are required to learn the various commands available.
+ By embedding the user guide within the application, it allows users to quickly look up Fine$$e's features and their corresponding commands.
+ This leads to a much better user experience.
+ * Highlights: JavaFX's `WebView` component was used to display the user guide.
+ Unfortunately, it does not adhere too closely to modern browser standards, resulting in certain pages not being rendered correctly.
+ In order to ensure that the user experience is smooth, the decision to only allow users to access pages in the domain `https://ay2021s1-cs2103t-w16-3.github.io/tp/` was made.
+ Should the user attempt to navigate to an external site, the following page is shown instead:
+ 
+
+* **New feature**: Added command history.
+ * What it does: Allows the user to cycle through their 50 most recent inputs via the ↑ and ↓ arrow keys.
+ * Justification: Almost all modern command line interfaces support the scrolling through of previously typed commands.
+ The addition of this feature allows users who are experienced with command line interfaces to be more efficent when using Fine$$e.
+ * Highlights: This feature necessitated the implementation of a stack with a maximum capacity so as not to run out of memory.
+ Once the stack is full, the bottom-most element of the stack is evicted.
+ The underlying data structure that backs the stack is a doubly linked list.
+
+* **Code contributed**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=&sort=groupTitle&sortWithin=title&since=2020-08-14&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other&tabOpen=true&tabType=authorship&tabAuthor=ianyong&tabRepo=AY2021S1-CS2103T-W16-3%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code~other)
+
+* **Project management**:
+ * Updated GitHub Pages to display meeting minutes and Gantt chart.
+
+* **Enhancements to existing features**:
+ * Refactored the user interface to be more extensible. (Pull request [#161](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/161))
+ * Updated the user interface to be resizable and scalable. (Pull requests [#174](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/174), [#226](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/226))
+
+* **Documentation**:
+ * User Guide (Pull requests [#179](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/179), [#235](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/235)):
+ * Updated user guide to give an overview of the various tabs in Fine$$e.
+ * Added section on command history.
+ * Developer Guide (Pull requests [#141](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/141), [#318](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/318)):
+ * Added implementation details for tab switching.
+ * Added implementation details for command history.
+ * Added implementation details for data integrity safeguards.
+ * Updated design details for UI component.
+
+* **Community**:
+ * PRs reviewed (with non-trivial review comments): [#39](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/39), [#75](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/75), [#123](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/123), [#232](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/232), [#264](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/264), [#265](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/265), [#285](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/285)
+ * Helped classmates in forum discussions. (Examples: [1](https://github.com/nus-cs2103-AY2021S1/forum/issues/14), [2](https://github.com/nus-cs2103-AY2021S1/forum/issues/117), [3](https://github.com/nus-cs2103-AY2021S1/forum/issues/191), [4](https://github.com/nus-cs2103-AY2021S1/forum/issues/200), [5](https://github.com/nus-cs2103-AY2021S1/forum/issues/249), [6](https://github.com/nus-cs2103-AY2021S1/forum/issues/262), [7](https://github.com/nus-cs2103-AY2021S1/forum/issues/269), [8](https://github.com/nus-cs2103-AY2021S1/forum/issues/276), [9](https://github.com/nus-cs2103-AY2021S1/forum/issues/386))
+ * Solution for removing bullet points from the table of contents of user guide was [adopted by several other classmates](https://github.com/nus-cs2103-AY2021S1/forum/issues/361).
+
+* **Tools**:
+ * Added Git pre-push hook to enforce code quality. (Pull request [#7](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/7))
+ * Updated GitHub Pages build process to use `jekyll-spaceship` for greater control over site formatting. (Pull request [#18](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/18))
diff --git a/docs/team/johndoe.md b/docs/team/johndoe.md
deleted file mode 100644
index 1f1e9e6f6db..00000000000
--- a/docs/team/johndoe.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-layout: page
-title: John Doe's Project Portfolio Page
----
-
-## Project: AddressBook Level 3
-
-AddressBook - Level 3 is a desktop address book application used for teaching Software Engineering principles. The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
-
-Given below are my contributions to the project.
-
-* **New Feature**: Added the ability to undo/redo previous commands.
- * What it does: allows the user to undo all previous commands one at a time. Preceding undo commands can be reversed by using the redo command.
- * Justification: This feature improves the product significantly because a user can make mistakes in commands and the app should provide a convenient way to rectify them.
- * Highlights: This enhancement affects existing commands and commands to be added in future. It required an in-depth analysis of design alternatives. The implementation too was challenging as it required changes to existing commands.
- * Credits: *{mention here if you reused any code/ideas from elsewhere or if a third-party library is heavily used in the feature so that a reader can make a more accurate judgement of how much effort went into the feature}*
-
-* **New Feature**: Added a history command that allows the user to navigate to previous commands using up/down keys.
-
-* **Code contributed**: [RepoSense link]()
-
-* **Project management**:
- * Managed releases `v1.3` - `v1.5rc` (3 releases) on GitHub
-
-* **Enhancements to existing features**:
- * Updated the GUI color scheme (Pull requests [\#33](), [\#34]())
- * Wrote additional tests for existing features to increase coverage from 88% to 92% (Pull requests [\#36](), [\#38]())
-
-* **Documentation**:
- * User Guide:
- * Added documentation for the features `delete` and `find` [\#72]()
- * Did cosmetic tweaks to existing documentation of features `clear`, `exit`: [\#74]()
- * Developer Guide:
- * Added implementation details of the `delete` feature.
-
-* **Community**:
- * PRs reviewed (with non-trivial review comments): [\#12](), [\#32](), [\#19](), [\#42]()
- * Contributed to forum discussions (examples: [1](), [2](), [3](), [4]())
- * Reported bugs and suggestions for other teams in the class (examples: [1](), [2](), [3]())
- * Some parts of the history feature I added was adopted by several other class mates ([1](), [2]())
-
-* **Tools**:
- * Integrated a third party library (Natty) to the project ([\#42]())
- * Integrated a new Github plugin (CircleCI) to the team repo
-
-* _{you can add/remove categories in the list above}_
diff --git a/docs/team/siddarth2824.md b/docs/team/siddarth2824.md
new file mode 100644
index 00000000000..a3231df75d8
--- /dev/null
+++ b/docs/team/siddarth2824.md
@@ -0,0 +1,51 @@
+---
+layout: page
+title: Siddarth Nandanahosur Suresh's Project Portfolio Page
+---
+
+## Project: Fine$$e
+
+### Overview
+
+Fine$$e is a desktop finance tracker that allows tertiary students to better manage their finances, cultivating good financial habits such as saving.
+It is optimised for CLI users so that expenses and income can be tracked efficiently by typing in commands.
+It is written in Java, and has a GUI created with JavaFX.
+
+### Summary of Contributions
+
+* **New Feature**: Developed the bookmark expense and income feature of Fine$$e.
+ * What it does: Allows university students to store and update, incomes and expenses that they make frequently.
+ It also allows users to convert bookmark incomes and expenses into incomes and expenses and store it in Fine$$e.
+ * Justification: This feature significantly improves the product’s functionality as it allows university students to conveniently add frequently occurring incomes and expenses without the hassle of keying in all of the information every time they want to add in a new income or expense to Fine$$e.
+ They can easily keep track of their bookmarked incomes and expenses and update them accordingly as well.
+ * Highlights: This enhancement features allows to store frequently expenses and incomes
+
+* **New Feature**: Assisted in the development of the UI/UX (User Interface / User Experience) of Fine$$e.
+ * What it does: Enhances the view of Fine$$e to be more pleasant and intuitive for the user to use.
+ * Justification: A product with a well-developed UI/UX is key to getting a user interested in using the application for a sustained period of time.
+ Fine$$e aims to create an attractive display and seamless experience for all our users.
+ * This enhancement saw a makeover of the original AddressBook3 interface.
+ Colors of each component in the application is carefully chosen to create a good blended theme.
+ The headers at the top will light up allowing for easy identification of which tab the user is on.
+
+* **Code contributed**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=siddarth2824&sort=groupTitle&sortWithin=title&since=2020-08-14&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other)
+
+* **Project management**:
+ * Managed release `v1.2` (1 release) on GitHub.
+
+* **Enhancements to existing features**:
+ * Updated the GUI color scheme. (Pull requests [#75](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/75))
+ * Updated the GUI basic layout from AddressBook3. (Pull requests [#75](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/75), [#101](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/101))
+ * Updated the layout of the User Guide: (Pull requests [#169](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/169))
+
+* **Documentation**:
+ * User Guide:
+ * Updated User Guide to include Bookmark Expense and Income feature.
+ * Updated User Guide with the Introduction of Fine$$e.
+ * Developer Guide:
+ * Updated Developer Guide to include Bookmark Transactions feature.
+ * Updated the use cases to include use cases for Bookmark Transactions feature.
+
+* **Community**:
+ * PRs reviewed (with non-trivial comments): [#150](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/150#discussion_r510884713), [#197](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/197#discussion_r512544298)
+ * Reported bugs and suggestions for other teams in the class. (examples: Practical Exam Dry Run)
diff --git a/docs/team/wltan.md b/docs/team/wltan.md
new file mode 100644
index 00000000000..2d6cbe5dac7
--- /dev/null
+++ b/docs/team/wltan.md
@@ -0,0 +1,69 @@
+---
+layout: page
+title: Tan Wei Liang's Project Portfolio Page
+---
+
+## Project: Fine$$e
+
+### Overview
+
+Fine$$e is a desktop finance tracker that allows tertiary students to better manage their finances, cultivating good financial habits such as saving. It is optimised for CLI users so that expenses and income can be tracked efficiently by typing in commands. It is written in Java, and has a GUI created with JavaFX.
+
+### Summary of Contributions
+
+* **New feature**: Overhauled the validation rules for data models.
+ * What it does: Transforms the data model from the base Address Book project to one that is more suitable for the needs of Fine\$\$e.
+ * Justification: Previously, the project contained data models such as `Name` and `Email`.
+ In the initial stages of the project, to minimize the amount of development work needed we decided to map some of the existing models over to Fine\$\$e.
+ However, the existing models had some existing validation rules which do not make sense in Fine\$\$e.
+ * Highlights: To facilitate further operations on the data models, some of the underlying types have been changed from `String` to other Java data types.
+ However, a layer of abstraction is maintained such that other components do not need to depend on the underlying data types.
+ This includes converting the internal data from `public` to `private`, and using accessors to retrieve the data.
+
+* **New feature**: Drafted the initial design for UI-dependent commands.
+ * What it does: Allows the user to use commands with different behavior based on the current state of the user interface (in particular, which tab is currently active).
+ * Justification: This streamlines the user experience, as they only need to remember a small set of intuitive commands.
+ * Highlights: The existing commands were reused as much as possible, while complying with the standard OOP principles.
+
+* **Code contributed**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=wltan&sort=groupTitle&sortWithin=title&since=2020-08-14&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other)
+
+* **Project management**:
+ * Set up the team [GitHub organization](https://github.com/AY2021S1-CS2103T-W16-3) and forked the tP repository.
+ * Checked for code quality infractions in PRs.
+ * Managed release `v1.3.1` and `v1.4` (2 releases) on GitHub.
+
+* **Enhancements to existing features**:
+ * Fixed obscure bugs. (Pull requests
+ [#168](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/168),
+ [#219](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/219),
+ [#225](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/225),
+ [#260](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/260))
+ * Restricted users from using certain commands for Bookmark Transactions. (Pull request [#196](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/196))
+ * Maintained code quality. (Pull requests [#284](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/284), [#304](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/304))
+
+* **Documentation**:
+ * User Guide:
+ * Updated user guide for Add Expense, Add Income, Edit Expense, Edit Income
+ commands for v1.3. (Pull request [#178](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/178))
+ * Fixed some user guide bugs between v1.3 and v1.3.1. (Pull request [#206](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/206))
+ * Developer Guide:
+ * Elaborated on the `Model` component documentation, and added Pitest to the DevOps guide. (Pull request [#140](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/140))
+ * Documented the implementation for add, edit, delete transaction features. (Pull request [#314](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/314))
+
+* **Community**:
+ * PRs reviewed (with non-trivial review comments):
+ [#123](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/123),
+ [#150](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/150),
+ [#166](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/166),
+ [#207](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/207),
+ [#257](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/257),
+ [#258](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/258).
+ Check [here](https://github.com/AY2021S1-CS2103T-W16-3/tp/pulls?q=is%3Apr+reviewed-by%3Awltan) for a full up-to-date listing.
+ * Contributions to Forum: [Forum link](https://github.com/nus-cs2103-AY2021S1/forum/issues?q=is%3Aissue+commenter%3Awltan)
+
+* **Tools**:
+ * Updated Gradle from `5.2.1` to `6.6.1`. (Pull request [#3](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/3))
+ * Set up [PIT mutation testing](http://pitest.org/) as a test coverage tool, as an alternative to JaCoCo and CodeCov.
+ (Pull request [#6](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/6))
+ * Automated PIT mutation testing as a CI job that generates artifacts to speed up the PR review process. (Pull request [#296](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/296))
+
diff --git a/docs/team/yongping827.md b/docs/team/yongping827.md
new file mode 100644
index 00000000000..10594d92bf7
--- /dev/null
+++ b/docs/team/yongping827.md
@@ -0,0 +1,40 @@
+---
+layout: page
+title: Yong Ping's Project Portfolio Page
+---
+
+## Project: Fine$$e
+
+### Overview
+
+Fine$$e is a desktop finance tracker that allows tertiary students to better manage their finances, cultivating good financial habits such as saving. It is optimised for CLI users so that expenses and income can be tracked efficiently by typing in commands. It is written in Java, and has a GUI created with JavaFX.
+
+### Summary of Contributions
+
+* **New feature**: Added the analytics feature to the finance tracker.
+ * What it does: It retrieves the total monthly expenses, incomes and savings over the three most recent months, calculated in the monthly budget, and displays it in the analytics tab in the form of bar charts.
+ * Justification: This feature gives the user a visualization of the quantitative information in monthly budget so that the user can view their spending and saving trends.
+ * Highlights: This feature required the use of JavaFX charts.
+
+* **Code contributed**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=w16&sort=groupTitle&sortWithin=title&since=2020-08-14&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other&tabOpen=true&tabType=authorship&tabAuthor=yongping827&tabRepo=AY2021S1-CS2103T-W16-3%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code~other)
+
+* **Project management**:
+ * Created automated projects to categorize issues and keep track of the progress of each issue.
+
+* **Enhancements to existing features**:
+ * Modified how all transactions (expenses and incomes) are stored in various components of the finance tracker so that it suits the needs of each component. (Pull requests [#76](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/76), [#77](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/77), [#103](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/103), [#123](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/123))
+ * Modified the savings goal panel to show either remaining budget or budget deficit, and either current savings or savings deficit, and colored the text red if a deficit value is displayed. (Pull request [#207](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/207))
+ * Modified duplicate check for bookmark expenses and incomes. (Pull request [#228](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/228))
+ * Abstracted similar behaviour in parsers to avoid duplicate code. (Pull request [#307](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/307))
+ * Modified prefix parsing behaviour to recognize all prefixes and detect invalid ones. (Pull request [#307](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/307))
+
+* **Documentation**:
+ * User Guide:
+ * Updated `list` commands and analytics section for v1.3. (Pull request [#180](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/180))
+ * Resolved all issues pertaining to the user guide from the practical exam dry run. (Pull request [#258](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/258))
+ * Developer Guide:
+ * Updated model and storage sections. (Pull request [#143](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/143))
+ * Add Analytics feature section. (Pull request [#317](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/317))
+
+* **Community**:
+ * PRs reviewed (with non-trivial review comments): [#102](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/102), [#118](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/118), [#135](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/135), [#136](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/136), [#148](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/148), [#166](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/166), [#172](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/172), [#183](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/183), [#281](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/281), [#288](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/288), [#295](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/295)
diff --git a/docs/team/zhaojj2209.md b/docs/team/zhaojj2209.md
new file mode 100644
index 00000000000..7501fb53cb6
--- /dev/null
+++ b/docs/team/zhaojj2209.md
@@ -0,0 +1,47 @@
+---
+layout: page
+title: Zhao Jingjing's Project Portfolio Page
+---
+
+## Project: Fine$$e
+
+### Overview
+
+Fine$$e is a desktop finance tracker that allows tertiary students to better manage their finances, cultivating good financial habits such as saving. It is optimised for CLI users so that expenses and income can be tracked efficiently by typing in commands. It is written in Java, and has a GUI created with JavaFX.
+
+### Summary of Contributions
+
+* **New feature**: Added the monthly budget feature to the finance tracker.
+ * What it does: With the addition of the monthly budget, the finance tracker allows the user to set their desired monthly expense limit and monthly savings goal, and calculates the user's remaining budget and current savings.
+ * Justification: This feature significantly enhances the capabilities of the finance tracker by allowing the user to track their progress in their savings, and paves the way for the application's analytics feature.
+ * Highlights: This feature required heavy use of the observer design pattern as all values in the monthly budget have to be observed by the UI so that the values and calculations can be updated immediately upon any changes.
+
+* **New feature**: Revamped the finance tracker's `find` command.
+ * What it does: Instead of only title keywords, the user can now search for transactions in the finance tracker by title keyphrase, amount, date, category, amount range and date range.
+ * Justification: This feature significantly increases the user's ease in finding the transactions they have entered into the finance tracker.
+ * Highlights: This feature involved changes in the way the find command is parsed, and different predicates for each of the search scenarios were created.
+
+* **Code contributed**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=w16&sort=groupTitle&sortWithin=title&since=2020-08-14&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other&tabOpen=true&tabType=authorship&tabAuthor=zhaojj2209&tabRepo=AY2021S1-CS2103T-W16-3%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code~other)
+
+* **Project management**:
+ * Created labels for issues and pull requests on GitHub.
+ * Managed release `v1.3` (1 release) on GitHub.
+
+* **Enhancements to existing features**:
+ * Removed duplicate checks to allow duplicate transactions to be added to the finance tracker. (Pull request [#72](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/72))
+ * Restricted command inputs to allow for only one title/amount/date input in the finance tracker. (Pull request [#201](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/201))
+ * Enabled automatic tab-switching upon execution of certain commands. (Pull request [#288](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/288))
+
+* **Documentation**:
+ * User Guide:
+ * Updated user guide to reflect commands for v1.2. (Pull request [#114](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/114))
+ * Updated user guide for `find`, `set-expense-limit` and `set-savings-goal` commands for v1.3. (Pull request [#176](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/176))
+ * Developer Guide:
+ * Updated user stories and use cases in the developer guide. (Pull request [#13](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/13))
+ * Updated find transactions and monthly budget features in the developer guide. (Pull requests [#120](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/120), [#144](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/144), [#299](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/299))
+ * Updated manual testing in the developer guide. (Pull request [#299](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/299))
+
+* **Community**:
+ * PRs reviewed (with non-trivial review comments): [#39](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/39), [#48](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/48), [#90](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/90), [#107](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/107), [#132](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/132), [#255](https://github.com/AY2021S1-CS2103T-W16-3/tp/pull/255).
+
+
diff --git a/docs/tutorials/AddRemark.md b/docs/tutorials/AddRemark.md
deleted file mode 100644
index 6907e29456c..00000000000
--- a/docs/tutorials/AddRemark.md
+++ /dev/null
@@ -1,394 +0,0 @@
----
-layout: page
-title: "Tutorial: Adding a command"
----
-
-Let's walk you through the implementation of a new command — `remark`.
-
-This command allows users of the AddressBook application to add optional remarks to people in their address book and edit it if required. The command should have the following format:
-
-`remark INDEX r/REMARK` (e.g., `remark 2 r/Likes baseball`)
-
-We’ll assume that you have already set up the development environment as outlined in the Developer’s Guide.
-
-
-## Create a new `remark` command
-
-Looking in the `logic.command` package, you will notice that each existing command have their own class. All the commands inherit from the abstract class `Command` which means that they must override `execute()`. Each `Command` returns an instance of `CommandResult` upon success and `CommandResult#feedbackToUser` is printed to the `ResultDisplay`.
-
-Let’s start by creating a new `RemarkCommand` class in the `src/main/java/seedu/address/logic/command` directory.
-
-For now, let’s keep `RemarkCommand` as simple as possible and print some output. We accomplish that by returning a `CommandResult` with an accompanying message.
-
-**`RemarkCommand.java`:**
-
-``` java
-package seedu.address.logic.commands;
-
-import seedu.address.model.Model;
-
-/**
- * Changes the remark of an existing person in the address book.
- */
-public class RemarkCommand extends Command {
-
- public static final String COMMAND_WORD = "remark";
-
- @Override
- public CommandResult execute(Model model) {
- return new CommandResult("Hello from remark");
- }
-}
-```
-
-### Hook `RemarkCommand` into the application
-
-Now that we have our `RemarkCommand` ready to be executed, we need to update `AddressBookParser#parseCommand()` to recognize the `remark` keyword. Add the new command to the `switch` block by creating a new `case` that returns a new instance of `RemarkCommand`.
-
-You can refer to the changes in this [diff](https://github.com/se-edu/addressbook-level3/commit/35eb7286f18a029d39cb7a29df8f172a001e4fd8#diff-34ace715a8a8d2e5a66e71289f017b47).
-
-### Run the application
-
-Run `Main#main` and try out your new `RemarkCommand`. If everything went well, you should see something like this:
-
-
-
-## Change `RemarkCommand` to throw an exception
-
-While we have successfully printed a message to `ResultDisplay`, the command does not do what it is supposed to do. Let’s change the command to throw an `CommandException` to accurately reflect that our command is still a work in progress.
-
-
-
-Following the convention in other commands, we add relevant messages as constants and use them.
-
-**`RemarkCommand.java`:**
-
-``` java
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the remark of the person identified "
- + "by the index number used in the last person listing. "
- + "Existing remark will be overwritten by the input.\n"
- + "Parameters: INDEX (must be a positive integer) "
- + "r/ [REMARK]\n"
- + "Example: " + COMMAND_WORD + " 1 "
- + "r/ Likes to swim.";
-
- public static final String MESSAGE_NOT_IMPLEMENTED_YET = "Remark command not implemented yet";
-
- @Override
- public CommandResult execute(Model model) throws CommandException {
- throw new CommandException(MESSAGE_NOT_IMPLEMENTED_YET);
- }
-```
-
-## Enhancing `RemarkCommand`
-
-Let’s change `RemarkCommand` to parse input from the user.
-
-### Make the command accept parameters
-
-We start by modifying the constructor of `RemarkCommand` to accept an `Index` and a `String`. While we are at it, let’s change the error message to echo the values. While this is not a replacement for tests, it is an obvious way to tell if our code is functioning as intended.
-
-``` java
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-//...
-public class RemarkCommand extends Command {
- //...
- public static final String MESSAGE_ARGUMENTS = "Index: %1$d, Remark: %2$s";
-
- private final Index index;
- private final String remark;
-
- /**
- * @param index of the person in the filtered person list to edit the remark
- * @param remark of the person to be updated to
- */
- public RemarkCommand(Index index, String remark) {
- requireAllNonNull(index, remark);
-
- this.index = index;
- this.remark = remark;
- }
- @Override
- public CommandResult execute(Model model) throws CommandException {
- throw new CommandException(String.format(MESSAGE_ARGUMENTS, index.getOneBased(), remark));
- }
-
- @Override
- public boolean equals(Object other) {
- // short circuit if same object
- if (other == this) {
- return true;
- }
-
- // instanceof handles nulls
- if (!(other instanceof RemarkCommand)) {
- return false;
- }
-
- // state check
- RemarkCommand e = (RemarkCommand) other;
- return index.equals(e.index)
- && remark.equals(e.remark);
- }
-}
-```
-
-Your code should look something like [this](https://github.com/se-edu/addressbook-level3/commit/35eb7286f18a029d39cb7a29df8f172a001e4fd8#diff-34ace715a8a8d2e5a66e71289f017b47) after you are done.
-
-### Parse user input
-
-Now let’s move on to writing a parser that will extract the index and remark from the input provided by the user.
-
-Create a `RemarkCommandParser` class in the `seedu.address.logic.parser` package. The class must extend the `Parser` interface.
-
-
-
-Thankfully, `ArgumentTokenizer#tokenize()` makes it trivial to parse user input. Let’s take a look at the JavaDoc provided for the function to understand what it does.
-
-**`ArgumentTokenizer.java`:**
-
-``` java
-/**
- * Tokenizes an arguments string and returns an {@code ArgumentMultimap}
- * object that maps prefixes to their respective argument values. Only the
- * given prefixes will be recognized in the arguments string.
- *
- * @param argsString Arguments string of the form:
- * {@code preamble value value ...}
- * @param prefixes Prefixes to tokenize the arguments string with
- * @return ArgumentMultimap object that maps prefixes to their
- * arguments
- */
-```
-
-We can tell `ArgumentTokenizer#tokenize()` to look out for our new prefix `r/` and it will return us an instance of `ArgumentMultimap`. Now let’s find out what we need to do in order to obtain the Index and String that we need. Let’s look through `ArgumentMultimap` :
-
-**`ArgumentMultimap.java`:**
-
-``` java
-/**
- * Returns the last value of {@code prefix}.
- */
-public Optional getValue(Prefix prefix) {
- List values = getAllValues(prefix);
- return values.isEmpty() ? Optional.empty() :
- Optional.of(values.get(values.size() - 1));
-}
-```
-
-This appears to be what we need to get a String of the remark. But what about the Index? Let's take a quick peek at existing `Command` that uses an index to see how it is done.
-
-**`DeleteCommandParser.java`:**
-
-``` java
-Index index = ParserUtil.parseIndex(args);
-return new DeleteCommand(index);
-```
-
-There appears to be another utility class that obtains an `Index` from the input provided by the user.
-
-Now that we have the know-how to extract the data that we need from the user’s input, we can parse the user command and create a new instance of `RemarkCommand`, as given below.
-
-**`RemarkCommandParser.java`:**
-
-``` java
-public RemarkCommand parse(String args) throws ParseException {
- requireNonNull(args);
- ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args,
- PREFIX_REMARK);
-
- Index index;
- try {
- index = ParserUtil.parseIndex(argMultimap.getPreamble());
- } catch (IllegalValueException ive) {
- throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
- RemarkCommand.MESSAGE_USAGE), ive);
- }
-
- String remark = argMultimap.getValue(PREFIX_REMARK).orElse("");
-
- return new RemarkCommand(index, remark);
-}
-```
-
-
-
-:information_source: Don’t forget to update `AddressBookParser` to use our new `RemarkCommandParser`!
-
-
-
-If you are stuck, check out the sample
-[here](https://github.com/se-edu/addressbook-level3/commit/dc6d5139d08f6403da0ec624ea32bd79a2ae0cbf#diff-fc19ecee89c3732a62fbc8c840250508).
-
-## Add `Remark` to the model
-
-Now that we have all the information that we need, let’s lay the groundwork for propagating the remarks added into the in-memory storage of person data. We achieve that by working with the `Person` model. Each field in a Person is implemented as a separate class (e.g. a `Name` object represents the person’s name). That means we should add a `Remark` class so that we can use a `Remark` object to represent a remark given to a person.
-
-### Add a new `Remark` class
-
-Create a new `Remark` in `seedu.address.model.person`. Since a `Remark` is a field that is similar to `Address`, we can reuse a significant bit of code.
-
-A copy-paste and search-replace later, you should have something like [this](https://github.com/se-edu/addressbook-level3/commit/4516e099699baa9e2d51801bd26f016d812dedcc#diff-af2f075d24dfcd333876f0fbce321f25). Note how `Remark` has no constrains and thus does not require input
-validation.
-
-### Make use of `Remark`
-
-Let’s change `RemarkCommand` and `RemarkCommandParser` to use the new `Remark` class instead of plain `String`. These should be relatively simple changes.
-
-## Add a placeholder element for remark to the UI
-
-Without getting too deep into `fxml`, let’s go on a 5 minute adventure to get some placeholder text to show up for each person.
-
-Simply add the following to [`seedu.address.ui.PersonCard`](https://github.com/se-edu/addressbook-level3/commit/850b78879582f38accb05dd20c245963c65ea599#diff-0c6b6abcfac8c205e075294f25e851fe).
-
-**`PersonCard.java`:**
-
-``` java
-@FXML
-private Label remark;
-```
-
-
-`@FXML` is an annotation that marks a private or protected field and makes it accessible to FXML. It might sound like Greek to you right now, don’t worry — we will get back to it later.
-
-Then insert the following into [`main/resources/view/PersonListCard.fxml`](https://github.com/se-edu/addressbook-level3/commit/850b78879582f38accb05dd20c245963c65ea599#diff-12580431f55d7880578aa4c16f249e71).
-
-**`PersonListCard.fxml`:**
-
-``` xml
-
-```
-
-That’s it! Fire up the application again and you should see something like this:
-
-
-
-## Modify `Person` to support a `Remark` field
-
-Since `PersonCard` displays data from a `Person`, we need to update `Person` to get our `Remark` displayed!
-
-### Modify `Person`
-
-We change the constructor of `Person` to take a `Remark`. We will also need to define new fields and accessors accordingly to store our new addition.
-
-### Update other usages of `Person`
-
-Unfortunately, a change to `Person` will cause other commands to break, you will have to modify these commands to use the updated `Person`!
-
-
-
-:bulb: Use the `Find Usages` feature in IntelliJ IDEA on the `Person` class to find these commands.
-
-
-
-Refer to [this commit](https://github.com/se-edu/addressbook-level3/commit/ce998c37e65b92d35c91d28c7822cd139c2c0a5c) and check that you have got everything in order!
-
-
-## Updating Storage
-
-AddressBook stores data by serializing `JsonAdaptedPerson` into `json` with the help of an external library — Jackson. Let’s update `JsonAdaptedPerson` to work with our new `Person`!
-
-While the changes to code may be minimal, the test data will have to be updated as well.
-
-
-
-:exclamation: You must delete AddressBook’s storage file located at `/data/addressbook.json` before running it! Not doing so will cause AddressBook to default to an empty address book!
-
-
-
-Check out [this commit](https://github.com/se-edu/addressbook-level3/commit/556cbd0e03ff224d7a68afba171ad2eb0ce56bbf)
-to see what the changes entail.
-
-## Finalizing the UI
-
-Now that we have finalized the `Person` class and its dependencies, we can now bind the `Remark` field to the UI.
-
-Just add [this one line of code!](https://github.com/se-edu/addressbook-level3/commit/5b98fee11b6b3f5749b6b943c4f3bd3aa049b692)
-
-**`PersonCard.java`:**
-
-``` java
-public PersonCard(Person person, int displayedIndex) {
- //...
- remark.setText(person.getRemark().value);
-}
-```
-
-
-
-## Putting everything together
-
-After the previous step, we notice a peculiar regression — we went from displaying something to nothing at all. However, this is expected behavior as we are yet to update the `RemarkCommand` to make use of the code we've been adding in the last few steps.
-
-### Update `RemarkCommand` and `RemarkCommandParser`
-
-In this last step, we modify `RemarkCommand#execute()` to change the `Remark` of a `Person`. Since all fields in a `Person` are immutable, we create a new instance of a `Person` with the values that we want and
-save it with `Model#setPerson()`.
-
-**`RemarkCommand.java`:**
-
-``` java
-//...
- public static final String MESSAGE_ADD_REMARK_SUCCESS = "Added remark to Person: %1$s";
- public static final String MESSAGE_DELETE_REMARK_SUCCESS = "Removed remark from Person: %1$s";
-//...
- @Override
- public CommandResult execute(Model model) throws CommandException {
- List lastShownList = model.getFilteredPersonList();
-
- if (index.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = new Person(personToEdit.getName(), personToEdit.getPhone(), personToEdit.getEmail(),
- personToEdit.getAddress(), remark, personToEdit.getTags());
-
- model.setPerson(personToEdit, editedPerson);
- model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-
- return new CommandResult(generateSuccessMessage(editedPerson));
- }
-
- /**
- * Generates a command execution success message based on whether the remark is added to or removed from
- * {@code personToEdit}.
- */
- private String generateSuccessMessage(Person personToEdit) {
- String message = !remark.value.isEmpty() ? MESSAGE_ADD_REMARK_SUCCESS : MESSAGE_DELETE_REMARK_SUCCESS;
- return String.format(message, personToEdit);
- }
-```
-
-
-
-## Writing tests
-
-Tests are crucial to ensuring that bugs don’t slip into the codebase unnoticed. This is especially true for large code bases where a change might lead to unintended behavior.
-
-Let’s verify the correctness of our code by writing some tests!
-
-### Automatically generating tests
-
-The goal is to write effective and efficient tests to ensure that `RemarkCommand#execute()` behaves as expected.
-
-The convention for test names is `methodName_testScenario_expectedResult`. An example would be
-`execute_filteredList_success`.
-
-Let’s create a test for `RemarkCommand#execute()` to test that adding a remark works. On `IntelliJ IDEA` you can bring up the context menu and choose to `Go To` \> `Test` or use the appropriate keyboard shortcut.
-
-
-
-Then, create a test for the `execute` method.
-
-
-
-Following convention, let’s change the name of the generated method to `execute_addRemarkUnfilteredList_success`.
-
-Let’s use the utility functions provided in `CommandTestUtil`. The functions ensure that commands produce the expected `CommandResult` and output the correct message. In this case, `CommandTestUtil#assertCommandSuccess` is the best fit as we are testing that a `RemarkCommand` will successfully add a `Remark`.
-
-You should end up with a test that looks something like [this](https://github.com/se-edu/addressbook-level3/commit/fac8f3fd855d55831ca0cc73313b5943d49d4d6e#diff-d749de38392f7ea504da7824641ba8d9).
-
-## Conclusion
-
-This concludes the tutorial for adding a new `Command` to AddressBook.
diff --git a/docs/tutorials/RemovingFields.md b/docs/tutorials/RemovingFields.md
deleted file mode 100644
index aa8e0baaad9..00000000000
--- a/docs/tutorials/RemovingFields.md
+++ /dev/null
@@ -1,103 +0,0 @@
----
-layout: page
-title: "Tutorial: Removing Fields"
----
-
-> Perfection is achieved, not when there is nothing more to add, but when there is nothing left to take away.
->
-> — Antoine de Saint-Exupery
-
-When working on AddressBook, you will most likely find that some features and fields that are no longer necessary. In scenarios like this, you can consider refactoring the existing `Person` model to suit your use case.
-
-In this tutorial, we’ll do exactly just that and remove the `address` field from `Person`.
-
-* Table of Contents
-{:toc}
-
-## Safely deleting `Address`
-
-Fortunately, IntelliJ IDEA provides a robust refactoring tool that can identify *most* usages. Let’s try to use it as much as we can.
-
-### Assisted refactoring
-
-The `address` field in `Person` is actually an instance of the `seedu.address.model.person.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu.
-
-
-
-Choose to `View Usages` and you should be presented with a list of `Safe Delete Conflicts`. These conflicts describe locations in which the `Address` class is used.
-
-
-
-Remove usages of `Address` by performing `Safe Delete`s on each entry. You will need to exercise discretion when removing usages of `Address`. Functions like `ParserUtil#parseAddress()` can be safely removed but its usages must be removed as well. Other usages like in `EditPersonDescriptor` may require more careful inspection.
-
-Let’s try removing references to `Address` in `EditPersonDescriptor`.
-
-1. Safe delete the field `address` in `EditPersonDescriptor`.
-
-1. Select `Yes` when prompted to remove getters and setters.
-
-1. Select `View Usages` again.
- 
-
-1. Remove the usages of `address` and select `Do refactor` when you are done.
-
-
-
- :bulb: **Tip:** Removing usages may result in errors. Exercise discretion and fix them. For example, removing the `address` field from the `Person` class will require you to modify its constructor.
-
-
-1. Repeat the steps for the remaining usages of `Address`
-
-After you are done, verify that the application still works by compiling and running it again.
-
-### Manual refactoring
-
-Unfortunately, there are usages of `Address` that IntelliJ IDEA cannot identify. You can find them by searching for instances of the word `address` in your code (`Edit` \> `Find` \> `Find in path`).
-
-Places of interest to look out for would be resources used by the application. `main/resources` contains images and `fxml` files used by the application and `test/resources` contains test data. For example, there is a `$address` in each `PersonCard` that has not been removed nor identified.
-
-
-
-A quick look at the `PersonCard` class and its `fxml` file quickly reveals why it slipped past the automated refactoring.
-
-**`PersonCard.java`**
-
-``` java
-...
-@FXML
-private Label address;
-...
-```
-
-**`PersonCard.fxml`**
-
-``` xml
-...
-
-
-
-...
-```
-
-After removing the `Label`, we can proceed to formally test our code. If everything went well, you should have most of your tests pass. Fix any remaining errors until the tests all pass.
-
-## Tidying up
-
-At this point, your application is working as intended and all your tests are passing. What’s left to do is to clean up references to `Address` in test data and documentation.
-
-In `src/test/data/`, data meant for testing purposes are stored. While keeping the `address` field in the json files does not cause the tests to fail, it is not good practice to let cruft from old features accumulate.
-
-**`invalidPersonAddressBook.json`:**
-
-```json
-{
- "persons": [ {
- "name": "Person with invalid name field: Ha!ns Mu@ster",
- "phone": "9482424",
- "email": "hans@example.com",
- "address": "4th street"
- } ]
-}
-```
-
-You can go through each individual `json` file and manually remove the `address` field.
diff --git a/docs/tutorials/TracingCode.md b/docs/tutorials/TracingCode.md
deleted file mode 100644
index bd34ed498cd..00000000000
--- a/docs/tutorials/TracingCode.md
+++ /dev/null
@@ -1,250 +0,0 @@
----
-layout: page
-title: "Tutorial: Tracing code"
----
-
-> Indeed, the ratio of time spent reading versus writing is well over 10 to 1. We are constantly reading old code as part of the effort to write new code. …\[Therefore,\] making it easy to read makes it easier to write.
->
-> — Robert C. Martin Clean Code: A Handbook of Agile Software Craftsmanship
-
-When trying to understand an unfamiliar code base, one common strategy used is to trace some representative execution path through the code base. One easy way to trace an execution path is to use a debugger to step through the code. In this tutorial, you will be using the IntelliJ IDEA’s debugger to trace the execution path of a specific user command.
-
-* Table of Contents
-{:toc}
-
-## Before we start
-
-Before we jump into the code, it is useful to get an idea of the overall structure and the high-level behavior of the application. This is provided in the 'Architecture' section of the developer guide. In particular, the architecture diagram (reproduced below), tells us that the App consists of several components.
-
-
-
-It also has a sequence diagram (reproduced below) that tells us how a command propagates through the App.
-
-
-
-Note how the diagram shows only how the execution flows *between* the main components. That is, it does not show details of the execution path *inside* each component. By hiding those details, the diagram succeeds in informing the reader about the overall execution path of a command without overwhelming the reader with too much details. In this tutorial, you aim to find those omitted details so that you get a more in-depth understanding of the code base.
-
-Before we proceed, ensure that you have done the following:
-1. Read the [*Architecture* section of the DG](../DeveloperGuide.md#architecture)
-1. Set up the project in Intellij IDEA
-1. Learn basic debugging features of Intellij IDEA
-
-## Setting a break point
-
-As you know, the first step of debugging is to put in a breakpoint where you want the debugger to pause the execution. For example, if you are trying to understand how the App starts up, you would put a breakpoint in the first statement of the `main` method. In our case, we would want to begin the tracing at the very point where the App start processing user input (i.e., somewhere in the UI component), and then trace through how the execution proceeds through the UI component. However, the execution path through a GUI is often somewhat obscure due to various *event-driven mechanisms* used by GUI frameworks, which happens to be the case here too. Therefore, let us put the breakpoint where the UI transfers control to the Logic component. According to the sequence diagram, the UI component yields control to the Logic component through a method named `execute`. Searching through the code base for `execute()` yields a promising candidate in `seedu.address.ui.CommandBox.CommandExecutor`.
-
-
-
-A quick look at the class confirms that this is indeed close to what we’re looking for. However, it is just an `Interface`. Let’s delve further and find the implementation of the interface by using the `Find Usages` feature in IntelliJ IDEA.
-
-
-
-Bingo\! `MainWindow#executeCommand()` seems to be exactly what we’re looking for\!
-
-Now let’s set the breakpoint. First, double-click the item to reach the corresponding code. Once there, click on the left gutter to set a breakpoint, as shown below.
- 
-
-## Tracing the execution path
-
-Recall from the User Guide that the `edit` command has the format: `edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…` For this tutorial we will be issuing the command `edit 1 n/Alice Yeoh`.
-
-
-
-:bulb: **Tip:** Over the course of the debugging session, you will encounter every major component in the application. Try to jot down what happens inside the component and where the execution transfers to another component.
-
-
-1. To start the debugging session, simply `Run` \> `Debug Main`
-
-1. Enter `edit 1 n/Alice Yeoh` into the command box and press `Enter`.
-
-1. The Debugger tool window should show up and look something like this:
- 
-
-1. Use the `Show execution point` feature to jump to the line of code that we stopped at:
- 
-
-1. `CommandResult commandResult = logic.execute(commandText);` is the line that you end up at.
-
-1. We are interested in the `logic.execute(commandText)` portion of that line so let’s `Step in` into that method call:
- 
-
-1. We end up in `LogicManager#execute()`. Let’s take a look at the body of the method and annotate what we can deduce.
-
- **LogicManager\#execute().**
-
- ``` java
- @Override
- public CommandResult execute(String commandText)
- throws CommandException, ParseException {
-
- //Logging, safe to ignore
- logger.info("----------------[USER COMMAND][" + commandText + "]");
-
- CommandResult commandResult;
- //Parse user input from String to a Command
- Command command = addressBookParser.parseCommand(commandText);
- //Executes the Command and stores the result
- commandResult = command.execute(model);
-
- try {
- //We can deduce that the previous line of code modifies model in some way
- // since it's being stored here.
- storage.saveAddressBook(model.getAddressBook());
- } catch (IOException ioe) {
- throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
- }
-
- return commandResult;
- }
- ```
-
-1. `LogicManager#execute()` appears to delegate most of the heavy lifting to other components. Let’s take a closer look at each one.
-
-1. `Step over` the logging code since it is of no interest to us now. 
-
-1. `Step into` the line where user input in parsed from a String to a Command.
-
- **`AddressBookParser\#parseCommand()`**
-
- ``` java
- public Command parseCommand(String userInput) throws ParseException {
- ...
- final String commandWord = matcher.group("commandWord");
- final String arguments = matcher.group("arguments");
- ...
- ```
-
-1. `Step over` until you reach the `switch` statement. The `Variables` window now shows the value of both `commandWord` and `arguments`:
- 
-
-1. We see that the value of `commandWord` is now `edit` but `arguments` is still not processed in any meaningful way.
-
-1. Stepping into the `switch`, we obviously stop at **`AddressBookParser\#parseCommand()`.**
-
- ``` java
- ...
- case EditCommand.COMMAND_WORD:
- return new EditCommandParser().parse(arguments);
- ...
- ```
-
-1. Let’s see what `EditCommandParser#parse()` does by stepping into it.
-
-1. Stepping through the method shows that it calls `ArgumentTokenizer#tokenize()` and `ParserUtil#parseIndex()` to obtain the arguments and index required.
-
-
:bulb: **Tip:** Sometimes you might end up stepping into functions that are not of interest. Simply `step out` of them\!
-
-
-1. The rest of the method seems to exhaustively check for the existence of each possible parameter of the `edit` command and store any possible changes in an `EditPersonDescriptor`. Recall that we can verify the contents of `editPersonDesciptor` through the `Variable` tool window.
- 
-
-1. Let’s continue stepping through until we return to `LogicManager#execute()`.
-
- The sequence diagram below shows the details of the execution path through the Logic component. Does the execution path you traced in the code so far matches with the diagram?
- 
-
-1. Now let’s see what happens when we call `command#execute()`\!
-
- **`EditCommand\#execute()`:**
-
- ``` java
- @Override
- public CommandResult execute(Model model) throws CommandException {
- ...
- Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
- if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
- throw new CommandException(MESSAGE_DUPLICATE_PERSON);
- }
- model.setPerson(personToEdit, editedPerson);
- model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
- return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedPerson));
- }
- ```
-
-1. As suspected, `command#execute()` does indeed make changes to `model`.
-
-1. We can a closer look at how storage works by repeatedly stepping into the code until we arrive at
- `JsonAddressBook#saveAddressBook()`.
-
-1. Again, it appears that the heavy lifting is delegated. Let’s take a look at `JsonSerializableAddressBook`'s constructor.
-
- **`JsonSerializableAddressBook\#JsonSerializableAddressBook()`:**
-
- ``` java
- /**
- * Converts a given {@code ReadOnlyAddressBook} into this class for Jackson use.
- *
- * @param source future changes to this will not affect the created
- * {@code JsonSerializableAddressBook}.
- */
- public JsonSerializableAddressBook(ReadOnlyAddressBook source) {
- persons.addAll(
- source.getPersonList()
- .stream()
- .map(JsonAdaptedPerson::new)
- .collect(Collectors.toList()));
- }
- ```
-
-1. It appears that a `JsonAdaptedPerson` is created for each `Person` and then added to the `JsonSerializableAddressBook`.
-
-1. We can continue to step through until we return to `MainWindow#executeCommand()`.
-
-1. Stepping into `resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());`, we end up in:
-
- **`ResultDisplay\#setFeedbackToUser()`**
-
- ``` java
- public void setFeedbackToUser(String feedbackToUser) {
- requireNonNull(feedbackToUser);
- resultDisplay.setText(feedbackToUser);
- }
- ```
-
-1. Finally, we step through until we reach the end of
- `MainWindow#executeCommand()`.
-
-## Conclusion
-
-In this tutorial, we traced a valid edit command from raw user input to
-the result being displayed to the user. From this tutorial, you learned
-more about the inner workings of AddressBook and how the various
-components mesh together to form one cohesive product.
-
-Here are some quick questions you can try to answer based on your
-execution path tracing. In some cases, you can do further tracing for
-the given commands to find exactly what happens.
-
-1. In this tutorial, we traced the "happy path" (i.e., no errors). What
- do you think will happen if we traced the following commands
- instead? What exceptions do you think will be thrown(if any), where
- will the exceptions be thrown and where will they be handled?
-
- 1. `redit 1 n/Alice Yu`
-
- 2. `edit 0 n/Alice Yu`
-
- 3. `edit 1 n/Alex Yeoh`
-
- 4. `edit 1`
-
- 5. `edit 1 n/アリス ユー`
-
- 6. `edit 1 t/one t/two t/three t/one`
-
-2. What components will you have to modify to perform the following
- enhancements to the application?
-
- 1. Make command words case-insensitive
-
- 2. Allow `delete` to remove more than one index at a time
-
- 3. Save the address book in the CSV format instead
-
- 4. Add a new command
-
- 5. Add a new field to `Person`
-
- 6. Add a new entity to the address book
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 44e7c4d1d7b..12d38de6a48 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/main/java/seedu/address/AppParameters.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/AppParameters.java
similarity index 91%
rename from src/main/java/seedu/address/AppParameters.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/AppParameters.java
index ab552c398f3..b37bd154f1a 100644
--- a/src/main/java/seedu/address/AppParameters.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/AppParameters.java
@@ -1,4 +1,4 @@
-package seedu.address;
+package ay2021s1_cs2103_w16_3.finesse;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -6,9 +6,9 @@
import java.util.Objects;
import java.util.logging.Logger;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.FileUtil;
import javafx.application.Application;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.util.FileUtil;
/**
* Represents the parsed command-line parameters given to the application.
diff --git a/src/main/java/seedu/address/Main.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/Main.java
similarity index 95%
rename from src/main/java/seedu/address/Main.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/Main.java
index 052a5068631..1469860c67a 100644
--- a/src/main/java/seedu/address/Main.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/Main.java
@@ -1,4 +1,4 @@
-package seedu.address;
+package ay2021s1_cs2103_w16_3.finesse;
import javafx.application.Application;
diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/MainApp.java
similarity index 62%
rename from src/main/java/seedu/address/MainApp.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/MainApp.java
index e5cfb161b73..0934c1683cc 100644
--- a/src/main/java/seedu/address/MainApp.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/MainApp.java
@@ -1,35 +1,36 @@
-package seedu.address;
+package ay2021s1_cs2103_w16_3.finesse;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Optional;
import java.util.logging.Logger;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.Config;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.Version;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.ConfigUtil;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.StringUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.Logic;
+import ay2021s1_cs2103_w16_3.finesse.logic.LogicManager;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyUserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.util.SampleDataUtil;
+import ay2021s1_cs2103_w16_3.finesse.storage.FinanceTrackerStorage;
+import ay2021s1_cs2103_w16_3.finesse.storage.JsonFinanceTrackerStorage;
+import ay2021s1_cs2103_w16_3.finesse.storage.JsonUserPrefsStorage;
+import ay2021s1_cs2103_w16_3.finesse.storage.Storage;
+import ay2021s1_cs2103_w16_3.finesse.storage.StorageManager;
+import ay2021s1_cs2103_w16_3.finesse.storage.UserPrefsStorage;
+import ay2021s1_cs2103_w16_3.finesse.ui.Ui;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiManager;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState;
import javafx.application.Application;
import javafx.stage.Stage;
-import seedu.address.commons.core.Config;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.core.Version;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.commons.util.ConfigUtil;
-import seedu.address.commons.util.StringUtil;
-import seedu.address.logic.Logic;
-import seedu.address.logic.LogicManager;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.util.SampleDataUtil;
-import seedu.address.storage.AddressBookStorage;
-import seedu.address.storage.JsonAddressBookStorage;
-import seedu.address.storage.JsonUserPrefsStorage;
-import seedu.address.storage.Storage;
-import seedu.address.storage.StorageManager;
-import seedu.address.storage.UserPrefsStorage;
-import seedu.address.ui.Ui;
-import seedu.address.ui.UiManager;
/**
* Runs the application.
@@ -41,6 +42,7 @@ public class MainApp extends Application {
private static final Logger logger = LogsCenter.getLogger(MainApp.class);
protected Ui ui;
+ protected UiState uiState;
protected Logic logic;
protected Storage storage;
protected Model model;
@@ -48,7 +50,7 @@ public class MainApp extends Application {
@Override
public void init() throws Exception {
- logger.info("=============================[ Initializing AddressBook ]===========================");
+ logger.info("=============================[ Initializing Fine$$e ]===========================");
super.init();
AppParameters appParameters = AppParameters.parse(getParameters());
@@ -56,8 +58,9 @@ public void init() throws Exception {
UserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(config.getUserPrefsFilePath());
UserPrefs userPrefs = initPrefs(userPrefsStorage);
- AddressBookStorage addressBookStorage = new JsonAddressBookStorage(userPrefs.getAddressBookFilePath());
- storage = new StorageManager(addressBookStorage, userPrefsStorage);
+ FinanceTrackerStorage financeTrackerStorage =
+ new JsonFinanceTrackerStorage(userPrefs.getFinanceTrackerFilePath());
+ storage = new StorageManager(financeTrackerStorage, userPrefsStorage);
initLogging(config);
@@ -65,29 +68,31 @@ public void init() throws Exception {
logic = new LogicManager(model, storage);
- ui = new UiManager(logic);
+ uiState = new UiState();
+
+ ui = new UiManager(model, logic, uiState);
}
/**
- * Returns a {@code ModelManager} with the data from {@code storage}'s address book and {@code userPrefs}.
- * The data from the sample address book will be used instead if {@code storage}'s address book is not found,
- * or an empty address book will be used instead if errors occur when reading {@code storage}'s address book.
+ * Returns a {@code ModelManager} with the data from {@code storage}'s finance tracker and {@code userPrefs}.
+ * The data from the sample finance tracker will be used instead if {@code storage}'s finance tracker is not found,
+ * or an empty finance tracker will be used instead if errors occur when reading {@code storage}'s finance tracker.
*/
private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) {
- Optional addressBookOptional;
- ReadOnlyAddressBook initialData;
+ Optional financeTrackerOptional;
+ ReadOnlyFinanceTracker initialData;
try {
- addressBookOptional = storage.readAddressBook();
- if (!addressBookOptional.isPresent()) {
- logger.info("Data file not found. Will be starting with a sample AddressBook");
+ financeTrackerOptional = storage.readFinanceTracker();
+ if (!financeTrackerOptional.isPresent()) {
+ logger.info("Data file not found. Will be starting with a sample FinanceTracker");
}
- initialData = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
+ initialData = financeTrackerOptional.orElseGet(SampleDataUtil::getSampleFinanceTracker);
} catch (DataConversionException e) {
- logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook");
- initialData = new AddressBook();
+ logger.warning("Data file not in the correct format. Will be starting with an empty FinanceTracker");
+ initialData = new FinanceTracker();
} catch (IOException e) {
- logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
- initialData = new AddressBook();
+ logger.warning("Problem while reading from the file. Will be starting with an empty FinanceTracker");
+ initialData = new FinanceTracker();
}
return new ModelManager(initialData, userPrefs);
@@ -151,7 +156,7 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
+ "Using default user prefs");
initializedPrefs = new UserPrefs();
} catch (IOException e) {
- logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
+ logger.warning("Problem while reading from the file. Will be starting with an empty FinanceTracker");
initializedPrefs = new UserPrefs();
}
@@ -167,13 +172,13 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
@Override
public void start(Stage primaryStage) {
- logger.info("Starting AddressBook " + MainApp.VERSION);
+ logger.info("Starting Fine$$e " + MainApp.VERSION);
ui.start(primaryStage);
}
@Override
public void stop() {
- logger.info("============================ [ Stopping Address Book ] =============================");
+ logger.info("============================ [ Stopping Fine$$e ] =============================");
try {
storage.saveUserPrefs(model.getUserPrefs());
} catch (IOException e) {
diff --git a/src/main/java/seedu/address/commons/core/Config.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Config.java
similarity index 96%
rename from src/main/java/seedu/address/commons/core/Config.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Config.java
index 91145745521..8525a65b836 100644
--- a/src/main/java/seedu/address/commons/core/Config.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Config.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core;
+package ay2021s1_cs2103_w16_3.finesse.commons.core;
import java.nio.file.Path;
import java.nio.file.Paths;
diff --git a/src/main/java/seedu/address/commons/core/GuiSettings.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/GuiSettings.java
similarity index 68%
rename from src/main/java/seedu/address/commons/core/GuiSettings.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/GuiSettings.java
index ba33653be67..81c8a5167ce 100644
--- a/src/main/java/seedu/address/commons/core/GuiSettings.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/GuiSettings.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core;
+package ay2021s1_cs2103_w16_3.finesse.commons.core;
import java.awt.Point;
import java.io.Serializable;
@@ -10,12 +10,14 @@
*/
public class GuiSettings implements Serializable {
- private static final double DEFAULT_HEIGHT = 600;
- private static final double DEFAULT_WIDTH = 740;
+ private static final double DEFAULT_HEIGHT = 815.0;
+ private static final double DEFAULT_WIDTH = 1240.0;
+ private static final boolean DEFAULT_FULLSCREEN = false;
private final double windowWidth;
private final double windowHeight;
private final Point windowCoordinates;
+ private final boolean isFullscreen;
/**
* Constructs a {@code GuiSettings} with the default height, width and position.
@@ -24,15 +26,17 @@ public GuiSettings() {
windowWidth = DEFAULT_WIDTH;
windowHeight = DEFAULT_HEIGHT;
windowCoordinates = null; // null represent no coordinates
+ isFullscreen = DEFAULT_FULLSCREEN;
}
/**
- * Constructs a {@code GuiSettings} with the specified height, width and position.
+ * Constructs a {@code GuiSettings} with the specified height, width, position, and whether it is fullscreen.
*/
- public GuiSettings(double windowWidth, double windowHeight, int xPosition, int yPosition) {
+ public GuiSettings(double windowWidth, double windowHeight, int xPosition, int yPosition, boolean isFullscreen) {
this.windowWidth = windowWidth;
this.windowHeight = windowHeight;
windowCoordinates = new Point(xPosition, yPosition);
+ this.isFullscreen = isFullscreen;
}
public double getWindowWidth() {
@@ -47,6 +51,10 @@ public Point getWindowCoordinates() {
return windowCoordinates != null ? new Point(windowCoordinates) : null;
}
+ public boolean isFullscreen() {
+ return isFullscreen;
+ }
+
@Override
public boolean equals(Object other) {
if (other == this) {
@@ -60,20 +68,22 @@ public boolean equals(Object other) {
return windowWidth == o.windowWidth
&& windowHeight == o.windowHeight
- && Objects.equals(windowCoordinates, o.windowCoordinates);
+ && Objects.equals(windowCoordinates, o.windowCoordinates)
+ && isFullscreen == o.isFullscreen;
}
@Override
public int hashCode() {
- return Objects.hash(windowWidth, windowHeight, windowCoordinates);
+ return Objects.hash(windowWidth, windowHeight, windowCoordinates, isFullscreen);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("Width : " + windowWidth + "\n");
- sb.append("Height : " + windowHeight + "\n");
- sb.append("Position : " + windowCoordinates);
+ sb.append("Width: " + windowWidth + "\n");
+ sb.append("Height: " + windowHeight + "\n");
+ sb.append("Position: " + windowCoordinates + "\n");
+ sb.append("Is Fullscreen: " + (isFullscreen ? "Yes" : "No"));
return sb.toString();
}
}
diff --git a/src/main/java/seedu/address/commons/core/LogsCenter.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/LogsCenter.java
similarity index 97%
rename from src/main/java/seedu/address/commons/core/LogsCenter.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/LogsCenter.java
index 431e7185e76..9d561849091 100644
--- a/src/main/java/seedu/address/commons/core/LogsCenter.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/LogsCenter.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core;
+package ay2021s1_cs2103_w16_3.finesse.commons.core;
import java.io.IOException;
import java.util.Arrays;
@@ -18,7 +18,7 @@
public class LogsCenter {
private static final int MAX_FILE_COUNT = 5;
private static final int MAX_FILE_SIZE_IN_BYTES = (int) (Math.pow(2, 20) * 5); // 5MB
- private static final String LOG_FILE = "addressbook.log";
+ private static final String LOG_FILE = "fine$$e.log";
private static Level currentLogLevel = Level.INFO;
private static final Logger logger = LogsCenter.getLogger(LogsCenter.class);
private static FileHandler fileHandler;
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Messages.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Messages.java
new file mode 100644
index 00000000000..3a763d41437
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Messages.java
@@ -0,0 +1,30 @@
+package ay2021s1_cs2103_w16_3.finesse.commons.core;
+
+/**
+ * Container for user visible messages.
+ */
+public class Messages {
+
+ public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command.";
+ public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
+ public static final String MESSAGE_INVALID_TAB_FORMAT = "'%s' command can only be used in the following tabs: %s.";
+ public static final String MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX =
+ "The bookmark expense index provided is invalid.";
+ public static final String MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX =
+ "The bookmark income index provided is invalid.";
+ public static final String MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX =
+ "The expense index provided is invalid.";
+ public static final String MESSAGE_INVALID_INCOME_DISPLAYED_INDEX =
+ "The income index provided is invalid.";
+ public static final String MESSAGE_TRANSACTIONS_LISTED_OVERVIEW = "%1$d transactions listed!";
+ public static final String MESSAGE_EXPENSES_LISTED_OVERVIEW = "%1$d expenses listed!";
+ public static final String MESSAGE_INCOMES_LISTED_OVERVIEW = "%1$d incomes listed!";
+ public static final String MESSAGE_METHOD_SHOULD_NOT_BE_CALLED = "This method should not be called.";
+ public static final String MESSAGE_NO_ARGUMENTS_COMMAND_FORMAT = "'%s' command cannot have any arguments.";
+ public static final String MESSAGE_INVALID_PREFIX_PRESENT_HEADER = "These invalid prefixes were found:";
+
+ /**
+ * Prevents instantiation of this class.
+ */
+ private Messages() {}
+}
diff --git a/src/main/java/seedu/address/commons/core/Version.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Version.java
similarity index 98%
rename from src/main/java/seedu/address/commons/core/Version.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Version.java
index 12142ec1e32..4f117976e2c 100644
--- a/src/main/java/seedu/address/commons/core/Version.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/Version.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core;
+package ay2021s1_cs2103_w16_3.finesse.commons.core;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/src/main/java/seedu/address/commons/core/index/Index.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/index/Index.java
similarity index 96%
rename from src/main/java/seedu/address/commons/core/index/Index.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/index/Index.java
index 19536439c09..aedbce75d6f 100644
--- a/src/main/java/seedu/address/commons/core/index/Index.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/core/index/Index.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core.index;
+package ay2021s1_cs2103_w16_3.finesse.commons.core.index;
/**
* Represents a zero-based or one-based index.
diff --git a/src/main/java/seedu/address/commons/exceptions/DataConversionException.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/exceptions/DataConversionException.java
similarity index 79%
rename from src/main/java/seedu/address/commons/exceptions/DataConversionException.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/exceptions/DataConversionException.java
index 1f689bd8e3f..0206ae2d0df 100644
--- a/src/main/java/seedu/address/commons/exceptions/DataConversionException.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/exceptions/DataConversionException.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.exceptions;
+package ay2021s1_cs2103_w16_3.finesse.commons.exceptions;
/**
* Represents an error during conversion of data from one format to another
diff --git a/src/main/java/seedu/address/commons/exceptions/IllegalValueException.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/exceptions/IllegalValueException.java
similarity index 90%
rename from src/main/java/seedu/address/commons/exceptions/IllegalValueException.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/exceptions/IllegalValueException.java
index 19124db485c..0048ed4b33a 100644
--- a/src/main/java/seedu/address/commons/exceptions/IllegalValueException.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/exceptions/IllegalValueException.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.exceptions;
+package ay2021s1_cs2103_w16_3.finesse.commons.exceptions;
/**
* Signals that some given data does not fulfill some constraints.
diff --git a/src/main/java/seedu/address/commons/util/AppUtil.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/AppUtil.java
similarity index 92%
rename from src/main/java/seedu/address/commons/util/AppUtil.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/AppUtil.java
index 87aa89c0326..8e0d05f19c6 100644
--- a/src/main/java/seedu/address/commons/util/AppUtil.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/AppUtil.java
@@ -1,9 +1,9 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
import static java.util.Objects.requireNonNull;
+import ay2021s1_cs2103_w16_3.finesse.MainApp;
import javafx.scene.image.Image;
-import seedu.address.MainApp;
/**
* A container for App specific utility functions
diff --git a/src/main/java/seedu/address/commons/util/CollectionUtil.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/CollectionUtil.java
similarity index 94%
rename from src/main/java/seedu/address/commons/util/CollectionUtil.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/CollectionUtil.java
index eafe4dfd681..d6d760adc19 100644
--- a/src/main/java/seedu/address/commons/util/CollectionUtil.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/CollectionUtil.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
import static java.util.Objects.requireNonNull;
diff --git a/src/main/java/seedu/address/commons/util/ConfigUtil.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/ConfigUtil.java
similarity index 72%
rename from src/main/java/seedu/address/commons/util/ConfigUtil.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/ConfigUtil.java
index f7f8a2bd44c..f1d2bdbeff2 100644
--- a/src/main/java/seedu/address/commons/util/ConfigUtil.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/ConfigUtil.java
@@ -1,11 +1,11 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Optional;
-import seedu.address.commons.core.Config;
-import seedu.address.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.Config;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
/**
* A class for accessing the Config File.
diff --git a/src/main/java/seedu/address/commons/util/FileUtil.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/FileUtil.java
similarity index 97%
rename from src/main/java/seedu/address/commons/util/FileUtil.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/FileUtil.java
index b1e2767cdd9..8abd5c20b15 100644
--- a/src/main/java/seedu/address/commons/util/FileUtil.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/FileUtil.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/src/main/java/seedu/address/commons/util/JsonUtil.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/JsonUtil.java
similarity index 96%
rename from src/main/java/seedu/address/commons/util/JsonUtil.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/JsonUtil.java
index 8ef609f055d..8ccbd296163 100644
--- a/src/main/java/seedu/address/commons/util/JsonUtil.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/JsonUtil.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
import static java.util.Objects.requireNonNull;
@@ -20,8 +20,8 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
/**
* Converts a Java object instance to JSON and vice versa
diff --git a/src/main/java/seedu/address/commons/util/StringUtil.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/StringUtil.java
similarity index 53%
rename from src/main/java/seedu/address/commons/util/StringUtil.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/StringUtil.java
index 61cc8c9a1cb..54b027b9348 100644
--- a/src/main/java/seedu/address/commons/util/StringUtil.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/commons/util/StringUtil.java
@@ -1,11 +1,10 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.AppUtil.checkArgument;
import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.Arrays;
/**
* Helper functions for handling strings.
@@ -13,33 +12,36 @@
public class StringUtil {
/**
- * Returns true if the {@code sentence} contains the {@code word}.
- * Ignores case, but a full word match is required.
+ * Returns true if the {@code sentence} contains the {@code keyphrase}.
+ * Ignores case, but a full keyphrase match is required.
* examples:
- * containsWordIgnoreCase("ABc def", "abc") == true
- * containsWordIgnoreCase("ABc def", "DEF") == true
- * containsWordIgnoreCase("ABc def", "AB") == false //not a full word match
+ * containsIgnoreCase("ABc def", "abc") == true
+ * containsIgnoreCase("ABc def", "DEF") == true
+ * containsIgnoreCase("ABc def", "AB") == false //not a full keyphrase match
*
* @param sentence cannot be null
- * @param word cannot be null, cannot be empty, must be a single word
+ * @param keyphrase cannot be null, cannot be empty
*/
- public static boolean containsWordIgnoreCase(String sentence, String word) {
+ public static boolean containsIgnoreCase(String sentence, String keyphrase) {
requireNonNull(sentence);
- requireNonNull(word);
+ checkArgument(!isEmptyString(keyphrase), "Keyphrase cannot be empty");
- String preppedWord = word.trim();
- checkArgument(!preppedWord.isEmpty(), "Word parameter cannot be empty");
- checkArgument(preppedWord.split("\\s+").length == 1, "Word parameter should be a single word");
-
- String preppedSentence = sentence;
- String[] wordsInPreppedSentence = preppedSentence.split("\\s+");
+ String preppedWord = keyphrase.trim();
+ return sentence.toLowerCase().contains(preppedWord.toLowerCase());
+ }
- return Arrays.stream(wordsInPreppedSentence)
- .anyMatch(preppedWord::equalsIgnoreCase);
+ /**
+ * Checks if the string {@code s} is an empty string.
+ * A string is considered empty if it is the empty string, or is a string consisting of only whitespaces.
+ * @param s cannot be null
+ */
+ public static boolean isEmptyString(String s) {
+ requireNonNull(s);
+ return s.trim().isEmpty();
}
/**
- * Returns a detailed message of the t, including the stack trace.
+ * Returns a detailed message of the Throwable object {@code t}, including the stack trace.
*/
public static String getDetails(Throwable t) {
requireNonNull(t);
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/Logic.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/Logic.java
new file mode 100644
index 00000000000..58a2c96435e
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/Logic.java
@@ -0,0 +1,78 @@
+package ay2021s1_cs2103_w16_3.finesse.logic;
+
+import java.nio.file.Path;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions.TemporalException;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState;
+import javafx.collections.ObservableList;
+
+/**
+ * API of the Logic component.
+ */
+public interface Logic {
+ /**
+ * Executes the command and returns the result.
+ *
+ * @param commandText The command as entered by the user.
+ * @param uiState The current state of the UI.
+ * @return The result of the command execution.
+ * @throws CommandException If an error occurs during command execution.
+ * @throws ParseException If an error occurs during parsing.
+ * @throws TemporalException If irregularities in the system time are detected.
+ */
+ CommandResult execute(String commandText, UiState uiState)
+ throws CommandException, ParseException, TemporalException;
+
+ /** Calculates the budget information in the finance tracker. */
+ void calculateBudgetInfo();
+
+ /**
+ * Returns the FinanceTracker.
+ *
+ * @see ay2021s1_cs2103_w16_3.finesse.model.Model#getFinanceTracker()
+ */
+ ReadOnlyFinanceTracker getFinanceTracker();
+
+ /** Returns an unmodifiable view of the filtered list of transactions. */
+ ObservableList getFilteredTransactionList();
+
+ /** Returns an unmodifiable view of the filtered list of expenses. */
+ ObservableList getFilteredExpenseList();
+
+ /** Returns an unmodifiable view of the filtered list of incomes. */
+ ObservableList getFilteredIncomeList();
+
+ /** Returns an unmodifiable view of the filtered list of bookmark expenses. */
+ ObservableList getFilteredBookmarkExpenseList();
+
+ /** Returns an unmodifiable view of the filtered list of bookmark incomes. */
+ ObservableList getFilteredBookmarkIncomeList();
+ /** Returns the monthly budget. */
+ MonthlyBudget getMonthlyBudget();
+
+ /**
+ * Returns the user prefs' finance tracker file path.
+ */
+ Path getFinanceTrackerFilePath();
+
+ /**
+ * Returns the user prefs' GUI settings.
+ */
+ GuiSettings getGuiSettings();
+
+ /**
+ * Set the user prefs' GUI settings.
+ */
+ void setGuiSettings(GuiSettings guiSettings);
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/LogicManager.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/LogicManager.java
new file mode 100644
index 00000000000..aa724f1aaf9
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/LogicManager.java
@@ -0,0 +1,123 @@
+package ay2021s1_cs2103_w16_3.finesse.logic;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.FinanceTrackerParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.logic.time.Timekeeper;
+import ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions.TemporalException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.storage.Storage;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState;
+import javafx.collections.ObservableList;
+
+/**
+ * The main LogicManager of the app.
+ */
+public class LogicManager implements Logic {
+ public static final String FILE_OPS_ERROR_MESSAGE = "Could not save data to file: ";
+ private final Logger logger = LogsCenter.getLogger(LogicManager.class);
+
+ private final Model model;
+ private final Storage storage;
+ private final FinanceTrackerParser financeTrackerParser;
+ private final Timekeeper timekeeper;
+
+ /**
+ * Constructs a {@code LogicManager} with the given {@code Model} and {@code Storage}.
+ */
+ public LogicManager(Model model, Storage storage) {
+ this.model = model;
+ this.storage = storage;
+ financeTrackerParser = new FinanceTrackerParser();
+ timekeeper = new Timekeeper();
+ }
+
+ @Override
+ public CommandResult execute(String commandText, UiState uiState)
+ throws CommandException, ParseException, TemporalException {
+ logger.info("----------------[USER COMMAND][" + commandText + "]");
+
+ timekeeper.checkIn();
+
+ CommandResult commandResult;
+ Command command = financeTrackerParser.parseCommand(commandText, uiState);
+ commandResult = command.execute(model);
+
+ try {
+ storage.saveFinanceTracker(model.getFinanceTracker());
+ } catch (IOException ioe) {
+ throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
+ }
+
+ return commandResult;
+ }
+
+ @Override
+ public void calculateBudgetInfo() {
+ model.calculateBudgetInfo();
+ }
+
+ @Override
+ public ReadOnlyFinanceTracker getFinanceTracker() {
+ return model.getFinanceTracker();
+ }
+
+ @Override
+ public ObservableList getFilteredTransactionList() {
+ return model.getFilteredTransactionList();
+ }
+
+ @Override
+ public ObservableList getFilteredExpenseList() {
+ return model.getFilteredExpenseList();
+ }
+
+ @Override
+ public ObservableList getFilteredIncomeList() {
+ return model.getFilteredIncomeList();
+ }
+
+ @Override
+ public ObservableList getFilteredBookmarkExpenseList() {
+ return model.getFilteredBookmarkExpenseList();
+ }
+
+ @Override
+ public ObservableList getFilteredBookmarkIncomeList() {
+ return model.getFilteredBookmarkIncomeList();
+ }
+
+ public MonthlyBudget getMonthlyBudget() {
+ return model.getMonthlyBudget();
+ }
+
+ @Override
+ public Path getFinanceTrackerFilePath() {
+ return model.getFinanceTrackerFilePath();
+ }
+
+ @Override
+ public GuiSettings getGuiSettings() {
+ return model.getGuiSettings();
+ }
+
+ @Override
+ public void setGuiSettings(GuiSettings guiSettings) {
+ model.setGuiSettings(guiSettings);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddExpenseCommand.java
new file mode 100644
index 00000000000..9a53e705cab
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddExpenseCommand.java
@@ -0,0 +1,60 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Adds an expense to the finance tracker.
+ */
+public class AddExpenseCommand extends Command {
+
+ public static final String COMMAND_WORD = "add-expense";
+ public static final String COMMAND_ALIAS = "adde";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an expense to the finance tracker. "
+ + "Parameters: "
+ + PREFIX_TITLE + "TITLE "
+ + PREFIX_AMOUNT + "AMOUNT "
+ + "[" + PREFIX_DATE + "DATE] "
+ + "[" + PREFIX_CATEGORY + "CATEGORY]...\n"
+ + "Inputting the date is optional. If no input is given for d/DATE, the current date will be used.\n"
+ + "Example: " + COMMAND_WORD + " "
+ + PREFIX_TITLE + "Bubble Tea "
+ + PREFIX_AMOUNT + "5 "
+ + PREFIX_DATE + "03/10/2020 "
+ + PREFIX_CATEGORY + "Food & Beverage";
+
+ public static final String MESSAGE_SUCCESS = "New expense added: %1$s";
+
+ private final Expense toAdd;
+
+ /**
+ * Creates an AddExpenseCommand to add the specified {@code Expense}.
+ */
+ public AddExpenseCommand(Expense expense) {
+ requireNonNull(expense);
+ toAdd = expense;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+
+ model.addExpense(toAdd);
+ return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd), true, Tab.EXPENSES);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof AddExpenseCommand // instanceof handles nulls
+ && toAdd.equals(((AddExpenseCommand) other).toAdd));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddIncomeCommand.java
new file mode 100644
index 00000000000..966ddb0388c
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddIncomeCommand.java
@@ -0,0 +1,60 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Adds an income to the finance tracker.
+ */
+public class AddIncomeCommand extends Command {
+
+ public static final String COMMAND_WORD = "add-income";
+ public static final String COMMAND_ALIAS = "addi";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an income to the finance tracker. "
+ + "Parameters: "
+ + PREFIX_TITLE + "TITLE "
+ + PREFIX_AMOUNT + "AMOUNT "
+ + "[" + PREFIX_DATE + "DATE] "
+ + "[" + PREFIX_CATEGORY + "CATEGORY]...\n"
+ + "Inputting the date is optional. If no input is given for d/DATE, the current date will be used.\n"
+ + "Example: " + COMMAND_WORD + " "
+ + PREFIX_TITLE + "Internship "
+ + PREFIX_AMOUNT + "560 "
+ + PREFIX_DATE + "03/10/2020 "
+ + PREFIX_CATEGORY + "Work";
+
+ public static final String MESSAGE_SUCCESS = "New income added: %1$s";
+
+ private final Income toAdd;
+
+ /**
+ * Creates an AddIncomeCommand to add the specified {@code Income}.
+ */
+ public AddIncomeCommand(Income income) {
+ requireNonNull(income);
+ toAdd = income;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+
+ model.addIncome(toAdd);
+ return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd), true, Tab.INCOME);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof AddIncomeCommand // instanceof handles nulls
+ && toAdd.equals(((AddIncomeCommand) other).toAdd));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ClearCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ClearCommand.java
new file mode 100644
index 00000000000..86dadfbfbc1
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ClearCommand.java
@@ -0,0 +1,41 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.FinanceTrackerParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState;
+
+/**
+ * Clears the finance tracker.
+ */
+public class ClearCommand extends Command {
+
+ public static final String COMMAND_WORD = "clear";
+ public static final String MESSAGE_SUCCESS = "Finance tracker has been cleared!";
+ public static final String MESSAGE_PRIMED = "Please enter 'clear' again to confirm your decision.";
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+ List recentCommands = model.getCommandHistory().recentCommands(20);
+ boolean isPrimed;
+ try {
+ isPrimed = recentCommands.size() >= 2 && new FinanceTrackerParser()
+ .parseCommand(recentCommands.get(1), new UiState()) instanceof ClearCommand;
+ } catch (ParseException e) {
+ isPrimed = false;
+ }
+ if (isPrimed) {
+ model.setFinanceTracker(new FinanceTracker());
+ return new CommandResult(MESSAGE_SUCCESS, true);
+ } else {
+ // set primed
+ return new CommandResult(MESSAGE_PRIMED);
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/Command.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/Command.java
similarity index 73%
rename from src/main/java/seedu/address/logic/commands/Command.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/Command.java
index 64f18992160..d96d9584afb 100644
--- a/src/main/java/seedu/address/logic/commands/Command.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/Command.java
@@ -1,7 +1,7 @@
-package seedu.address.logic.commands;
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
/**
* Represents a command with hidden internal logic and the ability to be executed.
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandResult.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandResult.java
new file mode 100644
index 00000000000..449ecbdf4b8
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandResult.java
@@ -0,0 +1,148 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Represents the result of a command execution.
+ */
+public class CommandResult {
+
+ private final String feedbackToUser;
+
+ /** Budget information should be recalculated. */
+ private final boolean calculateBudgetInfo;
+
+ /** Help information should be shown to the user. */
+ private final boolean showHelp;
+
+ /** The application should exit. */
+ private final boolean exit;
+
+ /** An optional {@code Tab} to switch to */
+ private final Optional tabToSwitchTo;
+
+ /**
+ * Constructs a {@code CommandResult} with the specified fields.
+ *
+ * @param feedbackToUser The feedback to be displayed to the user.
+ * @param calculateBudgetInfo Whether the budget information should be recalculated.
+ * @param showHelp Whether the help dialog should be shown to the user.
+ * @param exit Whether the application should exit.
+ * @param tabToSwitchTo The tab the UI should switch to.
+ */
+ public CommandResult(String feedbackToUser, boolean calculateBudgetInfo,
+ boolean showHelp, boolean exit, Tab tabToSwitchTo) {
+ this.feedbackToUser = requireNonNull(feedbackToUser);
+ this.calculateBudgetInfo = calculateBudgetInfo;
+ this.showHelp = showHelp;
+ this.exit = exit;
+ this.tabToSwitchTo = Optional.ofNullable(tabToSwitchTo);
+ }
+
+ /**
+ * Constructs a {@code CommandResult} with the specified {@code feedbackToUser}, {@code calculateBudgetInfo},
+ * {@code showHelp}, {@code exit}, and other fields set to their default value.
+ *
+ * @param feedbackToUser The feedback to be displayed to the user.
+ * @param calculateBudgetInfo Whether the budget information should be recalculated.
+ * @param showHelp Whether the help dialog should be shown to the user.
+ * @param exit Whether the application should exit.
+ */
+ public CommandResult(String feedbackToUser, boolean calculateBudgetInfo, boolean showHelp, boolean exit) {
+ this(feedbackToUser, calculateBudgetInfo, showHelp, exit, null);
+ }
+
+ /**
+ * Constructs a {@code CommandResult} with the specified {@code feedbackToUser}, {@code tabToSwitchTo},
+ * and other fields set to their default value.
+ *
+ * @param feedbackToUser The feedback to be displayed to the user.
+ * @param tabToSwitchTo The tab the UI should switch to.
+ */
+ public CommandResult(String feedbackToUser, Tab tabToSwitchTo) {
+ this(feedbackToUser, false, false, false, tabToSwitchTo);
+ }
+
+ /**
+ * Constructs a {@code CommandResult} with the specified {@code feedbackToUser},
+ * and other fields set to their default value.
+ *
+ * @param feedbackToUser The feedback to be displayed to the user.
+ */
+ public CommandResult(String feedbackToUser) {
+ this(feedbackToUser, false, false, false, null);
+ }
+
+ /**
+ * Constructs a {@code CommandResult} with the specified {@code feedbackToUser}, {@code calculateBudgetInfo},
+ * and other fields set to their default value.
+ *
+ * @param feedbackToUser The feedback to be displayed to the user.
+ * @param calculateBudgetInfo Whether the budget information should be recalculated.
+ */
+ public CommandResult(String feedbackToUser, boolean calculateBudgetInfo) {
+ this(feedbackToUser, calculateBudgetInfo, false, false, null);
+ }
+
+ /**
+ * Constructs a {@code CommandResult} with the specified {@code feedbackToUser}, {@code calculateBudgetInfo},
+ * {@code tabToSwitchTo}, and other fields set to their default value.
+ *
+ * @param feedbackToUser The feedback to be displayed to the user.
+ * @param calculateBudgetInfo Whether the budget information should be recalculated.
+ * @param tabToSwitchTo The tab the UI should switch to.
+ */
+ public CommandResult(String feedbackToUser, boolean calculateBudgetInfo, Tab tabToSwitchTo) {
+ this(feedbackToUser, calculateBudgetInfo, false, false, tabToSwitchTo);
+ }
+
+ public String getFeedbackToUser() {
+ return feedbackToUser;
+ }
+
+ public boolean isCalculateBudgetInfo() {
+ return calculateBudgetInfo;
+ }
+
+ public boolean isShowHelp() {
+ return showHelp;
+ }
+
+ public boolean isExit() {
+ return exit;
+ }
+
+ public Optional getTabToSwitchTo() {
+ return tabToSwitchTo;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof CommandResult)) {
+ return false;
+ }
+
+ CommandResult otherCommandResult = (CommandResult) other;
+ return feedbackToUser.equals(otherCommandResult.feedbackToUser)
+ && calculateBudgetInfo == otherCommandResult.calculateBudgetInfo
+ && showHelp == otherCommandResult.showHelp
+ && exit == otherCommandResult.exit
+ && tabToSwitchTo.equals(otherCommandResult.tabToSwitchTo);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(feedbackToUser, calculateBudgetInfo, showHelp, exit, tabToSwitchTo);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteCommand.java
new file mode 100644
index 00000000000..1b6f8d3af56
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteCommand.java
@@ -0,0 +1,48 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * Deletes a transaction identified using its displayed index from the finance tracker
+ * depending on the tab the user is on.
+ *
+ * Base class for DeleteExpenseCommand and DeleteIncomeCommand.
+ */
+public class DeleteCommand extends Command {
+
+ public static final String COMMAND_WORD = "delete";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + ": Deletes the transaction identified by the index number used in "
+ + "the displayed transaction list on the current tab.\n"
+ + "When on Income tab: Deletes from the currently displayed income list.\n"
+ + "When on Expenses tab: Deletes from the currently displayed expenses list.\n"
+ + "Parameters: INDEX (must be a positive integer)\n"
+ + "Example: " + COMMAND_WORD + " 1";
+
+ private final Index targetIndex;
+
+ public DeleteCommand(Index targetIndex) {
+ this.targetIndex = targetIndex;
+ }
+
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ throw new CommandException(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof DeleteCommand // instanceof handles nulls
+ && targetIndex.equals(((DeleteCommand) other).targetIndex)); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteExpenseCommand.java
new file mode 100644
index 00000000000..06ec9085909
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteExpenseCommand.java
@@ -0,0 +1,43 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+
+/**
+ * Deletes an expense identified using its displayed index from the finance tracker.
+ */
+public class DeleteExpenseCommand extends DeleteCommand {
+
+ public static final String MESSAGE_DELETE_EXPENSE_SUCCESS = "Deleted Expense: %1$s";
+
+ public DeleteExpenseCommand(DeleteCommand superCommand) {
+ super(superCommand.getTargetIndex());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List lastShownList = model.getFilteredExpenseList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ Expense expenseToDelete = lastShownList.get(getTargetIndex().getZeroBased());
+ model.deleteTransaction(expenseToDelete);
+ return new CommandResult(String.format(MESSAGE_DELETE_EXPENSE_SUCCESS, expenseToDelete), true);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof DeleteExpenseCommand // instanceof handles nulls
+ && getTargetIndex().equals(((DeleteExpenseCommand) other).getTargetIndex())); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteIncomeCommand.java
new file mode 100644
index 00000000000..a62676174dd
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteIncomeCommand.java
@@ -0,0 +1,43 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_INCOME_DISPLAYED_INDEX;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+
+/**
+ * Deletes an income identified using its displayed index from the finance tracker.
+ */
+public class DeleteIncomeCommand extends DeleteCommand {
+
+ public static final String MESSAGE_DELETE_INCOME_SUCCESS = "Deleted Income: %1$s";
+
+ public DeleteIncomeCommand(DeleteCommand superCommand) {
+ super(superCommand.getTargetIndex());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List lastShownList = model.getFilteredIncomeList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_INCOME_DISPLAYED_INDEX);
+ }
+
+ Income incomeToDelete = lastShownList.get(getTargetIndex().getZeroBased());
+ model.deleteTransaction(incomeToDelete);
+ return new CommandResult(String.format(MESSAGE_DELETE_INCOME_SUCCESS, incomeToDelete), true);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof DeleteIncomeCommand // instanceof handles nulls
+ && getTargetIndex().equals(((DeleteIncomeCommand) other).getTargetIndex())); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditCommand.java
new file mode 100644
index 00000000000..61be6840c42
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditCommand.java
@@ -0,0 +1,199 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.CollectionUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * Edits the details of an existing transaction using its displayed index from the finance tracker
+ * depending on the tab the user is on.
+ *
+ * Base class for EditExpenseCommand and EditIncomeCommand.
+ */
+public class EditCommand extends Command {
+
+ public static final String COMMAND_WORD = "edit";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the transaction identified "
+ + "by the index number used in the displayed transaction list on the current tab. "
+ + "Existing values will be overwritten by the input values.\n"
+ + "When on Income tab: Edits from the currently displayed income list.\n"
+ + "When on Expenses tab: Edits from the currently displayed expenses list.\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + "[" + PREFIX_TITLE + "TITLE] "
+ + "[" + PREFIX_AMOUNT + "AMOUNT] "
+ + "[" + PREFIX_DATE + "DATE] "
+ + "[" + PREFIX_CATEGORY + "CATEGORY]...\n"
+ + "Example: " + COMMAND_WORD + " 1 "
+ + PREFIX_AMOUNT + "5 "
+ + PREFIX_DATE + "22/09/2020";
+
+ public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
+
+ private final Index targetIndex;
+ private final EditTransactionDescriptor editTransactionDescriptor;
+
+ /**
+ * @param targetIndex Index of the transaction in the filtered transaction list to edit.
+ * @param editTransactionDescriptor Details to edit the transaction with.
+ */
+ public EditCommand(Index targetIndex, EditTransactionDescriptor editTransactionDescriptor) {
+ requireNonNull(targetIndex);
+ requireNonNull(editTransactionDescriptor);
+
+ this.targetIndex = targetIndex;
+ this.editTransactionDescriptor = new EditTransactionDescriptor(editTransactionDescriptor);
+ }
+
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ protected EditTransactionDescriptor getEditTransactionDescriptor() {
+ return editTransactionDescriptor;
+ }
+
+ protected boolean isAmountOrDateEdited() {
+ return editTransactionDescriptor.isAmountOrDateEdited();
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ throw new CommandException(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditCommand)) {
+ return false;
+ }
+
+ // state check
+ EditCommand e = (EditCommand) other;
+ return targetIndex.equals(e.targetIndex)
+ && editTransactionDescriptor.equals(e.editTransactionDescriptor);
+ }
+
+ /**
+ * Stores the details to edit the transaction with. Each non-empty field value will replace the
+ * corresponding field value of the transaction.
+ */
+ public static class EditTransactionDescriptor {
+ private Title title;
+ private Amount amount;
+ private Date date;
+ private Set categories;
+
+ public EditTransactionDescriptor() {}
+
+ /**
+ * Copy constructor.
+ * A defensive copy of {@code categories} is used internally.
+ */
+ public EditTransactionDescriptor(EditTransactionDescriptor toCopy) {
+ setTitle(toCopy.title);
+ setAmount(toCopy.amount);
+ setDate(toCopy.date);
+ setCategories(toCopy.categories);
+ }
+
+ /**
+ * Returns true if at least one field is edited.
+ */
+ public boolean isAnyFieldEdited() {
+ return CollectionUtil.isAnyNonNull(title, amount, date, categories);
+ }
+
+ /**
+ * Returns true if the amount or date is edited.
+ */
+ public boolean isAmountOrDateEdited() {
+ return amount != null || date != null;
+ }
+
+ public void setTitle(Title title) {
+ this.title = title;
+ }
+
+ public Optional getTitle() {
+ return Optional.ofNullable(title);
+ }
+
+ public void setAmount(Amount amount) {
+ this.amount = amount;
+ }
+
+ public Optional<Amount> getAmount() {
+ return Optional.ofNullable(amount);
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ public Optional<Date> getDate() {
+ return Optional.ofNullable(date);
+ }
+
+ /**
+ * Sets {@code categories} to this object's {@code categories}.
+ * A defensive copy of {@code categories} is used internally.
+ */
+ public void setCategories(Set<Category> categories) {
+ this.categories = (categories != null) ? new HashSet<>(categories) : null;
+ }
+
+ /**
+ * Returns an unmodifiable category set, which throws {@code UnsupportedOperationException}
+ * if modification is attempted.
+ * Returns {@code Optional#empty()} if {@code categories} is null.
+ */
+ public Optional<Set<Category>> getCategories() {
+ return (categories != null) ? Optional.of(Collections.unmodifiableSet(categories)) : Optional.empty();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditTransactionDescriptor)) {
+ return false;
+ }
+
+ // state check
+ EditTransactionDescriptor e = (EditTransactionDescriptor) other;
+
+ return getTitle().equals(e.getTitle())
+ && getAmount().equals(e.getAmount())
+ && getDate().equals(e.getDate())
+ && getCategories().equals(e.getCategories());
+ }
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditExpenseCommand.java
new file mode 100644
index 00000000000..0b6dd1ad0ea
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditExpenseCommand.java
@@ -0,0 +1,80 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * Edits an expense identified using its displayed index from the finance tracker.
+ */
+public class EditExpenseCommand extends EditCommand {
+
+ public static final String MESSAGE_EDIT_EXPENSE_SUCCESS = "Edited Expense: %1$s";
+
+ public EditExpenseCommand(EditCommand superCommand) {
+ super(superCommand.getTargetIndex(), superCommand.getEditTransactionDescriptor());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List<Expense> lastShownList = model.getFilteredExpenseList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ Expense expenseToEdit = lastShownList.get(getTargetIndex().getZeroBased());
+ Expense editedExpense = createEditedExpense(expenseToEdit, getEditTransactionDescriptor());
+
+ model.setTransaction(expenseToEdit, editedExpense);
+ model.updateFilteredExpenseList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ return new CommandResult(String.format(MESSAGE_EDIT_EXPENSE_SUCCESS, editedExpense), isAmountOrDateEdited());
+ }
+
+ /**
+ * Creates and returns an {@code Expense} with the details of {@code expenseToEdit}
+ * edited with {@code editExpenseDescriptor}.
+ */
+ private static Expense createEditedExpense(Expense expenseToEdit,
+ EditTransactionDescriptor editExpenseDescriptor) {
+ assert expenseToEdit != null;
+
+ Title updatedTitle = editExpenseDescriptor.getTitle().orElse(expenseToEdit.getTitle());
+ Amount updatedAmount = editExpenseDescriptor.getAmount().orElse(expenseToEdit.getAmount());
+ Date updatedDate = editExpenseDescriptor.getDate().orElse(expenseToEdit.getDate());
+ Set<Category> updatedCategories = editExpenseDescriptor.getCategories()
+ .orElse(expenseToEdit.getCategories());
+
+ return new Expense(updatedTitle, updatedAmount, updatedDate, updatedCategories);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditExpenseCommand)) {
+ return false;
+ }
+
+ // state check
+ EditExpenseCommand e = (EditExpenseCommand) other;
+ return getTargetIndex().equals(e.getTargetIndex())
+ && getEditTransactionDescriptor().equals(e.getEditTransactionDescriptor());
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditIncomeCommand.java
new file mode 100644
index 00000000000..6fa32643b87
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditIncomeCommand.java
@@ -0,0 +1,80 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_INCOME_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * Edits an income identified using its displayed index from the finance tracker.
+ */
+public class EditIncomeCommand extends EditCommand {
+
+ public static final String MESSAGE_EDIT_INCOME_SUCCESS = "Edited Income: %1$s";
+
+ public EditIncomeCommand(EditCommand superCommand) {
+ super(superCommand.getTargetIndex(), superCommand.getEditTransactionDescriptor());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List<Income> lastShownList = model.getFilteredIncomeList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_INCOME_DISPLAYED_INDEX);
+ }
+
+ Income incomeToEdit = lastShownList.get(getTargetIndex().getZeroBased());
+ Income editedIncome = createEditedIncome(incomeToEdit, getEditTransactionDescriptor());
+
+ model.setTransaction(incomeToEdit, editedIncome);
+ model.updateFilteredIncomeList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ return new CommandResult(String.format(MESSAGE_EDIT_INCOME_SUCCESS, editedIncome), isAmountOrDateEdited());
+ }
+
+ /**
+ * Creates and returns an {@code Income} with the details of {@code incomeToEdit}
+ * edited with {@code editIncomeDescriptor}.
+ */
+ private static Income createEditedIncome(Income incomeToEdit,
+ EditTransactionDescriptor editIncomeDescriptor) {
+ assert incomeToEdit != null;
+
+ Title updatedTitle = editIncomeDescriptor.getTitle().orElse(incomeToEdit.getTitle());
+ Amount updatedAmount = editIncomeDescriptor.getAmount().orElse(incomeToEdit.getAmount());
+ Date updatedDate = editIncomeDescriptor.getDate().orElse(incomeToEdit.getDate());
+ Set<Category> updatedCategories = editIncomeDescriptor.getCategories()
+ .orElse(incomeToEdit.getCategories());
+
+ return new Income(updatedTitle, updatedAmount, updatedDate, updatedCategories);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditIncomeCommand)) {
+ return false;
+ }
+
+ // state check
+ EditIncomeCommand e = (EditIncomeCommand) other;
+ return getTargetIndex().equals(e.getTargetIndex())
+ && getEditTransactionDescriptor().equals(e.getEditTransactionDescriptor());
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ExitCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ExitCommand.java
similarity index 68%
rename from src/main/java/seedu/address/logic/commands/ExitCommand.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ExitCommand.java
index 3dd85a8ba90..0165b37ae8e 100644
--- a/src/main/java/seedu/address/logic/commands/ExitCommand.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ExitCommand.java
@@ -1,6 +1,6 @@
-package seedu.address.logic.commands;
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
-import seedu.address.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
/**
* Terminates the program.
@@ -9,11 +9,11 @@ public class ExitCommand extends Command {
public static final String COMMAND_WORD = "exit";
- public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ...";
+ public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Fine$$e as requested ...";
@Override
public CommandResult execute(Model model) {
- return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+ return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, false, true);
}
}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindCommand.java
new file mode 100644
index 00000000000..690f5e696ad
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindCommand.java
@@ -0,0 +1,73 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT_FROM;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT_TO;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE_FROM;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE_TO;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Finds and lists all transactions in the finance tracker whose title contains any of the argument keywords
+ * depending on the tab the user is on.
+ * Keyword matching is case insensitive.
+ *
+ * Base class for FindExpenseCommand, FindIncomeCommand and FindTransactionCommand.
+ */
+public class FindCommand extends Command {
+
+ public static final String COMMAND_WORD = "find";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all transactions on the current tab "
+ + "that match any of the specified search parameters "
+ + "and displays them as a list with index numbers.\n"
+ + "When on Overview tab: Searches all transactions.\n"
+ + "When on Income tab: Searches all incomes.\n"
+ + "When on Expenses tab: Searches all expenses.\n"
+ + "Parameters: [" + PREFIX_TITLE + "TITLE_KEYPHRASE...] "
+ + "[" + PREFIX_AMOUNT + "AMOUNT] "
+ + "[" + PREFIX_DATE + "DATE] "
+ + "[" + PREFIX_CATEGORY + "CATEGORY...] "
+ + "[" + PREFIX_AMOUNT_FROM + "AMOUNT_FROM] "
+ + "[" + PREFIX_AMOUNT_TO + "AMOUNT_TO] "
+ + "[" + PREFIX_DATE_FROM + "DATE_FROM] "
+ + "[" + PREFIX_DATE_TO + "DATE_TO]\n"
+ + "Please refer to the user guide for more details on each search parameter.\n"
+ + "Example: " + COMMAND_WORD + " "
+ + PREFIX_TITLE + "Bubble Tea "
+ + PREFIX_AMOUNT_FROM + "5 "
+ + PREFIX_DATE_FROM + "01/10/2020 "
+ + PREFIX_DATE_TO + "31/10/2020";
+
+ private final List<Predicate<Transaction>> predicates;
+
+ public FindCommand(List<Predicate<Transaction>> predicates) {
+ this.predicates = predicates;
+ }
+
+ protected List<Predicate<Transaction>> getPredicates() {
+ return predicates;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ throw new CommandException(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof FindCommand // instanceof handles nulls
+ && predicates.equals(((FindCommand) other).predicates)); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindExpenseCommand.java
new file mode 100644
index 00000000000..80a0965a126
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindExpenseCommand.java
@@ -0,0 +1,34 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_EXPENSES_LISTED_OVERVIEW;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * Finds and lists all expenses in the finance tracker whose title contains any of the argument keywords.
+ * Used when the user is on the Expenses tab.
+ * Keyword matching is case insensitive.
+ */
+public class FindExpenseCommand extends FindCommand {
+
+ public FindExpenseCommand(FindCommand superCommand) {
+ super(superCommand.getPredicates());
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+ model.updateFilteredExpenseList(getPredicates());
+ return new CommandResult(
+ String.format(MESSAGE_EXPENSES_LISTED_OVERVIEW,
+ model.getFilteredExpenseList().size()));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof FindExpenseCommand // instanceof handles nulls
+ && getPredicates().equals(((FindExpenseCommand) other).getPredicates())); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindIncomeCommand.java
new file mode 100644
index 00000000000..6e09e22bce0
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindIncomeCommand.java
@@ -0,0 +1,34 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INCOMES_LISTED_OVERVIEW;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * Finds and lists all incomes in the finance tracker whose title contains any of the argument keywords.
+ * Used when the user is on the Income tab.
+ * Keyword matching is case insensitive.
+ */
+public class FindIncomeCommand extends FindCommand {
+
+ public FindIncomeCommand(FindCommand superCommand) {
+ super(superCommand.getPredicates());
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+ model.updateFilteredIncomeList(getPredicates());
+ return new CommandResult(
+ String.format(MESSAGE_INCOMES_LISTED_OVERVIEW,
+ model.getFilteredIncomeList().size()));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof FindIncomeCommand // instanceof handles nulls
+ && getPredicates().equals(((FindIncomeCommand) other).getPredicates())); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindTransactionCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindTransactionCommand.java
new file mode 100644
index 00000000000..a525875bd83
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindTransactionCommand.java
@@ -0,0 +1,34 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_TRANSACTIONS_LISTED_OVERVIEW;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * Finds and lists all transactions in the finance tracker whose title contains any of the argument keywords.
+ * Used when the user is on the Overview tab.
+ * Keyword matching is case insensitive.
+ */
+public class FindTransactionCommand extends FindCommand {
+
+ public FindTransactionCommand(FindCommand superCommand) {
+ super(superCommand.getPredicates());
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+ model.updateFilteredTransactionList(getPredicates());
+ return new CommandResult(
+ String.format(MESSAGE_TRANSACTIONS_LISTED_OVERVIEW,
+ model.getFilteredTransactionList().size()));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof FindTransactionCommand // instanceof handles nulls
+ && getPredicates().equals(((FindTransactionCommand) other).getPredicates())); // state check
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/HelpCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/HelpCommand.java
similarity index 72%
rename from src/main/java/seedu/address/logic/commands/HelpCommand.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/HelpCommand.java
index bf824f91bd0..850128c32d5 100644
--- a/src/main/java/seedu/address/logic/commands/HelpCommand.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/HelpCommand.java
@@ -1,6 +1,6 @@
-package seedu.address.logic.commands;
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
-import seedu.address.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
/**
* Format full help instructions for every command for display.
@@ -16,6 +16,6 @@ public class HelpCommand extends Command {
@Override
public CommandResult execute(Model model) {
- return new CommandResult(SHOWING_HELP_MESSAGE, true, false);
+ return new CommandResult(SHOWING_HELP_MESSAGE, false, true, false);
}
}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListCommand.java
new file mode 100644
index 00000000000..36d87ea274c
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListCommand.java
@@ -0,0 +1,21 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * Lists all transactions in the finance tracker to the user.
+ */
+public class ListCommand extends Command {
+
+ public static final String COMMAND_WORD = "list";
+
+ public static final String MESSAGE_SUCCESS = "Listed all transactions";
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ throw new CommandException(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListExpenseCommand.java
new file mode 100644
index 00000000000..5204c6eb09f
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListExpenseCommand.java
@@ -0,0 +1,26 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Lists all expenses in the finance tracker to the user.
+ */
+public class ListExpenseCommand extends Command {
+
+ public static final String COMMAND_WORD = "ls-expense";
+ public static final String COMMAND_ALIAS = "lse";
+
+ public static final String MESSAGE_SUCCESS = "Listed all expenses.";
+
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+ model.updateFilteredExpenseList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ return new CommandResult(MESSAGE_SUCCESS, Tab.EXPENSES);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListIncomeCommand.java
new file mode 100644
index 00000000000..f3bc149bdce
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListIncomeCommand.java
@@ -0,0 +1,26 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Lists all income in the finance tracker to the user.
+ */
+public class ListIncomeCommand extends Command {
+
+ public static final String COMMAND_WORD = "ls-income";
+ public static final String COMMAND_ALIAS = "lsi";
+
+ public static final String MESSAGE_SUCCESS = "Listed all income.";
+
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+ model.updateFilteredIncomeList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ return new CommandResult(MESSAGE_SUCCESS, Tab.INCOME);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListTransactionCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListTransactionCommand.java
new file mode 100644
index 00000000000..f69e100a6c5
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListTransactionCommand.java
@@ -0,0 +1,26 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Lists all transactions in the finance tracker to the user.
+ */
+public class ListTransactionCommand extends Command {
+
+ public static final String COMMAND_WORD = "ls-overview";
+ public static final String COMMAND_ALIAS = "lso";
+
+ public static final String MESSAGE_SUCCESS = "Listed all transactions.";
+
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+ model.updateFilteredTransactionList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ return new CommandResult(MESSAGE_SUCCESS, Tab.OVERVIEW);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/TabCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/TabCommand.java
new file mode 100644
index 00000000000..4cd86dbefca
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/TabCommand.java
@@ -0,0 +1,59 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Switches UI tabs.
+ */
+public class TabCommand extends Command {
+
+ /** The number of tabs in the UI. */
+ public static final int NUM_OF_TABS = 4;
+
+ public static final String COMMAND_WORD = "tab";
+
+ // TODO: Update this
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Switches to the specified tab by index.\n"
+ + "Parameters: INDEX (must be a positive integer between 1 to " + NUM_OF_TABS + " inclusive)";
+
+ public static final String MESSAGE_SWITCH_TABS_SUCCESS = "Switched to %1$s tab.";
+ public static final String MESSAGE_TAB_DOES_NOT_EXIST = "The specified tab does not exist.";
+
+ /** The index of the tab to switch to. */
+ private final Index tabIndex;
+
+ /**
+ * Constructs a {@code TabCommand} with the specified tab index to switch to.
+ *
+ * @param tabIndex The index of the tab to switch to.
+ * @throws CommandException If the specified tab index does not exist.
+ */
+ public TabCommand(Index tabIndex) {
+ requireNonNull(tabIndex);
+
+ this.tabIndex = tabIndex;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ if (tabIndex.getOneBased() > NUM_OF_TABS) {
+ throw new CommandException(TabCommand.MESSAGE_TAB_DOES_NOT_EXIST);
+ }
+
+ Tab tabToSwitchTo = Tab.values()[tabIndex.getZeroBased()];
+ String formattedSuccessMessage = String.format(MESSAGE_SWITCH_TABS_SUCCESS, tabToSwitchTo);
+ return new CommandResult(formattedSuccessMessage, tabToSwitchTo);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // Short circuit if same object.
+ || (other instanceof TabCommand // instanceof handles nulls.
+ && tabIndex.equals(((TabCommand) other).tabIndex)); // State check.
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/AddBookmarkExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/AddBookmarkExpenseCommand.java
new file mode 100644
index 00000000000..35b923b1273
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/AddBookmarkExpenseCommand.java
@@ -0,0 +1,62 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+public class AddBookmarkExpenseCommand extends Command {
+
+ public static final String COMMAND_WORD = "add-bookmark-expense";
+ public static final String COMMAND_ALIAS = "addbe";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a bookmark expense to the finance tracker. "
+ + "Parameters: "
+ + PREFIX_TITLE + "TITLE "
+ + PREFIX_AMOUNT + "AMOUNT "
+ + "[" + PREFIX_CATEGORY + "CATEGORY]...\n"
+ + "Example: " + COMMAND_WORD + " "
+ + PREFIX_TITLE + "Phone Bill "
+ + PREFIX_AMOUNT + "24 "
+ + PREFIX_CATEGORY + "Utilities";
+
+ public static final String MESSAGE_SUCCESS = "New bookmark expense added: %1$s";
+
+ private final BookmarkExpense toAdd;
+
+ /**
+ * Creates an AddBookmarkExpenseCommand to add the specified {@code BookmarkExpense}
+ */
+ public AddBookmarkExpenseCommand(BookmarkExpense bookmarkExpense) {
+ requireNonNull(bookmarkExpense);
+ toAdd = bookmarkExpense;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+
+ try {
+ model.addBookmarkExpense(toAdd);
+ } catch (DuplicateBookmarkTransactionException e) {
+ throw new CommandException(e.getMessage());
+ }
+ return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd), Tab.EXPENSES);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof AddBookmarkExpenseCommand // instanceof handles nulls
+ && toAdd.equals(((AddBookmarkExpenseCommand) other).toAdd));
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/AddBookmarkIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/AddBookmarkIncomeCommand.java
new file mode 100644
index 00000000000..4c3f3e9a715
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/AddBookmarkIncomeCommand.java
@@ -0,0 +1,63 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+public class AddBookmarkIncomeCommand extends Command {
+
+ public static final String COMMAND_WORD = "add-bookmark-income";
+ public static final String COMMAND_ALIAS = "addbi";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a bookmark income to the finance tracker. "
+ + "Parameters: "
+ + PREFIX_TITLE + "TITLE "
+ + PREFIX_AMOUNT + "AMOUNT "
+ + "[" + PREFIX_CATEGORY + "CATEGORY]...\n"
+ + "Example: " + COMMAND_WORD + " "
+ + PREFIX_TITLE + "Summer Internship "
+ + PREFIX_AMOUNT + "1000 "
+ + PREFIX_CATEGORY + "Work";
+
+ public static final String MESSAGE_SUCCESS = "New bookmark income added: %1$s";
+
+ private final BookmarkIncome toAdd;
+
+ /**
+ * Creates an AddBookmarkIncomeCommand to add the specified {@code BookmarkIncome}
+ * @param bookmarkIncome
+ */
+ public AddBookmarkIncomeCommand(BookmarkIncome bookmarkIncome) {
+ requireNonNull(bookmarkIncome);
+ toAdd = bookmarkIncome;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+
+ try {
+ model.addBookmarkIncome(toAdd);
+ } catch (DuplicateBookmarkTransactionException e) {
+ throw new CommandException(e.getMessage());
+ }
+ return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd), Tab.INCOME);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof AddBookmarkIncomeCommand // instanceof handles nulls
+ && toAdd.equals(((AddBookmarkIncomeCommand) other).toAdd));
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkCommand.java
new file mode 100644
index 00000000000..481cf43c3fd
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkCommand.java
@@ -0,0 +1,61 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+
+/**
+ * Converts a specified bookmark transaction and adds it as an expense to the finance tracker
+ * depending on the tab the user is on.
+ *
+ * Base class for ConvertBookmarkExpenseCommand and ConvertBookmarkIncomeCommand.
+ */
+public class ConvertBookmarkCommand extends Command {
+ public static final String COMMAND_WORD = "convert-bookmark";
+ public static final String COMMAND_ALIAS = "convertb";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Converts the specified bookmark transaction and adds"
+ + " it as a transaction to the finance tracker.\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + "[" + PREFIX_DATE + "DATE]\n"
+ + "Inputting the date is optional. If no input is given for d/DATE, the current date will be used.\n"
+ + "Example: " + COMMAND_WORD + " 1 " + PREFIX_DATE + "03/10/2020 ";
+
+ private final Index targetIndex;
+ private final Date convertedDate;
+
+ /**
+ * @param targetIndex Index of the bookmark transaction in its respective bookmark transaction list to convert.
+ * @param convertedDate Date of conversion of bookmark transaction to a transaction.
+ */
+ public ConvertBookmarkCommand(Index targetIndex, Date convertedDate) {
+ this.targetIndex = targetIndex;
+ this.convertedDate = convertedDate;
+ }
+
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ protected Date getConvertedDate() {
+ return convertedDate;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ throw new CommandException(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof ConvertBookmarkCommand // instanceof handles nulls
+ && targetIndex.equals(((ConvertBookmarkCommand) other).targetIndex)); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkExpenseCommand.java
new file mode 100644
index 00000000000..757f57eff5d
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkExpenseCommand.java
@@ -0,0 +1,55 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+
+/**
+ * Converts a specified bookmark expense and adds it as an expense to the finance tracker.
+ */
+public class ConvertBookmarkExpenseCommand extends ConvertBookmarkCommand {
+
+ public static final String MESSAGE_CONVERT_BOOKMARK_EXPENSE_SUCCESS = "Bookmark expense has been converted "
+ + "and successfully added to finance tracker: %1$s";
+
+ public ConvertBookmarkExpenseCommand(ConvertBookmarkCommand superCommand) {
+ super(superCommand.getTargetIndex(), superCommand.getConvertedDate());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List<BookmarkExpense> lastShownList = model.getFilteredBookmarkExpenseList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ BookmarkExpense bookmarkExpenseToBeConverted = lastShownList.get(getTargetIndex().getZeroBased());
+ Expense newExpenseToAdd = bookmarkExpenseToBeConverted.convert(getConvertedDate());
+ model.addExpense(newExpenseToAdd);
+ return new CommandResult(String.format(MESSAGE_CONVERT_BOOKMARK_EXPENSE_SUCCESS, newExpenseToAdd), true);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof ConvertBookmarkExpenseCommand)) {
+ return false;
+ }
+
+ ConvertBookmarkExpenseCommand otherConvertBookmarkExpenseCommand = (ConvertBookmarkExpenseCommand) other;
+ return getTargetIndex().equals(otherConvertBookmarkExpenseCommand.getTargetIndex())
+ && getConvertedDate().equals(otherConvertBookmarkExpenseCommand.getConvertedDate());
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkIncomeCommand.java
new file mode 100644
index 00000000000..1a49056d3cb
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/ConvertBookmarkIncomeCommand.java
@@ -0,0 +1,56 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+
+/**
+ * Converts a specified bookmark income and adds it as an income to the finance tracker.
+ */
+public class ConvertBookmarkIncomeCommand extends ConvertBookmarkCommand {
+
+ public static final String MESSAGE_CONVERT_BOOKMARK_INCOME_SUCCESS = "Bookmark income has been converted "
+ + "and successfully added to finance tracker: %1$s";
+
+ public ConvertBookmarkIncomeCommand(ConvertBookmarkCommand superCommand) {
+ super(superCommand.getTargetIndex(), superCommand.getConvertedDate());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List<BookmarkIncome> lastShownList = model.getFilteredBookmarkIncomeList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ BookmarkIncome bookmarkIncomeToBeConverted = lastShownList.get(getTargetIndex().getZeroBased());
+ Income newIncomeToAdd = bookmarkIncomeToBeConverted.convert(getConvertedDate());
+ model.addIncome(newIncomeToAdd);
+ return new CommandResult(String.format(MESSAGE_CONVERT_BOOKMARK_INCOME_SUCCESS, newIncomeToAdd), true);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof ConvertBookmarkIncomeCommand)) {
+ return false;
+ }
+
+ ConvertBookmarkIncomeCommand otherConvertBookmarkIncomeCommand = (ConvertBookmarkIncomeCommand) other;
+ return getTargetIndex().equals(otherConvertBookmarkIncomeCommand.getTargetIndex())
+ && getConvertedDate().equals(otherConvertBookmarkIncomeCommand.getConvertedDate());
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkCommand.java
new file mode 100644
index 00000000000..ae84f52cfa6
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkCommand.java
@@ -0,0 +1,49 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * Deletes a bookmark transaction identified using its displayed index from the finance tracker
+ * depending on the tab the user is on.
+ *
+ * Base class for DeleteBookmarkExpenseCommand and DeleteBookmarkIncomeCommand.
+ */
+public class DeleteBookmarkCommand extends Command {
+ public static final String COMMAND_WORD = "delete-bookmark";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + ": Deletes the bookmark transaction identified by the index number used in the displayed "
+ + "bookmark transaction list on the current tab. \n"
+ + "When on Income tab: Deletes from the currently displayed bookmark income list.\n"
+ + "When on Expenses tab: Deletes from the currently displayed bookmark expenses list.\n"
+ + "Parameters: INDEX (must be a positive integer)\n"
+ + "Example: " + COMMAND_WORD + " 1 ";
+
+ private final Index targetIndex;
+
+ public DeleteBookmarkCommand(Index index) {
+ this.targetIndex = index;
+ }
+
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ throw new CommandException(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof DeleteBookmarkCommand // instanceof handles nulls
+ && targetIndex.equals(((DeleteBookmarkCommand) other).targetIndex)); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkExpenseCommand.java
new file mode 100644
index 00000000000..31be51d3884
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkExpenseCommand.java
@@ -0,0 +1,44 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+
+/**
+ * Deletes a bookmark expense identified using its displayed index from the finance tracker.
+ */
+public class DeleteBookmarkExpenseCommand extends DeleteBookmarkCommand {
+
+ public static final String MESSAGE_DELETE_BOOKMARK_EXPENSE_SUCCESS = "Deleted Bookmark Expense: %1$s";
+
+ public DeleteBookmarkExpenseCommand(DeleteBookmarkCommand superCommand) {
+ super(superCommand.getTargetIndex());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List<BookmarkExpense> lastShownList = model.getFilteredBookmarkExpenseList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ BookmarkExpense bookmarkExpenseToDelete = lastShownList.get(getTargetIndex().getZeroBased());
+ model.deleteBookmarkExpense(bookmarkExpenseToDelete);
+ return new CommandResult(String.format(MESSAGE_DELETE_BOOKMARK_EXPENSE_SUCCESS, bookmarkExpenseToDelete));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof DeleteBookmarkExpenseCommand // instanceof handles nulls
+ && getTargetIndex().equals(((DeleteBookmarkExpenseCommand) other).getTargetIndex())); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkIncomeCommand.java
new file mode 100644
index 00000000000..e6e9677d9c8
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/DeleteBookmarkIncomeCommand.java
@@ -0,0 +1,44 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+
+/**
+ * Deletes a bookmark income identified using its displayed index from the finance tracker.
+ */
+public class DeleteBookmarkIncomeCommand extends DeleteBookmarkCommand {
+
+ public static final String MESSAGE_DELETE_BOOKMARK_INCOME_SUCCESS = "Deleted Bookmark Income: %1$s";
+
+ public DeleteBookmarkIncomeCommand(DeleteBookmarkCommand superCommand) {
+ super(superCommand.getTargetIndex());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List<BookmarkIncome> lastShownList = model.getFilteredBookmarkIncomeList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ BookmarkIncome bookmarkIncomeToDelete = lastShownList.get(getTargetIndex().getZeroBased());
+ model.deleteBookmarkIncome(bookmarkIncomeToDelete);
+ return new CommandResult(String.format(MESSAGE_DELETE_BOOKMARK_INCOME_SUCCESS, bookmarkIncomeToDelete));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof DeleteBookmarkIncomeCommand // instanceof handles nulls
+ && getTargetIndex().equals(((DeleteBookmarkIncomeCommand) other).getTargetIndex())); // state check
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkCommand.java
new file mode 100644
index 00000000000..4cc8953c4e4
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkCommand.java
@@ -0,0 +1,84 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * Edits the details of an existing bookmark transaction using its displayed index from the finance tracker
+ * depending on the tab the user is on.
+ *
+ * Base class for EditBookmarkExpenseCommand and EditBookmarkIncomeCommand.
+ */
+public class EditBookmarkCommand extends Command {
+ public static final String COMMAND_WORD = "edit-bookmark";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the bookmark transaction "
+ + "identified by the index number used in the displayed bookmark transaction list on the current tab. "
+ + "Existing values will be overwritten by the input values.\n"
+ + "When on Income tab: Edits from the currently displayed bookmark incomes list.\n"
+ + "When on Expenses tab: Edits from the currently displayed bookmark expenses list.\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + "[" + PREFIX_TITLE + "TITLE] "
+ + "[" + PREFIX_AMOUNT + "AMOUNT] "
+ + "[" + PREFIX_CATEGORY + "CATEGORY]...\n"
+ + "Example: " + COMMAND_WORD + " 1 "
+ + PREFIX_AMOUNT + "5 ";
+ public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
+
+ private final Index targetIndex;
+ private final EditBookmarkTransactionDescriptor editBookmarkTransactionDescriptor;
+
+ /**
+ * @param targetIndex Index of the bookmark transaction in the respective filtered bookmark transaction list to
+ * edit.
+ * @param editBookmarkTransactionDescriptor Details to edit the bookmark transaction with.
+ */
+ public EditBookmarkCommand(Index targetIndex, EditBookmarkTransactionDescriptor editBookmarkTransactionDescriptor) {
+ requireNonNull(targetIndex);
+ requireNonNull(editBookmarkTransactionDescriptor);
+
+ this.targetIndex = targetIndex;
+ this.editBookmarkTransactionDescriptor = editBookmarkTransactionDescriptor;
+ }
+
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ protected EditBookmarkTransactionDescriptor getEditBookmarkTransactionDescriptor() {
+ return editBookmarkTransactionDescriptor;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ throw new CommandException(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditBookmarkCommand)) {
+ return false;
+ }
+
+ // state check
+ EditBookmarkCommand e = (EditBookmarkCommand) other;
+ return targetIndex.equals(e.targetIndex)
+ && getEditBookmarkTransactionDescriptor().equals(e.getEditBookmarkTransactionDescriptor());
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkExpenseCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkExpenseCommand.java
new file mode 100644
index 00000000000..56e29372154
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkExpenseCommand.java
@@ -0,0 +1,88 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_BOOKMARK_EXPENSES;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * Edits the details of an existing bookmark expense using its displayed index from the bookmark expense list
+ * in the expense tab.
+ */
+public class EditBookmarkExpenseCommand extends EditBookmarkCommand {
+
+ public static final String MESSAGE_EDIT_BOOKMARK_EXPENSE_SUCCESS = "Edited Bookmark Expense: %1$s";
+
+ public EditBookmarkExpenseCommand(EditBookmarkCommand superCommand) {
+ super(superCommand.getTargetIndex(), superCommand.getEditBookmarkTransactionDescriptor());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List<BookmarkExpense> lastShownList = model.getFilteredBookmarkExpenseList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ BookmarkExpense bookmarkExpenseToEdit = lastShownList.get(getTargetIndex().getZeroBased());
+ BookmarkExpense editedBookmarkExpense = createEditedBookmarkExpense(bookmarkExpenseToEdit,
+ getEditBookmarkTransactionDescriptor());
+ try {
+ model.setBookmarkExpense(bookmarkExpenseToEdit, editedBookmarkExpense);
+ } catch (DuplicateBookmarkTransactionException e) {
+ throw new CommandException(e.getMessage());
+ }
+ model.updateFilteredBookmarkExpenseList(PREDICATE_SHOW_ALL_BOOKMARK_EXPENSES);
+ return new CommandResult(String.format(MESSAGE_EDIT_BOOKMARK_EXPENSE_SUCCESS, editedBookmarkExpense));
+ }
+
+ /**
+ * Creates and returns a {@code BookmarkExpense} with the details of {@code bookmarkExpenseToEdit}
+ * edited with {@code editBookmarkExpenseDescriptor}.
+ */
+ private static BookmarkExpense createEditedBookmarkExpense(BookmarkExpense bookmarkExpenseToEdit,
+ EditBookmarkTransactionDescriptor
+ editBookmarkExpenseDescriptor) {
+ assert bookmarkExpenseToEdit != null;
+
+ Title updatedTitle = editBookmarkExpenseDescriptor.getTitle().orElse(bookmarkExpenseToEdit.getTitle());
+ Amount updatedAmount = editBookmarkExpenseDescriptor.getAmount().orElse(bookmarkExpenseToEdit.getAmount());
+ Set<Category> updatedCategories = editBookmarkExpenseDescriptor.getCategories()
+ .orElse(bookmarkExpenseToEdit.getCategories());
+
+ return new BookmarkExpense(updatedTitle, updatedAmount, updatedCategories);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditBookmarkExpenseCommand)) {
+ return false;
+ }
+
+ // state check
+ EditBookmarkExpenseCommand otherEditBookmarkExpenseCommand = (EditBookmarkExpenseCommand) other;
+ return getTargetIndex().equals(otherEditBookmarkExpenseCommand.getTargetIndex())
+ && getEditBookmarkTransactionDescriptor()
+ .equals(otherEditBookmarkExpenseCommand.getEditBookmarkTransactionDescriptor());
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkIncomeCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkIncomeCommand.java
new file mode 100644
index 00000000000..0d0f96047e7
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkIncomeCommand.java
@@ -0,0 +1,88 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_BOOKMARK_INCOMES;
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * Edits the details of an existing bookmark income using its displayed index from the bookmark income list
+ * in the income tab.
+ */
+public class EditBookmarkIncomeCommand extends EditBookmarkCommand {
+
+ public static final String MESSAGE_EDIT_BOOKMARK_INCOME_SUCCESS = "Edited Bookmark Income: %1$s";
+
+ public EditBookmarkIncomeCommand(EditBookmarkCommand superCommand) {
+ super(superCommand.getTargetIndex(), superCommand.getEditBookmarkTransactionDescriptor());
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List<BookmarkIncome> lastShownList = model.getFilteredBookmarkIncomeList();
+
+ if (getTargetIndex().getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ BookmarkIncome bookmarkIncomeToEdit = lastShownList.get(getTargetIndex().getZeroBased());
+ BookmarkIncome editedBookmarkIncome = createdEditedBookmarkIncome(bookmarkIncomeToEdit,
+ getEditBookmarkTransactionDescriptor());
+ try {
+ model.setBookmarkIncome(bookmarkIncomeToEdit, editedBookmarkIncome);
+ } catch (DuplicateBookmarkTransactionException e) {
+ throw new CommandException(e.getMessage());
+ }
+ model.updateFilteredBookmarkIncomeList(PREDICATE_SHOW_ALL_BOOKMARK_INCOMES);
+ return new CommandResult(String.format(MESSAGE_EDIT_BOOKMARK_INCOME_SUCCESS, editedBookmarkIncome));
+ }
+
+ /**
+ * Creates and returns a {@code BookmarkIncome} with the details of {@code bookmarkIncomeToEdit}
+ * edited with {@code editBookmarkIncomeDescriptor}.
+ */
+ private static BookmarkIncome createdEditedBookmarkIncome(BookmarkIncome bookmarkIncomeToEdit,
+ EditBookmarkTransactionDescriptor
+ editBookmarkIncomeDescriptor) {
+ assert bookmarkIncomeToEdit != null;
+
+ Title updatedTitle = editBookmarkIncomeDescriptor.getTitle().orElse(bookmarkIncomeToEdit.getTitle());
+ Amount updatedAmount = editBookmarkIncomeDescriptor.getAmount().orElse(bookmarkIncomeToEdit.getAmount());
+ Set<Category> updatedCategories = editBookmarkIncomeDescriptor.getCategories()
+ .orElse(bookmarkIncomeToEdit.getCategories());
+
+ return new BookmarkIncome(updatedTitle, updatedAmount, updatedCategories);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditBookmarkIncomeCommand)) {
+ return false;
+ }
+
+ // state check
+ EditBookmarkIncomeCommand otherEditBookmarkIncomeCommand = (EditBookmarkIncomeCommand) other;
+ return getTargetIndex().equals(otherEditBookmarkIncomeCommand.getTargetIndex())
+ && getEditBookmarkTransactionDescriptor()
+ .equals(otherEditBookmarkIncomeCommand.getEditBookmarkTransactionDescriptor());
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkTransactionDescriptor.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkTransactionDescriptor.java
new file mode 100644
index 00000000000..6da260458f4
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmark/EditBookmarkTransactionDescriptor.java
@@ -0,0 +1,94 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.util.CollectionUtil;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * Stores the details to edit the bookmark transaction with. Each non-empty field value will replace the
+ * corresponding field value of the bookmark transaction.
+ */
+public class EditBookmarkTransactionDescriptor {
+ private Title title;
+ private Amount amount;
+ private Set<Category> categories;
+
+ public EditBookmarkTransactionDescriptor() { }
+
+ /**
+ * Copy constructor.
+ * A defensive copy of {@code categories} is used internally.
+ */
+ public EditBookmarkTransactionDescriptor(EditBookmarkTransactionDescriptor toCopy) {
+ setTitle(toCopy.title);
+ setAmount(toCopy.amount);
+ setCategories(toCopy.categories);
+ }
+
+ /**
+ * Returns true if at least one field is edited.
+ */
+ public boolean isAnyFieldEdited() {
+ return CollectionUtil.isAnyNonNull(title, amount, categories);
+ }
+
+ public void setTitle(Title title) {
+ this.title = title;
+ }
+
+ public Optional<Title> getTitle() {
+ return Optional.ofNullable(title);
+ }
+
+ public void setAmount(Amount amount) {
+ this.amount = amount;
+ }
+
+ public Optional<Amount> getAmount() {
+ return Optional.ofNullable(amount);
+ }
+
+ /**
+ * Sets {@code categories} to this object's {@code categories}.
+ * A defensive copy of {@code categories} is used internally.
+ */
+ public void setCategories(Set<Category> categories) {
+ this.categories = (categories != null) ? new HashSet<>(categories) : null;
+ }
+
+ /**
+ * Returns an unmodifiable category set, which throws {@code UnsupportedOperationException}
+ * if modification is attempted.
+ * Returns {@code Optional#empty()} if {@code categories} is null.
+ */
+ public Optional<Set<Category>> getCategories() {
+ return (categories != null) ? Optional.of(Collections.unmodifiableSet(categories)) : Optional.empty();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditBookmarkTransactionDescriptor)) {
+ return false;
+ }
+
+ // state check
+ EditBookmarkTransactionDescriptor e = (EditBookmarkTransactionDescriptor) other;
+
+ return getTitle().equals(e.getTitle())
+ && getAmount().equals(e.getAmount())
+ && getCategories().equals(e.getCategories());
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetExpenseLimitCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetExpenseLimitCommand.java
new file mode 100644
index 00000000000..24b72c20d99
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetExpenseLimitCommand.java
@@ -0,0 +1,50 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.budget;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Sets the monthly expense limit in the finance tracker.
+ */
+public class SetExpenseLimitCommand extends Command {
+
+ public static final String COMMAND_WORD = "set-expense-limit";
+ public static final String COMMAND_ALIAS = "setel";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Sets the monthly expense limit. "
+ + "Parameters: " + PREFIX_AMOUNT + "AMOUNT\n"
+ + "Example: " + COMMAND_WORD + " " + PREFIX_AMOUNT + "500";
+
+ public static final String MESSAGE_SUCCESS = "New monthly expense limit set: %1$s";
+
+ private final Amount amount;
+
+ /**
+ * Creates a SetExpenseLimitCommand to set the monthly expense limit.
+ */
+ public SetExpenseLimitCommand(Amount amount) {
+ requireNonNull(amount);
+ this.amount = amount;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+
+ model.setExpenseLimit(amount);
+ return new CommandResult(String.format(MESSAGE_SUCCESS, amount), true, Tab.OVERVIEW);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof SetExpenseLimitCommand // instanceof handles nulls
+ && amount.equals(((SetExpenseLimitCommand) other).amount));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetSavingsGoalCommand.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetSavingsGoalCommand.java
new file mode 100644
index 00000000000..eca5e9628d0
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetSavingsGoalCommand.java
@@ -0,0 +1,50 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.budget;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Sets the monthly savings goal in the finance tracker.
+ */
+public class SetSavingsGoalCommand extends Command {
+
+ public static final String COMMAND_WORD = "set-savings-goal";
+ public static final String COMMAND_ALIAS = "setsg";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Sets the monthly savings goal. "
+ + "Parameters: " + PREFIX_AMOUNT + "AMOUNT\n"
+ + "Example: " + COMMAND_WORD + " " + PREFIX_AMOUNT + "500";
+
+ public static final String MESSAGE_SUCCESS = "New monthly savings goal set: %1$s";
+
+ private final Amount amount;
+
+ /**
+ * Creates a SetSavingsGoalCommand to set the monthly savings goal.
+ */
+ public SetSavingsGoalCommand(Amount amount) {
+ requireNonNull(amount);
+ this.amount = amount;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+
+ model.setSavingsGoal(amount);
+ return new CommandResult(String.format(MESSAGE_SUCCESS, amount), true, Tab.OVERVIEW);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof SetSavingsGoalCommand // instanceof handles nulls
+ && amount.equals(((SetSavingsGoalCommand) other).amount));
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/exceptions/CommandException.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/exceptions/CommandException.java
similarity index 87%
rename from src/main/java/seedu/address/logic/commands/exceptions/CommandException.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/exceptions/CommandException.java
index a16bd14f2cd..3752a712fbf 100644
--- a/src/main/java/seedu/address/logic/commands/exceptions/CommandException.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/exceptions/CommandException.java
@@ -1,4 +1,4 @@
-package seedu.address.logic.commands.exceptions;
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions;
/**
* Represents an error which occurs during execution of a {@link Command}.
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddExpenseCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddExpenseCommandParser.java
new file mode 100644
index 00000000000..5140c3d7864
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddExpenseCommandParser.java
@@ -0,0 +1,24 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+
+/**
+ * Parses input arguments and creates a new AddExpenseCommand object
+ */
+public class AddExpenseCommandParser implements Parser<AddExpenseCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the AddExpenseCommand
+ * and returns an AddExpenseCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public AddExpenseCommand parse(String args) throws ParseException {
+ TransactionBuilder transactionBuilder = ParserUtil.parseTransactionBuilder(args,
+ AddExpenseCommand.MESSAGE_USAGE);
+ Expense expense = transactionBuilder.buildExpense();
+ return new AddExpenseCommand(expense);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddIncomeCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddIncomeCommandParser.java
new file mode 100644
index 00000000000..1240c61a232
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddIncomeCommandParser.java
@@ -0,0 +1,24 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+
+/**
+ * Parses input arguments and creates a new AddIncomeCommand object
+ */
+public class AddIncomeCommandParser implements Parser<AddIncomeCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the AddIncomeCommand
+ * and returns an AddIncomeCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public AddIncomeCommand parse(String args) throws ParseException {
+ TransactionBuilder transactionBuilder = ParserUtil.parseTransactionBuilder(args,
+ AddIncomeCommand.MESSAGE_USAGE);
+ Income income = transactionBuilder.buildIncome();
+ return new AddIncomeCommand(income);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentMultimap.java
similarity index 69%
rename from src/main/java/seedu/address/logic/parser/ArgumentMultimap.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentMultimap.java
index 954c8e18f8e..fad993b1371 100644
--- a/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentMultimap.java
@@ -1,10 +1,11 @@
-package seedu.address.logic.parser;
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Stream;
/**
* Stores mapping of prefixes to their respective arguments.
@@ -51,6 +52,33 @@ public List<String> getAllValues(Prefix prefix) {
return new ArrayList<>(argMultimap.get(prefix));
}
+ /**
+ * Returns true if none of the given prefixes contains empty {@code Optional} values.
+ */
+ public boolean arePrefixesPresent(Prefix... prefixes) {
+ return Stream.of(prefixes).allMatch(prefix -> getValue(prefix).isPresent());
+ }
+
+ /**
+ * Returns a list of prefixes that are present in this {@code ArgumentMultimap}.
+ */
+ public List<Prefix> getPresentPrefixes(Prefix... prefixes) {
+ List<Prefix> presentPrefixes = new ArrayList<>();
+ Stream.of(prefixes).forEach(prefix -> {
+ if (getValue(prefix).isPresent()) {
+ presentPrefixes.add(prefix);
+ }
+ });
+ return presentPrefixes;
+ }
+
+ /**
+ * Returns true if the prefix contains more than one value.
+ */
+ public boolean moreThanOneValuePresent(Prefix prefix) {
+ return getAllValues(prefix).size() > 1;
+ }
+
/**
* Returns the preamble (text before the first valid prefix). Trims any leading/trailing spaces.
*/
diff --git a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentTokenizer.java
similarity index 69%
rename from src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentTokenizer.java
index 5c9aebfa488..9dd2a2f207a 100644
--- a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentTokenizer.java
@@ -1,10 +1,15 @@
-package seedu.address.logic.parser;
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_PREFIX_PRESENT_HEADER;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+
/**
* Tokenizes arguments string of the form: {@code preamble <prefix>value <prefix>value ...}<br>
* e.g. {@code some preamble text t/ 11.00 t/12.00 k/ m/ July} where prefixes are {@code t/ k/ m/}.<br>
@@ -15,25 +20,49 @@
*/
public class ArgumentTokenizer {
+ /**
+ * Prevents instantiation of this class.
+ */
+ private ArgumentTokenizer() {}
+
/**
* Tokenizes an arguments string and returns an {@code ArgumentMultimap} object that maps prefixes to their
- * respective argument values. Only the given prefixes will be recognized in the arguments string.
+ * respective argument values. All prefixes from {@code CliSyntax::getAllPrefixes} are recognized, but only the
+ * specified {@param prefixes} are considered valid. The other prefixes from {@param prefixFullSet} that are not
+ * specified are considered invalid and, if detected, will throw {@code ParseException}.
*
- * @param argsString Arguments string of the form: {@code preamble <prefix>value <prefix>value ...}
- * @param prefixes Prefixes to tokenize the arguments string with
- * @return ArgumentMultimap object that maps prefixes to their arguments
+ * @param argsString Arguments string of the form: {@code preamble <prefix>value <prefix>value ...}.
+ * @param prefixes Subset of prefixFullSet that are considered valid. Any other prefixes is invalid and
+ * thus should throw ParseException.
+ * @return ArgumentMultimap object that maps prefixes to their arguments.
+ * @throws ParseException if any invalid prefixes are detected.
*/
- public static ArgumentMultimap tokenize(String argsString, Prefix... prefixes) {
- List<PrefixPosition> positions = findAllPrefixPositions(argsString, prefixes);
- return extractArguments(argsString, positions);
+ public static ArgumentMultimap tokenize(String argsString, String exceptionMessage, Prefix... prefixes)
+ throws ParseException {
+ List<PrefixPosition> positions = findAllPrefixPositions(argsString, CliSyntax.getAllPrefixes());
+ ArgumentMultimap argumentMultimap = extractArguments(argsString, positions);
+
+ List<Prefix> prefixComplementList = Arrays.stream(CliSyntax.getAllPrefixes()).collect(Collectors.toList());
+ List<Prefix> prefixSubList = Arrays.stream(prefixes).collect(Collectors.toList());
+ prefixComplementList.removeAll(prefixSubList);
+ List<Prefix> presentInvalidPrefixes = argumentMultimap.getPresentPrefixes(
+ prefixComplementList.toArray(new Prefix[0]));
+
+ if (!presentInvalidPrefixes.isEmpty()) {
+ StringBuilder invalidPrefixesMessage = new StringBuilder(MESSAGE_INVALID_PREFIX_PRESENT_HEADER);
+ presentInvalidPrefixes.forEach(prefix -> invalidPrefixesMessage.append(" ").append(prefix.toString()));
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ invalidPrefixesMessage.toString() + "\n" + exceptionMessage));
+ }
+ return argumentMultimap;
}
/**
* Finds all zero-based prefix positions in the given arguments string.
*
- * @param argsString Arguments string of the form: {@code preamble <prefix>value <prefix>value ...}
- * @param prefixes Prefixes to find in the arguments string
- * @return List of zero-based prefix positions in the given arguments string
+ * @param argsString Arguments string of the form: {@code preamble <prefix>value <prefix>value ...}.
+ * @param prefixes Prefixes to find in the arguments string.
+ * @return List of zero-based prefix positions in the given arguments string.
*/
private static List<PrefixPosition> findAllPrefixPositions(String argsString, Prefix... prefixes) {
return Arrays.stream(prefixes)
@@ -80,9 +109,9 @@ private static int findPrefixPosition(String argsString, String prefix, int from
* extracted prefixes to their respective arguments. Prefixes are extracted based on their zero-based positions in
* {@code argsString}.
*
- * @param argsString Arguments string of the form: {@code preamble <prefix>value <prefix>value ...}
- * @param prefixPositions Zero-based positions of all prefixes in {@code argsString}
- * @return ArgumentMultimap object that maps prefixes to their arguments
+ * @param argsString Arguments string of the form: {@code preamble <prefix>value <prefix>value ...}.
+ * @param prefixPositions Zero-based positions of all prefixes in {@code argsString}.
+ * @return ArgumentMultimap object that maps prefixes to their arguments.
*/
private static ArgumentMultimap extractArguments(String argsString, List<PrefixPosition> prefixPositions) {
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/CliSyntax.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/CliSyntax.java
new file mode 100644
index 00000000000..6feaf6ac322
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/CliSyntax.java
@@ -0,0 +1,33 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+/**
+ * Contains Command Line Interface (CLI) syntax definitions common to multiple commands
+ */
+public class CliSyntax {
+
+ /* Prefix definitions */
+ public static final Prefix PREFIX_TITLE = new Prefix("t/");
+ public static final Prefix PREFIX_AMOUNT = new Prefix("a/");
+ public static final Prefix PREFIX_DATE = new Prefix("d/");
+ public static final Prefix PREFIX_CATEGORY = new Prefix("c/");
+ public static final Prefix PREFIX_AMOUNT_FROM = new Prefix("af/");
+ public static final Prefix PREFIX_AMOUNT_TO = new Prefix("at/");
+ public static final Prefix PREFIX_DATE_FROM = new Prefix("df/");
+ public static final Prefix PREFIX_DATE_TO = new Prefix("dt/");
+
+ /**
+ * Prevents instantiation of this class.
+ */
+ private CliSyntax() {}
+
+ /**
+ * Retrieves a list containing all prefixes.
+ *
+ * @return List of all prefixes.
+ */
+ public static Prefix[] getAllPrefixes() {
+ return new Prefix[] {PREFIX_TITLE, PREFIX_AMOUNT, PREFIX_DATE, PREFIX_CATEGORY, PREFIX_AMOUNT_FROM,
+ PREFIX_AMOUNT_TO, PREFIX_DATE_FROM, PREFIX_DATE_TO};
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/DeleteCommandParser.java
similarity index 65%
rename from src/main/java/seedu/address/logic/parser/DeleteCommandParser.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/DeleteCommandParser.java
index 522b93081cc..79b113c5759 100644
--- a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/DeleteCommandParser.java
@@ -1,10 +1,10 @@
-package seedu.address.logic.parser;
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.DeleteCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
/**
* Parses input arguments and creates a new DeleteCommand object
@@ -19,6 +19,7 @@ public class DeleteCommandParser implements Parser<DeleteCommand> {
public DeleteCommand parse(String args) throws ParseException {
try {
Index index = ParserUtil.parseIndex(args);
+ assert index.getZeroBased() >= 0;
return new DeleteCommand(index);
} catch (ParseException pe) {
throw new ParseException(
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/EditCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/EditCommandParser.java
new file mode 100644
index 00000000000..8652cff5ac0
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/EditCommandParser.java
@@ -0,0 +1,74 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand.EditTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Parses input arguments and creates a new EditCommand object
+ */
+public class EditCommandParser implements Parser<EditCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the EditCommand
+ * and returns an EditCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public EditCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, EditCommand.MESSAGE_USAGE, PREFIX_TITLE,
+ PREFIX_AMOUNT, PREFIX_DATE, PREFIX_CATEGORY);;
+
+ Index index;
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_TITLE)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_TITLE_CONSTRAINTS));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_AMOUNT_CONSTRAINTS));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_DATE)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_DATE_CONSTRAINTS));
+ }
+
+ EditTransactionDescriptor editTransactionDescriptor = new EditTransactionDescriptor();
+ if (argMultimap.getValue(PREFIX_TITLE).isPresent()) {
+ editTransactionDescriptor.setTitle(ParserUtil.parseTitle(argMultimap.getValue(PREFIX_TITLE).get()));
+ }
+ if (argMultimap.getValue(PREFIX_AMOUNT).isPresent()) {
+ editTransactionDescriptor.setAmount(ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT).get()));
+ }
+ if (argMultimap.getValue(PREFIX_DATE).isPresent()) {
+ editTransactionDescriptor.setDate(ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get()));
+ }
+ ParserUtil.parseCategoriesForEdit(argMultimap.getAllValues(PREFIX_CATEGORY))
+ .ifPresent(editTransactionDescriptor::setCategories);
+
+ if (!editTransactionDescriptor.isAnyFieldEdited()) {
+ throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
+ }
+
+ return new EditCommand(index, editTransactionDescriptor);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FinanceTrackerParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FinanceTrackerParser.java
new file mode 100644
index 00000000000..26e58481733
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FinanceTrackerParser.java
@@ -0,0 +1,282 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_TAB_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_NO_ARGUMENTS_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static java.util.Objects.requireNonNull;
+
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ClearCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.DeleteCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.DeleteExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.DeleteIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ExitCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.FindCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.FindExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.FindIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.FindTransactionCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.HelpCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListTransactionCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.TabCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.budget.SetExpenseLimitCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.budget.SetSavingsGoalCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.AddBookmarkExpenseCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.AddBookmarkIncomeCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.ConvertBookmarkCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.DeleteBookmarkCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.EditBookmarkCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.budgetparsers.SetExpenseLimitCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.budgetparsers.SetSavingsGoalCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Parses user input.
+ */
+public class FinanceTrackerParser {
+
+ /**
+ * Command word for the generic "add" command which adds an expense or an income to the finance tracker
+ * depending on the tab the user is on.
+ */
+ public static final String ADD_COMMAND_COMMAND_WORD = "add";
+
+ /**
+ * Used for initial separation of command word and args.
+ */
+ private static final Pattern BASIC_COMMAND_FORMAT = Pattern.compile("(?<commandWord>\\S+)(?<arguments>.*)");
+
+ private final Logger logger = LogsCenter.getLogger(FinanceTrackerParser.class);
+
+ /**
+ * Parses user input into command for execution.
+ *
+ * @param userInput Full user input string.
+ * @param uiState Current state of the UI.
+ * @return The command based on the user input.
+ * @throws ParseException If the user input does not conform the expected format.
+ */
+ public Command parseCommand(String userInput, UiState uiState) throws ParseException {
+ // Replace non-breaking spaces with regular spaces and trim.
+ String trimmedUserInput = userInput.replaceAll("\u00A0", " ").trim();
+
+ final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(trimmedUserInput);
+ if (!matcher.matches()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE));
+ }
+
+ final Tab uiCurrentTab = uiState.getCurrentTab();
+ logger.info("----------------[CURRENT TAB][" + uiCurrentTab.toString() + "]");
+
+ final String commandWord = matcher.group("commandWord");
+ final String arguments = matcher.group("arguments");
+ switch (commandWord) {
+
+ case ADD_COMMAND_COMMAND_WORD:
+ switch (uiCurrentTab) {
+ case EXPENSES:
+ return new AddExpenseCommandParser().parse(arguments);
+ case INCOME:
+ return new AddIncomeCommandParser().parse(arguments);
+ default:
+ throw new ParseException(commandInvalidTabMessage(commandWord,
+ Tab.EXPENSES, Tab.INCOME));
+ }
+
+ case AddExpenseCommand.COMMAND_WORD:
+ case AddExpenseCommand.COMMAND_ALIAS:
+ return new AddExpenseCommandParser().parse(arguments);
+
+ case AddIncomeCommand.COMMAND_WORD:
+ case AddIncomeCommand.COMMAND_ALIAS:
+ return new AddIncomeCommandParser().parse(arguments);
+
+ case AddBookmarkExpenseCommand.COMMAND_WORD:
+ case AddBookmarkExpenseCommand.COMMAND_ALIAS:
+ return new AddBookmarkExpenseCommandParser().parse(arguments);
+
+ case AddBookmarkIncomeCommand.COMMAND_WORD:
+ case AddBookmarkIncomeCommand.COMMAND_ALIAS:
+ return new AddBookmarkIncomeCommandParser().parse(arguments);
+
+ case EditCommand.COMMAND_WORD:
+ switch (uiCurrentTab) {
+ case EXPENSES:
+ return new EditExpenseCommand(new EditCommandParser().parse(arguments));
+ case INCOME:
+ return new EditIncomeCommand(new EditCommandParser().parse(arguments));
+ default:
+ throw new ParseException(commandInvalidTabMessage(commandWord,
+ Tab.EXPENSES, Tab.INCOME));
+ }
+
+ case EditBookmarkCommand.COMMAND_WORD:
+ switch (uiCurrentTab) {
+ case EXPENSES:
+ return new EditBookmarkExpenseCommand(new EditBookmarkCommandParser().parse(arguments));
+ case INCOME:
+ return new EditBookmarkIncomeCommand(new EditBookmarkCommandParser().parse(arguments));
+ default:
+ throw new ParseException(commandInvalidTabMessage(commandWord,
+ Tab.EXPENSES, Tab.INCOME));
+ }
+
+ case DeleteCommand.COMMAND_WORD:
+ switch (uiCurrentTab) {
+ case EXPENSES:
+ return new DeleteExpenseCommand(new DeleteCommandParser().parse(arguments));
+ case INCOME:
+ return new DeleteIncomeCommand(new DeleteCommandParser().parse(arguments));
+ default:
+ throw new ParseException(commandInvalidTabMessage(commandWord,
+ Tab.EXPENSES, Tab.INCOME));
+ }
+
+ case DeleteBookmarkCommand.COMMAND_WORD:
+ switch (uiCurrentTab) {
+ case EXPENSES:
+ return new DeleteBookmarkExpenseCommand(new DeleteBookmarkCommandParser().parse(arguments));
+ case INCOME:
+ return new DeleteBookmarkIncomeCommand(new DeleteBookmarkCommandParser().parse(arguments));
+ default:
+ throw new ParseException(commandInvalidTabMessage(commandWord,
+ Tab.EXPENSES, Tab.INCOME));
+ }
+
+ case ConvertBookmarkCommand.COMMAND_WORD:
+ case ConvertBookmarkCommand.COMMAND_ALIAS:
+ switch (uiCurrentTab) {
+ case EXPENSES:
+ return new ConvertBookmarkExpenseCommand(new ConvertBookmarkCommandParser().parse(arguments));
+ case INCOME:
+ return new ConvertBookmarkIncomeCommand(new ConvertBookmarkCommandParser().parse(arguments));
+ default:
+ throw new ParseException(commandInvalidTabMessage(commandWord,
+ Tab.EXPENSES, Tab.INCOME));
+ }
+
+ case ClearCommand.COMMAND_WORD:
+ enforceNoArguments(ClearCommand.COMMAND_WORD, arguments);
+ return new ClearCommand();
+
+ case FindCommand.COMMAND_WORD:
+ switch (uiCurrentTab) {
+ case OVERVIEW:
+ return new FindTransactionCommand(new FindCommandParser().parse(arguments));
+ case EXPENSES:
+ return new FindExpenseCommand(new FindCommandParser().parse(arguments));
+ case INCOME:
+ return new FindIncomeCommand(new FindCommandParser().parse(arguments));
+ default:
+ throw new ParseException(commandInvalidTabMessage(commandWord,
+ Tab.OVERVIEW, Tab.EXPENSES, Tab.INCOME));
+ }
+
+ case SetExpenseLimitCommand.COMMAND_WORD:
+ case SetExpenseLimitCommand.COMMAND_ALIAS:
+ return new SetExpenseLimitCommandParser().parse(arguments);
+
+ case SetSavingsGoalCommand.COMMAND_WORD:
+ case SetSavingsGoalCommand.COMMAND_ALIAS:
+ return new SetSavingsGoalCommandParser().parse(arguments);
+
+ case ListCommand.COMMAND_WORD:
+ enforceNoArguments(ListCommand.COMMAND_WORD, arguments);
+ switch (uiCurrentTab) {
+ case OVERVIEW:
+ return new ListTransactionCommand();
+ case EXPENSES:
+ return new ListExpenseCommand();
+ case INCOME:
+ return new ListIncomeCommand();
+ default:
+ throw new ParseException(commandInvalidTabMessage(commandWord,
+ Tab.OVERVIEW, Tab.EXPENSES, Tab.INCOME));
+ }
+
+ case ListTransactionCommand.COMMAND_WORD:
+ case ListTransactionCommand.COMMAND_ALIAS:
+ enforceNoArguments(ListTransactionCommand.COMMAND_WORD, arguments);
+ return new ListTransactionCommand();
+
+ case ListExpenseCommand.COMMAND_WORD:
+ case ListExpenseCommand.COMMAND_ALIAS:
+ enforceNoArguments(ListExpenseCommand.COMMAND_WORD, arguments);
+ return new ListExpenseCommand();
+
+ case ListIncomeCommand.COMMAND_WORD:
+ case ListIncomeCommand.COMMAND_ALIAS:
+ enforceNoArguments(ListIncomeCommand.COMMAND_WORD, arguments);
+ return new ListIncomeCommand();
+
+ case ExitCommand.COMMAND_WORD:
+ enforceNoArguments(ExitCommand.COMMAND_WORD, arguments);
+ return new ExitCommand();
+
+ case HelpCommand.COMMAND_WORD:
+ enforceNoArguments(HelpCommand.COMMAND_WORD, arguments);
+ return new HelpCommand();
+
+ case TabCommand.COMMAND_WORD:
+ return new TabCommandParser().parse(arguments);
+
+ default:
+ throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
+ }
+ }
+
+ /**
+ * Error message to be used when a command is not applicable to the user's current tab.
+ *
+ * @param command The command word that was used incorrectly.
+ * @param tabs The tabs that the command is applicable to.
+ * @return The error message to be displayed to the user.
+ */
+ private String commandInvalidTabMessage(String command, Tab... tabs) {
+ return String.format(MESSAGE_INVALID_TAB_FORMAT, command,
+ Stream.of(tabs).map(Tab::toString).collect(Collectors.joining(", ")));
+ }
+
+ /**
+ * Enforces that no arguments are input for commands that take in no arguments.
+ *
+ * @param command The command word that was used.
+ * @param args The arguments that the user input.
+ * @throws ParseException If {@code args} is not the empty string.
+ */
+ private void enforceNoArguments(String command, String args) throws ParseException {
+ requireNonNull(command);
+ requireNonNull(args);
+ if (!args.isEmpty()) {
+ throw new ParseException(String.format(MESSAGE_NO_ARGUMENTS_COMMAND_FORMAT, command));
+ }
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FindCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FindCommandParser.java
new file mode 100644
index 00000000000..2e1dc315673
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FindCommandParser.java
@@ -0,0 +1,206 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.StringUtil.isEmptyString;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT_FROM;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT_TO;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE_FROM;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE_TO;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static ay2021s1_cs2103_w16_3.finesse.model.category.Category.MESSAGE_EMPTY_CATEGORY;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.FindCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.HasCategoriesPredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.HasExactAmountPredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.InAmountRangePredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.InDateRangePredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.OnExactDatePredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.TitleContainsKeyphrasesPredicate;
+
+/**
+ * Parses input arguments and creates a new FindCommand object
+ */
+public class FindCommandParser implements Parser<FindCommand> {
+
+ public static final String MESSAGE_AMOUNT_SEARCH_USAGE =
+ "To search for transactions with an exact amount, please use " + PREFIX_AMOUNT
+ + " to indicate the amount.\n"
+ + "To search for transactions within a range of amounts, please use " + PREFIX_AMOUNT_FROM
+ + " to indicate the lower bound, and/or " + PREFIX_AMOUNT_TO + " to indicate the upper bound.";
+
+ public static final String MESSAGE_DATE_SEARCH_USAGE =
+ "To search for transactions with an exact date, please use " + PREFIX_DATE + " to indicate the date.\n"
+ + "To search for transactions within a range of dates, please use " + PREFIX_DATE_FROM
+ + " to indicate the lower bound, and/or " + PREFIX_DATE_TO + " to indicate the upper bound.";
+
+ public static final String MESSAGE_AMOUNT_SEARCH_CONSTRAINTS =
+ PREFIX_AMOUNT + " cannot be used concurrently with " + PREFIX_AMOUNT_FROM
+ + " and/or " + PREFIX_AMOUNT_TO + ".\n" + MESSAGE_AMOUNT_SEARCH_USAGE;
+
+ public static final String MESSAGE_DATE_SEARCH_CONSTRAINTS =
+ PREFIX_DATE + " cannot be used concurrently with " + PREFIX_DATE_FROM
+ + " and/or " + PREFIX_DATE_TO + ".\n" + MESSAGE_DATE_SEARCH_USAGE;
+
+ public static final String MESSAGE_AMOUNT_DUPLICATE_CONSTRAINTS =
+ "Only one amount can be input for a search of transactions containing an exact amount.\n"
+ + MESSAGE_AMOUNT_SEARCH_USAGE;
+
+ public static final String MESSAGE_DATE_DUPLICATE_CONSTRAINTS =
+ "Only one date can be input for a search of transactions occurring on an exact date.\n"
+ + MESSAGE_DATE_SEARCH_USAGE;
+
+ public static final String MESSAGE_AMOUNT_FROM_CONSTRAINTS =
+ "Only one amount can be input as the lower bound for a search of transactions within a range of amounts.\n"
+ + MESSAGE_AMOUNT_SEARCH_USAGE;
+
+ public static final String MESSAGE_AMOUNT_TO_CONSTRAINTS =
+ "Only one amount can be input as the upper bound for a search of transactions within a range of amounts.\n"
+ + MESSAGE_AMOUNT_SEARCH_USAGE;
+
+ public static final String MESSAGE_AMOUNT_RANGE_CONSTRAINTS =
+ "The lower bound for the amount range cannot be larger than the upper bound.";
+
+ public static final String MESSAGE_DATE_FROM_CONSTRAINTS =
+ "Only one date can be input as the lower bound for a search of transactions "
+ + "occurring within a range of dates.\n" + MESSAGE_DATE_SEARCH_USAGE;
+
+ public static final String MESSAGE_DATE_TO_CONSTRAINTS =
+ "Only one date can be input as the upper bound for a search of transactions "
+ + "occurring within a range of dates.\n" + MESSAGE_DATE_SEARCH_USAGE;
+
+ public static final String MESSAGE_DATE_RANGE_CONSTRAINTS =
+ "The lower bound for the date range cannot be later than the upper bound.";
+
+ public static final String MESSAGE_EMPTY_TITLE_KEYPHRASE = "Title keyphrases cannot be empty.";
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the FindCommand
+ * and returns a FindCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public FindCommand parse(String args) throws ParseException {
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, FindCommand.MESSAGE_USAGE,
+ CliSyntax.getAllPrefixes());
+
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+
+ if (!argMultimap.getPreamble().isEmpty()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT)) {
+ throw new ParseException(MESSAGE_AMOUNT_DUPLICATE_CONSTRAINTS);
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_DATE)) {
+ throw new ParseException(MESSAGE_DATE_DUPLICATE_CONSTRAINTS);
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT_FROM)) {
+ throw new ParseException(MESSAGE_AMOUNT_FROM_CONSTRAINTS);
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT_TO)) {
+ throw new ParseException(MESSAGE_AMOUNT_TO_CONSTRAINTS);
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_DATE_FROM)) {
+ throw new ParseException(MESSAGE_DATE_FROM_CONSTRAINTS);
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_DATE_TO)) {
+ throw new ParseException(MESSAGE_DATE_TO_CONSTRAINTS);
+ }
+
+ if (argMultimap.getValue(PREFIX_TITLE).isPresent()) {
+ List<String> titleKeyphrases = argMultimap.getAllValues(PREFIX_TITLE);
+ for (String s: titleKeyphrases) {
+ if (isEmptyString(s)) {
+ throw new ParseException(MESSAGE_EMPTY_TITLE_KEYPHRASE);
+ }
+ }
+ predicateList.add(new TitleContainsKeyphrasesPredicate(titleKeyphrases));
+ }
+
+ if (argMultimap.getValue(PREFIX_AMOUNT).isPresent()) {
+ if (argMultimap.getValue(PREFIX_AMOUNT_FROM).isPresent()
+ || argMultimap.getValue(PREFIX_AMOUNT_TO).isPresent()) {
+ throw new ParseException(MESSAGE_AMOUNT_SEARCH_CONSTRAINTS);
+ }
+ Amount amount = ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT).get());
+ predicateList.add(new HasExactAmountPredicate(amount));
+ }
+
+ if (argMultimap.getValue(PREFIX_DATE).isPresent()) {
+ if (argMultimap.getValue(PREFIX_DATE_FROM).isPresent()
+ || argMultimap.getValue(PREFIX_DATE_TO).isPresent()) {
+ throw new ParseException(MESSAGE_DATE_SEARCH_CONSTRAINTS);
+ }
+ Date date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());
+ predicateList.add(new OnExactDatePredicate(date));
+ }
+
+ if (argMultimap.getValue(PREFIX_CATEGORY).isPresent()) {
+ List<String> categories = argMultimap.getAllValues(PREFIX_CATEGORY);
+ for (String s: categories) {
+ if (isEmptyString(s)) {
+ throw new ParseException(MESSAGE_EMPTY_CATEGORY);
+ }
+ }
+ predicateList.add(new HasCategoriesPredicate(categories));
+ }
+
+ if (argMultimap.getValue(PREFIX_AMOUNT_FROM).isPresent()
+ || argMultimap.getValue(PREFIX_AMOUNT_TO).isPresent()) {
+ Amount amountFrom = null;
+ Amount amountTo = null;
+ if (argMultimap.getValue(PREFIX_AMOUNT_FROM).isPresent()) {
+ amountFrom = ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT_FROM).get());
+ }
+ if (argMultimap.getValue(PREFIX_AMOUNT_TO).isPresent()) {
+ amountTo = ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT_TO).get());
+ }
+ if (amountFrom != null && amountTo != null && amountFrom.compareTo(amountTo) > 0) {
+ throw new ParseException(MESSAGE_AMOUNT_RANGE_CONSTRAINTS);
+ }
+ predicateList.add(new InAmountRangePredicate(Optional.ofNullable(amountFrom),
+ Optional.ofNullable(amountTo)));
+ }
+
+ if (argMultimap.getValue(PREFIX_DATE_FROM).isPresent()
+ || argMultimap.getValue(PREFIX_DATE_TO).isPresent()) {
+ Date dateFrom = null;
+ Date dateTo = null;
+ if (argMultimap.getValue(PREFIX_DATE_FROM).isPresent()) {
+ dateFrom = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE_FROM).get());
+ }
+ if (argMultimap.getValue(PREFIX_DATE_TO).isPresent()) {
+ dateTo = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE_TO).get());
+ }
+ if (dateFrom != null && dateTo != null && dateFrom.compareTo(dateTo) > 0) {
+ throw new ParseException(MESSAGE_DATE_RANGE_CONSTRAINTS);
+ }
+ predicateList.add(new InDateRangePredicate(Optional.ofNullable(dateFrom),
+ Optional.ofNullable(dateTo)));
+ }
+
+ if (predicateList.isEmpty()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+ }
+
+ return new FindCommand(predicateList);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/Parser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/Parser.java
similarity index 66%
rename from src/main/java/seedu/address/logic/parser/Parser.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/Parser.java
index d6551ad8e3f..7f3adc9485a 100644
--- a/src/main/java/seedu/address/logic/parser/Parser.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/Parser.java
@@ -1,7 +1,7 @@
-package seedu.address.logic.parser;
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
/**
* Represents a Parser that is able to parse user input into a {@code Command} of type {@code T}.
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ParserUtil.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ParserUtil.java
new file mode 100644
index 00000000000..1538fb3b806
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ParserUtil.java
@@ -0,0 +1,245 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.StringUtil.isEmptyString;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static ay2021s1_cs2103_w16_3.finesse.model.category.Category.MESSAGE_EMPTY_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount.MESSAGE_EMPTY_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.model.transaction.Date.MESSAGE_EMPTY_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.model.transaction.Title.MESSAGE_EMPTY_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.StringUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Contains utility methods used for parsing strings in the various *Parser classes.
+ */
+public class ParserUtil {
+
+ public static final String MESSAGE_INVALID_INDEX = "Index is not a non-zero unsigned integer.";
+
+ /**
+ * Parses {@code oneBasedIndex} into an {@code Index} and returns it. Leading and trailing whitespaces will be
+ * trimmed.
+ * @throws ParseException if the specified index is invalid (not non-zero unsigned integer).
+ */
+ public static Index parseIndex(String oneBasedIndex) throws ParseException {
+ String trimmedIndex = oneBasedIndex.trim();
+ if (!StringUtil.isNonZeroUnsignedInteger(trimmedIndex)) {
+ throw new ParseException(MESSAGE_INVALID_INDEX);
+ }
+ return Index.fromOneBased(Integer.parseInt(trimmedIndex));
+ }
+
+ /**
+ * Parses a {@code String title} into a {@code Title}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code title} is invalid.
+ */
+ public static Title parseTitle(String title) throws ParseException {
+ requireNonNull(title);
+ String trimmedTitle = title.trim();
+ if (isEmptyString(trimmedTitle)) {
+ throw new ParseException(MESSAGE_EMPTY_TITLE);
+ }
+ if (!Title.isValidTitle(trimmedTitle)) {
+ throw new ParseException(Title.MESSAGE_CONSTRAINTS);
+ }
+ return new Title(trimmedTitle);
+ }
+
+ /**
+ * Parses a {@code String title} into a {@code Title}.
+ * Leading and trailing whitespaces will be trimmed.
+ * Any extra whitespaces between words will be removed.
+ *
+ * @throws ParseException if the given {@code title} is invalid.
+ */
+ public static Title parseTitleAndTrimBetweenWords(String title) throws ParseException {
+ requireNonNull(title);
+ String removedExtraWhitespaceTitle = title.replaceAll("\\s{2,}", " ");
+ return parseTitle(removedExtraWhitespaceTitle);
+ }
+
+ /**
+ * Parses a {@code String amount} into a {@code Amount}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code amount} is invalid.
+ */
+ public static Amount parseAmount(String amount) throws ParseException {
+ requireNonNull(amount);
+ String trimmedAmount = amount.trim();
+ if (isEmptyString(trimmedAmount)) {
+ throw new ParseException(MESSAGE_EMPTY_AMOUNT);
+ }
+ if (!Amount.isValidAmount(trimmedAmount)) {
+ throw new ParseException(Amount.MESSAGE_CONSTRAINTS);
+ }
+ return new Amount(trimmedAmount);
+ }
+
+ /**
+ * Parses a {@code String date} into an {@code Date}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code date} is invalid.
+ */
+ public static Date parseDate(String date) throws ParseException {
+ requireNonNull(date);
+ String trimmedDate = date.trim();
+ if (isEmptyString(trimmedDate)) {
+ throw new ParseException(MESSAGE_EMPTY_DATE);
+ }
+ if (!Date.isValidDate(trimmedDate)) {
+ throw new ParseException(Date.MESSAGE_CONSTRAINTS);
+ }
+ return new Date(trimmedDate);
+ }
+
+ /**
+ * Parses a {@code String category} into a {@code Category}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code category} is invalid.
+ */
+ public static Category parseCategory(String category) throws ParseException {
+ requireNonNull(category);
+ String trimmedCategory = category.trim();
+ if (isEmptyString(trimmedCategory)) {
+ throw new ParseException(MESSAGE_EMPTY_CATEGORY);
+ }
+ if (!Category.isValidCategoryName(trimmedCategory)) {
+ throw new ParseException(Category.MESSAGE_CONSTRAINTS);
+ }
+ return new Category(trimmedCategory);
+ }
+
+ /**
+ * Parses {@code Collection<String> categories} into a {@code Set<Category>}.
+ */
+ public static Set<Category> parseCategories(Collection<String> categories) throws ParseException {
+ requireNonNull(categories);
+ final Set<Category> categorySet = new HashSet<>();
+ for (String categoryName : categories) {
+ categorySet.add(parseCategory(categoryName));
+ }
+ return categorySet;
+ }
+
+ /**
+ * Parses {@code Collection<String> categories} into a {@code Set<Category>} if {@code categories} is non-empty.
+ * If {@code categories} contain only one element which is an empty string, it will be parsed into a
+ * {@code Set<Category>} containing zero categories.
+ */
+ public static Optional<Set<Category>> parseCategoriesForEdit(Collection<String> categories) throws ParseException {
+ assert categories != null;
+
+ if (categories.isEmpty()) {
+ return Optional.empty();
+ }
+ Collection<String> categorySet = categories.size() == 1 && categories.contains("")
+ ? Collections.emptySet() : categories;
+ return Optional.of(ParserUtil.parseCategories(categorySet));
+ }
+
+ /**
+ * Parses {@code String args} into a {@code BookmarkTransactionBuilder}.
+ *
+ * @throws ParseException if the given {@code args} do not adhere to the format of a bookmark transaction.
+ */
+ public static BookmarkTransactionBuilder parseBookmarkTransactionBuilder(String args, String exceptionMessage)
+ throws ParseException {
+ requireNonNull(args);
+ requireNonNull(exceptionMessage);
+
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, exceptionMessage, PREFIX_TITLE, PREFIX_AMOUNT,
+ PREFIX_CATEGORY);
+
+ if (!argMultimap.getPreamble().isEmpty() || !argMultimap.arePrefixesPresent(PREFIX_TITLE, PREFIX_AMOUNT)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, exceptionMessage));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_TITLE)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_TITLE_CONSTRAINTS));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_AMOUNT_CONSTRAINTS));
+ }
+
+ Title title = ParserUtil.parseTitleAndTrimBetweenWords(argMultimap.getValue(PREFIX_TITLE).get());
+ Amount amount = ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT).get());
+ Set<Category> categoryList = ParserUtil.parseCategories(argMultimap.getAllValues(PREFIX_CATEGORY));
+
+ return new BookmarkTransactionBuilder(title, amount, categoryList);
+ }
+
+ /**
+ * Parses {@code String args} into a {@code TransactionBuilder}.
+ *
+ * @throws ParseException if the given {@code args} do not adhere to the format of a transaction.
+ */
+ public static TransactionBuilder parseTransactionBuilder(String args, String exceptionMessage)
+ throws ParseException {
+ requireNonNull(args);
+ requireNonNull(exceptionMessage);
+
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, exceptionMessage, PREFIX_TITLE, PREFIX_AMOUNT,
+ PREFIX_DATE, PREFIX_CATEGORY);
+
+ if (!argMultimap.getPreamble().isEmpty() || !argMultimap.arePrefixesPresent(PREFIX_TITLE, PREFIX_AMOUNT)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, exceptionMessage));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_TITLE)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_TITLE_CONSTRAINTS));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_AMOUNT_CONSTRAINTS));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_DATE)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_DATE_CONSTRAINTS));
+ }
+
+ Title title = ParserUtil.parseTitleAndTrimBetweenWords(argMultimap.getValue(PREFIX_TITLE).get());
+ Amount amount = ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT).get());
+ Set<Category> categoryList = ParserUtil.parseCategories(argMultimap.getAllValues(PREFIX_CATEGORY));
+
+ Date date;
+ if (argMultimap.getValue(PREFIX_DATE).isPresent()) {
+ date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());
+ } else {
+ date = Date.getCurrentDate();
+ }
+
+ return new TransactionBuilder(title, amount, date, categoryList);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/Prefix.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/Prefix.java
similarity index 67%
rename from src/main/java/seedu/address/logic/parser/Prefix.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/Prefix.java
index c859d5fa5db..32517509a20 100644
--- a/src/main/java/seedu/address/logic/parser/Prefix.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/Prefix.java
@@ -1,4 +1,6 @@
-package seedu.address.logic.parser;
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static java.util.Objects.requireNonNull;
/**
* A prefix that marks the beginning of an argument in an arguments string.
@@ -7,7 +9,14 @@
public class Prefix {
private final String prefix;
+ /**
+ * Constructs a new {@code Prefix} object with the specified prefix.
+ * Note that the prefix cannot be {@code null}.
+ *
+ * @param prefix The specified prefix.
+ */
public Prefix(String prefix) {
+ requireNonNull(prefix);
this.prefix = prefix;
}
@@ -21,7 +30,7 @@ public String toString() {
@Override
public int hashCode() {
- return prefix == null ? 0 : prefix.hashCode();
+ return prefix.hashCode();
}
@Override
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TabCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TabCommandParser.java
new file mode 100644
index 00000000000..84400f1c4ef
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TabCommandParser.java
@@ -0,0 +1,27 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.TabCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new {@code TabCommand} object.
+ */
+public class TabCommandParser implements Parser<TabCommand> {
+ /**
+ * Parses the given {@code String} of arguments in the context of the {@code TabCommand}
+ * and returns a {@code TabCommand} object for execution.
+ * @throws ParseException If the user input does not conform to the expected format.
+ */
+ public TabCommand parse(String args) throws ParseException {
+ try {
+ Index index = ParserUtil.parseIndex(args);
+ return new TabCommand(index);
+ } catch (ParseException pe) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, TabCommand.MESSAGE_USAGE), pe);
+ }
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TransactionBuilder.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TransactionBuilder.java
new file mode 100644
index 00000000000..e2011fdb207
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TransactionBuilder.java
@@ -0,0 +1,120 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.util.SampleDataUtil;
+
+/**
+ * A utility class to help with building Transaction objects.
+ */
+public class TransactionBuilder {
+
+ public static final String DEFAULT_TITLE = "Bubble Tea";
+ public static final String DEFAULT_AMOUNT = "$4.80";
+ public static final String DEFAULT_DATE = "14/10/2020";
+
+ private Title title;
+ private Amount amount;
+ private Date date;
+ private Set<Category> categories;
+
+ /**
+ * Creates a {@code TransactionBuilder} with the given {@code Title}, {@code Amount}, {@code Date} and
+ * {@code Category}.
+ */
+ public TransactionBuilder(Title title, Amount amount, Date date, Set<Category> categories) {
+ this.title = title;
+ this.amount = amount;
+ this.date = date;
+ this.categories = categories;
+ }
+
+ /**
+ * Creates a {@code TransactionBuilder} with the default details.
+ */
+ public TransactionBuilder() {
+ title = new Title(DEFAULT_TITLE);
+ amount = new Amount(DEFAULT_AMOUNT);
+ date = new Date(DEFAULT_DATE);
+ categories = new HashSet<>();
+ }
+
+ /**
+ * Initializes the TransactionBuilder with the data of {@code transactionToCopy}.
+ */
+ public TransactionBuilder(Transaction transactionToCopy) {
+ title = transactionToCopy.getTitle();
+ amount = transactionToCopy.getAmount();
+ date = transactionToCopy.getDate();
+ categories = new HashSet<>(transactionToCopy.getCategories());
+ }
+
+ /**
+ * Sets the {@code Title} of the {@code Transaction} that we are building.
+ */
+ public TransactionBuilder withTitle(String title) {
+ this.title = new Title(title);
+ return this;
+ }
+
+ /**
+ * Parses the {@code categories} into a {@code Set<Category>} and set it to the {@code Transaction} that we are
+ * building.
+ */
+ public TransactionBuilder withCategories(String ... categories) {
+ this.categories = SampleDataUtil.getCategoriesSet(categories);
+ return this;
+ }
+
+ /**
+ * Sets the {@code Amount} of the {@code Transaction} that we are building.
+ */
+ public TransactionBuilder withAmount(String amount) {
+ this.amount = new Amount(amount);
+ return this;
+ }
+
+ /**
+ * Sets the {@code Date} of the {@code Transaction} that we are building.
+ */
+ public TransactionBuilder withDate(String date) {
+ this.date = new Date(date);
+ return this;
+ }
+
+ public Income buildIncome() {
+ return new Income(title, amount, date, categories);
+ }
+
+ public Expense buildExpense() {
+ return new Expense(title, amount, date, categories);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // Short circuit if same object.
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls.
+ if (!(other instanceof TransactionBuilder)) {
+ return false;
+ }
+
+ TransactionBuilder otherTransactionBuilder = (TransactionBuilder) other;
+ return title.equals(otherTransactionBuilder.title)
+ && amount.equals(otherTransactionBuilder.amount)
+ && date.equals(otherTransactionBuilder.date)
+ && categories.equals(otherTransactionBuilder.categories);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/AddBookmarkExpenseCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/AddBookmarkExpenseCommandParser.java
new file mode 100644
index 00000000000..10ae21c5b03
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/AddBookmarkExpenseCommandParser.java
@@ -0,0 +1,26 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.Parser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ParserUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+
+/**
+ * Parses input arguments and creates a new AddBookmarkExpenseCommand object
+ */
+public class AddBookmarkExpenseCommandParser implements Parser<AddBookmarkExpenseCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the AddBookmarkExpenseCommand
+ * and returns an AddBookmarkExpenseCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public AddBookmarkExpenseCommand parse(String args) throws ParseException {
+ BookmarkTransactionBuilder bookmarkTransactionBuilder = ParserUtil
+ .parseBookmarkTransactionBuilder(args, AddBookmarkExpenseCommand.MESSAGE_USAGE);
+ BookmarkExpense toAdd = bookmarkTransactionBuilder.buildBookmarkExpense();
+ return new AddBookmarkExpenseCommand(toAdd);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/AddBookmarkIncomeCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/AddBookmarkIncomeCommandParser.java
new file mode 100644
index 00000000000..272f399d9bf
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/AddBookmarkIncomeCommandParser.java
@@ -0,0 +1,26 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.Parser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ParserUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+
+/**
+ * Parses input arguments and creates a new AddBookmarkIncomeCommand object
+ */
+public class AddBookmarkIncomeCommandParser implements Parser<AddBookmarkIncomeCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the AddBookmarkIncomeCommand
+ * and returns an AddBookmarkIncomeCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public AddBookmarkIncomeCommand parse(String args) throws ParseException {
+ BookmarkTransactionBuilder bookmarkTransactionBuilder = ParserUtil
+ .parseBookmarkTransactionBuilder(args, AddBookmarkIncomeCommand.MESSAGE_USAGE);
+ BookmarkIncome toAdd = bookmarkTransactionBuilder.buildBookmarkIncome();
+ return new AddBookmarkIncomeCommand(toAdd);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/BookmarkTransactionBuilder.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/BookmarkTransactionBuilder.java
new file mode 100644
index 00000000000..9f7eee08301
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/BookmarkTransactionBuilder.java
@@ -0,0 +1,104 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.util.SampleDataUtil;
+
+/**
+ * A utility class to help with building BookmarkExpense and BookmarkIncome objects.
+ */
+public class BookmarkTransactionBuilder {
+
+ public static final String DEFAULT_TITLE = "Phone Bill";
+ public static final String DEFAULT_AMOUNT = "$60.00";
+
+ private Title title;
+ private Amount amount;
+ private Set<Category> categories;
+
+ /**
+ * Creates a {@code BookmarkTransactionBuilder} with the given {@code Title}, {@code Amount} and {@code Category}.
+ */
+ public BookmarkTransactionBuilder(Title title, Amount amount, Set<Category> categories) {
+ this.title = title;
+ this.amount = amount;
+ this.categories = categories;
+ }
+
+ /**
+ * Creates a {@code BookmarkTransactionBuilder} with the default details.
+ */
+ public BookmarkTransactionBuilder() {
+ title = new Title(DEFAULT_TITLE);
+ amount = new Amount(DEFAULT_AMOUNT);
+ categories = new HashSet<>();
+ }
+
+ /**
+ * Initializes the BookmarkTransactionBuilder with the data of {@code bookmarkTransactionToCopy}.
+ */
+ public <T extends Transaction> BookmarkTransactionBuilder(BookmarkTransaction<T> bookmarkTransactionToCopy) {
+ title = bookmarkTransactionToCopy.getTitle();
+ amount = bookmarkTransactionToCopy.getAmount();
+ categories = new HashSet<>(bookmarkTransactionToCopy.getCategories());
+ }
+
+ /**
+ * Sets the {@code Title} of the {@code BookmarkTransaction} that we are building.
+ */
+ public BookmarkTransactionBuilder withTitle(String title) {
+ this.title = new Title(title);
+ return this;
+ }
+
+ /**
+ * Parses the {@code categories} into a {@code Set<Category>} and set it to the {@code BookmarkTransaction}
+ * that we are building.
+ */
+ public BookmarkTransactionBuilder withCategories(String ... categories) {
+ this.categories = SampleDataUtil.getCategoriesSet(categories);
+ return this;
+ }
+
+ /**
+ * Sets the {@code Amount} of the {@code BookmarkTransaction} that we are building.
+ */
+ public BookmarkTransactionBuilder withAmount(String amount) {
+ this.amount = new Amount(amount);
+ return this;
+ }
+
+ public BookmarkExpense buildBookmarkExpense() {
+ return new BookmarkExpense(title, amount, categories);
+ }
+
+ public BookmarkIncome buildBookmarkIncome() {
+ return new BookmarkIncome(title, amount, categories);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // Short circuit if same object.
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls.
+ if (!(other instanceof BookmarkTransactionBuilder)) {
+ return false;
+ }
+
+ BookmarkTransactionBuilder otherBookmarkTransactionBuilder = (BookmarkTransactionBuilder) other;
+ return title.equals(otherBookmarkTransactionBuilder.title)
+ && amount.equals(otherBookmarkTransactionBuilder.amount)
+ && categories.equals(otherBookmarkTransactionBuilder.categories);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/ConvertBookmarkCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/ConvertBookmarkCommandParser.java
new file mode 100644
index 00000000000..40194d27ac1
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/ConvertBookmarkCommandParser.java
@@ -0,0 +1,55 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ArgumentMultimap;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ArgumentTokenizer;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.Parser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ParserUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Parses input arguments and creates a new ConvertBookmarkCommand object
+ */
+public class ConvertBookmarkCommandParser implements Parser<ConvertBookmarkCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the ConvertBookmarkCommand
+ * and returns an ConvertBookmarkCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public ConvertBookmarkCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, ConvertBookmarkCommand.MESSAGE_USAGE,
+ PREFIX_DATE);
+
+ Index index;
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ConvertBookmarkCommand.MESSAGE_USAGE), pe);
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_DATE)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ Transaction.MESSAGE_DATE_CONSTRAINTS));
+ }
+
+ Date date;
+ if (argMultimap.getValue(PREFIX_DATE).isPresent()) {
+ date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());
+ } else {
+ date = Date.getCurrentDate();
+ }
+
+ return new ConvertBookmarkCommand(index, date);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/DeleteBookmarkCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/DeleteBookmarkCommandParser.java
new file mode 100644
index 00000000000..ff759522b56
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/DeleteBookmarkCommandParser.java
@@ -0,0 +1,30 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.Parser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ParserUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new DeleteBookmarkCommand object
+ */
+public class DeleteBookmarkCommandParser implements Parser<DeleteBookmarkCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the DeleteBookmarkCommand
+ * and returns a DeleteBookmarkCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public DeleteBookmarkCommand parse(String args) throws ParseException {
+ try {
+ Index index = ParserUtil.parseIndex(args);
+ return new DeleteBookmarkCommand(index);
+ } catch (ParseException pe) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteBookmarkCommand.MESSAGE_USAGE), pe);
+ }
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/EditBookmarkCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/EditBookmarkCommandParser.java
new file mode 100644
index 00000000000..3613319cc3e
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmarkparsers/EditBookmarkCommandParser.java
@@ -0,0 +1,72 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ArgumentMultimap;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ArgumentTokenizer;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.Parser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ParserUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+
+/**
+ * Parses input arguments and creates a new EditBookmarkCommand object
+ */
+public class EditBookmarkCommandParser implements Parser<EditBookmarkCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the EditBookmarkIncomeCommand
+ * and returns an EditBookmarkIncomeCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public EditBookmarkCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, EditBookmarkCommand.MESSAGE_USAGE, PREFIX_TITLE,
+ PREFIX_AMOUNT, PREFIX_CATEGORY);
+
+ Index index;
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditBookmarkCommand.MESSAGE_USAGE),
+ pe);
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_TITLE)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_TITLE_CONSTRAINTS));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_AMOUNT_CONSTRAINTS));
+ }
+
+ EditBookmarkTransactionDescriptor editBookmarkIncomeDescriptor = new EditBookmarkTransactionDescriptor();
+
+ if (argMultimap.getValue(PREFIX_TITLE).isPresent()) {
+ editBookmarkIncomeDescriptor.setTitle(ParserUtil
+ .parseTitleAndTrimBetweenWords(argMultimap.getValue(PREFIX_TITLE).get()));
+ }
+ if (argMultimap.getValue(PREFIX_AMOUNT).isPresent()) {
+ editBookmarkIncomeDescriptor.setAmount(ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT).get()));
+ }
+
+ ParserUtil.parseCategoriesForEdit(argMultimap.getAllValues(PREFIX_CATEGORY))
+ .ifPresent(editBookmarkIncomeDescriptor::setCategories);
+
+ if (!editBookmarkIncomeDescriptor.isAnyFieldEdited()) {
+ throw new ParseException(EditBookmarkCommand.MESSAGE_NOT_EDITED);
+ }
+
+ return new EditBookmarkCommand(index, editBookmarkIncomeDescriptor);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budgetparsers/SetExpenseLimitCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budgetparsers/SetExpenseLimitCommandParser.java
new file mode 100644
index 00000000000..ab6d2467a4b
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budgetparsers/SetExpenseLimitCommandParser.java
@@ -0,0 +1,43 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.budgetparsers;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.budget.SetExpenseLimitCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ArgumentMultimap;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ArgumentTokenizer;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.Parser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ParserUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+
+/**
+ * Parses input arguments and creates a new SetExpenseLimitCommand object.
+ */
+public class SetExpenseLimitCommandParser implements Parser<SetExpenseLimitCommand> {
+
+ public static final String MESSAGE_CONSTRAINTS = "Only one amount should be input as the expense limit.";
+ /**
+ * Parses the given {@code String} of arguments in the context of the SetExpenseLimitCommand
+ * and returns a SetExpenseLimitCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public SetExpenseLimitCommand parse(String args) throws ParseException {
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, SetExpenseLimitCommand.MESSAGE_USAGE,
+ PREFIX_AMOUNT);
+
+ if (!argMultimap.arePrefixesPresent(PREFIX_AMOUNT) || !argMultimap.getPreamble().isEmpty()) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetExpenseLimitCommand.MESSAGE_USAGE));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_CONSTRAINTS));
+ }
+
+ Amount amount = ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT).get());
+ return new SetExpenseLimitCommand(amount);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budgetparsers/SetSavingsGoalCommandParser.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budgetparsers/SetSavingsGoalCommandParser.java
new file mode 100644
index 00000000000..cc950b9709c
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budgetparsers/SetSavingsGoalCommandParser.java
@@ -0,0 +1,45 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.budgetparsers;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.budget.SetSavingsGoalCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ArgumentMultimap;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ArgumentTokenizer;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.Parser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.ParserUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+
+/**
+ * Parses input arguments and creates a new SetSavingsGoalCommand object.
+ */
+public class SetSavingsGoalCommandParser implements Parser<SetSavingsGoalCommand> {
+
+ public static final String MESSAGE_CONSTRAINTS = "Only one amount should be input as the savings goal.";
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the SetSavingsGoalCommand
+ * and returns a SetSavingsGoalCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public SetSavingsGoalCommand parse(String args) throws ParseException {
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, SetSavingsGoalCommand.MESSAGE_USAGE,
+ PREFIX_AMOUNT);
+
+ if (!argMultimap.arePrefixesPresent(PREFIX_AMOUNT)
+ || !argMultimap.getPreamble().isEmpty()) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetSavingsGoalCommand.MESSAGE_USAGE));
+ }
+
+ if (argMultimap.moreThanOneValuePresent(PREFIX_AMOUNT)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_CONSTRAINTS));
+ }
+
+ Amount amount = ParserUtil.parseAmount(argMultimap.getValue(PREFIX_AMOUNT).get());
+ return new SetSavingsGoalCommand(amount);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/exceptions/ParseException.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/exceptions/ParseException.java
similarity index 67%
rename from src/main/java/seedu/address/logic/parser/exceptions/ParseException.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/exceptions/ParseException.java
index 158a1a54c1c..96928b9bef9 100644
--- a/src/main/java/seedu/address/logic/parser/exceptions/ParseException.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/exceptions/ParseException.java
@@ -1,6 +1,6 @@
-package seedu.address.logic.parser.exceptions;
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions;
-import seedu.address.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
/**
* Represents a parse error encountered by a parser.
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/Clock.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/Clock.java
new file mode 100644
index 00000000000..3e3de43d350
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/Clock.java
@@ -0,0 +1,8 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.time;
+
+/**
+ * Represents a clock that is able to give the current time.
+ */
+public interface Clock {
+ long getCurrentTime();
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/SystemClock.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/SystemClock.java
new file mode 100644
index 00000000000..4d0ce972066
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/SystemClock.java
@@ -0,0 +1,17 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.time;
+
+/**
+ * A clock that relies on the system time.
+ */
+public class SystemClock implements Clock {
+ /**
+ * Returns the current system time in milliseconds.
+ *
+ * @return The difference, measured in milliseconds, between the current system
+ * time and midnight, January 1, 1970 UTC.
+ */
+ @Override
+ public long getCurrentTime() {
+ return System.currentTimeMillis();
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/Timekeeper.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/Timekeeper.java
new file mode 100644
index 00000000000..88b2a416932
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/Timekeeper.java
@@ -0,0 +1,63 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.time;
+
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions.TemporalException;
+
+/**
+ * Responsible for detecting temporal disruptions.
+ */
+public class Timekeeper {
+ // Strings
+ private static final String TIME_INCONSISTENT =
+ "The current time '%s' is earlier than the last observed time '%s'!";
+ private static final String TIME_INITIALIZED = "Current time initialized to '%s'";
+ private static final String TIME_UPDATED = "Current time updated to '%s'";
+ private static final String TIME_IRREGULARITIES_DETECTED = "Irregularities in the flow of time detected.";
+
+ /** Logger for logging time updates. */
+ private static final Logger logger = LogsCenter.getLogger(Timekeeper.class);
+ /** A clock from which to poll the current time. */
+ private final Clock clock;
+ /** The last observed time. */
+ private long lastObservedTime;
+
+ /**
+ * Constructs a new {@code Timekeeper} with the default system time clock
+ * and the current system time.
+ */
+ public Timekeeper() {
+ this(new SystemClock());
+ }
+
+ /**
+ * Constructs a new {@code Timekeeper} with the specified clock and the
+ * current time provided by the clock.
+ *
+ * @param clock The {@code Clock} to poll for the current time.
+ */
+ public Timekeeper(Clock clock) {
+ this.clock = clock;
+ lastObservedTime = clock.getCurrentTime();
+ logger.info(String.format(TIME_INITIALIZED, lastObservedTime));
+ }
+
+ /**
+ * Checks in with the {@code Timekeeper}. If the current time is earlier than
+ * the last observed time, this method throws a {@code TemporalException}.
+ * Otherwise, it updates the last observed time of the {@code Timekeeper}.
+ *
+ * @throws TemporalException If the current time is earlier than the last
+ * observed time.
+ */
+ public void checkIn() throws TemporalException {
+ long currentTime = clock.getCurrentTime();
+ if (currentTime < lastObservedTime) {
+ logger.severe(String.format(TIME_INCONSISTENT, currentTime, lastObservedTime));
+ throw new TemporalException(TIME_IRREGULARITIES_DETECTED);
+ }
+ lastObservedTime = currentTime;
+ logger.info(String.format(TIME_UPDATED, lastObservedTime));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/exceptions/TemporalException.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/exceptions/TemporalException.java
new file mode 100644
index 00000000000..e77d4ba4b73
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/time/exceptions/TemporalException.java
@@ -0,0 +1,24 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions;
+
+/**
+ * Represents a disruption in the flow of time.
+ */
+public class TemporalException extends Exception {
+ /**
+ * Constructs a new {@code TemporalException} with the specified message.
+ * @param message The message to use for this exception, may be {@code null}.
+ */
+ public TemporalException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructs a new {@code TemporalException} with the specified message and cause.
+ *
+ * @param message The message to use for this exception, may be {@code null}.
+ * @param cause The cause of the exception, may be {@code null}.
+ */
+ public TemporalException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/FinanceTracker.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/FinanceTracker.java
new file mode 100644
index 00000000000..65c2ceb567a
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/FinanceTracker.java
@@ -0,0 +1,249 @@
+package ay2021s1_cs2103_w16_3.finesse.model;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpenseList;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncomeList;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.TransactionList;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+/**
+ * Wraps all data at the finance tracker level
+ */
+public class FinanceTracker implements ReadOnlyFinanceTracker {
+
+ private static final int NUM_OF_MONTHS = 3;
+
+ private final TransactionList transactions;
+ private final BookmarkExpenseList bookmarkExpenses;
+ private final BookmarkIncomeList bookmarkIncomes;
+ private final MonthlyBudget monthlyBudget;
+
+ /*
+ * The 'unusual' code block below is a non-static initialization block, sometimes used to avoid duplication
+ * between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
+ *
+ * Note that non-static init blocks are not recommended to use. There are other ways to avoid duplication
+ * among constructors.
+ */
+ {
+ transactions = new TransactionList();
+ bookmarkExpenses = new BookmarkExpenseList();
+ bookmarkIncomes = new BookmarkIncomeList();
+ monthlyBudget = new MonthlyBudget();
+ }
+
+ public FinanceTracker() {}
+
+ /**
+ * Creates an FinanceTracker using the Transactions in the {@code toBeCopied}
+ */
+ public FinanceTracker(ReadOnlyFinanceTracker toBeCopied) {
+ this();
+ resetData(toBeCopied);
+ }
+
+ //// list overwrite operations
+
+ /**
+ * Replaces the contents of the transaction list with {@code transactions}.
+ */
+ public void setTransactions(List<Transaction> transactions) {
+ this.transactions.setTransactions(transactions);
+ }
+
+ /**
+ * Replaces the contents of the bookmark expense list with {@code bookmarkExpens}.
+ */
+ public void setBookmarkExpenses(List<BookmarkExpense> bookmarkExpens) {
+ this.bookmarkExpenses.setBookmarkExpenses(bookmarkExpens);
+ }
+
+ /**
+ * Replaces the contents of the bookmark incomes list with {@code bookmarkIncomes}.
+ */
+ public void setBookmarkIncomes(List<BookmarkIncome> bookmarkIncomes) {
+ this.bookmarkIncomes.setBookmarkIncomes(bookmarkIncomes);
+ }
+
+ /**
+ * Resets the existing data of this {@code FinanceTracker} with {@code newData}.
+ */
+ public void resetData(ReadOnlyFinanceTracker newData) {
+ requireNonNull(newData);
+
+ setTransactions(newData.getTransactionList());
+ setBookmarkExpenses(newData.getBookmarkExpenseList());
+ setBookmarkIncomes(newData.getBookmarkIncomeList());
+ setMonthlyBudget(newData.getMonthlyBudget());
+ calculateBudgetInfo();
+ }
+
+ //// transaction-level operations
+
+ /**
+ * Adds a transaction to the finance tracker.
+ */
+ public void addTransaction(Transaction transaction) {
+ transactions.add(transaction);
+ }
+
+ /**
+ * Adds a bookmark expense to the finance tracker.
+ */
+ public void addBookmarkExpense(BookmarkExpense bookmarkExpense) {
+ bookmarkExpenses.add(bookmarkExpense);
+ }
+
+ /**
+ * Adds a bookmark income to the finance tracker.
+ */
+ public void addBookmarkIncome(BookmarkIncome bookmarkIncome) {
+ bookmarkIncomes.add(bookmarkIncome);
+ }
+
+ /**
+ * Replaces the given transaction {@code target} in the list with {@code editedTransaction}.
+ * {@code target} must exist in the finance tracker.
+ */
+ public void setTransaction(Transaction target, Transaction editedTransaction) {
+ requireNonNull(editedTransaction);
+
+ transactions.setTransaction(target, editedTransaction);
+ }
+
+ /**
+ * Replaces the given bookmark expense {@code target} in the list with {@code editedBookmarkExpense}.
+ * {@code target} must exist in the bookmark expense list.
+ */
+ public void setBookmarkExpense(BookmarkExpense target, BookmarkExpense editedBookmarkExpense) {
+ requireNonNull(editedBookmarkExpense);
+
+ bookmarkExpenses.setBookmarkExpense(target, editedBookmarkExpense);
+ }
+
+ /**
+ * Replaces the given bookmark income {@code target} in the list with {@code editedBookmarkIncome}.
+ * {@code target} must exist in the bookmark bookmark list.
+ */
+ public void setBookmarkIncome(BookmarkIncome target, BookmarkIncome editedBookmarkIncome) {
+ requireNonNull(editedBookmarkIncome);
+
+ bookmarkIncomes.setBookmarkIncome(target, editedBookmarkIncome);
+ }
+
+ /**
+ * Removes {@code key} from this {@code FinanceTracker}.
+ * {@code key} must exist in the finance tracker.
+ */
+ public void removeTransaction(Transaction key) {
+ transactions.remove(key);
+ }
+
+ /**
+ * Removes {@code key} from this {@code FinanceTracker}.
+ * {@code key} must exist in the finance tracker.
+ */
+ public void removeBookmarkExpense(BookmarkExpense key) {
+ bookmarkExpenses.remove(key);
+ }
+
+ /**
+ * Removes {@code key} from this {@code FinanceTracker}.
+ * {@code key} must exist in the finance tracker.
+ */
+ public void removeBookmarkIncome(BookmarkIncome key) {
+ bookmarkIncomes.remove(key);
+ }
+
+ //// budget-level operations
+
+ public void setExpenseLimit(Amount limit) {
+ monthlyBudget.setMonthlyExpenseLimit(limit);
+ }
+
+ public void setSavingsGoal(Amount goal) {
+ monthlyBudget.setMonthlySavingsGoal(goal);
+ }
+
+ public void setMonthlyBudget(MonthlyBudget budget) {
+ monthlyBudget.setMonthlyExpenseLimit(budget.getMonthlyExpenseLimit().get());
+ monthlyBudget.setMonthlySavingsGoal(budget.getMonthlySavingsGoal().get());
+ }
+
+ public void calculateBudgetInfo() {
+ monthlyBudget.calculateBudgetInfo(transactions, NUM_OF_MONTHS);
+ }
+
+ //// util methods
+
+ @Override
+ public String toString() {
+ return transactions.asUnmodifiableObservableList().size() + " transactions";
+ // TODO: refine later
+ }
+
+ @Override
+ public ObservableList<Transaction> getTransactionList() {
+ return transactions.asUnmodifiableObservableList();
+ }
+
+ @Override
+ public ObservableList<Expense> getExpenseList() {
+ ObservableList<Expense> expenses = FXCollections.observableArrayList();
+ transactions.forEach(t -> {
+ if (t instanceof Expense) {
+ expenses.add((Expense) t);
+ }
+ });
+ return FXCollections.unmodifiableObservableList(expenses);
+ }
+
+ @Override
+ public ObservableList<Income> getIncomeList() {
+ ObservableList<Income> incomes = FXCollections.observableArrayList();
+ transactions.forEach(t -> {
+ if (t instanceof Income) {
+ incomes.add((Income) t);
+ }
+ });
+ return FXCollections.unmodifiableObservableList(incomes);
+ }
+
+ @Override
+ public ObservableList<BookmarkExpense> getBookmarkExpenseList() {
+ return bookmarkExpenses.asUnmodifiableObservableList();
+ }
+
+ @Override
+ public ObservableList<BookmarkIncome> getBookmarkIncomeList() {
+ return bookmarkIncomes.asUnmodifiableObservableList();
+ }
+
+ public MonthlyBudget getMonthlyBudget() {
+ return monthlyBudget;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof FinanceTracker // instanceof handles nulls
+ && transactions.equals(((FinanceTracker) other).transactions));
+ }
+
+ @Override
+ public int hashCode() {
+ return transactions.hashCode();
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/Model.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/Model.java
new file mode 100644
index 00000000000..a3520849f23
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/Model.java
@@ -0,0 +1,208 @@
+package ay2021s1_cs2103_w16_3.finesse.model;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.command.history.CommandHistory;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import javafx.collections.ObservableList;
+
+/**
+ * The API of the Model component.
+ */
+public interface Model {
+
+ /** {@code Predicate} that always evaluate to true. */
+ Predicate<Transaction> PREDICATE_SHOW_ALL_TRANSACTIONS = transaction -> true;
+
+ /** {@code Predicate} that evaluates to true if the transaction is an {@code Expense} */
+ Predicate<Transaction> PREDICATE_SHOW_ALL_EXPENSES = transaction -> transaction instanceof Expense;
+
+ /** {@code Predicate} that evaluates to true if the transaction is an {@code Income} */
+ Predicate<Transaction> PREDICATE_SHOW_ALL_INCOMES = transaction -> transaction instanceof Income;
+
+ /** {@code Predicate} that always evaluates to true. */
+ Predicate<BookmarkExpense> PREDICATE_SHOW_ALL_BOOKMARK_EXPENSES = bookmarkExpense -> true;
+
+ Predicate<BookmarkIncome> PREDICATE_SHOW_ALL_BOOKMARK_INCOMES = bookmarkIncome -> true;
+ /**
+ * Replaces user prefs data with the data in {@code userPrefs}.
+ */
+ void setUserPrefs(ReadOnlyUserPrefs userPrefs);
+
+ /**
+ * Returns the user prefs.
+ */
+ ReadOnlyUserPrefs getUserPrefs();
+
+ /**
+ * Returns the user prefs' GUI settings.
+ */
+ GuiSettings getGuiSettings();
+
+ /**
+ * Sets the user prefs' GUI settings.
+ */
+ void setGuiSettings(GuiSettings guiSettings);
+
+ /**
+ * Returns the user prefs' finance tracker file path.
+ */
+ Path getFinanceTrackerFilePath();
+
+ /**
+ * Sets the user prefs' finance tracker file path.
+ */
+ void setFinanceTrackerFilePath(Path financeTrackerFilePath);
+
+ /**
+ * Returns the command history.
+ */
+ CommandHistory getCommandHistory();
+
+ /**
+ * Replaces finance tracker data with the data in {@code financeTracker}.
+ */
+ void setFinanceTracker(ReadOnlyFinanceTracker financeTracker);
+
+ /** Returns the FinanceTracker */
+ ReadOnlyFinanceTracker getFinanceTracker();
+
+ /**
+ * Deletes the given transaction.
+ * The transaction must exist in the finance tracker.
+ */
+ void deleteTransaction(Transaction target);
+
+ /**
+ * Deletes the given bookmark expense.
+ * The bookmark expense must exist in the finance tracker.
+ */
+ void deleteBookmarkExpense(BookmarkExpense target);
+
+ /**
+ * Deletes the given bookmark income.
+ * The bookmark income must exist in the finance tracker.
+ */
+ void deleteBookmarkIncome(BookmarkIncome target);
+
+ /**
+ * Adds the given expense.
+ */
+ void addExpense(Expense expense);
+
+ /**
+ * Adds the given income.
+ */
+ void addIncome(Income income);
+
+ /**
+ * Adds the given bookmark expense.
+ */
+ void addBookmarkExpense(BookmarkExpense bookmarkExpense);
+
+ /**
+ * Adds the given bookmark income.
+ */
+ void addBookmarkIncome(BookmarkIncome bookmarkIncome);
+
+ /**
+ * Replaces the given transaction {@code target} with {@code editedTransaction}.
+ * {@code target} must exist in the finance tracker.
+ */
+ void setTransaction(Transaction target, Transaction editedTransaction);
+
+ /**
+ * Replaces the given bookmark expense {@code target} with {@code editedBookmarkExpense}.
+ * {@code target} must exist in the finance tracker.
+ */
+ void setBookmarkExpense(BookmarkExpense target, BookmarkExpense editedBookmarkExpense);
+
+ /**
+ * Replaces the given bookmark income {@code target} with {@code editedBookmarkIncome}.
+ * {@code target} must exist in the finance tracker.
+ */
+ void setBookmarkIncome(BookmarkIncome target, BookmarkIncome editedBookmarkIncome);
+
+ /** Returns the monthly budget. */
+ MonthlyBudget getMonthlyBudget();
+
+ /** Sets an expense limit. */
+ void setExpenseLimit(Amount limit);
+
+ /** Sets a savings goal. */
+ void setSavingsGoal(Amount goal);
+
+ void calculateBudgetInfo();
+
+ /** Returns an unmodifiable view of the filtered transaction list. */
+ ObservableList<Transaction> getFilteredTransactionList();
+
+ /** Returns an unmodifiable view of the filtered expense list. */
+ ObservableList<Expense> getFilteredExpenseList();
+
+ /** Returns an unmodifiable view of the filtered income list. */
+ ObservableList<Income> getFilteredIncomeList();
+
+ /** Returns an unmodifiable view of the filtered bookmark expense list. */
+ ObservableList<BookmarkExpense> getFilteredBookmarkExpenseList();
+
+ /** Returns an unmodifiable view of the filtered bookmark income list. */
+ ObservableList<BookmarkIncome> getFilteredBookmarkIncomeList();
+
+ /**
+ * Updates the filter of the filtered transaction list to filter by the given {@code predicate}.
+ * @throws NullPointerException if {@code predicate} is null.
+ */
+ void updateFilteredTransactionList(Predicate<Transaction> predicate);
+
+ /**
+ * Updates the filter of the filtered transaction list to filter by the given list of {@code predicates}.
+ * @throws NullPointerException if {@code predicate} is null.
+ */
+ void updateFilteredTransactionList(List<Predicate<Transaction>> predicates);
+
+ /**
+ * Updates the filter of the filtered expense list to filter by the given {@code predicate}.
+ * @throws NullPointerException if {@code predicate} is null.
+ */
+ void updateFilteredExpenseList(Predicate<Transaction> predicate);
+
+ /**
+ * Updates the filter of the filtered expense list to filter by the given list of {@code predicates}.
+ * @throws NullPointerException if {@code predicate} is null.
+ */
+ void updateFilteredExpenseList(List<Predicate<Transaction>> predicates);
+
+ /**
+ * Updates the filter of the filtered income list to filter by the given {@code predicate}.
+ * @throws NullPointerException if {@code predicate} is null.
+ */
+ void updateFilteredIncomeList(Predicate<Transaction> predicate);
+
+ /**
+ * Updates the filter of the filtered income list to filter by the given list of {@code predicates}.
+ * @throws NullPointerException if {@code predicate} is null.
+ */
+ void updateFilteredIncomeList(List<Predicate<Transaction>> predicates);
+
+ /**
+ * Updates the filter of the filtered bookmark expense list to filter by the given {@code predicate}.
+ * @throws NullPointerException if {@code predicate} is null.
+ */
+ void updateFilteredBookmarkExpenseList(Predicate<BookmarkExpense> predicate);
+
+ /**
+ * Updates the filter of the filtered bookmark income list to filter by the given {@code predicate}.
+ * @throws NullPointerException if {@code predicate} is null.
+ */
+ void updateFilteredBookmarkIncomeList(Predicate<BookmarkIncome> predicate);
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ModelManager.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ModelManager.java
new file mode 100644
index 00000000000..efa4ec6d020
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ModelManager.java
@@ -0,0 +1,366 @@
+package ay2021s1_cs2103_w16_3.finesse.model;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.CollectionUtil.requireAllNonNull;
+import static java.util.Objects.requireNonNull;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.command.history.CommandHistory;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
+
+/**
+ * Represents the in-memory model of the finance tracker data.
+ */
+public class ModelManager implements Model {
+ private static final Logger logger = LogsCenter.getLogger(ModelManager.class);
+ private static final int COMMAND_HISTORY_SIZE = 50;
+
+ private final FinanceTracker financeTracker;
+ private final UserPrefs userPrefs;
+ private final CommandHistory commandHistory;
+ private final FilteredList<Transaction> filteredTransactions;
+ private final FilteredList<Transaction> filteredExpenses;
+ private final FilteredList<Transaction> filteredIncomes;
+ private final FilteredList<BookmarkExpense> filteredBookmarkExpenses;
+ private final FilteredList<BookmarkIncome> filteredBookmarkIncomes;
+ private final ObservableList<Expense> castFilteredExpenses;
+ private final ObservableList<Income> castFilteredIncomes;
+ private final MonthlyBudget monthlyBudget;
+
+ /**
+ * Initializes a ModelManager with the given financeTracker and userPrefs.
+ */
+ public ModelManager(ReadOnlyFinanceTracker financeTracker, ReadOnlyUserPrefs userPrefs) {
+ super();
+ requireAllNonNull(financeTracker, userPrefs);
+
+ logger.fine("Initializing with finance tracker: " + financeTracker + " and user prefs " + userPrefs);
+
+ this.financeTracker = new FinanceTracker(financeTracker);
+ this.userPrefs = new UserPrefs(userPrefs);
+ commandHistory = new CommandHistory(COMMAND_HISTORY_SIZE);
+ filteredTransactions = new FilteredList<>(this.financeTracker.getTransactionList());
+ filteredExpenses = new FilteredList<>(this.financeTracker.getTransactionList(), PREDICATE_SHOW_ALL_EXPENSES);
+ filteredIncomes = new FilteredList<>(this.financeTracker.getTransactionList(), PREDICATE_SHOW_ALL_INCOMES);
+ filteredBookmarkExpenses = new FilteredList<>(this.financeTracker.getBookmarkExpenseList());
+ filteredBookmarkIncomes = new FilteredList<>(this.financeTracker.getBookmarkIncomeList());
+ castFilteredExpenses = FXCollections.observableArrayList(castFilteredList(filteredExpenses, Expense.class));
+ castFilteredIncomes = FXCollections.observableArrayList(castFilteredList(filteredIncomes, Income.class));
+ monthlyBudget = this.financeTracker.getMonthlyBudget();
+ }
+
+ public ModelManager() {
+ this(new FinanceTracker(), new UserPrefs());
+ }
+
+ //=========== UserPrefs ==================================================================================
+
+ @Override
+ public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
+ requireNonNull(userPrefs);
+ this.userPrefs.resetData(userPrefs);
+ }
+
+ @Override
+ public ReadOnlyUserPrefs getUserPrefs() {
+ return userPrefs;
+ }
+
+ @Override
+ public GuiSettings getGuiSettings() {
+ return userPrefs.getGuiSettings();
+ }
+
+ @Override
+ public void setGuiSettings(GuiSettings guiSettings) {
+ requireNonNull(guiSettings);
+ userPrefs.setGuiSettings(guiSettings);
+ }
+
+ @Override
+ public Path getFinanceTrackerFilePath() {
+ return userPrefs.getFinanceTrackerFilePath();
+ }
+
+ @Override
+ public void setFinanceTrackerFilePath(Path financeTrackerFilePath) {
+ requireNonNull(financeTrackerFilePath);
+ userPrefs.setFinanceTrackerFilePath(financeTrackerFilePath);
+ }
+
+ //=========== Command History ================================================================================
+
+ @Override
+ public CommandHistory getCommandHistory() {
+ return commandHistory;
+ }
+
+
+ //=========== FinanceTracker ================================================================================
+
+ @Override
+ public void setFinanceTracker(ReadOnlyFinanceTracker financeTracker) {
+ this.financeTracker.resetData(financeTracker);
+ refreshTransactionLists();
+ }
+
+ @Override
+ public ReadOnlyFinanceTracker getFinanceTracker() {
+ return financeTracker;
+ }
+
+ @Override
+ public void deleteTransaction(Transaction target) {
+ financeTracker.removeTransaction(target);
+ refreshTransactionLists();
+ }
+
+ @Override
+ public void addExpense(Expense expense) {
+ financeTracker.addTransaction(expense);
+ updateFilteredExpenseList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ }
+
+ @Override
+ public void addIncome(Income income) {
+ financeTracker.addTransaction(income);
+ updateFilteredIncomeList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ }
+
+ @Override
+ public void setTransaction(Transaction target, Transaction editedTransaction) {
+ requireAllNonNull(target, editedTransaction);
+
+ financeTracker.setTransaction(target, editedTransaction);
+ refreshTransactionLists();
+ }
+
+ //=========== Bookmark Transaction ================================================================================
+
+ @Override
+ public void addBookmarkExpense(BookmarkExpense bookmarkExpense) {
+ financeTracker.addBookmarkExpense(bookmarkExpense);
+ }
+
+ @Override
+ public void addBookmarkIncome(BookmarkIncome bookmarkIncome) {
+ financeTracker.addBookmarkIncome(bookmarkIncome);
+ }
+
+ @Override
+ public void deleteBookmarkExpense(BookmarkExpense bookmarkExpense) {
+ financeTracker.removeBookmarkExpense(bookmarkExpense);
+ }
+
+ @Override
+ public void deleteBookmarkIncome(BookmarkIncome bookmarkIncome) {
+ financeTracker.removeBookmarkIncome(bookmarkIncome);
+ }
+
+ @Override
+ public void setBookmarkExpense(BookmarkExpense target, BookmarkExpense editedBookmarkExpense) {
+ requireAllNonNull(target, editedBookmarkExpense);
+
+ financeTracker.setBookmarkExpense(target, editedBookmarkExpense);
+ }
+
+ @Override
+ public void setBookmarkIncome(BookmarkIncome target, BookmarkIncome editedBookmarkIncome) {
+ requireAllNonNull(target, editedBookmarkIncome);
+
+ financeTracker.setBookmarkIncome(target, editedBookmarkIncome);
+ }
+
+ @Override
+ public void updateFilteredBookmarkExpenseList(Predicate<BookmarkExpense> predicate) {
+ requireNonNull(predicate);
+
+ filteredBookmarkExpenses.setPredicate(predicate);
+ }
+
+ @Override
+ public void updateFilteredBookmarkIncomeList(Predicate<BookmarkIncome> predicate) {
+ requireNonNull(predicate);
+
+ filteredBookmarkIncomes.setPredicate(predicate);
+ }
+
+ //=========== Budget ===========================================================================================
+ @Override
+ public MonthlyBudget getMonthlyBudget() {
+ return monthlyBudget;
+ }
+
+ @Override
+ public void setExpenseLimit(Amount limit) {
+ monthlyBudget.setMonthlyExpenseLimit(limit);
+ calculateBudgetInfo();
+ }
+
+ @Override
+ public void setSavingsGoal(Amount goal) {
+ monthlyBudget.setMonthlySavingsGoal(goal);
+ calculateBudgetInfo();
+ }
+
+ @Override
+ public void calculateBudgetInfo() {
+ financeTracker.calculateBudgetInfo();
+ }
+
+ //=========== Filtered Transaction List Accessors =============================================================
+
+ /**
+ * Returns an unmodifiable view of the list of {@code Transaction} backed by the internal transaction list of
+ * {@code versionedFinanceTracker}.
+ */
+ @Override
+ public ObservableList<Transaction> getFilteredTransactionList() {
+ return filteredTransactions;
+ }
+
+ /**
+ * Returns an unmodifiable view of the list of {@code Expense} backed by the internal expense list of
+ * {@code versionedFinanceTracker}.
+ */
+ @Override
+ public ObservableList<Expense> getFilteredExpenseList() {
+ return FXCollections.unmodifiableObservableList(castFilteredExpenses);
+ }
+
+ /**
+ * Returns an unmodifiable view of the list of {@code Income} backed by the internal income list of
+ * {@code versionedFinanceTracker}.
+ */
+ @Override
+ public ObservableList<Income> getFilteredIncomeList() {
+ return FXCollections.unmodifiableObservableList(castFilteredIncomes);
+ }
+
+ /**
+ * Returns an unmodifiable view of the list of {@code BookmarkExpense} backed by the internal bookmark expense
+ * list of {@code versionedFinanceTracker}.
+ */
+ @Override
+ public ObservableList<BookmarkExpense> getFilteredBookmarkExpenseList() {
+ return filteredBookmarkExpenses;
+ }
+
+ /**
+ * Returns an unmodifiable view of the list of {@code BookmarkIncome} backed by the internal bookmark income
+ * list of {@code versionedFinanceTracker}.
+ */
+ @Override
+ public ObservableList<BookmarkIncome> getFilteredBookmarkIncomeList() {
+ return filteredBookmarkIncomes;
+ }
+
+ @Override
+ public void updateFilteredTransactionList(Predicate<Transaction> predicate) {
+ requireNonNull(predicate);
+ filteredTransactions.setPredicate(predicate);
+ }
+
+ @Override
+ public void updateFilteredTransactionList(List<Predicate<Transaction>> predicates) {
+ requireNonNull(predicates);
+ Predicate<Transaction> combinedPredicate = predicates.stream()
+ .reduce(PREDICATE_SHOW_ALL_TRANSACTIONS, Predicate::and);
+ updateFilteredTransactionList(combinedPredicate);
+ }
+
+ @Override
+ public void updateFilteredExpenseList(Predicate<Transaction> predicate) {
+ requireNonNull(predicate);
+ filteredExpenses.setPredicate(t -> predicate.test(t) && PREDICATE_SHOW_ALL_EXPENSES.test(t));
+ refreshTransactionLists();
+ }
+
+ @Override
+ public void updateFilteredExpenseList(List<Predicate<Transaction>> predicates) {
+ requireNonNull(predicates);
+ Predicate<Transaction> combinedPredicate = predicates.stream()
+ .reduce(PREDICATE_SHOW_ALL_EXPENSES, Predicate::and);
+ updateFilteredExpenseList(combinedPredicate);
+ }
+
+ @Override
+ public void updateFilteredIncomeList(Predicate<Transaction> predicate) {
+ requireNonNull(predicate);
+ filteredIncomes.setPredicate(t -> predicate.test(t) && PREDICATE_SHOW_ALL_INCOMES.test(t));
+ refreshTransactionLists();
+ }
+
+ @Override
+ public void updateFilteredIncomeList(List<Predicate<Transaction>> predicates) {
+ requireNonNull(predicates);
+ Predicate<Transaction> combinedPredicate = predicates.stream()
+ .reduce(PREDICATE_SHOW_ALL_INCOMES, Predicate::and);
+ updateFilteredIncomeList(combinedPredicate);
+ }
+
+ /**
+ * Casts a FilteredList into a List of the filtered subtype.
+ * Precondition: The given FilteredList must be either the expense list or income list.
+ * This guarantees that the elements of the FilteredList can successfully be cast to the target type.
+ *
+ * @param list The FilteredList to be cast.
+ * @param toCast The class of the target type to be cast. Required as casting to generic types is not allowed.
+ * @param <T> The type of transaction. Can be either Expense or Income, but not Transaction itself.
+ * @return A List whose elements are equal to the current state of the FilteredList.
+ */
+ private <T extends Transaction> List<T> castFilteredList(FilteredList<Transaction> list, Class<T> toCast) {
+ assert list == filteredExpenses || list == filteredIncomes
+ : "Casting can only be performed on expense or income list";
+ assert toCast != Transaction.class : "Casting can only be to Expense or Income, not Transaction";
+ return list.stream().map(toCast::cast).collect(Collectors.toUnmodifiableList());
+ }
+
+ /**
+ * Refreshes the typecasted ObservableLists used by other components.
+ * To be called anytime the expense or income list updates.
+ */
+ private void refreshTransactionLists() {
+ castFilteredExpenses.clear();
+ castFilteredExpenses.addAll(castFilteredList(filteredExpenses, Expense.class));
+ castFilteredIncomes.clear();
+ castFilteredIncomes.addAll(castFilteredList(filteredIncomes, Income.class));
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ // short circuit if same object
+ if (obj == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(obj instanceof ModelManager)) {
+ return false;
+ }
+
+ // state check
+ ModelManager other = (ModelManager) obj;
+ return financeTracker.equals(other.financeTracker)
+ && userPrefs.equals(other.userPrefs)
+ && commandHistory.equals(other.commandHistory)
+ && filteredTransactions.equals(other.filteredTransactions)
+ && filteredExpenses.equals(other.filteredExpenses)
+ && filteredIncomes.equals(other.filteredIncomes);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ReadOnlyFinanceTracker.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ReadOnlyFinanceTracker.java
new file mode 100644
index 00000000000..cbb292f7dec
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ReadOnlyFinanceTracker.java
@@ -0,0 +1,46 @@
+package ay2021s1_cs2103_w16_3.finesse.model;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import javafx.collections.ObservableList;
+
+/**
+ * Unmodifiable view of a finance tracker
+ */
+public interface ReadOnlyFinanceTracker {
+
+ /**
+ * Returns an unmodifiable view of the transactions list.
+ */
+ ObservableList<Transaction> getTransactionList();
+
+ /**
+ * Returns an unmodifiable view of the transactions list.
+ */
+ ObservableList<Expense> getExpenseList();
+
+ /**
+ * Returns an unmodifiable view of the transactions list.
+ */
+ ObservableList<Income> getIncomeList();
+
+ /**
+ * Returns an unmodifiable view of the bookmark expense list.
+ */
+ ObservableList<BookmarkExpense> getBookmarkExpenseList();
+
+ /**
+ * Returns an unmodifiable view of the bookmark income list.
+ */
+ ObservableList<BookmarkIncome> getBookmarkIncomeList();
+
+ /**
+ * Returns the monthly budget.
+ */
+ MonthlyBudget getMonthlyBudget();
+
+}
diff --git a/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ReadOnlyUserPrefs.java
similarity index 50%
rename from src/main/java/seedu/address/model/ReadOnlyUserPrefs.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ReadOnlyUserPrefs.java
index befd58a4c73..ab2d5b3c42e 100644
--- a/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/ReadOnlyUserPrefs.java
@@ -1,8 +1,8 @@
-package seedu.address.model;
+package ay2021s1_cs2103_w16_3.finesse.model;
import java.nio.file.Path;
-import seedu.address.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
/**
* Unmodifiable view of user prefs.
@@ -11,6 +11,6 @@ public interface ReadOnlyUserPrefs {
GuiSettings getGuiSettings();
- Path getAddressBookFilePath();
+ Path getFinanceTrackerFilePath();
}
diff --git a/src/main/java/seedu/address/model/UserPrefs.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/UserPrefs.java
similarity index 68%
rename from src/main/java/seedu/address/model/UserPrefs.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/model/UserPrefs.java
index 25a5fd6eab9..61b247f013d 100644
--- a/src/main/java/seedu/address/model/UserPrefs.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/UserPrefs.java
@@ -1,4 +1,4 @@
-package seedu.address.model;
+package ay2021s1_cs2103_w16_3.finesse.model;
import static java.util.Objects.requireNonNull;
@@ -6,7 +6,7 @@
import java.nio.file.Paths;
import java.util.Objects;
-import seedu.address.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
/**
* Represents User's preferences.
@@ -14,7 +14,7 @@
public class UserPrefs implements ReadOnlyUserPrefs {
private GuiSettings guiSettings = new GuiSettings();
- private Path addressBookFilePath = Paths.get("data" , "addressbook.json");
+ private Path financeTrackerFilePath = Paths.get("data" , "fine$$e.json");
/**
* Creates a {@code UserPrefs} with default values.
@@ -35,7 +35,7 @@ public UserPrefs(ReadOnlyUserPrefs userPrefs) {
public void resetData(ReadOnlyUserPrefs newUserPrefs) {
requireNonNull(newUserPrefs);
setGuiSettings(newUserPrefs.getGuiSettings());
- setAddressBookFilePath(newUserPrefs.getAddressBookFilePath());
+ setFinanceTrackerFilePath(newUserPrefs.getFinanceTrackerFilePath());
}
public GuiSettings getGuiSettings() {
@@ -47,13 +47,13 @@ public void setGuiSettings(GuiSettings guiSettings) {
this.guiSettings = guiSettings;
}
- public Path getAddressBookFilePath() {
- return addressBookFilePath;
+ public Path getFinanceTrackerFilePath() {
+ return financeTrackerFilePath;
}
- public void setAddressBookFilePath(Path addressBookFilePath) {
- requireNonNull(addressBookFilePath);
- this.addressBookFilePath = addressBookFilePath;
+ public void setFinanceTrackerFilePath(Path financeTrackerFilePath) {
+ requireNonNull(financeTrackerFilePath);
+ this.financeTrackerFilePath = financeTrackerFilePath;
}
@Override
@@ -68,19 +68,19 @@ public boolean equals(Object other) {
UserPrefs o = (UserPrefs) other;
return guiSettings.equals(o.guiSettings)
- && addressBookFilePath.equals(o.addressBookFilePath);
+ && financeTrackerFilePath.equals(o.financeTrackerFilePath);
}
@Override
public int hashCode() {
- return Objects.hash(guiSettings, addressBookFilePath);
+ return Objects.hash(guiSettings, financeTrackerFilePath);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("Gui Settings : " + guiSettings);
- sb.append("\nLocal data file location : " + addressBookFilePath);
+ sb.append("\nLocal data file location : " + financeTrackerFilePath);
return sb.toString();
}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpense.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpense.java
new file mode 100644
index 00000000000..5ba93da497a
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpense.java
@@ -0,0 +1,52 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+public class BookmarkExpense extends BookmarkTransaction<Expense> {
+
+ public BookmarkExpense(Title title, Amount amount, Set<Category> categories) {
+ super(title, amount, categories);
+ }
+
+ /**
+ * Returns true if the titles of both bookmark expenses are the same.
+ */
+ public boolean hasSameTitle(Object other) {
+ return other instanceof BookmarkExpense && getTitle().equals(((BookmarkExpense) other).getTitle());
+ }
+
+ @Override
+ public Expense convert(Date expenseDate) {
+ Title title = getTitle();
+ Amount amount = getAmount();
+ Set<Category> categories = getCategories();
+
+ return new Expense(title, amount, expenseDate, categories);
+ }
+
+ /**
+ * Returns true if both bookmark expenses have the same identity and data fields.
+ * This defines a stronger notion of equality between two bookmark expenses.
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof BookmarkExpense)) {
+ return false;
+ }
+
+ BookmarkExpense otherBookmarkExpense = (BookmarkExpense) other;
+ return getTitle().equals(otherBookmarkExpense.getTitle())
+ && getAmount().equals(otherBookmarkExpense.getAmount())
+ && getCategories().equals(otherBookmarkExpense.getCategories());
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseList.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseList.java
new file mode 100644
index 00000000000..339af066deb
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseList.java
@@ -0,0 +1,120 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.CollectionUtil.requireAllNonNull;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Iterator;
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.BookmarkTransactionNotFoundException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+/**
+ * A list of bookmark expenses that does not allow nulls.
+ * The removal of a bookmark expense uses BookmarkExpense#equals(Object) so as to ensure that the bookmark expense
+ * with exactly the same fields will be removed.
+ *
+ * Supports a minimal set of list operations.
+ */
+public class BookmarkExpenseList implements Iterable<BookmarkExpense> {
+ public static final String MESSAGE_OPERATION_WILL_RESULT_IN_DUPLICATE_BOOKMARK_EXPENSE =
+ "Operation will result in duplicate bookmark expense";
+
+ private final ObservableList<BookmarkExpense> internalBookmarkExpenseList = FXCollections.observableArrayList();
+ private final ObservableList<BookmarkExpense> internalUnmodifiableBookmarkExpenseList =
+ FXCollections.unmodifiableObservableList(internalBookmarkExpenseList);
+
+ /**
+ * Adds a bookmark expense to the list.
+ */
+ public void add(BookmarkExpense toAdd) {
+ requireNonNull(toAdd);
+ if (contains(toAdd)) {
+ throw new DuplicateBookmarkTransactionException(
+ MESSAGE_OPERATION_WILL_RESULT_IN_DUPLICATE_BOOKMARK_EXPENSE);
+ }
+ internalBookmarkExpenseList.add(toAdd);
+ }
+
+ /**
+ * Returns true if the bookmark expense list contains a bookmark expense with the same title as the given argument.
+ */
+ public boolean contains(BookmarkExpense toCheck) {
+ requireNonNull(toCheck);
+ return internalBookmarkExpenseList.stream().anyMatch(toCheck::hasSameTitle);
+ }
+
+ /**
+ * Replaces the bookmark expense {@code target} in the list with {@code editedBookmarkExpense}.
+ * {@code target} must exist in the list.
+ * The bookmark expense identity of {@code editedBookmarkExpense} must not be the same as another existing
+ * bookmark expense in the list.
+ */
+ public void setBookmarkExpense(BookmarkExpense target, BookmarkExpense editedBookmarkExpense) {
+ requireAllNonNull(target, editedBookmarkExpense);
+
+ int index = internalBookmarkExpenseList.indexOf(target);
+ if (index == -1) {
+ throw new BookmarkTransactionNotFoundException();
+ }
+
+ if (contains(editedBookmarkExpense) && !(target.getTitle().equals(editedBookmarkExpense.getTitle()))) {
+ throw new DuplicateBookmarkTransactionException(
+ MESSAGE_OPERATION_WILL_RESULT_IN_DUPLICATE_BOOKMARK_EXPENSE);
+ }
+
+ internalBookmarkExpenseList.set(index, editedBookmarkExpense);
+ }
+
+ /**
+ * Removes the equivalent bookmark expense from the list.
+ * The bookmark expense must exist in the list.
+ */
+ public void remove(BookmarkExpense toRemove) {
+ requireNonNull(toRemove);
+ if (!(internalBookmarkExpenseList.remove(toRemove))) {
+ throw new BookmarkTransactionNotFoundException();
+ }
+ }
+
+ /**
+ * Returns the backing list as an unmodifiable {@code ObservableList}.
+ */
+ public ObservableList<BookmarkExpense> asUnmodifiableObservableList() {
+ return internalUnmodifiableBookmarkExpenseList;
+ }
+
+ /**
+ * Replaces the contents of this list with {@code bookmarkExpenses}.
+ */
+ public void setBookmarkExpenses(List<BookmarkExpense> bookmarkExpenses) {
+ requireAllNonNull(bookmarkExpenses);
+
+ internalBookmarkExpenseList.setAll(bookmarkExpenses);
+ }
+
+ public void setBookmarkExpenses(BookmarkExpenseList replacement) {
+ requireNonNull(replacement);
+ internalBookmarkExpenseList.setAll(replacement.internalBookmarkExpenseList);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof BookmarkExpenseList // instanceof handles nulls
+ && internalBookmarkExpenseList.equals(((BookmarkExpenseList) other).internalBookmarkExpenseList));
+ }
+
+ @Override
+ public int hashCode() {
+ return internalBookmarkExpenseList.hashCode();
+ }
+
+ @Override
+ public Iterator<BookmarkExpense> iterator() {
+ return internalBookmarkExpenseList.iterator();
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncome.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncome.java
new file mode 100644
index 00000000000..031eacfd693
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncome.java
@@ -0,0 +1,51 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+public class BookmarkIncome extends BookmarkTransaction<Income> {
+
+ public BookmarkIncome(Title title, Amount amount, Set<Category> categories) {
+ super(title, amount, categories);
+ }
+
+ /**
+ * Returns true if the titles of both bookmark incomes are the same.
+ */
+ public boolean hasSameTitle(Object other) {
+ return other instanceof BookmarkIncome && getTitle().equals(((BookmarkIncome) other).getTitle());
+ }
+
+ @Override
+ public Income convert(Date date) {
+ Title title = getTitle();
+ Amount amount = getAmount();
+ Set<Category> categories = getCategories();
+
+ return new Income(title, amount, date, categories);
+ }
+
+ /**
+ * Returns true if both bookmark incomes have the same identity and data fields.
+ * This defines a stronger notion of equality between two bookmark incomes.
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof BookmarkIncome)) {
+ return false;
+ }
+ BookmarkIncome otherBookmarkIncome = (BookmarkIncome) other;
+ return getTitle().equals(otherBookmarkIncome.getTitle())
+ && getAmount().equals(otherBookmarkIncome.getAmount())
+ && getCategories().equals(otherBookmarkIncome.getCategories());
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeList.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeList.java
new file mode 100644
index 00000000000..87390c4a5c9
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeList.java
@@ -0,0 +1,120 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.CollectionUtil.requireAllNonNull;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Iterator;
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.BookmarkTransactionNotFoundException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+/**
+ * A list of bookmark incomes that does not allow nulls.
+ * The removal of a bookmark income uses BookmarkIncome#equals(Object) so as to ensure that the bookmark income
+ * with exactly the same fields will be removed.
+ *
+ * Supports a minimal set of list operations.
+ */
+public class BookmarkIncomeList implements Iterable<BookmarkIncome> {
+ public static final String MESSAGE_OPERATION_WOULD_RESULT_IN_DUPLICATE_BOOKMARK_INCOME =
+ "Operation would result in duplicate bookmark income";
+
+ private final ObservableList<BookmarkIncome> internalBookmarkIncomeList = FXCollections.observableArrayList();
+ private final ObservableList<BookmarkIncome> internalUnmodifiableBookmarkIncomeList =
+ FXCollections.unmodifiableObservableList(internalBookmarkIncomeList);
+
+ /**
+ * Adds a bookmark income to the list.
+ */
+ public void add(BookmarkIncome toAdd) {
+ requireNonNull(toAdd);
+ if (contains(toAdd)) {
+ throw new DuplicateBookmarkTransactionException(
+ MESSAGE_OPERATION_WOULD_RESULT_IN_DUPLICATE_BOOKMARK_INCOME);
+ }
+ internalBookmarkIncomeList.add(toAdd);
+ }
+
+ /**
+ * Returns true if the bookmark income list contains a bookmark income with the same title as the given argument.
+ */
+ public boolean contains(BookmarkIncome toCheck) {
+ requireNonNull(toCheck);
+ return internalBookmarkIncomeList.stream().anyMatch(toCheck::hasSameTitle);
+ }
+
+ /**
+ * Replaces the bookmark income {@code target} in the list with {@code editedBookmarkIncome}.
+ * {@code target} must exist in the list.
+ * The bookmark income identity of {@code editedBookmarkIncome} must not be the same as another existing
+ * bookmark income in the list.
+ */
+ public void setBookmarkIncome(BookmarkIncome target, BookmarkIncome editedBookmarkIncome) {
+ requireAllNonNull(target, editedBookmarkIncome);
+
+ int index = internalBookmarkIncomeList.indexOf(target);
+ if (index == -1) {
+ throw new BookmarkTransactionNotFoundException();
+ }
+
+ if (contains(editedBookmarkIncome) && !(target.getTitle().equals(editedBookmarkIncome.getTitle()))) {
+ throw new DuplicateBookmarkTransactionException(
+ MESSAGE_OPERATION_WOULD_RESULT_IN_DUPLICATE_BOOKMARK_INCOME);
+ }
+
+ internalBookmarkIncomeList.set(index, editedBookmarkIncome);
+ }
+
+ /**
+ * Returns the backing list as an unmodifiable {@code ObservableList}.
+ */
+ public ObservableList<BookmarkIncome> asUnmodifiableObservableList() {
+ return internalUnmodifiableBookmarkIncomeList;
+ }
+
+ /**
+ * Removes the equivalent bookmark income from the list.
+ * The bookmark income must exist in the list.
+ */
+ public void remove(BookmarkIncome toRemove) {
+ requireNonNull(toRemove);
+ if (!(internalBookmarkIncomeList.remove(toRemove))) {
+ throw new BookmarkTransactionNotFoundException();
+ }
+ }
+
+ /**
+ * Replaces the contents of this list with {@code bookmarkIncomes}.
+ */
+ public void setBookmarkIncomes(List<BookmarkIncome> bookmarkIncomes) {
+ requireAllNonNull(bookmarkIncomes);
+
+ internalBookmarkIncomeList.setAll(bookmarkIncomes);
+ }
+
+ public void setBookmarkIncomes(BookmarkIncomeList replacement) {
+ requireNonNull(replacement);
+ internalBookmarkIncomeList.setAll(replacement.internalBookmarkIncomeList);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this
+ || (other instanceof BookmarkIncomeList)
+ && internalBookmarkIncomeList.equals(((BookmarkIncomeList) other).internalBookmarkIncomeList);
+ }
+
+ @Override
+ public int hashCode() {
+ return internalBookmarkIncomeList.hashCode();
+ }
+
+ @Override
+ public Iterator<BookmarkIncome> iterator() {
+ return internalBookmarkIncomeList.iterator();
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkTransaction.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkTransaction.java
new file mode 100644
index 00000000000..86f0c34b011
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkTransaction.java
@@ -0,0 +1,60 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import java.util.Collections;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Represents a Bookmark Transaction in the finance tracker.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public abstract class BookmarkTransaction<T extends Transaction> {
+
+ public static final String MESSAGE_TITLE_CONSTRAINTS = "Bookmark transactions should only contain one title";
+ public static final String MESSAGE_AMOUNT_CONSTRAINTS = "Bookmark transactions should only contain one amount";
+ public static final String MESSAGE_CANNOT_CONTAIN_DATE = "Bookmark transactions should not contain any date";
+
+ private final Title title;
+ private final Amount amount;
+ private final Set<Category> categories;
+
+ protected BookmarkTransaction(Title title, Amount amount, Set<Category> categories) {
+ this.title = title;
+ this.amount = amount;
+ this.categories = categories;
+ }
+
+ public Title getTitle() {
+ return this.title;
+ }
+
+ public Amount getAmount() {
+ return this.amount;
+ }
+
+ /**
+ * Returns an immutable category set, which throws {@code UnsupportedOperationException}
+ * if modification is attempted.
+ */
+ public Set<Category> getCategories() {
+ return Collections.unmodifiableSet(categories);
+ }
+
+ public abstract T convert(Date date);
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append(getTitle())
+ .append(" Amount: ")
+ .append(getAmount())
+ .append(" Categories: ");
+ getCategories().forEach(builder::append);
+ return builder.toString();
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/exceptions/BookmarkTransactionNotFoundException.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/exceptions/BookmarkTransactionNotFoundException.java
new file mode 100644
index 00000000000..f4ad5250bad
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/exceptions/BookmarkTransactionNotFoundException.java
@@ -0,0 +1,6 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified input
+ */
+public class BookmarkTransactionNotFoundException extends RuntimeException {}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/exceptions/DuplicateBookmarkTransactionException.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/exceptions/DuplicateBookmarkTransactionException.java
new file mode 100644
index 00000000000..6161f207f6e
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/exceptions/DuplicateBookmarkTransactionException.java
@@ -0,0 +1,10 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions;
+
+/**
+ * Signals that the following operation will result in a duplicate bookmark transaction.
+ */
+public class DuplicateBookmarkTransactionException extends RuntimeException {
+ public DuplicateBookmarkTransactionException(String message) {
+ super(message);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/budget/MonthlyBudget.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/budget/MonthlyBudget.java
new file mode 100644
index 00000000000..8073974970d
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/budget/MonthlyBudget.java
@@ -0,0 +1,237 @@
+package ay2021s1_cs2103_w16_3.finesse.model.budget;
+
+import java.text.DateFormatSymbols;
+import java.time.YearMonth;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.StreamSupport;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount.CalculatedAmount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.TransactionList;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+/**
+ * Represents the monthly budget in the finance tracker.
+ */
+public class MonthlyBudget {
+ private static final String[] MONTHS = new DateFormatSymbols().getMonths();
+ private static final int NUM_OF_MONTHS = 12;
+
+ private ObjectProperty<Amount> monthlyExpenseLimit;
+ private ObjectProperty<Amount> monthlySavingsGoal;
+ private ObjectProperty<CalculatedAmount> remainingBudget;
+ private ObjectProperty<CalculatedAmount> currentSavings;
+ private ObservableList<CalculatedAmount> monthlyExpenses;
+ private ObservableList<CalculatedAmount> monthlyIncomes;
+ private ObservableList<CalculatedAmount> monthlySavings;
+ private ObservableList<String> months;
+
+ @FunctionalInterface
+ public interface ChangeListener extends Runnable {
+
+ }
+
+ private Collection<ChangeListener> listeners;
+
+ /**
+ * Creates a {@code MonthlyBudget} with an expense limit and savings goal of $0.
+ */
+ public MonthlyBudget() {
+ monthlyExpenseLimit = new SimpleObjectProperty<>(Amount.ZERO_AMOUNT);
+ monthlySavingsGoal = new SimpleObjectProperty<>(Amount.ZERO_AMOUNT);
+ remainingBudget = new SimpleObjectProperty<>(new CalculatedAmount());
+ currentSavings = new SimpleObjectProperty<>(new CalculatedAmount());
+ monthlyExpenses = FXCollections.observableArrayList();
+ monthlyIncomes = FXCollections.observableArrayList();
+ monthlySavings = FXCollections.observableArrayList();
+ months = FXCollections.observableArrayList();
+ listeners = new ArrayList<>();
+ }
+
+ public ObjectProperty<Amount> getMonthlyExpenseLimit() {
+ return monthlyExpenseLimit;
+ }
+
+ public void setMonthlyExpenseLimit(Amount limit) {
+ monthlyExpenseLimit.setValue(limit);
+ }
+
+ public ObjectProperty<Amount> getMonthlySavingsGoal() {
+ return monthlySavingsGoal;
+ }
+
+ public void setMonthlySavingsGoal(Amount goal) {
+ monthlySavingsGoal.setValue(goal);
+ }
+
+ public ObjectProperty<CalculatedAmount> getRemainingBudget() {
+ return remainingBudget;
+ }
+
+ public void setRemainingBudget(CalculatedAmount budget) {
+ remainingBudget.setValue(budget);
+ }
+
+ public ObjectProperty<CalculatedAmount> getCurrentSavings() {
+ return currentSavings;
+ }
+
+ public void setCurrentSavings(CalculatedAmount savings) {
+ currentSavings.setValue(savings);
+ }
+
+ public ObservableList<CalculatedAmount> getMonthlyExpenses() {
+ return FXCollections.unmodifiableObservableList(monthlyExpenses);
+ }
+
+ public ObservableList<CalculatedAmount> getMonthlyIncomes() {
+ return FXCollections.unmodifiableObservableList(monthlyIncomes);
+ }
+
+ public ObservableList<CalculatedAmount> getMonthlySavings() {
+ return FXCollections.unmodifiableObservableList(monthlySavings);
+ }
+
+ public ObservableList<String> getMonths() {
+ return FXCollections.unmodifiableObservableList(months);
+ }
+
+ public void addChangeListener(ChangeListener listener) {
+ listeners.add(listener);
+ }
+
+ private void callChangeListeners() {
+ listeners.forEach(ChangeListener::run);
+ }
+
+ /**
+ * Calculates all information related to the user's savings.
+ * These are:
+ * 1. Expenses for the past number of months specified by the user
+ * 2. Incomes for the past number of months specified by user
+ * 3. Savings for the past number of months specified by user
+ * 4. The months to be displayed according to the number of months specified by user
+ *
+ * @param transactions The current list of transactions.
+ * @param numOfMonths The number of months of data the user wishes to display.
+ */
+ public void calculateBudgetInfo(TransactionList transactions, int numOfMonths) {
+ this.monthlyExpenses.clear();
+ this.monthlyIncomes.clear();
+ this.months.clear();
+
+ YearMonth today = YearMonth.now();
+ int thisMonthValue = today.getMonthValue();
+
+ // function to get the month the transaction was dated, relative to today
+ Function<Transaction, Integer> monthsBeforeToday = transaction -> (int) ChronoUnit.MONTHS.between(
+ YearMonth.from(transaction.getDateValue()), today);
+
+ // filter transactions that are outside the desired range, and split according to class (expense vs income)
+ Map<Class<? extends Transaction>, List<Transaction>> filteredAndSplit =
+ StreamSupport.stream(transactions.spliterator(), false)
+ .filter(transaction -> monthsBeforeToday.apply(transaction) < numOfMonths)
+ .collect(Collectors.groupingBy(Transaction::getClass));
+
+ // function that takes a list of either expenses or incomes and splits them by month
+ Function<Class<? extends Transaction>, Map<Integer, List<Transaction>>> groupByMonth = transactionType ->
+ filteredAndSplit.getOrDefault(transactionType, Collections.emptyList()).stream()
+ .collect(Collectors.groupingBy(monthsBeforeToday));
+
+ Map<Integer, List<Transaction>> expensesByMonth = groupByMonth.apply(Expense.class);
+ Map<Integer, List<Transaction>> incomesByMonth = groupByMonth.apply(Income.class);
+
+ // function that turns a mapping from months to transaction list to a sequence of transaction lists by month,
+ // then reducing the transaction list to a calculated amount total
+ Function<Map<Integer, List<Transaction>>, List<CalculatedAmount>> amountSum = transactionsByMonth ->
+ IntStream.range(0, numOfMonths)
+ .map(i -> numOfMonths - 1 - i)
+ .mapToObj(month -> transactionsByMonth.getOrDefault(month, Collections.emptyList()))
+ .map(transactionsInMonth -> transactionsInMonth.stream()
+ .map(Transaction::getAmount)
+ .map(CalculatedAmount::new)
+ .reduce(new CalculatedAmount(), (x, y) -> y.add(x)))
+ .collect(Collectors.toUnmodifiableList());
+
+ List<CalculatedAmount> monthlyExpenses = amountSum.apply(expensesByMonth);
+ List<CalculatedAmount> monthlyIncomes = amountSum.apply(incomesByMonth);
+
+ this.monthlyExpenses.addAll(monthlyExpenses);
+ this.monthlyIncomes.addAll(monthlyIncomes);
+
+ IntStream.range(0, numOfMonths)
+ .map(i -> numOfMonths - i)
+ .map(i -> thisMonthValue - i)
+ .map(i -> i < 0 ? NUM_OF_MONTHS + i : i)
+ .mapToObj(i -> MONTHS[i])
+ .forEach(months::add);
+
+ calculateBudget();
+ calculateSavings();
+
+ callChangeListeners();
+ }
+
+ /**
+ * Calculates the user's remaining budget for the month
+ * by deducting this month's expenses from the monthly expense limit.
+ * If the result is positive, the result is set as the remaining budget.
+ * If the result is negative, the magnitude of the result is set as the budget deficit.
+ */
+ private void calculateBudget() {
+ setRemainingBudget(new CalculatedAmount(monthlyExpenseLimit.get())
+ .subtract(monthlyExpenses.get(monthlyExpenses.size() - 1)));
+ }
+
+ /**
+ * Calculates the user's current savings for the month
+ * by deducting this month's expenses from this month's incomes.
+ * If the result is positive, the result is set as the current savings.
+ * If the result is negative, the magnitude of the result is set as the savings deficit.
+ */
+ private void calculateSavings() {
+ monthlySavings.clear();
+ for (int i = 0; i < monthlyIncomes.size(); i++) {
+ CalculatedAmount savings = monthlyIncomes.get(i).subtract(monthlyExpenses.get(i));
+ monthlySavings.add(savings);
+ }
+ setCurrentSavings(monthlySavings.get(monthlyIncomes.size() - 1));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof MonthlyBudget)) {
+ return false;
+ }
+
+ MonthlyBudget otherMonthlyBudget = (MonthlyBudget) other;
+ return monthlyExpenseLimit.getValue().equals(otherMonthlyBudget.monthlyExpenseLimit.getValue())
+ && monthlySavingsGoal.getValue().equals(otherMonthlyBudget.monthlySavingsGoal.getValue())
+ && remainingBudget.getValue().equals(otherMonthlyBudget.remainingBudget.getValue())
+ && currentSavings.getValue().equals(otherMonthlyBudget.currentSavings.getValue())
+ && monthlyExpenses.equals(otherMonthlyBudget.monthlyExpenses)
+ && monthlyIncomes.equals(otherMonthlyBudget.monthlyIncomes)
+ && monthlySavings.equals(otherMonthlyBudget.monthlySavings)
+ && months.equals(otherMonthlyBudget.months);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/category/Category.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/category/Category.java
new file mode 100644
index 00000000000..31de484674c
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/category/Category.java
@@ -0,0 +1,61 @@
+package ay2021s1_cs2103_w16_3.finesse.model.category;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.AppUtil.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Represents a Category in the finance tracker.
+ * Guarantees: immutable; name is valid as declared in {@link #isValidCategoryName(String)}
+ */
+public class Category {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "Category names should contain at least one non-whitespace printable ASCII character "
+ + "and cannot contain any characters that are not printable ASCII characters.";
+ public static final String MESSAGE_EMPTY_CATEGORY = "Categories cannot be empty.";
+ public static final String VALIDATION_REGEX = "\\p{Graph}\\p{Print}*";
+
+ private final String categoryName;
+
+ /**
+ * Constructs a {@code Category}.
+ *
+ * @param categoryName A valid category name.
+ */
+ public Category(String categoryName) {
+ requireNonNull(categoryName);
+ checkArgument(isValidCategoryName(categoryName), MESSAGE_CONSTRAINTS);
+ this.categoryName = categoryName;
+ }
+
+ public String getCategoryName() {
+ return categoryName;
+ }
+
+ /**
+ * Returns true if a given string is a valid category name.
+ */
+ public static boolean isValidCategoryName(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Category // instanceof handles nulls
+ && categoryName.equals(((Category) other).categoryName)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return categoryName.hashCode();
+ }
+
+ /**
+ * Format state as text for viewing.
+ */
+ public String toString() {
+ return '[' + categoryName + ']';
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/CommandHistory.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/CommandHistory.java
new file mode 100644
index 00000000000..114c7badd1b
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/CommandHistory.java
@@ -0,0 +1,121 @@
+package ay2021s1_cs2103_w16_3.finesse.model.command.history;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Keeps track of the user input history as well as the command history navigation state.
+ */
+public class CommandHistory {
+ /** An {@code EvictingStack} to keep track of the command history. **/
+ private final EvictingStack<String> commandHistory;
+ /** A reference to the current {@code Node} in the current command navigation state. **/
+ private Node<String> currentNode;
+
+ /**
+ * Creates a new {@code CommandHistory} which keeps track of the most recent commands.
+ *
+ * @param maxCommands The number of recent commands to keep track of.
+ * @throws IllegalArgumentException If the specified maximum commands is not at least 1.
+ */
+ public CommandHistory(int maxCommands) {
+ if (maxCommands < 1) {
+ throw new IllegalArgumentException("Maximum number of commands must be at least 1.");
+ }
+ commandHistory = new EvictingStack<>(maxCommands);
+ }
+
+ /**
+ * Adds a command to the command history and resets the state of the command navigation.
+ *
+ * @param command The command to be added.
+ */
+ public void addCommand(String command) {
+ commandHistory.push(command);
+ currentNode = null;
+ }
+
+ /**
+ * Returns the previous command in the current command navigation state. If the current
+ * command is already the earliest tracked command, then the current command is returned.
+ * If the command history is empty, returns an empty string.
+ *
+ * @return The previous command.
+ */
+ public String navigateUp() {
+ if (currentNode == null && commandHistory.isEmpty()) {
+ return "";
+ } else if (currentNode == null) {
+ currentNode = commandHistory.getTopNode();
+ } else if (currentNode.hasPreviousNode()) {
+ currentNode = currentNode.getPreviousNode();
+ }
+ return currentNode.getValue();
+ }
+
+ /**
+ * Returns the next command in the current command navigation state. If the current
+ * command is already the latest tracked command, then {@code null} is returned.
+ * If the command history is empty, returns an empty string.
+ *
+ * @return The next command.
+ */
+ public String navigateDown() {
+ if (currentNode == null) {
+ return "";
+ } else if (currentNode.hasNextNode()) {
+ currentNode = currentNode.getNextNode();
+ } else {
+ return null;
+ }
+ return currentNode.getValue();
+ }
+
+ /**
+ * Returns a list of the most recent commands, up to a specified limit.
+ * The list is ordered such that the first element is the most recently entered command,
+ * and the last element is the least recently entered command.
+ * If there are fewer commands stored in the command history than the specified limit,
+ * the returned list will be smaller than the specified limit.
+ *
+ * @param range The maximum number of commands to be retrieved.
+ * @return A list of the most recent commands, limited by {@code range} and the
+ * number of commands stored in the command history.
+ */
+ public List<String> recentCommands(int range) {
+ assert range >= 0;
+ return stream().limit(range).collect(Collectors.toUnmodifiableList());
+ }
+
+ /**
+ * Returns a stream of command strings, from most recent to least recent.
+ * Note that due to the lazy nature of streams, undefined behavior may occur
+ * if the stream is not consumed immediately.
+ *
+ * @return A stream of command strings, from most recent to least recent.
+ */
+ private Stream<String> stream() {
+ return Stream.iterate(commandHistory.getTopNode(), Objects::nonNull, Node::getPreviousNode).map(Node::getValue);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ // short circuit if same object
+ if (obj == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(obj instanceof CommandHistory)) {
+ return false;
+ }
+
+ // state check
+ CommandHistory other = (CommandHistory) obj;
+ List<String> myCommands = this.stream().collect(Collectors.toUnmodifiableList());
+ List<String> otherCommands = other.stream().collect(Collectors.toUnmodifiableList());
+ return myCommands.equals(otherCommands);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/EvictingStack.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/EvictingStack.java
new file mode 100644
index 00000000000..0ac0f38a069
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/EvictingStack.java
@@ -0,0 +1,136 @@
+package ay2021s1_cs2103_w16_3.finesse.model.command.history;
+
+import java.util.EmptyStackException;
+
+/**
+ * A stack that can hold a fixed number of elements. When pushing a new element
+ * onto an already full {@code EvictingStack}, the bottom-most element is removed.
+ */
+public class EvictingStack<E> {
+ /** The maximum size of this {@code EvictingStack}. **/
+ private final int maxSize;
+ /** The current size of this {@code EvictingStack}. **/
+ private int currentSize;
+ /** A reference to the top-most {@code Node}. **/
+ private Node<E> topNode;
+ /** A reference to the bottom-most {@code Node}. **/
+ private Node<E> bottomNode;
+
+ /**
+ * Constructs an empty {@code EvictingStack} with the specified maximum size.
+ *
+ * @param maxSize The maximum size of the {@code EvictingStack}.
+ * @throws IllegalArgumentException If the specified maximum size is not at least 1.
+ */
+ public EvictingStack(int maxSize) {
+ if (maxSize < 1) {
+ throw new IllegalArgumentException("Maximum size of the evicting stack must be at least 1.");
+ }
+ this.maxSize = maxSize;
+ currentSize = 0;
+ }
+
+ /**
+ * Removes the bottom-most element in this {@code EvictingStack}.
+ */
+ private void removeBottomElement() {
+ assert currentSize >= 1;
+
+ Node<E> nextNode = bottomNode.getNextNode();
+ bottomNode.removeLinks();
+ bottomNode = nextNode;
+ currentSize--;
+
+ // Set the top node to null if the stack is empty.
+ if (currentSize == 0) {
+ topNode = null;
+ }
+ }
+
+ /**
+ * Checks if this {@code EvictingStack} is empty.
+ *
+ * @return {@code true} if this {@code EvictingStack} is empty; {@code false} otherwise.
+ */
+ public boolean isEmpty() {
+ return currentSize == 0;
+ }
+
+ /**
+ * Pushes an element onto the top of this {@code EvictingStack}. If the
+ * stack is full, the bottom element is evicted.
+ *
+ * @param element The element to be pushed onto the stack.
+ * @return The element that was pushed onto the stack.
+ */
+ public E push(E element) {
+ // Evict the bottom-most element if the stack is full.
+ if (currentSize == maxSize) {
+ removeBottomElement();
+ }
+
+ assert currentSize < maxSize;
+
+ // Push the new element onto the stack.
+ Node<E> newNode = new Node<>(element);
+ if (topNode != null) {
+ Node.linkNodes(topNode, newNode);
+ }
+ topNode = newNode;
+ currentSize++;
+
+ // Set the bottom node to the new node if the stack was previously empty.
+ if (currentSize == 1) {
+ bottomNode = newNode;
+ }
+
+ return element;
+ }
+
+ /**
+ * Returns the value of the top-most element in this {@code EvictingStack}.
+ *
+ * @return The value of the element at the top of this {@code EvictingStack}.
+ * @throws EmptyStackException If this {@code EvictingStack} is empty.
+ */
+ public E peek() {
+ if (isEmpty()) {
+ throw new EmptyStackException();
+ }
+ return topNode.getValue();
+ }
+
+ /**
+ * Removes the top-most element from this {@code EvictingStack} and returns it.
+ *
+ * @return The value of the element at the top of this {@code EvictingStack}.
+ */
+ public E pop() {
+ if (isEmpty()) {
+ throw new EmptyStackException();
+ }
+
+ // Pop the top-most element from the stack.
+ E element = topNode.getValue();
+ Node<E> previousNode = topNode.getPreviousNode();
+ topNode.removeLinks();
+ topNode = previousNode;
+ currentSize--;
+
+ // Set the bottom node to null if the stack is empty.
+ if (currentSize == 0) {
+ bottomNode = null;
+ }
+
+ return element;
+ }
+
+ /**
+ * Returns the {@code Node} containing the top-most element of this {@code EvictingStack}.
+ *
+ * @return The {@code Node} containing the top-most element of this {@code EvictingStack}.
+ */
+ public Node<E> getTopNode() {
+ return topNode;
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/Node.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/Node.java
new file mode 100644
index 00000000000..38828f152dc
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/Node.java
@@ -0,0 +1,113 @@
+package ay2021s1_cs2103_w16_3.finesse.model.command.history;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * A node in a doubly linked list.
+ */
+public class Node<E> {
+ /** The value contained in this {@code Node}. **/
+ private final E value;
+ /** A reference to the next {@code Node}. **/
+ private Node<E> nextNode;
+ /** A reference to the previous {@code Node}. **/
+ private Node<E> previousNode;
+
+ /**
+ * Creates a new {@code Node} containing the specified value.
+ *
+ * @param value The value to be contained in this {@code Node}.
+ */
+ public Node(E value) {
+ this.value = value;
+ }
+
+ /**
+ * Returns the value that is contained in this {@code Node}.
+ *
+ * @return The value that is contained in this {@code Node}.
+ */
+ public E getValue() {
+ return value;
+ }
+
+ /**
+ * Returns the {@code Node} that comes after this {@code Node}.
+ *
+ * @return The next {@code Node}.
+ */
+ public Node<E> getNextNode() {
+ return nextNode;
+ }
+
+ /**
+ * Returns the {@code Node} that comes before this {@code Node}.
+ *
+ * @return The previous {@code Node}.
+ */
+ public Node<E> getPreviousNode() {
+ return previousNode;
+ }
+
+ /**
+ * Returns whether there exists a node that comes after this {@code Node}.
+ *
+ * @return {@code true} if {@code nextNode} is not {@code null}; false otherwise.
+ */
+ public boolean hasNextNode() {
+ return nextNode != null;
+ }
+
+ /**
+ * Returns whether there exists a node that comes before this {@code Node}.
+ *
+ * @return {@code true} if {@code previousNode} is not {@code null}; false otherwise;
+ */
+ public boolean hasPreviousNode() {
+ return previousNode != null;
+ }
+
+ /**
+ * Links two nodes together by setting the respective nodes to point to each other.
+ * {@code firstNode} will have its {@code nextNode} be set to {@code secondNode}, while
+ * {@code secondNode} will have its {@code previousNode} be set to {@code firstNode}.
+ * If linking the two nodes together overrides existing links, the linking fails and
+ * {@code false} will be returned.
+ *
+ * @param firstNode The {@code Node} that comes before in the link.
+ * @param secondNode The {@code Node} that comes after in the link.
+ * @param <E> The type of the two {@code Node}s.
+ * @return {@code true} if the two nodes are successfully linked; {@code false} otherwise.
+ */
+ public static <E> boolean linkNodes(Node<E> firstNode, Node<E> secondNode) {
+ requireNonNull(firstNode);
+ requireNonNull(secondNode);
+
+ // Do not override existing links.
+ if (firstNode.hasNextNode() || secondNode.hasPreviousNode()) {
+ return false;
+ }
+
+ firstNode.nextNode = secondNode;
+ secondNode.previousNode = firstNode;
+
+ return true;
+ }
+
+ /**
+ * Removes all links for this {@code Node}.
+ */
+ public void removeLinks() {
+ // Remove link with the node that comes after this node.
+ if (nextNode != null) {
+ nextNode.previousNode = null;
+ nextNode = null;
+ }
+
+ // Remove link with the node that comes before this node.
+ if (previousNode != null) {
+ previousNode.nextNode = null;
+ previousNode = null;
+ }
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Amount.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Amount.java
new file mode 100644
index 00000000000..1a2c6ff46da
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Amount.java
@@ -0,0 +1,147 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.AppUtil.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+import java.math.BigDecimal;
+
+/**
+ * Represents a Transaction's amount in the finance tracker.
+ * Guarantees: immutable; is valid as declared in {@link #isValidAmount(String)}
+ */
+public class Amount implements Comparable<Amount> {
+
+ public static final Amount ZERO_AMOUNT = new Amount("0");
+ public static final String MESSAGE_CONSTRAINTS = "Amounts should only contain non-negative numbers up to 8 digits,"
+ + " with an optional 2 decimal places or '$' prefix";
+ public static final String MESSAGE_EMPTY_AMOUNT = "Amounts cannot be empty.";
+ public static final String VALIDATION_REGEX = "^\\$?\\d{1,8}(\\.\\d{2})?$";
+ private final BigDecimal value;
+
+ /**
+ * Constructs an {@code Amount} from a string.
+ *
+ * @param amount A valid amount.
+ */
+ public Amount(String amount) {
+ requireNonNull(amount);
+ checkArgument(isValidAmount(amount), MESSAGE_CONSTRAINTS);
+ value = new BigDecimal(amount.replaceFirst("^\\$", ""));
+ assert value.compareTo(BigDecimal.ZERO) >= 0; // amount should be non-negative
+ }
+
+ /**
+ * Returns true if a given string is a valid amount.
+ * A valid amount must only contain numbers, with an optional 2 decimal places or '$' prefix.
+ */
+ public static boolean isValidAmount(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ /**
+ * Returns a String representation of this Amount that can be used to construct an identical Amount.
+ * @return A String representation of this Amount.
+ */
+ @Override
+ public String toString() {
+ return String.format("$%.2f", value);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Amount // instanceof handles nulls
+ && (value.compareTo(((Amount) other).value)) == 0); // state check
+ }
+
+ @Override
+ public int compareTo(Amount other) {
+ return value.compareTo(other.value);
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ /**
+ * Represents a calculated amount, used for budget calculations.
+ * It supports simple arithmetic such as addition and subtraction.
+ * Note that unlike {@code Amount} which can only contain non-negative values,
+ * {@code CalculatedAmount} can contain negative values due to subtraction.
+ * Guarantees: immutable; has at most 2 decimal places
+ */
+ public static class CalculatedAmount {
+ private final BigDecimal value;
+
+ /**
+ * Creates a new calculated amount with a default value of zero.
+ */
+ public CalculatedAmount() {
+ this(Amount.ZERO_AMOUNT);
+ }
+
+ /**
+ * Wraps an amount into a calculated amount.
+ *
+ * @param amount The amount to be wrapped.
+ */
+ public CalculatedAmount(Amount amount) {
+ this(amount.value);
+ }
+
+ private CalculatedAmount(BigDecimal value) {
+ this.value = value;
+ }
+
+ /**
+ * Adds two calculated amounts.
+ *
+ * @param other The addend.
+ * @return A calculated amount representing the added value.
+ */
+ public CalculatedAmount add(CalculatedAmount other) {
+ return new CalculatedAmount(value.add(other.value));
+ }
+
+ /**
+ * Subtracts two calculated amounts, with this calculated amount as the minuend
+ * and the given argument as the subtrahend.
+ *
+ * @param other The subtrahend.
+ * @return A calculated amount representing the subtracted value.
+ */
+ public CalculatedAmount subtract(CalculatedAmount other) {
+ return new CalculatedAmount(value.subtract(other.value));
+ }
+
+ /**
+ * Returns a number representing the value of this calculated amount.
+ *
+ * @return A number representing the value of this calculated amount.
+ */
+ public Number getValue() {
+ return value;
+ }
+
+ /**
+ * Returns true if the calculated amount has a non-negative value.
+ */
+ public boolean isNonNegative() {
+ return value.compareTo(BigDecimal.ZERO) >= 0;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("$%.2f", value.abs());
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof CalculatedAmount // instanceof handles nulls
+ && (value.compareTo(((CalculatedAmount) other).value)) == 0); // state check
+ }
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Date.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Date.java
new file mode 100644
index 00000000000..2b37f3117eb
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Date.java
@@ -0,0 +1,99 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.AppUtil.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+import java.time.Clock;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.ResolverStyle;
+
+/**
+ * Represents a Transaction's date in the finance tracker.
+ * Guarantees: immutable; is valid as declared in {@link #isValidDate(String, Clock)}
+ */
+public class Date implements Comparable<Date> {
+
+ public static final String EPOCH_STRING = "01/01/1970";
+ public static final String MESSAGE_CONSTRAINTS = "Dates should be a valid calendar date of the format dd/mm/yyyy, "
+ + "cannot be earlier than " + EPOCH_STRING + ", and cannot be later than the current date";
+ public static final DateTimeFormatter VALIDATION_FORMAT = DateTimeFormatter.ofPattern("dd/MM/uuuu")
+ .withResolverStyle(ResolverStyle.STRICT);
+ public static final String MESSAGE_EMPTY_DATE = "Dates cannot be empty.";
+ private static final LocalDate EPOCH = LocalDate.parse(EPOCH_STRING, VALIDATION_FORMAT);
+
+ private final LocalDate value;
+
+ /**
+ * Constructs an {@code Date}.
+ *
+ * @param date A valid date.
+ */
+ public Date(String date) {
+ requireNonNull(date);
+ checkArgument(isValidDate(date), MESSAGE_CONSTRAINTS);
+ value = LocalDate.parse(date, VALIDATION_FORMAT);
+ }
+
+ /**
+ * Returns if a given string is a valid date.
+ * Uses {@link #isValidDate(String, Clock)} with the current system time.
+ * A valid date must be in dd/mm/yyyy format representing a correct date (all parts within range),
+ * and additionally can only be at or before the current date.
+ */
+ public static boolean isValidDate(String test) {
+ return isValidDate(test, Clock.systemDefaultZone());
+ }
+
+ /**
+ * Returns if a given string is a valid date. Allows for a custom Clock to be used for testing purposes.
+ * A valid date must be in dd/mm/yyyy format representing a correct date (all parts within range),
+ * and additionally can only be at or before the current date.
+ */
+ public static boolean isValidDate(String test, Clock currentTime) {
+ try {
+ LocalDate value = LocalDate.parse(test, VALIDATION_FORMAT);
+ LocalDate today = LocalDate.now(currentTime);
+ return (value.isBefore(today) || value.isEqual(today))
+ && (value.isAfter(EPOCH) || value.isEqual(EPOCH));
+ } catch (DateTimeParseException e) {
+ return false;
+ }
+ }
+
+ public LocalDate getDate() {
+ return value;
+ }
+
+ public static Date getCurrentDate() {
+ LocalDate currentDate = LocalDate.now();
+ return new Date(VALIDATION_FORMAT.format(currentDate));
+ }
+
+ /**
+ * Returns a String representation of this Date that can be used to construct an identical Date.
+ * @return A String representation of this Date.
+ */
+ @Override
+ public String toString() {
+ return VALIDATION_FORMAT.format(value);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Date // instanceof handles nulls
+ && value.equals(((Date) other).value)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ @Override
+ public int compareTo(Date date) {
+ return value.compareTo(date.value);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Expense.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Expense.java
new file mode 100644
index 00000000000..9017768b749
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Expense.java
@@ -0,0 +1,34 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+
+public class Expense extends Transaction {
+
+ public Expense(Title title, Amount amount, Date date, Set<Category> categories) {
+ super(title, amount, date, categories);
+ }
+
+ /**
+ * Returns true if both expenses have the same identity and data fields.
+ * This defines a stronger notion of equality between two expenses.
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof Expense)) {
+ return false;
+ }
+
+ Expense otherExpense = (Expense) other;
+ return otherExpense.getTitle().equals(getTitle())
+ && otherExpense.getAmount().equals(getAmount())
+ && otherExpense.getDate().equals(getDate())
+ && otherExpense.getCategories().equals(getCategories());
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Income.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Income.java
new file mode 100644
index 00000000000..9ce58b70b59
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Income.java
@@ -0,0 +1,34 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+
+public class Income extends Transaction {
+
+ public Income(Title title, Amount amount, Date date, Set<Category> categories) {
+ super(title, amount, date, categories);
+ }
+
+ /**
+ * Returns true if both incomes have the same identity and data fields.
+ * This defines a stronger notion of equality between two incomes.
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof Income)) {
+ return false;
+ }
+
+ Income otherIncome = (Income) other;
+ return otherIncome.getTitle().equals(getTitle())
+ && otherIncome.getAmount().equals(getAmount())
+ && otherIncome.getDate().equals(getDate())
+ && otherIncome.getCategories().equals(getCategories());
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Title.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Title.java
new file mode 100644
index 00000000000..6bf9a2d0f60
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Title.java
@@ -0,0 +1,63 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.AppUtil.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Represents a Transaction's title in the finance tracker.
+ * Guarantees: immutable; is valid as declared in {@link #isValidTitle(String)}
+ */
+public class Title implements Comparable<Title> {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "Titles should contain at least one non-whitespace printable ASCII character "
+ + "and cannot contain any characters that are not printable ASCII characters.";
+ public static final String MESSAGE_EMPTY_TITLE = "Titles cannot be empty.";
+ public static final String VALIDATION_REGEX = "\\p{Graph}\\p{Print}*";
+
+ private final String fullTitle;
+
+ /**
+ * Constructs a {@code Title}.
+ *
+ * @param title A valid title.
+ */
+ public Title(String title) {
+ requireNonNull(title);
+ checkArgument(isValidTitle(title), MESSAGE_CONSTRAINTS);
+ fullTitle = title;
+ }
+
+ /**
+ * Returns true if a given string is a valid title.
+ */
+ public static boolean isValidTitle(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ /**
+ * Returns a String representation of this Title that can be used to construct an identical Title.
+ * @return A String representation of this Title.
+ */
+ @Override
+ public String toString() {
+ return fullTitle;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Title // instanceof handles nulls
+ && fullTitle.equals(((Title) other).fullTitle)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return fullTitle.hashCode();
+ }
+
+ @Override
+ public int compareTo(Title title) {
+ return fullTitle.compareTo(title.fullTitle);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Transaction.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Transaction.java
new file mode 100644
index 00000000000..1e95b26a6d7
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/Transaction.java
@@ -0,0 +1,89 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.time.LocalDate;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+
+/**
+ * Represents a Transaction in the finance tracker.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public abstract class Transaction {
+
+ public static final Comparator<Transaction> TRANSACTION_COMPARATOR =
+ Comparator.comparing((Transaction t) -> t.date).reversed().thenComparing(t -> t.title);
+
+ public static final String MESSAGE_TITLE_CONSTRAINTS = "Transactions should only contain one title.";
+ public static final String MESSAGE_AMOUNT_CONSTRAINTS = "Transactions should only contain one amount.";
+ public static final String MESSAGE_DATE_CONSTRAINTS = "Transactions should only contain one date.";
+
+ // Identity fields
+ private final Title title;
+ private final Amount amount;
+ private final Date date;
+
+ // Data fields
+ private final Set<Category> categories = new HashSet<>();
+
+ /**
+ * Every field must be present and not null.
+ */
+ public Transaction(Title title, Amount amount, Date date, Set<Category> categories) {
+ requireAllNonNull(title, amount, date, categories);
+ this.title = title;
+ this.amount = amount;
+ this.date = date;
+ this.categories.addAll(categories);
+ }
+
+ public Title getTitle() {
+ return title;
+ }
+
+ public Amount getAmount() {
+ return amount;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
+ public LocalDate getDateValue() {
+ return date.getDate();
+ }
+
+ /**
+ * Returns an immutable category set, which throws {@code UnsupportedOperationException}
+ * if modification is attempted.
+ */
+ public Set<Category> getCategories() {
+ return Collections.unmodifiableSet(categories);
+ }
+
+ @Override
+ public int hashCode() {
+ // use this method for custom fields hashing instead of implementing your own
+ return Objects.hash(title, amount, date, categories);
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append(getTitle())
+ .append(" Amount: ")
+ .append(getAmount())
+ .append(" Date: ")
+ .append(getDate())
+ .append(" Categories: ");
+ getCategories().forEach(builder::append);
+ return builder.toString();
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TransactionList.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TransactionList.java
new file mode 100644
index 00000000000..1a67f63ec91
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TransactionList.java
@@ -0,0 +1,113 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.CollectionUtil.requireAllNonNull;
+import static ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction.TRANSACTION_COMPARATOR;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Iterator;
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.exceptions.TransactionNotFoundException;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+/**
+ * A list of transactions that does not allow nulls.
+ * The removal of a transaction uses Transaction#equals(Object) so as to ensure that the transaction with exactly the
+ * same fields will be removed.
+ *
+ * Supports a minimal set of list operations.
+ */
+public class TransactionList implements Iterable<Transaction> {
+
+ private final ObservableList<Transaction> internalList = FXCollections.observableArrayList();
+ private final ObservableList<Transaction> internalUnmodifiableList =
+ FXCollections.unmodifiableObservableList(internalList);
+
+ /**
+ * Adds a transaction to the list.
+ */
+ public void add(Transaction toAdd) {
+ requireNonNull(toAdd);
+ internalList.add(toAdd);
+ sortTransactions();
+ }
+
+ /**
+ * Replaces the transaction {@code target} in the list with {@code editedTransaction}.
+ * {@code target} must exist in the list.
+ * The transaction identity of {@code editedTransaction} must not be the same as another existing transaction in
+ * the list.
+ */
+ public void setTransaction(Transaction target, Transaction editedTransaction) {
+ requireAllNonNull(target, editedTransaction);
+
+ int index = internalList.indexOf(target);
+ if (index == -1) {
+ throw new TransactionNotFoundException();
+ }
+
+ internalList.set(index, editedTransaction);
+ sortTransactions();
+ }
+
+ /**
+ * Removes the equivalent transaction from the list.
+ * The transaction must exist in the list.
+ */
+ public void remove(Transaction toRemove) {
+ requireNonNull(toRemove);
+ if (!internalList.remove(toRemove)) {
+ throw new TransactionNotFoundException();
+ }
+ sortTransactions();
+ }
+
+ public void setTransactions(TransactionList replacement) {
+ requireNonNull(replacement);
+ internalList.setAll(replacement.internalList);
+ sortTransactions();
+ }
+
+ /**
+ * Replaces the contents of this list with {@code transactions}.
+ */
+ public void setTransactions(List<Transaction> transactions) {
+ requireAllNonNull(transactions);
+
+ internalList.setAll(transactions);
+ sortTransactions();
+ }
+
+ /**
+ * Sorts the list based on {@code TRANSACTION_COMPARATOR}.
+ */
+ public void sortTransactions() {
+ internalList.sort(TRANSACTION_COMPARATOR);
+ }
+
+ /**
+ * Returns the backing list as an unmodifiable {@code ObservableList}.
+ */
+ public ObservableList<Transaction> asUnmodifiableObservableList() {
+ return internalUnmodifiableList;
+ }
+
+ @Override
+ public Iterator<Transaction> iterator() {
+ return internalList.iterator();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof TransactionList // instanceof handles nulls
+ && internalList.equals(((TransactionList) other).internalList));
+ }
+
+ @Override
+ public int hashCode() {
+ return internalList.hashCode();
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/exceptions/TransactionNotFoundException.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/exceptions/TransactionNotFoundException.java
new file mode 100644
index 00000000000..93caf73d05e
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/exceptions/TransactionNotFoundException.java
@@ -0,0 +1,6 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified transaction.
+ */
+public class TransactionNotFoundException extends RuntimeException {}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasCategoriesPredicate.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasCategoriesPredicate.java
new file mode 100644
index 00000000000..0a62a0c8420
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasCategoriesPredicate.java
@@ -0,0 +1,31 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Tests that a {@code Transaction}'s {@code Category}s matches any of the categories given.
+ */
+public class HasCategoriesPredicate implements Predicate<Transaction> {
+ private final List<String> categories;
+
+ public HasCategoriesPredicate(List<String> categories) {
+ this.categories = categories;
+ }
+
+ @Override
+ public boolean test(Transaction transaction) {
+ return categories.stream().anyMatch(category -> transaction.getCategories().stream()
+ .map(x -> x.getCategoryName()).anyMatch(category::equalsIgnoreCase));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof HasCategoriesPredicate // instanceof handles nulls
+ && categories.equals(((HasCategoriesPredicate) other).categories)); // state check
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasExactAmountPredicate.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasExactAmountPredicate.java
new file mode 100644
index 00000000000..994eec65c52
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasExactAmountPredicate.java
@@ -0,0 +1,30 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Tests that a {@code Transaction}'s {@code Amount} matches the amount given.
+ */
+public class HasExactAmountPredicate implements Predicate<Transaction> {
+ private final Amount amount;
+
+ public HasExactAmountPredicate(Amount amount) {
+ this.amount = amount;
+ }
+
+ @Override
+ public boolean test(Transaction transaction) {
+ return amount.equals(transaction.getAmount());
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof HasExactAmountPredicate // instanceof handles nulls
+ && amount.equals(((HasExactAmountPredicate) other).amount)); // state check
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InAmountRangePredicate.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InAmountRangePredicate.java
new file mode 100644
index 00000000000..62e1b25d0d7
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InAmountRangePredicate.java
@@ -0,0 +1,51 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Tests that a {@code Transaction}'s {@code Amount} is within the given amount range.
+ */
+public class InAmountRangePredicate implements Predicate<Transaction> {
+ private final Optional<Amount> amountFrom;
+ private final Optional<Amount> amountTo;
+
+
+ /**
+ * Constructs a {@code InAmountRangePredicate}.
+ *
+ * @param amountFrom The lower bound of the amount range, if given.
+ * @param amountTo The upper bound of the amount range, if given.
+ */
+ public InAmountRangePredicate(Optional<Amount> amountFrom, Optional<Amount> amountTo) {
+ this.amountFrom = amountFrom;
+ this.amountTo = amountTo;
+ }
+
+ @Override
+ public boolean test(Transaction transaction) {
+ boolean testResult = true;
+
+ if (amountFrom.isPresent()) {
+ testResult = testResult && (amountFrom.get().compareTo(transaction.getAmount()) <= 0);
+ }
+
+ if (amountTo.isPresent()) {
+ testResult = testResult && amountTo.get().compareTo(transaction.getAmount()) >= 0;
+ }
+
+ return testResult;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof InAmountRangePredicate // instanceof handles nulls
+ && amountFrom.equals(((InAmountRangePredicate) other).amountFrom)
+ && amountTo.equals(((InAmountRangePredicate) other).amountTo)); // state check
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InDateRangePredicate.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InDateRangePredicate.java
new file mode 100644
index 00000000000..f6ac6360a2a
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InDateRangePredicate.java
@@ -0,0 +1,50 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Tests that a {@code Transaction}'s {@code Date} is with the given date range.
+ */
+public class InDateRangePredicate implements Predicate<Transaction> {
+ private final Optional<Date> dateFrom;
+ private final Optional<Date> dateTo;
+
+ /**
+ * Constructs a {@code InDateRangePredicate}.
+ *
+ * @param dateFrom The lower bound of the date range, if given.
+ * @param dateTo The upper bound of the date range, if given.
+ */
+ public InDateRangePredicate(Optional<Date> dateFrom, Optional<Date> dateTo) {
+ this.dateFrom = dateFrom;
+ this.dateTo = dateTo;
+ }
+
+ @Override
+ public boolean test(Transaction transaction) {
+ boolean testResult = true;
+
+ if (dateFrom.isPresent()) {
+ testResult = testResult && (dateFrom.get().compareTo(transaction.getDate()) <= 0);
+ }
+
+ if (dateTo.isPresent()) {
+ testResult = testResult && dateTo.get().compareTo(transaction.getDate()) >= 0;
+ }
+
+ return testResult;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof InDateRangePredicate // instanceof handles nulls
+ && dateFrom.equals(((InDateRangePredicate) other).dateFrom)
+ && dateTo.equals(((InDateRangePredicate) other).dateTo)); // state check
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/OnExactDatePredicate.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/OnExactDatePredicate.java
new file mode 100644
index 00000000000..ef8be462698
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/OnExactDatePredicate.java
@@ -0,0 +1,30 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Tests that a {@code Transaction}'s {@code Date} matches the date given.
+ */
+public class OnExactDatePredicate implements Predicate<Transaction> {
+ private final Date date;
+
+ public OnExactDatePredicate(Date date) {
+ this.date = date;
+ }
+
+ @Override
+ public boolean test(Transaction transaction) {
+ return date.equals(transaction.getDate());
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof OnExactDatePredicate // instanceof handles nulls
+ && date.equals(((OnExactDatePredicate) other).date)); // state check
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/TitleContainsKeyphrasesPredicate.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/TitleContainsKeyphrasesPredicate.java
new file mode 100644
index 00000000000..4ed48ac5ac9
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/TitleContainsKeyphrasesPredicate.java
@@ -0,0 +1,32 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.util.StringUtil;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Tests that a {@code Transaction}'s {@code Title} matches any of the keywords given.
+ */
+public class TitleContainsKeyphrasesPredicate implements Predicate<Transaction> {
+ private final List<String> keyphrases;
+
+ public TitleContainsKeyphrasesPredicate(List<String> keyphrases) {
+ this.keyphrases = keyphrases;
+ }
+
+ @Override
+ public boolean test(Transaction transaction) {
+ return keyphrases.stream()
+ .anyMatch(keyphrase -> StringUtil.containsIgnoreCase(transaction.getTitle().toString(), keyphrase));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof TitleContainsKeyphrasesPredicate // instanceof handles nulls
+ && keyphrases.equals(((TitleContainsKeyphrasesPredicate) other).keyphrases)); // state check
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/util/SampleDataUtil.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/util/SampleDataUtil.java
new file mode 100644
index 00000000000..b06de054b20
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/util/SampleDataUtil.java
@@ -0,0 +1,86 @@
+package ay2021s1_cs2103_w16_3.finesse.model.util;
+
+import java.util.Arrays;
+import java.util.Set;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Contains utility methods for populating {@code FinanceTracker} with sample data.
+ */
+public class SampleDataUtil {
+ private static final Logger logger = LogsCenter.getLogger(SampleDataUtil.class);
+
+ public static Transaction[] getSampleTransactions() {
+ return new Transaction[] {
+ new Expense(new Title("Bubble Tea"), new Amount("4.80"), new Date("14/10/2020"),
+ getCategoriesSet("Food & Beverage")),
+ new Expense(new Title("Tuition Fees"), new Amount("4221"), new Date("22/09/2020"),
+ getCategoriesSet("NUS", "GIRO")),
+ new Expense(new Title("Artificial Intelligence: A Modern Approach"), new Amount("139"),
+ new Date("15/08/2020"), getCategoriesSet("Textbook")),
+ new Income(new Title("Internship"), new Amount("560"), new Date("04/08/2020"),
+ getCategoriesSet("Work")),
+ new Income(new Title("Teaching Assistant"), new Amount("1920"), new Date("18/10/2020"),
+ getCategoriesSet("CS1101S", "CS2103T")),
+ new Income(new Title("Start-up Funding"), new Amount("10000"), new Date("01/10/2020"),
+ getCategoriesSet("NUS Enterprise"))
+ };
+ }
+
+ public static BookmarkExpense[] getBookmarkExpenses() {
+ return new BookmarkExpense[] {
+ new BookmarkExpense(new Title("Phone Bill"), new Amount("60"),
+ getCategoriesSet("Personal", "Utilities")),
+ new BookmarkExpense(new Title("Spotify Subscription"), new Amount("9.90"),
+ getCategoriesSet("Others"))
+ };
+ }
+
+ public static BookmarkIncome[] getBookmarkIncome() {
+ return new BookmarkIncome[] {
+ new BookmarkIncome(new Title("Internship"), new Amount("1000"),
+ getCategoriesSet("Work", "Stipend")),
+ new BookmarkIncome(new Title("Teaching Assistant"), new Amount("1890"),
+ getCategoriesSet("CS1101S", "CS1231S"))
+ };
+ }
+
+ public static ReadOnlyFinanceTracker getSampleFinanceTracker() {
+ logger.info("Populating Fine$$e with sample data...");
+ FinanceTracker sampleFt = new FinanceTracker();
+ for (Transaction sampleTransaction : getSampleTransactions()) {
+ sampleFt.addTransaction(sampleTransaction);
+ }
+ for (BookmarkExpense bookmarkExpense : getBookmarkExpenses()) {
+ sampleFt.addBookmarkExpense(bookmarkExpense);
+ }
+ for (BookmarkIncome bookmarkIncome : getBookmarkIncome()) {
+ sampleFt.addBookmarkIncome(bookmarkIncome);
+ }
+ return sampleFt;
+ }
+
+ /**
+ * Returns a category set containing the list of strings given.
+ */
+ public static Set<Category> getCategoriesSet(String... strings) {
+ return Arrays.stream(strings)
+ .map(Category::new)
+ .collect(Collectors.toSet());
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/FinanceTrackerStorage.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/FinanceTrackerStorage.java
new file mode 100644
index 00000000000..82bbbcd59a4
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/FinanceTrackerStorage.java
@@ -0,0 +1,46 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+
+/**
+ * Represents a storage for {@link FinanceTracker}.
+ */
+public interface FinanceTrackerStorage {
+
+ /**
+ * Returns the file path of the data file.
+ */
+ Path getFinanceTrackerFilePath();
+
+ /**
+ * Returns FinanceTracker data as a {@link ReadOnlyFinanceTracker}.
+ * Returns {@code Optional.empty()} if storage file is not found.
+ * @throws DataConversionException if the data in storage is not in the expected format.
+ * @throws IOException if there was any problem when reading from the storage.
+ */
+ Optional<ReadOnlyFinanceTracker> readFinanceTracker() throws DataConversionException, IOException;
+
+ /**
+ * @see #getFinanceTrackerFilePath()
+ */
+ Optional<ReadOnlyFinanceTracker> readFinanceTracker(Path filePath) throws DataConversionException, IOException;
+
+ /**
+ * Saves the given {@link ReadOnlyFinanceTracker} to the storage.
+ * @param financeTracker cannot be null.
+ * @throws IOException if there was any problem writing to the file.
+ */
+ void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker) throws IOException;
+
+ /**
+ * @see #saveFinanceTracker(ReadOnlyFinanceTracker)
+ */
+ void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker, Path filePath) throws IOException;
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedBookmarkExpense.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedBookmarkExpense.java
new file mode 100644
index 00000000000..735b1561fb9
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedBookmarkExpense.java
@@ -0,0 +1,83 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * JSON-friendly version of {@link BookmarkExpense}.
+ */
+public class JsonAdaptedBookmarkExpense {
+ public static final String MISSING_FIELD_MESSAGE_FORMAT = "BookmarkExpense's %s is missing!";
+
+ private final String title;
+ private final String amount;
+ private final List<JsonAdaptedCategory> categories = new ArrayList<>();
+
+ /**
+ * Constructs a {@code JsonAdaptedBookmarkExpense} with the given bookmark expense details.
+ */
+ @JsonCreator
+ public JsonAdaptedBookmarkExpense(@JsonProperty("title") String title, @JsonProperty("amount") String amount,
+ @JsonProperty("categories") List<JsonAdaptedCategory> categories) {
+ this.title = title;
+ this.amount = amount;
+ if (categories != null) {
+ this.categories.addAll(categories);
+ }
+ }
+
+ /**
+ * Converts a given {@code BookmarkExpense} into this class for Jackson use.
+ */
+ public JsonAdaptedBookmarkExpense(BookmarkExpense source) {
+ title = source.getTitle().toString();
+ amount = source.getAmount().toString();
+ categories.addAll(source.getCategories().stream()
+ .map(JsonAdaptedCategory::new)
+ .collect(Collectors.toList()));
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted bookmark expense object into the model's {@code BookmarkExpense} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted bookmark expense.
+ */
+ public BookmarkExpense toModelType() throws IllegalValueException {
+ final List<Category> transactionCategories = new ArrayList<>();
+ for (JsonAdaptedCategory category : categories) {
+ transactionCategories.add(category.toModelType());
+ }
+
+ if (title == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Title.class.getSimpleName()));
+ }
+ if (!Title.isValidTitle(title)) {
+ throw new IllegalValueException(Title.MESSAGE_CONSTRAINTS);
+ }
+ final Title modelTitle = new Title(title);
+
+ if (amount == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Amount.class.getSimpleName()));
+ }
+ if (!Amount.isValidAmount(amount)) {
+ throw new IllegalValueException(Amount.MESSAGE_CONSTRAINTS);
+ }
+ final Amount modelAmount = new Amount(amount);
+
+ final Set<Category> modelCategories = new HashSet<>(transactionCategories);
+ return new BookmarkExpense(modelTitle, modelAmount, modelCategories);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedBookmarkIncome.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedBookmarkIncome.java
new file mode 100644
index 00000000000..7021a9c1089
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedBookmarkIncome.java
@@ -0,0 +1,83 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * JSON-friendly version of {@link BookmarkIncome}.
+ */
+public class JsonAdaptedBookmarkIncome {
+ public static final String MISSING_FIELD_MESSAGE_FORMAT = "BookmarkIncome's %s is missing!";
+
+ private final String title;
+ private final String amount;
+ private final List<JsonAdaptedCategory> categories = new ArrayList<>();
+
+ /**
+ * Constructs a {@code JsonAdaptedBookmarkIncome} with the given bookmark income details.
+ */
+ @JsonCreator
+ public JsonAdaptedBookmarkIncome(@JsonProperty("title") String title, @JsonProperty("amount") String amount,
+ @JsonProperty("categories") List<JsonAdaptedCategory> categories) {
+ this.title = title;
+ this.amount = amount;
+ if (categories != null) {
+ this.categories.addAll(categories);
+ }
+ }
+
+ /**
+ * Converts a given {@code BookmarkIncome} into this class for Jackson use.
+ */
+ public JsonAdaptedBookmarkIncome(BookmarkIncome source) {
+ title = source.getTitle().toString();
+ amount = source.getAmount().toString();
+ categories.addAll(source.getCategories().stream()
+ .map(JsonAdaptedCategory::new)
+ .collect(Collectors.toList()));
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted bookmark income object into the model's {@code BookmarkIncome} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted bookmark income.
+ */
+ public BookmarkIncome toModelType() throws IllegalValueException {
+ final List<Category> transactionCategories = new ArrayList<>();
+ for (JsonAdaptedCategory category : categories) {
+ transactionCategories.add(category.toModelType());
+ }
+
+ if (title == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Title.class.getSimpleName()));
+ }
+ if (!Title.isValidTitle(title)) {
+ throw new IllegalValueException(Title.MESSAGE_CONSTRAINTS);
+ }
+ final Title modelTitle = new Title(title);
+
+ if (amount == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Amount.class.getSimpleName()));
+ }
+ if (!Amount.isValidAmount(amount)) {
+ throw new IllegalValueException(Amount.MESSAGE_CONSTRAINTS);
+ }
+ final Amount modelAmount = new Amount(amount);
+
+ final Set<Category> modelCategories = new HashSet<>(transactionCategories);
+ return new BookmarkIncome(modelTitle, modelAmount, modelCategories);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedCategory.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedCategory.java
new file mode 100644
index 00000000000..bd804b53831
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedCategory.java
@@ -0,0 +1,48 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+
+/**
+ * Jackson-friendly version of {@link Category}.
+ */
+class JsonAdaptedCategory {
+
+ private final String categoryName;
+
+ /**
+ * Constructs a {@code JsonAdaptedCategory} with the given {@code categoryName}.
+ */
+ @JsonCreator
+ public JsonAdaptedCategory(String categoryName) {
+ this.categoryName = categoryName;
+ }
+
+ /**
+ * Converts a given {@code Category} into this class for Jackson use.
+ */
+ public JsonAdaptedCategory(Category source) {
+ categoryName = source.getCategoryName();
+ }
+
+ @JsonValue
+ public String getCategoryName() {
+ return categoryName;
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted category object into the model's {@code Category} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted category.
+ */
+ public Category toModelType() throws IllegalValueException {
+ if (!Category.isValidCategoryName(categoryName)) {
+ throw new IllegalValueException(Category.MESSAGE_CONSTRAINTS);
+ }
+ return new Category(categoryName);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedExpense.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedExpense.java
new file mode 100644
index 00000000000..e53f8b87daa
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedExpense.java
@@ -0,0 +1,97 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * JSON-friendly version of {@link Expense}.
+ */
+class JsonAdaptedExpense {
+
+ public static final String MISSING_FIELD_MESSAGE_FORMAT = "Expense's %s field is missing!";
+
+ private final String title;
+ private final String amount;
+ private final String date;
+ private final List<JsonAdaptedCategory> categories = new ArrayList<>();
+
+ /**
+ * Constructs a {@code JsonAdaptedExpense} with the given transaction details.
+ */
+ @JsonCreator
+ public JsonAdaptedExpense(@JsonProperty("title") String title, @JsonProperty("amount") String amount,
+ @JsonProperty("date") String date,
+ @JsonProperty("categories") List<JsonAdaptedCategory> categories) {
+ this.title = title;
+ this.amount = amount;
+ this.date = date;
+ if (categories != null) {
+ this.categories.addAll(categories);
+ }
+ }
+
+ /**
+ * Converts a given {@code Expense} into this class for Jackson use.
+ */
+ public JsonAdaptedExpense(Expense source) {
+ title = source.getTitle().toString();
+ amount = source.getAmount().toString();
+ date = source.getDate().toString();
+ categories.addAll(source.getCategories().stream()
+ .map(JsonAdaptedCategory::new)
+ .collect(Collectors.toList()));
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted expense object into the model's {@code Expense} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted transaction.
+ */
+ public Expense toModelType() throws IllegalValueException {
+ final List<Category> transactionCategories = new ArrayList<>();
+ for (JsonAdaptedCategory category : categories) {
+ transactionCategories.add(category.toModelType());
+ }
+
+ if (title == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Title.class.getSimpleName()));
+ }
+ if (!Title.isValidTitle(title)) {
+ throw new IllegalValueException(Title.MESSAGE_CONSTRAINTS);
+ }
+ final Title modelTitle = new Title(title);
+
+ if (amount == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Amount.class.getSimpleName()));
+ }
+ if (!Amount.isValidAmount(amount)) {
+ throw new IllegalValueException(Amount.MESSAGE_CONSTRAINTS);
+ }
+ final Amount modelAmount = new Amount(amount);
+
+ if (date == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Date.class.getSimpleName()));
+ }
+ if (!Date.isValidDate(date)) {
+ throw new IllegalValueException(Date.MESSAGE_CONSTRAINTS);
+ }
+ final Date modelDate = new Date(date);
+
+ final Set<Category> modelCategories = new HashSet<>(transactionCategories);
+ return new Expense(modelTitle, modelAmount, modelDate, modelCategories);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedIncome.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedIncome.java
new file mode 100644
index 00000000000..0f2422a1d92
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedIncome.java
@@ -0,0 +1,97 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * JSON-friendly version of {@link Income}.
+ */
+class JsonAdaptedIncome {
+
+ public static final String MISSING_FIELD_MESSAGE_FORMAT = "Income's %s field is missing!";
+
+ private final String title;
+ private final String amount;
+ private final String date;
+ private final List<JsonAdaptedCategory> categories = new ArrayList<>();
+
+ /**
+ * Constructs a {@code JsonAdaptedIncome} with the given transaction details.
+ */
+ @JsonCreator
+ public JsonAdaptedIncome(@JsonProperty("title") String title, @JsonProperty("amount") String amount,
+ @JsonProperty("date") String date,
+ @JsonProperty("categories") List<JsonAdaptedCategory> categories) {
+ this.title = title;
+ this.amount = amount;
+ this.date = date;
+ if (categories != null) {
+ this.categories.addAll(categories);
+ }
+ }
+
+ /**
+ * Converts a given {@code Income} into this class for Jackson use.
+ */
+ public JsonAdaptedIncome(Income source) {
+ title = source.getTitle().toString();
+ amount = source.getAmount().toString();
+ date = source.getDate().toString();
+ categories.addAll(source.getCategories().stream()
+ .map(JsonAdaptedCategory::new)
+ .collect(Collectors.toList()));
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted transaction object into the model's {@code Income} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted transaction.
+ */
+ public Income toModelType() throws IllegalValueException {
+ final List<Category> transactionCategories = new ArrayList<>();
+ for (JsonAdaptedCategory category : categories) {
+ transactionCategories.add(category.toModelType());
+ }
+
+ if (title == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Title.class.getSimpleName()));
+ }
+ if (!Title.isValidTitle(title)) {
+ throw new IllegalValueException(Title.MESSAGE_CONSTRAINTS);
+ }
+ final Title modelTitle = new Title(title);
+
+ if (amount == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Amount.class.getSimpleName()));
+ }
+ if (!Amount.isValidAmount(amount)) {
+ throw new IllegalValueException(Amount.MESSAGE_CONSTRAINTS);
+ }
+ final Amount modelAmount = new Amount(amount);
+
+ if (date == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Date.class.getSimpleName()));
+ }
+ if (!Date.isValidDate(date)) {
+ throw new IllegalValueException(Date.MESSAGE_CONSTRAINTS);
+ }
+ final Date modelDate = new Date(date);
+
+ final Set<Category> modelCategories = new HashSet<>(transactionCategories);
+ return new Income(modelTitle, modelAmount, modelDate, modelCategories);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedMonthlyBudget.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedMonthlyBudget.java
new file mode 100644
index 00000000000..2762301de05
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedMonthlyBudget.java
@@ -0,0 +1,59 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+/**
+ * JSON-friendly version of {@link MonthlyBudget}.
+ */
+class JsonAdaptedMonthlyBudget {
+
+ public static final String MISSING_FIELD_MESSAGE_FORMAT = "Monthly Budget's %s field is missing!";
+
+ private final String expenseLimit;
+ private final String savingsGoal;
+
+ /**
+ * Constructs a {@code JsonAdaptedMonthlyBudget} with the given transaction details.
+ */
+ @JsonCreator
+ public JsonAdaptedMonthlyBudget(@JsonProperty("expenseLimit") String expenseLimit,
+ @JsonProperty("savingsGoal") String savingsGoal) {
+ this.expenseLimit = expenseLimit;
+ this.savingsGoal = savingsGoal;
+ }
+
+ /**
+ * Converts a given {@code MonthlyBudget} into this class for Jackson use.
+ */
+ public JsonAdaptedMonthlyBudget(MonthlyBudget source) {
+ expenseLimit = source.getMonthlyExpenseLimit().get().toString();
+ savingsGoal = source.getMonthlySavingsGoal().get().toString();
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted monthly budget object into the model's {@code MonthlyBudget} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted monthly budget.
+ */
+ public MonthlyBudget toModelType() throws IllegalValueException {
+ final MonthlyBudget monthlyBudget = new MonthlyBudget();
+ if (expenseLimit == null || savingsGoal == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Title.class.getSimpleName()));
+ }
+
+ if (!Amount.isValidAmount(expenseLimit) || !Amount.isValidAmount(savingsGoal)) {
+ throw new IllegalValueException(Amount.MESSAGE_CONSTRAINTS);
+ }
+
+ monthlyBudget.setMonthlyExpenseLimit(new Amount(expenseLimit));
+ monthlyBudget.setMonthlySavingsGoal(new Amount(savingsGoal));
+ return monthlyBudget;
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonFinanceTrackerStorage.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonFinanceTrackerStorage.java
new file mode 100644
index 00000000000..cd95e27eb66
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonFinanceTrackerStorage.java
@@ -0,0 +1,80 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.FileUtil;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.JsonUtil;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+
+/**
+ * A class to access FinanceTracker data stored as a json file on the hard disk.
+ */
+public class JsonFinanceTrackerStorage implements FinanceTrackerStorage {
+
+ private static final Logger logger = LogsCenter.getLogger(JsonFinanceTrackerStorage.class);
+
+ private Path filePath;
+
+ public JsonFinanceTrackerStorage(Path filePath) {
+ this.filePath = filePath;
+ }
+
+ public Path getFinanceTrackerFilePath() {
+ return filePath;
+ }
+
+ @Override
+ public Optional<ReadOnlyFinanceTracker> readFinanceTracker() throws DataConversionException {
+ return readFinanceTracker(filePath);
+ }
+
+ /**
+ * Similar to {@link #readFinanceTracker()}.
+ *
+ * @param filePath location of the data. Cannot be null.
+ * @throws DataConversionException if the file is not in the correct format.
+ */
+ public Optional<ReadOnlyFinanceTracker> readFinanceTracker(Path filePath) throws DataConversionException {
+ requireNonNull(filePath);
+
+ Optional<JsonSerializableFinanceTracker> jsonFinanceTracker = JsonUtil.readJsonFile(
+ filePath, JsonSerializableFinanceTracker.class);
+ if (!jsonFinanceTracker.isPresent()) {
+ return Optional.empty();
+ }
+
+ try {
+ return Optional.of(jsonFinanceTracker.get().toModelType());
+ } catch (IllegalValueException ive) {
+ logger.info("Illegal values found in " + filePath + ": " + ive.getMessage());
+ throw new DataConversionException(ive);
+ }
+ }
+
+ @Override
+ public void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker) throws IOException {
+ saveFinanceTracker(financeTracker, filePath);
+ }
+
+ /**
+ * Similar to {@link #saveFinanceTracker(ReadOnlyFinanceTracker)}.
+ *
+ * @param filePath location of the data. Cannot be null.
+ */
+ public void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker, Path filePath) throws IOException {
+ requireNonNull(financeTracker);
+ requireNonNull(filePath);
+
+ FileUtil.createIfMissing(filePath);
+ JsonUtil.saveJsonFile(new JsonSerializableFinanceTracker(financeTracker), filePath);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonSerializableFinanceTracker.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonSerializableFinanceTracker.java
new file mode 100644
index 00000000000..26c5ece4e40
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonSerializableFinanceTracker.java
@@ -0,0 +1,94 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+
+/**
+ * An Immutable FinanceTracker that is serializable to JSON format.
+ */
+@JsonRootName(value = "fine$$e")
+class JsonSerializableFinanceTracker {
+
+ private final List<JsonAdaptedExpense> expenses = new ArrayList<>();
+ private final List<JsonAdaptedIncome> incomes = new ArrayList<>();
+ private final List<JsonAdaptedBookmarkExpense> bookmarkExpenses = new ArrayList<>();
+ private final List<JsonAdaptedBookmarkIncome> bookmarkIncomes = new ArrayList<>();
+ private final JsonAdaptedMonthlyBudget monthlyBudget;
+
+ /**
+ * Constructs a {@code JsonSerializableFinanceTracker} with the given transactions.
+ */
+ @JsonCreator
+ public JsonSerializableFinanceTracker(@JsonProperty("expenses") List<JsonAdaptedExpense> expenses,
+ @JsonProperty("incomes") List<JsonAdaptedIncome> incomes,
+ @JsonProperty("bookmarkExpenses") List<JsonAdaptedBookmarkExpense> bookmarkExpenses,
+ @JsonProperty("bookmarkIncomes") List<JsonAdaptedBookmarkIncome> bookmarkIncomes,
+ @JsonProperty("monthlyBudget") JsonAdaptedMonthlyBudget monthlyBudget) {
+ this.expenses.addAll(expenses);
+ this.incomes.addAll(incomes);
+ this.bookmarkExpenses.addAll(bookmarkExpenses);
+ this.bookmarkIncomes.addAll(bookmarkIncomes);
+ this.monthlyBudget = monthlyBudget;
+ }
+
+ /**
+ * Converts a given {@code ReadOnlyFinanceTracker} into this class for Jackson use.
+ *
+ * @param source future changes to this will not affect the created {@code JsonSerializableFinanceTracker}.
+ */
+ public JsonSerializableFinanceTracker(ReadOnlyFinanceTracker source) {
+ expenses.addAll(source.getExpenseList().stream().map(JsonAdaptedExpense::new)
+ .collect(Collectors.toList()));
+ incomes.addAll(source.getIncomeList().stream().map(JsonAdaptedIncome::new)
+ .collect(Collectors.toList()));
+ bookmarkExpenses.addAll(source.getBookmarkExpenseList().stream().map(JsonAdaptedBookmarkExpense::new)
+ .collect(Collectors.toList()));
+ bookmarkIncomes.addAll(source.getBookmarkIncomeList().stream().map(JsonAdaptedBookmarkIncome::new)
+ .collect(Collectors.toList()));
+ monthlyBudget = new JsonAdaptedMonthlyBudget(source.getMonthlyBudget());
+ }
+
+ /**
+ * Converts this finance tracker into the model's {@code FinanceTracker} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated.
+ */
+ public FinanceTracker toModelType() throws IllegalValueException {
+ FinanceTracker financeTracker = new FinanceTracker();
+ for (JsonAdaptedExpense jsonAdaptedExpense : expenses) {
+ Expense expense = jsonAdaptedExpense.toModelType();
+ financeTracker.addTransaction(expense);
+ }
+ for (JsonAdaptedIncome jsonAdaptedIncome : incomes) {
+ Income income = jsonAdaptedIncome.toModelType();
+ financeTracker.addTransaction(income);
+ }
+ for (JsonAdaptedBookmarkExpense jsonAdaptedBookmarkExpense : bookmarkExpenses) {
+ BookmarkExpense bookmarkExpense = jsonAdaptedBookmarkExpense.toModelType();
+ financeTracker.addBookmarkExpense(bookmarkExpense);
+ }
+ for (JsonAdaptedBookmarkIncome jsonAdaptedBookmarkIncome : bookmarkIncomes) {
+ BookmarkIncome bookmarkIncome = jsonAdaptedBookmarkIncome.toModelType();
+ financeTracker.addBookmarkIncome(bookmarkIncome);
+ }
+ MonthlyBudget budget = monthlyBudget.toModelType();
+ financeTracker.setMonthlyBudget(budget);
+ financeTracker.calculateBudgetInfo();
+ return financeTracker;
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonUserPrefsStorage.java
similarity index 78%
rename from src/main/java/seedu/address/storage/JsonUserPrefsStorage.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonUserPrefsStorage.java
index bc2bbad84aa..d5531443619 100644
--- a/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonUserPrefsStorage.java
@@ -1,13 +1,13 @@
-package seedu.address.storage;
+package ay2021s1_cs2103_w16_3.finesse.storage;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Optional;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.commons.util.JsonUtil;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.JsonUtil;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyUserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
/**
* A class to access UserPrefs stored in the hard disk as a json file
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/Storage.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/Storage.java
new file mode 100644
index 00000000000..ac0699b24f8
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/Storage.java
@@ -0,0 +1,32 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyUserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+
+/**
+ * API of the Storage component
+ */
+public interface Storage extends FinanceTrackerStorage, UserPrefsStorage {
+
+ @Override
+ Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException;
+
+ @Override
+ void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException;
+
+ @Override
+ Path getFinanceTrackerFilePath();
+
+ @Override
+ Optional<ReadOnlyFinanceTracker> readFinanceTracker() throws DataConversionException, IOException;
+
+ @Override
+ void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker) throws IOException;
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/StorageManager.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/StorageManager.java
new file mode 100644
index 00000000000..ad13b6cdcc1
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/StorageManager.java
@@ -0,0 +1,80 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyUserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+
+/**
+ * Manages storage of FinanceTracker data in local storage.
+ */
+public class StorageManager implements Storage {
+
+ private static final Logger logger = LogsCenter.getLogger(StorageManager.class);
+ private FinanceTrackerStorage financeTrackerStorage;
+ private UserPrefsStorage userPrefsStorage;
+
+ /**
+ * Creates a {@code StorageManager} with the given {@code FinanceTrackerStorage} and {@code UserPrefStorage}.
+ */
+ public StorageManager(FinanceTrackerStorage financeTrackerStorage, UserPrefsStorage userPrefsStorage) {
+ super();
+ this.financeTrackerStorage = financeTrackerStorage;
+ this.userPrefsStorage = userPrefsStorage;
+ }
+
+ // ================ UserPrefs methods ==============================
+
+ @Override
+ public Path getUserPrefsFilePath() {
+ return userPrefsStorage.getUserPrefsFilePath();
+ }
+
+ @Override
+ public Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException {
+ return userPrefsStorage.readUserPrefs();
+ }
+
+ @Override
+ public void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException {
+ userPrefsStorage.saveUserPrefs(userPrefs);
+ }
+
+
+ // ================ FinanceTracker methods ==============================
+
+ @Override
+ public Path getFinanceTrackerFilePath() {
+ return financeTrackerStorage.getFinanceTrackerFilePath();
+ }
+
+ @Override
+ public Optional<ReadOnlyFinanceTracker> readFinanceTracker() throws DataConversionException, IOException {
+ return readFinanceTracker(financeTrackerStorage.getFinanceTrackerFilePath());
+ }
+
+ @Override
+ public Optional<ReadOnlyFinanceTracker> readFinanceTracker(Path filePath) throws DataConversionException,
+ IOException {
+ logger.fine("Attempting to read data from file: " + filePath);
+ return financeTrackerStorage.readFinanceTracker(filePath);
+ }
+
+ @Override
+ public void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker) throws IOException {
+ saveFinanceTracker(financeTracker, financeTrackerStorage.getFinanceTrackerFilePath());
+ }
+
+ @Override
+ public void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker, Path filePath) throws IOException {
+ logger.fine("Attempting to write to data file: " + filePath);
+ financeTrackerStorage.saveFinanceTracker(financeTracker, filePath);
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/UserPrefsStorage.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/UserPrefsStorage.java
similarity index 66%
rename from src/main/java/seedu/address/storage/UserPrefsStorage.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/UserPrefsStorage.java
index 29eef178dbc..4c0bb810ed4 100644
--- a/src/main/java/seedu/address/storage/UserPrefsStorage.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/storage/UserPrefsStorage.java
@@ -1,15 +1,15 @@
-package seedu.address.storage;
+package ay2021s1_cs2103_w16_3.finesse.storage;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Optional;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyUserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
/**
- * Represents a storage for {@link seedu.address.model.UserPrefs}.
+ * Represents a storage for {@link ay2021s1_cs2103_w16_3.finesse.model.UserPrefs}.
*/
public interface UserPrefsStorage {
@@ -27,7 +27,7 @@ public interface UserPrefsStorage {
Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException;
/**
- * Saves the given {@link seedu.address.model.ReadOnlyUserPrefs} to the storage.
+ * Saves the given {@link ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyUserPrefs} to the storage.
* @param userPrefs cannot be null.
* @throws IOException if there was any problem writing to the file.
*/
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/CommandBox.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/CommandBox.java
new file mode 100644
index 00000000000..017f3cf6fb3
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/CommandBox.java
@@ -0,0 +1,116 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions.TemporalException;
+import ay2021s1_cs2103_w16_3.finesse.model.command.history.CommandHistory;
+import javafx.beans.binding.BooleanBinding;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+
+/**
+ * The UI component that is responsible for receiving user command inputs.
+ */
+public class CommandBox extends UiPart<Region> {
+ private static final String FXML = "CommandBox.fxml";
+
+ private final CommandExecutor commandExecutor;
+ private final CommandHistory commandHistory;
+
+ @FXML
+ private HBox commandBoxContainer;
+ @FXML
+ private TextField commandTextField;
+ @FXML
+ private Label commandBoxLabel;
+ @FXML
+ private Button commandBoxButton;
+
+ /**
+ * Creates a {@code CommandBox} with the given {@code CommandExecutor}.
+ */
+ public CommandBox(CommandExecutor commandExecutor, CommandHistory commandHistory) {
+ super(FXML);
+ this.commandExecutor = commandExecutor;
+ this.commandHistory = commandHistory;
+
+ // Set up cycling through command history.
+ commandTextField.setOnKeyPressed(keyEvent -> {
+ String command;
+ switch (keyEvent.getCode()) {
+ case UP:
+ command = commandHistory.navigateUp();
+ break;
+ case DOWN:
+ command = commandHistory.navigateDown();
+ break;
+ default:
+ return;
+ }
+
+ if (command == null) {
+ commandTextField.clear();
+ } else {
+ // If 'command' is the empty string, 'setText' does nothing.
+ commandTextField.setText(command);
+ }
+
+ // Set the caret position to the end of the text field.
+ commandTextField.positionCaret(commandTextField.getLength());
+ });
+
+ commandBoxContainer.setSpacing(10);
+ BooleanBinding isUserInputEmpty = new BooleanBinding() {
+ {
+ super.bind(commandTextField.textProperty());
+ }
+ @Override
+ protected boolean computeValue() {
+ return commandTextField.getText().isEmpty();
+ }
+ };
+ commandBoxButton.disableProperty().bind(isUserInputEmpty);
+ }
+
+ /**
+ * Handles the Enter button pressed event.
+ */
+ @FXML
+ private void handleCommandEntered() {
+ try {
+ String userInput = commandTextField.getText();
+ if (userInput.isEmpty()) {
+ return;
+ }
+
+ // Push user input into command history.
+ commandHistory.addCommand(userInput);
+
+ // Clear text field.
+ commandTextField.clear();
+
+ commandExecutor.execute(userInput);
+ } catch (CommandException | ParseException | TemporalException ignored) {
+ // Do nothing.
+ }
+ }
+
+ /**
+ * Represents a function that can execute commands.
+ */
+ @FunctionalInterface
+ public interface CommandExecutor {
+ /**
+ * Executes the command and returns the result.
+ *
+ * @see ay2021s1_cs2103_w16_3.finesse.logic.Logic#execute(String, UiState)
+ */
+ CommandResult execute(String commandText) throws CommandException, ParseException, TemporalException;
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/DisabledWindow.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/DisabledWindow.java
new file mode 100644
index 00000000000..4e83c3b78f5
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/DisabledWindow.java
@@ -0,0 +1,45 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import javafx.beans.binding.Bindings;
+import javafx.fxml.FXML;
+import javafx.scene.Parent;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+
+public class DisabledWindow extends UiPart<Parent> {
+ private static final String FXML = "DisabledWindow.fxml";
+ private static final String CREDITS_LABEL = "Image courtesy of InnerSloth and UnitedWorldMedia";
+ private static final String DETAILS_LABEL = "A regression in the system time was detected. "
+ + "In order to safeguard against loss of data, Fine$$e has been disabled. "
+ + "Please ensure that your system time is correct, then restart Fine$$e.";
+ private final Image image = new Image(this.getClass()
+ .getResourceAsStream("/images/sus.png"));
+
+ @FXML
+ private Label creditsLabel;
+ @FXML
+ private Label detailsLabel;
+ @FXML
+ private ImageView imageView;
+ @FXML
+ private Pane imageContainer;
+
+ /**
+ * Creates a {@code DisabledWindow}.
+ */
+ public DisabledWindow() {
+ super(FXML);
+
+ // Initialize label messages.
+ creditsLabel.setText(CREDITS_LABEL);
+ detailsLabel.setText(DETAILS_LABEL);
+
+ // Set up image.
+ imageView.setImage(image);
+ imageView.layoutXProperty().bind(imageContainer.widthProperty()
+ .subtract(Bindings.min(imageView.fitHeightProperty(), imageView.fitWidthProperty()))
+ .divide(3));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/MainWindow.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/MainWindow.java
new file mode 100644
index 00000000000..98691b1951c
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/MainWindow.java
@@ -0,0 +1,303 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Optional;
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.logic.Logic;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions.TemporalException;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.ui.tabs.AnalyticsTabPane;
+import ay2021s1_cs2103_w16_3.finesse.ui.tabs.ExpenseTabPane;
+import ay2021s1_cs2103_w16_3.finesse.ui.tabs.IncomeTabPane;
+import ay2021s1_cs2103_w16_3.finesse.ui.tabs.OverviewTabPane;
+import ay2021s1_cs2103_w16_3.finesse.ui.tabs.UserGuideTabPane;
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.SelectionModel;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+
+/**
+ * The Main Window. Provides the basic application layout containing
+ * a menu bar and space where other JavaFX elements can be placed.
+ */
+public class MainWindow extends UiPart<Stage> {
+
+ private static final String FXML = "MainWindow.fxml";
+
+ private static final String WELCOME_MESSAGE = "Welcome to Fine$$e - your personal finance tracker."
+ + "\nPlease enter the command \"help\" to view the user guide on the various commands you can use.";
+
+ private final Logger logger = LogsCenter.getLogger(getClass());
+
+ private final Stage primaryStage;
+ private final Model model;
+ private final Logic logic;
+ private final UiState uiState;
+
+ // Independent Ui parts residing in this Ui container
+ private ResultDisplay resultDisplay;
+
+ @FXML
+ private StackPane commandBoxPlaceholder;
+ @FXML
+ private Button commandBoxButton;
+ @FXML
+ private StackPane resultDisplayPlaceholder;
+ @FXML
+ private Tab overviewTab;
+ @FXML
+ private Tab incomeTab;
+ @FXML
+ private Tab expenseTab;
+ @FXML
+ private Tab analyticsTab;
+ @FXML
+ private Tab userGuideTab;
+ @FXML
+ private ToggleButton userGuideButton;
+ @FXML
+ private TabPane tabPane;
+ @FXML
+ private Text expenseLimit;
+
+ // Window size and position information when application is not fullscreen.
+ private double windowWidth;
+ private double windowHeight;
+ private int xPosition;
+ private int yPosition;
+
+ /**
+ * Creates a {@code MainWindow} with the given {@code Stage}, {@code Logic} and {@code UiState}.
+ */
+ public MainWindow(Stage primaryStage, Model model, Logic logic, UiState uiState) {
+ super(FXML, primaryStage);
+
+ // Set dependencies
+ this.primaryStage = primaryStage;
+ this.model = model;
+ this.logic = logic;
+ this.uiState = uiState;
+
+ // Configure the UI
+ setWindowDefaultSize(logic.getGuiSettings());
+
+ // Keep track of window size and position when application is not fullscreen.
+ initializeWindowListeners();
+ }
+
+ public Stage getPrimaryStage() {
+ return primaryStage;
+ }
+
+ /**
+ * Fills up all the placeholders of this window.
+ */
+ public void fillInnerParts() {
+ resultDisplay = new ResultDisplay();
+ resultDisplay.setFeedbackToUser(WELCOME_MESSAGE);
+ resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
+
+ CommandBox commandBox = new CommandBox(this::executeCommand, model.getCommandHistory());
+ commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
+ }
+
+ /**
+ * Initialize the contents of each tab.
+ */
+ public void initializeTabs() {
+ // Set up tab contents.
+ OverviewTabPane overviewTabPane =
+ new OverviewTabPane(logic.getFilteredTransactionList(), logic.getMonthlyBudget());
+ overviewTab.setContent(overviewTabPane.getRoot());
+
+ IncomeTabPane incomeTabPane =
+ new IncomeTabPane(logic.getFilteredIncomeList(), logic.getFilteredBookmarkIncomeList());
+ incomeTab.setContent(incomeTabPane.getRoot());
+
+ ExpenseTabPane expenseTabPane =
+ new ExpenseTabPane(logic.getFilteredExpenseList(), logic.getFilteredBookmarkExpenseList());
+ expenseTab.setContent(expenseTabPane.getRoot());
+
+ AnalyticsTabPane analyticsTabPane = new AnalyticsTabPane(logic.getMonthlyBudget());
+ analyticsTab.setContent(analyticsTabPane.getRoot());
+
+ UserGuideTabPane userGuideTabPane = new UserGuideTabPane();
+ userGuideTab.setContent(userGuideTabPane.getRoot());
+
+ // Set default selection.
+ SelectionModel<Tab> selectionModel = tabPane.getSelectionModel();
+ selectionModel.select(overviewTab);
+
+ // Set the bottom anchor after the tabs have been initialized.
+ AnchorPane.setBottomAnchor(tabPane, 0.0);
+
+ tabPane.getSelectionModel().selectedIndexProperty().addListener((observable, oldTabIndex, newTabIndex) -> {
+ // Update UI state on tab change.
+ uiState.setCurrentTab(UiState.Tab.values()[newTabIndex.intValue()]);
+
+ // Disable the user guide tab when not selected to prevent the user from clicking the invisible tab.
+ userGuideTab.setDisable(newTabIndex.intValue() != UiState.Tab.USER_GUIDE.getTabIndex().getZeroBased());
+
+ // Set the user guide button to be unselected.
+ userGuideButton.setSelected(false);
+ });
+
+ // Disable tab scrolling using arrow keys.
+ tabPane.addEventFilter(KeyEvent.ANY, Event::consume);
+ }
+
+ /**
+ * Sets the default size based on {@code guiSettings}.
+ */
+ private void setWindowDefaultSize(GuiSettings guiSettings) {
+ // Set minimum window size.
+ primaryStage.setMinHeight(650.0);
+ primaryStage.setMinWidth(900.0);
+
+ // Retrieve window size and position from previous session.
+ windowHeight = guiSettings.getWindowHeight();
+ windowWidth = guiSettings.getWindowWidth();
+ if (guiSettings.getWindowCoordinates() != null) {
+ xPosition = (int) guiSettings.getWindowCoordinates().getX();
+ yPosition = (int) guiSettings.getWindowCoordinates().getY();
+ }
+
+ // Restore window size and position from previous session.
+ primaryStage.setHeight(windowHeight);
+ primaryStage.setWidth(windowWidth);
+ if (guiSettings.getWindowCoordinates() != null) {
+ primaryStage.setX(xPosition);
+ primaryStage.setY(yPosition);
+ }
+ primaryStage.setMaximized(guiSettings.isFullscreen());
+ }
+
+ /**
+ * Initializes listeners for the window size and position.
+ */
+ private void initializeWindowListeners() {
+ primaryStage.widthProperty().addListener(((observableValue, oldWidth, newWidth) -> {
+ if (!primaryStage.isMaximized()) {
+ windowWidth = newWidth.doubleValue();
+ }
+ }));
+ primaryStage.heightProperty().addListener((observableValue, oldHeight, newHeight) -> {
+ if (!primaryStage.isMaximized()) {
+ windowHeight = newHeight.doubleValue();
+ }
+ });
+ // The x and y properties are set before the application is considered maximised.
+ // Hence, we check whether they are non-negative values instead when setting.
+ primaryStage.xProperty().addListener((observableValue, oldX, newX) -> {
+ if (newX.intValue() >= 0) {
+ xPosition = newX.intValue();
+ }
+ });
+ primaryStage.yProperty().addListener((observableValue, oldY, newY) -> {
+ if (newY.intValue() >= 0) {
+ yPosition = newY.intValue();
+ }
+ });
+ }
+
+ /**
+ * Switches to the hidden user guide tab and sets the user guide button to be selected.
+ */
+ @FXML
+ public void switchToUserGuideTab() {
+ tabPane.getSelectionModel().select(userGuideTab);
+ userGuideButton.setSelected(true);
+ }
+
+ void show() {
+ primaryStage.show();
+ }
+
+ /**
+ * Closes the application.
+ */
+ @FXML
+ private void handleExit() {
+ GuiSettings guiSettings =
+ new GuiSettings(windowWidth, windowHeight, xPosition, yPosition, primaryStage.isMaximized());
+ logic.setGuiSettings(guiSettings);
+ primaryStage.hide();
+ }
+
+ /**
+ * Disables the application and displays a fullscreen error message.
+ */
+ private void disableApplication() {
+ DisabledWindow disabledWindow = new DisabledWindow();
+ // Cannot setScene directly as the new scene will not be sized correctly.
+ primaryStage.getScene().setRoot(disabledWindow.getRoot());
+ }
+
+ /**
+ * Executes the command and returns the result.
+ *
+ * @see ay2021s1_cs2103_w16_3.finesse.logic.Logic#execute(String, UiState)
+ */
+ private CommandResult executeCommand(String commandText)
+ throws CommandException, ParseException, TemporalException {
+ try {
+ CommandResult commandResult = logic.execute(commandText, uiState);
+ logger.info("Result: " + commandResult.getFeedbackToUser());
+ resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
+
+ if (commandResult.isShowHelp()) {
+ switchToUserGuideTab();
+ }
+
+ if (commandResult.isExit()) {
+ handleExit();
+ }
+
+ if (commandResult.isCalculateBudgetInfo()) {
+ logic.calculateBudgetInfo();
+ }
+
+ Optional<UiState.Tab> tabToSwitchTo = commandResult.getTabToSwitchTo();
+ tabToSwitchTo.ifPresent(this::switchTabs);
+
+ return commandResult;
+ } catch (TemporalException e) {
+ resultDisplay.setFeedbackToUser(e.getMessage());
+ disableApplication();
+ throw e;
+ } catch (CommandException | ParseException e) {
+ logger.info("Invalid command: " + commandText);
+ resultDisplay.setFeedbackToUser(e.getMessage());
+ throw e;
+ }
+ }
+
+ /**
+ * Programmatically switches UI tab based on the specified tab.
+ *
+ * @param tab The tab to switch to.
+ * @throws NullPointerException If the tab is {@code null}.
+ */
+ private void switchTabs(UiState.Tab tab) {
+ requireNonNull(tab);
+ tabPane.getSelectionModel().select(tab.getTabIndex().getZeroBased());
+ if (tab.equals(UiState.Tab.OVERVIEW)) {
+ logic.calculateBudgetInfo();
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/ui/ResultDisplay.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/ResultDisplay.java
similarity index 93%
rename from src/main/java/seedu/address/ui/ResultDisplay.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/ResultDisplay.java
index 7d98e84eedf..2c43878e56c 100644
--- a/src/main/java/seedu/address/ui/ResultDisplay.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/ResultDisplay.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package ay2021s1_cs2103_w16_3.finesse.ui;
import static java.util.Objects.requireNonNull;
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/SavingsGoalCard.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/SavingsGoalCard.java
new file mode 100644
index 00000000000..c096b7d82d5
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/SavingsGoalCard.java
@@ -0,0 +1,90 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
+
+/**
+ * A UI component displaying all the information from monthly budget.
+ */
+public class SavingsGoalCard extends UiPart<Region> {
+ private static final String FXML = "SavingsGoalCard.fxml";
+ private final Image savingsPanelPicture = new Image(this.getClass()
+ .getResourceAsStream("/images/SavingsImage.png"));
+
+ @FXML
+ private Label monthlyExpenseLimit;
+ @FXML
+ private Label monthlySavingsGoal;
+ @FXML
+ private Label budgetStatus;
+ @FXML
+ private Label savingsStatus;
+ @FXML
+ private Pane imageContainer;
+ @FXML
+ private ImageView savingsPicture;
+
+ /**
+ * Creates a {@code }SavingsGoalCard} using the information from the given {@code MonthlyBudget}.
+ */
+ public SavingsGoalCard(MonthlyBudget monthlyBudget) {
+ super(FXML);
+
+ AtomicBoolean isBudgetDeficit = new AtomicBoolean();
+ AtomicBoolean isSavingsDeficit = new AtomicBoolean();
+
+ StringBinding expenseLimitBinding = Bindings.createStringBinding(() ->
+ String.format(
+ "Monthly Expense Limit: %s",
+ monthlyBudget.getMonthlyExpenseLimit().get().toString()),
+ monthlyBudget.getMonthlyExpenseLimit());
+
+ StringBinding savingsGoalBinding = Bindings.createStringBinding(() ->
+ String.format(
+ "Monthly Savings Goal: %s",
+ monthlyBudget.getMonthlySavingsGoal().get().toString()),
+ monthlyBudget.getMonthlySavingsGoal());
+
+ StringBinding budgetStatusBinding = Bindings.createStringBinding(() -> {
+ if (monthlyBudget.getRemainingBudget().get().isNonNegative()) {
+ budgetStatus.setStyle("-fx-text-fill: white");
+ return String.format("Remaining Budget: %s",
+ monthlyBudget.getRemainingBudget().get().toString());
+ } else {
+ budgetStatus.setStyle("-fx-text-fill: #FF4D4D");
+ return String.format("Budget Deficit: %s",
+ monthlyBudget.getRemainingBudget().get().toString());
+ }
+ }, monthlyBudget.getRemainingBudget());
+
+ StringBinding savingsStatusBinding = Bindings.createStringBinding(() -> {
+ if (monthlyBudget.getCurrentSavings().get().isNonNegative()) {
+ savingsStatus.setStyle("-fx-text-fill: white");
+ return String.format("Current Savings: %s",
+ monthlyBudget.getCurrentSavings().get().toString());
+ } else {
+ savingsStatus.setStyle("-fx-text-fill: #FF4D4D");
+ return String.format("Savings Deficit: %s",
+ monthlyBudget.getCurrentSavings().get().toString());
+ }
+ }, monthlyBudget.getCurrentSavings());
+
+ monthlyExpenseLimit.textProperty().bind(expenseLimitBinding);
+ monthlySavingsGoal.textProperty().bind(savingsGoalBinding);
+ budgetStatus.textProperty().bind(budgetStatusBinding);
+ savingsStatus.textProperty().bind(savingsStatusBinding);
+ savingsPicture.setImage(savingsPanelPicture);
+ savingsPicture.layoutXProperty().bind(imageContainer.widthProperty()
+ .subtract(Bindings.min(savingsPicture.fitHeightProperty(), savingsPicture.fitWidthProperty()))
+ .divide(2));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/SavingsGoalPanel.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/SavingsGoalPanel.java
new file mode 100644
index 00000000000..31432a13ee8
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/SavingsGoalPanel.java
@@ -0,0 +1,25 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import javafx.fxml.FXML;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+
+/**
+ * Panel containing {@code SavingsGoalCard}.
+ */
+public class SavingsGoalPanel extends UiPart<Region> {
+
+ private static final String FXML = "SavingsGoalPanel.fxml";
+
+ @FXML
+ private StackPane savingsGoalDataPane;
+
+ /**
+ * Creates a {@code SavingsGoalPanel}.
+ */
+ public SavingsGoalPanel(MonthlyBudget monthlyBudget) {
+ super(FXML);
+ savingsGoalDataPane.getChildren().add(new SavingsGoalCard(monthlyBudget).getRoot());
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/TransactionCard.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/TransactionCard.java
new file mode 100644
index 00000000000..cc5dd87e99d
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/TransactionCard.java
@@ -0,0 +1,146 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import java.util.Comparator;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+
+/**
+ * An UI component that displays information of a {@code Transaction}.
+ */
+public class TransactionCard extends UiPart<Region> {
+
+ private static final String FXML = "TransactionListCard.fxml";
+
+ /**
+ * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
+ * As a consequence, UI elements' variable names cannot be set to such keywords
+ * or an exception will be thrown by JavaFX during runtime.
+ *
+ * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
+ */
+
+ public final Transaction transaction;
+
+ @FXML
+ private BorderPane cardPane;
+ @FXML
+ private Label title;
+ @FXML
+ private Label id;
+ @FXML
+ private Label amount;
+ @FXML
+ private Label date;
+ @FXML
+ private HBox categories;
+ @FXML
+ private ScrollPane scrollPane;
+
+ /**
+ * Creates a {@code TransactionCard} with the given {@code Transaction} and index to display.
+ * Binds the width of the {@code TransactionCard} to that of its containing list.
+ */
+ public TransactionCard(Transaction transaction, int displayedIndex, ReadOnlyDoubleProperty width) {
+ this(transaction, displayedIndex, false, width);
+ }
+
+ /**
+ * Creates a {@code TransactionCard} with the given {@code Transaction} and index to display.
+ * Binds the width of the {@code TransactionCard} to that of its containing list.
+ * If {@code displaySign} is {@code true}, displays the '+' sign beside the {@code Amount}
+ * if the transaction is an income, and the '-' sign if the transaction is an expense.
+ */
+ public TransactionCard(Transaction transaction, int displayedIndex, boolean displaySign,
+ ReadOnlyDoubleProperty width) {
+ super(FXML);
+ this.transaction = transaction;
+ cardPane.maxWidthProperty().bind(width.subtract(32));
+ id.setText(displayedIndex + ". ");
+ title.setText(transaction.getTitle().toString());
+
+ String amountStr = transaction.getAmount().toString();
+ if (displaySign) {
+ boolean isIncome = transaction instanceof Income;
+ boolean isExpense = transaction instanceof Expense;
+ assert isIncome != isExpense;
+ if (isIncome) {
+ amount.setText("+" + amountStr);
+ }
+ if (isExpense) {
+ amount.setText("-" + amountStr);
+ amount.setStyle("-fx-text-fill: #FF4D4D");
+ }
+ } else {
+ amount.setText(amountStr);
+ }
+
+ transaction.getCategories().stream()
+ .sorted(Comparator.comparing(category -> category.getCategoryName()))
+ .forEach(category -> {
+ Label newCategory = new Label(category.getCategoryName());
+ categories.getChildren().add(newCategory);
+ });
+ date.setText(transaction.getDate().toString());
+
+ // 'categories' HBox cannot be scrolled down on when empty.
+ if (categories.getChildren().size() == 0) {
+ // Add an invisible label when there are no categories.
+ Label placeholderLabel = new Label("");
+ placeholderLabel.setVisible(false);
+ categories.getChildren().add(placeholderLabel);
+ }
+
+ // Hijack scroll wheel for horizontal scrolling instead of vertical scrolling.
+ scrollPane.setOnScroll(scrollEvent -> {
+ // If no scrollbar, pass scroll event up to parent.
+ if (categories.getWidth() <= scrollPane.getWidth()) {
+ return;
+ }
+
+ double oldHvalue = scrollPane.getHvalue();
+ double newHvalue = scrollPane.getHvalue() - scrollEvent.getDeltaY() / categories.getWidth();
+ // Bound the values of 'newHvalue' to [0, 1].
+ newHvalue = Math.max(0.0, Math.min(1.0, newHvalue));
+
+ // If there is a change in the Hvalue, consume the scroll event.
+ if (oldHvalue != newHvalue) {
+ scrollPane.setHvalue(newHvalue);
+ // Do not pass scroll event up to parent.
+ scrollEvent.consume();
+ }
+ });
+
+ // Hijack scroll events on category labels and pass on to scroll pane.
+ categories.setOnScroll(scrollEvent -> {
+ scrollPane.fireEvent(scrollEvent);
+ scrollEvent.consume();
+ });
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof TransactionCard)) {
+ return false;
+ }
+
+ // state check
+ TransactionCard card = (TransactionCard) other;
+ return id.getText().equals(card.id.getText())
+ && transaction.equals(card.transaction);
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/TransactionListPanel.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/TransactionListPanel.java
new file mode 100644
index 00000000000..99938e0f10f
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/TransactionListPanel.java
@@ -0,0 +1,49 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+
+/**
+ * Panel containing the list of transactions.
+ */
+public class TransactionListPanel extends UiPart<Region> {
+ private static final String FXML = "TransactionListPanel.fxml";
+
+ @FXML
+ private ListView<Transaction> transactionListView;
+
+ /**
+ * Creates a {@code TransactionListPanel} with the given {@code ObservableList}.
+ *
+ * @param transactionList The list of transactions.
+ */
+ public TransactionListPanel(ObservableList<Transaction> transactionList) {
+ super(FXML);
+ transactionListView.setItems(transactionList);
+ transactionListView.setCellFactory(listView -> new TransactionListViewCell());
+ }
+
+ /**
+ * Custom {@code ListCell} that displays the graphics of a {@code Transaction} using a {@code TransactionCard}.
+ */
+ class TransactionListViewCell extends ListCell<Transaction> {
+ @Override
+ protected void updateItem(Transaction transaction, boolean empty) {
+ super.updateItem(transaction, empty);
+
+ if (empty || transaction == null) {
+ setGraphic(null);
+ setText(null);
+ setStyle("-fx-background-color: #2E2E36");
+ } else {
+ setGraphic(new TransactionCard(transaction, getIndex() + 1, true,
+ transactionListView.widthProperty()).getRoot());
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/seedu/address/ui/Ui.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/Ui.java
similarity index 79%
rename from src/main/java/seedu/address/ui/Ui.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/Ui.java
index 17aa0b494fe..ddc7c68a231 100644
--- a/src/main/java/seedu/address/ui/Ui.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/Ui.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package ay2021s1_cs2103_w16_3.finesse.ui;
import javafx.stage.Stage;
diff --git a/src/main/java/seedu/address/ui/UiManager.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiManager.java
similarity index 68%
rename from src/main/java/seedu/address/ui/UiManager.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiManager.java
index 882027e4537..69f6221ad68 100644
--- a/src/main/java/seedu/address/ui/UiManager.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiManager.java
@@ -1,16 +1,18 @@
-package seedu.address.ui;
+package ay2021s1_cs2103_w16_3.finesse.ui;
import java.util.logging.Logger;
+import ay2021s1_cs2103_w16_3.finesse.MainApp;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.StringUtil;
+import ay2021s1_cs2103_w16_3.finesse.logic.Logic;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
import javafx.application.Platform;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.image.Image;
+import javafx.scene.text.Font;
import javafx.stage.Stage;
-import seedu.address.MainApp;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.util.StringUtil;
-import seedu.address.logic.Logic;
/**
* The manager of the UI component.
@@ -20,37 +22,47 @@ public class UiManager implements Ui {
public static final String ALERT_DIALOG_PANE_FIELD_ID = "alertDialogPane";
private static final Logger logger = LogsCenter.getLogger(UiManager.class);
- private static final String ICON_APPLICATION = "/images/address_book_32.png";
+ private static final String APPLICATION_ICON = "/images/SavingsImage.png";
+ private Model model;
private Logic logic;
private MainWindow mainWindow;
+ private UiState uiState;
/**
* Creates a {@code UiManager} with the given {@code Logic}.
*/
- public UiManager(Logic logic) {
+ public UiManager(Model model, Logic logic, UiState uiState) {
super();
+ this.model = model;
this.logic = logic;
+ this.uiState = uiState;
}
@Override
public void start(Stage primaryStage) {
logger.info("Starting UI...");
- //Set the application icon.
- primaryStage.getIcons().add(getImage(ICON_APPLICATION));
+ // Set the application icon.
+ primaryStage.getIcons().add(getImage(APPLICATION_ICON));
try {
- mainWindow = new MainWindow(primaryStage, logic);
- mainWindow.show(); //This should be called before creating other UI parts
+ loadCustomFonts();
+ mainWindow = new MainWindow(primaryStage, model, logic, uiState);
+ mainWindow.show(); // This should be called before creating other UI parts.
mainWindow.fillInnerParts();
-
+ mainWindow.initializeTabs();
} catch (Throwable e) {
logger.severe(StringUtil.getDetails(e));
showFatalErrorDialogAndShutdown("Fatal error during initializing", e);
}
}
+ private void loadCustomFonts() {
+ Font.loadFont(getClass().getResourceAsStream("/fonts/RobotoCondensed-Regular.ttf"), 16);
+ Font.loadFont(getClass().getResourceAsStream("/fonts/Eczar-Regular.ttf"), 16);
+ }
+
private Image getImage(String imagePath) {
return new Image(MainApp.class.getResourceAsStream(imagePath));
}
diff --git a/src/main/java/seedu/address/ui/UiPart.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiPart.java
similarity index 96%
rename from src/main/java/seedu/address/ui/UiPart.java
rename to src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiPart.java
index fc820e01a9c..434957c7f42 100644
--- a/src/main/java/seedu/address/ui/UiPart.java
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiPart.java
@@ -1,12 +1,12 @@
-package seedu.address.ui;
+package ay2021s1_cs2103_w16_3.finesse.ui;
import static java.util.Objects.requireNonNull;
import java.io.IOException;
import java.net.URL;
+import ay2021s1_cs2103_w16_3.finesse.MainApp;
import javafx.fxml.FXMLLoader;
-import seedu.address.MainApp;
/**
* Represents a distinct part of the UI. e.g. Windows, dialogs, panels, status bars, etc.
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiState.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiState.java
new file mode 100644
index 00000000000..55d11da1338
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/UiState.java
@@ -0,0 +1,93 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import static java.util.Objects.requireNonNull;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+
+/**
+ * Represents the state of the current UI.
+ */
+public class UiState {
+ /**
+ * Tabs present in the UI.
+ */
+ public enum Tab {
+ OVERVIEW(1),
+ INCOME(2),
+ EXPENSES(3),
+ ANALYTICS(4),
+ USER_GUIDE(5);
+
+ /** The index of the tab in the {@code TabPane}. */
+ private final Index tabIndex;
+
+ /**
+ * Constructs a new {@code Tab} enum with the specified tab index.
+ *
+ * @param tabIndex The index of the tab in the {@code TabPane}.
+ */
+ Tab(int tabIndex) {
+ this.tabIndex = Index.fromOneBased(tabIndex);
+ }
+
+ /**
+ * Returns the index of the tab in the {@code TabPane}.
+ *
+ * @return The index of the tab in the {@code TabPane}.
+ */
+ public Index getTabIndex() {
+ return tabIndex;
+ }
+
+ /**
+ * Returns a string representation of this {@code Tab}.
+ *
+ * @return A string representation of this {@code Tab}.
+ */
+ @Override
+ public String toString() {
+ return super.toString().toLowerCase();
+ }
+ }
+
+ /**
+ * The current selected tab.
+ */
+ private Tab currentTab;
+
+ /**
+ * Creates a {@code UiState} with the currently selected tab set to the 'Overview' tab.
+ */
+ public UiState() {
+ currentTab = Tab.OVERVIEW;
+ }
+
+ /**
+ * Creates a {@code UiState} with the specified currently selected tab.
+ *
+ * @param currentTab The currently selected tab.
+ */
+ public UiState(Tab currentTab) {
+ requireNonNull(currentTab);
+ this.currentTab = currentTab;
+ }
+
+ /**
+ * Returns the currently selected tab.
+ *
+ * @return The currently selected tab.
+ */
+ public Tab getCurrentTab() {
+ return currentTab;
+ }
+
+ /**
+ * Updates the currently selected tab.
+ *
+ * @param currentTab The currently selected tab.
+ */
+ public void setCurrentTab(Tab currentTab) {
+ requireNonNull(currentTab);
+ this.currentTab = currentTab;
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkExpensePanel.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkExpensePanel.java
new file mode 100644
index 00000000000..99679fea2a0
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkExpensePanel.java
@@ -0,0 +1,48 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.bookmark;
+
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiPart;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+
+public class BookmarkExpensePanel extends UiPart<Region> {
+ private static final String FXML = "BookmarkTransactionPanel.fxml";
+ private final Logger logger = LogsCenter.getLogger(BookmarkExpensePanel.class);
+
+ @FXML
+ private ListView<BookmarkExpense> bookmarkTransactionList;
+
+ /**
+ * Creates a {@code BookmarkExpensePanel} with the given {@code ObservableList}.
+ */
+ public BookmarkExpensePanel(ObservableList<BookmarkExpense> bookmarkExpensesList) {
+ super(FXML);
+ bookmarkTransactionList.setItems(bookmarkExpensesList);
+ bookmarkTransactionList.setCellFactory(listView -> new BookmarkExpenseListViewCell());
+ }
+
+ class BookmarkExpenseListViewCell extends ListCell<BookmarkExpense> {
+ @Override
+ protected void updateItem(BookmarkExpense bookmarkExpense, boolean empty) {
+ super.updateItem(bookmarkExpense, empty);
+
+ if (empty || bookmarkExpense == null) {
+ setGraphic(null);
+ setText(null);
+ setStyle("-fx-background-color: #2E2E36");
+ } else {
+ BookmarkTransactionCard<Expense> bookmarkTransactionCard =
+ new BookmarkTransactionCard<>(bookmarkExpense, getIndex() + 1,
+ bookmarkTransactionList.widthProperty());
+ setGraphic(bookmarkTransactionCard.getRoot());
+ }
+ }
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkIncomePanel.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkIncomePanel.java
new file mode 100644
index 00000000000..c19f0571410
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkIncomePanel.java
@@ -0,0 +1,45 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.bookmark;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiPart;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+
+public class BookmarkIncomePanel extends UiPart<Region> {
+ private static final String FXML = "BookmarkTransactionPanel.fxml";
+
+ @FXML
+ private ListView<BookmarkIncome> bookmarkTransactionList;
+
+ /**
+ * Creates a {@code BookmarkIncomePanel} with the given {@code ObservableList}.
+ */
+ public BookmarkIncomePanel(ObservableList<BookmarkIncome> bookmarkIncomesList) {
+ super(FXML);
+ bookmarkTransactionList.setItems(bookmarkIncomesList);
+ bookmarkTransactionList.setCellFactory(listView -> new BookmarkIncomeListViewCell());
+ }
+
+ class BookmarkIncomeListViewCell extends ListCell<BookmarkIncome> {
+ @Override
+ protected void updateItem(BookmarkIncome bookmarkIncome, boolean empty) {
+ super.updateItem(bookmarkIncome, empty);
+
+ if (empty || bookmarkIncome == null) {
+ setGraphic(null);
+ setText(null);
+ setStyle("-fx-background-color: #2E2E36");
+ } else {
+ BookmarkTransactionCard<Income> bookmarkTransactionCard =
+ new BookmarkTransactionCard<>(bookmarkIncome, getIndex() + 1,
+ bookmarkTransactionList.widthProperty());
+ setGraphic(bookmarkTransactionCard.getRoot());
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkTransactionCard.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkTransactionCard.java
new file mode 100644
index 00000000000..1ec30b96919
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/bookmark/BookmarkTransactionCard.java
@@ -0,0 +1,112 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.bookmark;
+
+import java.util.Comparator;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiPart;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+
+public class BookmarkTransactionCard<T extends Transaction> extends UiPart<Region> {
+
+ private static final String FXML = "BookmarkTransactionListCard.fxml";
+
+ public final BookmarkTransaction<T> bookmarkTransaction;
+
+ @FXML
+ private BorderPane cardPane;
+ @FXML
+ private Label title;
+ @FXML
+ private Label id;
+ @FXML
+ private Label amount;
+ @FXML
+ private HBox categories;
+ @FXML
+ private GridPane transactionDetails;
+ @FXML
+ private ScrollPane scrollPane;
+
+ /**
+ * Creates a {@code BookmarkTransactionCard} with the given {@code BookmarkTransaction} and index to display.
+ * Binds the width of the {@code BookmarkTransactionCard} to that of its containing list.
+ */
+ public BookmarkTransactionCard(BookmarkTransaction<T> bookmarkTransaction, int displayedIndex,
+ ReadOnlyDoubleProperty width) {
+ super(FXML);
+ this.bookmarkTransaction = bookmarkTransaction;
+ cardPane.maxWidthProperty().bind(width.subtract(32));
+
+ id.setText(displayedIndex + ". ");
+ title.setText(bookmarkTransaction.getTitle().toString());
+ amount.setText(bookmarkTransaction.getAmount().toString());
+
+ bookmarkTransaction.getCategories().stream()
+ .sorted(Comparator.comparing(category -> category.getCategoryName()))
+ .forEach(category -> {
+ Label newCategory = new Label(category.getCategoryName());
+ categories.getChildren().add(newCategory);
+ });
+
+ // 'categories' HBox cannot be scrolled down on when empty.
+ if (categories.getChildren().size() == 0) {
+ // Add an invisible label when there are no categories.
+ Label placeholderLabel = new Label("");
+ placeholderLabel.setVisible(false);
+ categories.getChildren().add(placeholderLabel);
+ }
+
+ // Hijack scroll wheel for horizontal scrolling instead of vertical scrolling.
+ scrollPane.setOnScroll(scrollEvent -> {
+ // If no scrollbar, pass scroll event up to parent.
+ if (categories.getWidth() <= scrollPane.getWidth()) {
+ return;
+ }
+
+ double oldHvalue = scrollPane.getHvalue();
+ double newHvalue = scrollPane.getHvalue() - scrollEvent.getDeltaY() / categories.getWidth();
+ // Bound the values of 'newHvalue' to [0, 1].
+ newHvalue = Math.max(0.0, Math.min(1.0, newHvalue));
+
+ // If there is a change in the Hvalue, consume the scroll event.
+ if (oldHvalue != newHvalue) {
+ scrollPane.setHvalue(newHvalue);
+ // Do not pass scroll event up to parent.
+ scrollEvent.consume();
+ }
+ });
+
+ // Hijack scroll events on category labels and pass on to scroll pane.
+ categories.setOnScroll(scrollEvent -> {
+ scrollPane.fireEvent(scrollEvent);
+ scrollEvent.consume();
+ });
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof BookmarkTransactionCard)) {
+ return false;
+ }
+
+ // state check
+ BookmarkTransactionCard<?> card = (BookmarkTransactionCard<?>) other;
+ return id.getText().equals(card.id.getText())
+ && bookmarkTransaction.equals(card.bookmarkTransaction);
+ }
+
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/expense/ExpensePanel.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/expense/ExpensePanel.java
new file mode 100644
index 00000000000..6c664cc37eb
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/expense/ExpensePanel.java
@@ -0,0 +1,46 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.expense;
+
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.ui.TransactionCard;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiPart;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+
+public class ExpensePanel extends UiPart<Region> {
+ private static final String FXML = "ExpensePanel.fxml";
+ private final Logger logger = LogsCenter.getLogger(ExpensePanel.class);
+
+ @FXML
+ private ListView<Expense> expenseListView;
+
+ /**
+ * Creates a {@code ExpensePanel} with the given {@code ObservableList}.
+ */
+ public ExpensePanel(ObservableList<Expense> expenseList) {
+ super(FXML);
+ expenseListView.setItems(expenseList);
+ expenseListView.setCellFactory(listView -> new ExpenseListViewCell());
+ }
+
+ class ExpenseListViewCell extends ListCell<Expense> {
+ @Override
+ protected void updateItem(Expense expense, boolean empty) {
+ super.updateItem(expense, empty);
+
+ if (empty || expense == null) {
+ setGraphic(null);
+ setText(null);
+ setStyle("-fx-background-color: #2E2E36");
+ } else {
+ setGraphic(new TransactionCard(expense, getIndex() + 1,
+ expenseListView.widthProperty()).getRoot());
+ }
+ }
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/income/IncomePanel.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/income/IncomePanel.java
new file mode 100644
index 00000000000..39bffcb4a65
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/income/IncomePanel.java
@@ -0,0 +1,46 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.income;
+
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.ui.TransactionCard;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiPart;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+
+public class IncomePanel extends UiPart<Region> {
+ private static final String FXML = "IncomePanel.fxml";
+ private final Logger logger = LogsCenter.getLogger(IncomePanel.class);
+
+ @FXML
+ private ListView<Income> incomeListView;
+
+ /**
+ * Creates a {@code IncomePanel} with the given {@code ObservableList}.
+ */
+ public IncomePanel(ObservableList<Income> incomeList) {
+ super(FXML);
+ incomeListView.setItems(incomeList);
+ incomeListView.setCellFactory(listView -> new IncomeListViewCell());
+ }
+
+ class IncomeListViewCell extends ListCell<Income> {
+ @Override
+ protected void updateItem(Income income, boolean empty) {
+ super.updateItem(income, empty);
+
+ if (empty || income == null) {
+ setGraphic(null);
+ setText(null);
+ setStyle("-fx-background-color: #2E2E36");
+ } else {
+ setGraphic(new TransactionCard(income, getIndex() + 1,
+ incomeListView.widthProperty()).getRoot());
+ }
+ }
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/AnalyticsTabPane.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/AnalyticsTabPane.java
new file mode 100644
index 00000000000..ec38330b9ba
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/AnalyticsTabPane.java
@@ -0,0 +1,145 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.tabs;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount.CalculatedAmount;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiPart;
+import javafx.collections.ModifiableObservableListBase;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.canvas.Canvas;
+import javafx.scene.chart.Axis;
+import javafx.scene.chart.BarChart;
+import javafx.scene.chart.CategoryAxis;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart;
+import javafx.scene.control.Label;
+import javafx.scene.layout.Pane;
+
+/**
+ * Tab pane that displays analytics.
+ */
+public class AnalyticsTabPane extends UiPart<Canvas> {
+
+ private static final String FXML = "AnalyticsTabPane.fxml";
+
+ @FXML
+ private Pane expenseAnalyticsPane;
+ @FXML
+ private Pane incomeAnalyticsPane;
+ @FXML
+ private Pane savingsAnalyticsPane;
+ @FXML
+ private Label expenseAnalyticsLabel;
+ @FXML
+ private Label incomeAnalyticsLabel;
+ @FXML
+ private Label savingsAnalyticsLabel;
+ @FXML
+ private BarChart<String, Number> expenseAnalyticsBarChart;
+ @FXML
+ private BarChart<String, Number> incomeAnalyticsBarChart;
+ @FXML
+ private BarChart<String, Number> savingsAnalyticsBarChart;
+
+ /**
+ * Creates an {@code AnalyticsTabPane}.
+ */
+ public AnalyticsTabPane(MonthlyBudget monthlyBudget) {
+ super(FXML);
+
+ Axis<String> expenseAnalyticsStringAxis = new CategoryAxis();
+ Axis<Number> expenseAnalyticsNumberAxis = new NumberAxis();
+ expenseAnalyticsBarChart = new BarChart<>(expenseAnalyticsStringAxis, expenseAnalyticsNumberAxis);
+ expenseAnalyticsBarChart.setLegendVisible(false);
+ expenseAnalyticsBarChart.setVerticalGridLinesVisible(false);
+ expenseAnalyticsBarChart.setAnimated(false);
+ expenseAnalyticsBarChart.lookup(".chart-plot-background").setStyle("-fx-background-color: transparent;");
+ expenseAnalyticsPane.getChildren().add(expenseAnalyticsBarChart);
+ expenseAnalyticsLabel.setText("EXPENSE");
+
+ Axis<String> incomeAnalyticsStringAxis = new CategoryAxis();
+ Axis<Number> incomeAnalyticsNumberAxis = new NumberAxis();
+ incomeAnalyticsBarChart = new BarChart<>(incomeAnalyticsStringAxis, incomeAnalyticsNumberAxis);
+ incomeAnalyticsBarChart.setLegendVisible(false);
+ incomeAnalyticsBarChart.setVerticalGridLinesVisible(false);
+ incomeAnalyticsBarChart.setAnimated(false);
+ incomeAnalyticsBarChart.lookup(".chart-plot-background").setStyle("-fx-background-color: transparent;");
+ incomeAnalyticsPane.getChildren().add(incomeAnalyticsBarChart);
+ incomeAnalyticsLabel.setText("INCOME");
+
+ Axis<String> savingsAnalyticsStringAxis = new CategoryAxis();
+ Axis<Number> savingsAnalyticsNumberAxis = new NumberAxis();
+ savingsAnalyticsBarChart = new BarChart<>(savingsAnalyticsStringAxis, savingsAnalyticsNumberAxis);
+ savingsAnalyticsBarChart.setLegendVisible(false);
+ savingsAnalyticsBarChart.setVerticalGridLinesVisible(false);
+ savingsAnalyticsBarChart.setAnimated(false);
+ savingsAnalyticsBarChart.lookup(".chart-plot-background").setStyle("-fx-background-color: transparent;");
+ savingsAnalyticsPane.getChildren().add(savingsAnalyticsBarChart);
+ savingsAnalyticsLabel.setText("SAVINGS");
+
+ populateData(monthlyBudget);
+ }
+
+ private void populateData(MonthlyBudget monthlyBudget) {
+ Stream.of(
+ populateDataIn(expenseAnalyticsBarChart, monthlyBudget.getMonths(), monthlyBudget.getMonthlyExpenses()),
+ populateDataIn(incomeAnalyticsBarChart, monthlyBudget.getMonths(), monthlyBudget.getMonthlyIncomes()),
+ populateDataIn(savingsAnalyticsBarChart, monthlyBudget.getMonths(), monthlyBudget.getMonthlySavings()))
+ .forEach(monthlyBudget::addChangeListener);
+ }
+
+ private MonthlyBudget.ChangeListener populateDataIn(BarChart<String, Number> barChart,
+ ObservableList<String> strings,
+ ObservableList<CalculatedAmount> values) {
+ assert strings.size() == values.size();
+
+ class ZippedData extends ModifiableObservableListBase<XYChart.Data<String, Number>> {
+ private final List<XYChart.Data<String, Number>> data = new ArrayList<>();
+
+ {
+ updateList();
+ }
+
+ @Override
+ public XYChart.Data<String, Number> get(int index) {
+ return data.get(index);
+ }
+
+ @Override
+ public int size() {
+ return data.size();
+ }
+
+ @Override
+ protected void doAdd(int index, XYChart.Data<String, Number> element) {
+ data.add(index, element);
+ }
+
+ @Override
+ protected XYChart.Data<String, Number> doSet(int index, XYChart.Data<String, Number> element) {
+ return data.set(index, element);
+ }
+
+ @Override
+ protected XYChart.Data<String, Number> doRemove(int index) {
+ return data.remove(index);
+ }
+
+ public void updateList() {
+ this.clear();
+ IntStream.range(0, strings.size())
+ .mapToObj(i -> new XYChart.Data<String, Number>(strings.get(i), values.get(i).getValue()))
+ .forEach(this::add);
+ }
+ }
+
+ ZippedData newData = new ZippedData();
+ barChart.getData().add(new XYChart.Series<>(newData));
+ return newData::updateList;
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/ExpenseTabPane.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/ExpenseTabPane.java
new file mode 100644
index 00000000000..23c44137035
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/ExpenseTabPane.java
@@ -0,0 +1,27 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.tabs;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.ui.bookmark.BookmarkExpensePanel;
+import ay2021s1_cs2103_w16_3.finesse.ui.expense.ExpensePanel;
+import javafx.collections.ObservableList;
+
+/**
+ * Tab pane that displays expenses.
+ */
+public class ExpenseTabPane extends TwoColumnTabPane {
+ private static final String MAIN_PANEL_LABEL = "Expenses";
+ private static final String SIDE_PANEL_LABEL = "Bookmark Expenses";
+
+ /**
+ * Constructs an {@code ExpenseTabPane} that displays the specified list of expenses
+ * and bookmark expenses.
+ *
+ * @param expenseList The list of expenses to be displayed.
+ * @param bookmarkExpenseList The list of bookmark expenses to be displayed.
+ */
+ public ExpenseTabPane(ObservableList<Expense> expenseList, ObservableList<BookmarkExpense> bookmarkExpenseList) {
+ super(MAIN_PANEL_LABEL, SIDE_PANEL_LABEL,
+ new ExpensePanel(expenseList), new BookmarkExpensePanel(bookmarkExpenseList));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/IncomeTabPane.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/IncomeTabPane.java
new file mode 100644
index 00000000000..b827fd744d5
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/IncomeTabPane.java
@@ -0,0 +1,27 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.tabs;
+
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.ui.bookmark.BookmarkIncomePanel;
+import ay2021s1_cs2103_w16_3.finesse.ui.income.IncomePanel;
+import javafx.collections.ObservableList;
+
+/**
+ * Tab pane that displays incomes.
+ */
+public class IncomeTabPane extends TwoColumnTabPane {
+ private static final String MAIN_PANEL_LABEL = "Incomes";
+ private static final String SIDE_PANEL_LABEL = "Bookmark Incomes";
+
+ /**
+ * Constructs an {@code IncomeTabPane} that displays the specified list of incomes
+ * and bookmark incomes.
+ *
+ * @param incomeList The list of incomes to be displayed.
+ * @param bookmarkIncomeList The list of bookmark incomes to be displayed.
+ */
+ public IncomeTabPane(ObservableList<Income> incomeList, ObservableList<BookmarkIncome> bookmarkIncomeList) {
+ super(MAIN_PANEL_LABEL, SIDE_PANEL_LABEL,
+ new IncomePanel(incomeList), new BookmarkIncomePanel(bookmarkIncomeList));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/OverviewTabPane.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/OverviewTabPane.java
new file mode 100644
index 00000000000..9eb4351b1e2
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/OverviewTabPane.java
@@ -0,0 +1,27 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.tabs;
+
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.ui.SavingsGoalPanel;
+import ay2021s1_cs2103_w16_3.finesse.ui.TransactionListPanel;
+import javafx.collections.ObservableList;
+
+/**
+ * Tab pane that displays an overview of transactions.
+ */
+public class OverviewTabPane extends TwoColumnTabPane {
+ private static final String MAIN_PANEL_LABEL = "Overview";
+ private static final String SIDE_PANEL_LABEL = "Savings Summary";
+
+ /**
+ * Constructs an {@code OverviewTabPane} that displays the specified list of transactions
+ * and savings goal.
+ *
+ * @param transactionList The list of transactions to be displayed.
+ * @param monthlyBudget The monthly budget in the finance tracker.
+ */
+ public OverviewTabPane(ObservableList<Transaction> transactionList, MonthlyBudget monthlyBudget) {
+ super(MAIN_PANEL_LABEL, SIDE_PANEL_LABEL, new TransactionListPanel(transactionList),
+ new SavingsGoalPanel(monthlyBudget));
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/TwoColumnTabPane.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/TwoColumnTabPane.java
new file mode 100644
index 00000000000..5ae679f7f77
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/TwoColumnTabPane.java
@@ -0,0 +1,40 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.tabs;
+
+import ay2021s1_cs2103_w16_3.finesse.ui.UiPart;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+
+/**
+ * An abstract tab pane with two panels arranged in columns.
+ */
+public abstract class TwoColumnTabPane extends UiPart<Region> {
+ private static final String FXML = "TwoColumnTabPane.fxml";
+
+ @FXML
+ private Label mainPanelLabel;
+ @FXML
+ private Label sidePanelLabel;
+ @FXML
+ private StackPane mainPanelPlaceholder;
+ @FXML
+ private StackPane sidePanelPlaceholder;
+
+ /**
+ * Creates a {@code TwoColumnTabPane} with the specified attributes.
+ *
+ * @param mainPanelLabelStr The label of the main panel.
+ * @param sidePanelLabelStr The label of the side panel.
+ * @param mainPanel The main panel to be displayed.
+ * @param sidePanel The side panel to be displayed.
+ */
+ public TwoColumnTabPane(String mainPanelLabelStr, String sidePanelLabelStr, UiPart<Region> mainPanel,
+ UiPart<Region> sidePanel) {
+ super(FXML);
+ mainPanelLabel.setText(mainPanelLabelStr);
+ sidePanelLabel.setText(sidePanelLabelStr);
+ mainPanelPlaceholder.getChildren().add(mainPanel.getRoot());
+ sidePanelPlaceholder.getChildren().add(sidePanel.getRoot());
+ }
+}
diff --git a/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/UserGuideTabPane.java b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/UserGuideTabPane.java
new file mode 100644
index 00000000000..5d58170e4cc
--- /dev/null
+++ b/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/tabs/UserGuideTabPane.java
@@ -0,0 +1,123 @@
+package ay2021s1_cs2103_w16_3.finesse.ui.tabs;
+
+import java.util.logging.Logger;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.LogsCenter;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiPart;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.layout.StackPane;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import javafx.util.Duration;
+
+/**
+ * Tab pane that displays the user guide.
+ */
+public class UserGuideTabPane extends UiPart<StackPane> {
+ private static final String FXML = "UserGuideTabPane.fxml";
+
+ // Links
+ private static final String GITHUB_PAGES_DOMAIN = "https://ay2021s1-cs2103t-w16-3.github.io";
+ private static final String USER_GUIDE_URL = "https://ay2021s1-cs2103t-w16-3.github.io/tp/UserGuide.html";
+ private static final String NO_EXTERNAL_SITE_PAGE_URL =
+ "https://ay2021s1-cs2103t-w16-3.github.io/tp/NoExternalSite.html";
+
+ // Constants
+ private static final double REFRESH_TIMEOUT_DELAY = 10000.0;
+
+ // Logging messages
+ private static final String WEB_ENGINE_EXTERNAL_SITE_REQUEST_BLOCKED =
+ "Request to load page on external site blocked";
+ private static final String WEB_ENGINE_WORKER_STATE_CANCELLED = "Page load cancelled: ";
+ private static final String WEB_ENGINE_WORKER_STATE_FAILED = "Unable to load page (no internet connection): ";
+ private static final String WEB_ENGINE_WORKER_STATE_RUNNING = "Loading page: ";
+ private static final String WEB_ENGINE_WORKER_STATE_SCHEDULED = "Page load scheduled: ";
+ private static final String WEB_ENGINE_WORKER_STATE_SUCCEEDED = "Page successfully loaded: ";
+
+ private final Logger logger = LogsCenter.getLogger(getClass());
+
+ @FXML
+ private WebView webView;
+
+ /**
+ * Constructs a {@code UserGuideTabPane}.
+ */
+ public UserGuideTabPane() {
+ super(FXML);
+ initializeUserGuide();
+ }
+
+ /**
+ * Initializes the {@code WebEngine} that is backing the {@code WebView}.
+ */
+ private void initializeUserGuide() {
+ // Disable right click.
+ webView.setContextMenuEnabled(false);
+
+ WebEngine webEngine = webView.getEngine();
+
+ // Override fonts to call the default macOS system font without using '-apple-system'.
+ webEngine.setUserStyleSheetLocation(getClass().getResource("/view/WebView.css").toString());
+
+ // Log user agent.
+ logger.info("User Agent: " + webEngine.getUserAgent());
+
+ webEngine.locationProperty().addListener((observableValue, oldUrl, newUrl) -> {
+ if (!newUrl.startsWith(GITHUB_PAGES_DOMAIN)) {
+ logger.info(WEB_ENGINE_EXTERNAL_SITE_REQUEST_BLOCKED);
+
+ // Block requests to external sites.
+ Platform.runLater(() -> {
+ // Load the 'No External Site' page.
+ webEngine.load(NO_EXTERNAL_SITE_PAGE_URL);
+ });
+ }
+ });
+
+ // Initialize refresh task.
+ Timeline refreshTask = new Timeline(new KeyFrame(Duration.millis(REFRESH_TIMEOUT_DELAY),
+ actionEvent -> refreshPage()));
+
+ webEngine.getLoadWorker().stateProperty().addListener((observableValue, oldState, newState) -> {
+ String location = webEngine.getLocation();
+
+ // Stop the refresh task to prevent multiple tasks running.
+ refreshTask.stop();
+
+ switch (newState) {
+ case CANCELLED:
+ logger.info(WEB_ENGINE_WORKER_STATE_CANCELLED + location);
+ break;
+ case FAILED:
+ logger.warning(WEB_ENGINE_WORKER_STATE_FAILED + location);
+ refreshTask.playFromStart();
+ break;
+ case RUNNING:
+ logger.info(WEB_ENGINE_WORKER_STATE_RUNNING + location);
+ break;
+ case SCHEDULED:
+ logger.info(WEB_ENGINE_WORKER_STATE_SCHEDULED + location);
+ break;
+ case SUCCEEDED:
+ logger.info(WEB_ENGINE_WORKER_STATE_SUCCEEDED + location);
+ break;
+ default:
+ }
+ });
+
+ webEngine.load(USER_GUIDE_URL);
+ }
+
+ /**
+ * Refreshes the WebView.
+ */
+ public void refreshPage() {
+ // Cannot simply reload the page because if the page has not loaded a single time,
+ // reloading does not work.
+ String currentPage = webView.getEngine().getLocation();
+ webView.getEngine().load(currentPage);
+ }
+}
diff --git a/src/main/java/seedu/address/commons/core/Messages.java b/src/main/java/seedu/address/commons/core/Messages.java
deleted file mode 100644
index 1deb3a1e469..00000000000
--- a/src/main/java/seedu/address/commons/core/Messages.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package seedu.address.commons.core;
-
-/**
- * Container for user visible messages.
- */
-public class Messages {
-
- public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command";
- public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
- public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
- public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
-
-}
diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/seedu/address/logic/Logic.java
deleted file mode 100644
index 92cd8fa605a..00000000000
--- a/src/main/java/seedu/address/logic/Logic.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package seedu.address.logic;
-
-import java.nio.file.Path;
-
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * API of the Logic component
- */
-public interface Logic {
- /**
- * Executes the command and returns the result.
- * @param commandText The command as entered by the user.
- * @return the result of the command execution.
- * @throws CommandException If an error occurs during command execution.
- * @throws ParseException If an error occurs during parsing.
- */
- CommandResult execute(String commandText) throws CommandException, ParseException;
-
- /**
- * Returns the AddressBook.
- *
- * @see seedu.address.model.Model#getAddressBook()
- */
- ReadOnlyAddressBook getAddressBook();
-
- /** Returns an unmodifiable view of the filtered list of persons */
- ObservableList<Person> getFilteredPersonList();
-
- /**
- * Returns the user prefs' address book file path.
- */
- Path getAddressBookFilePath();
-
- /**
- * Returns the user prefs' GUI settings.
- */
- GuiSettings getGuiSettings();
-
- /**
- * Set the user prefs' GUI settings.
- */
- void setGuiSettings(GuiSettings guiSettings);
-}
diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
deleted file mode 100644
index 9d9c6d15bdc..00000000000
--- a/src/main/java/seedu/address/logic/LogicManager.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package seedu.address.logic;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.logging.Logger;
-
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.AddressBookParser;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.Model;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
-import seedu.address.storage.Storage;
-
-/**
- * The main LogicManager of the app.
- */
-public class LogicManager implements Logic {
- public static final String FILE_OPS_ERROR_MESSAGE = "Could not save data to file: ";
- private final Logger logger = LogsCenter.getLogger(LogicManager.class);
-
- private final Model model;
- private final Storage storage;
- private final AddressBookParser addressBookParser;
-
- /**
- * Constructs a {@code LogicManager} with the given {@code Model} and {@code Storage}.
- */
- public LogicManager(Model model, Storage storage) {
- this.model = model;
- this.storage = storage;
- addressBookParser = new AddressBookParser();
- }
-
- @Override
- public CommandResult execute(String commandText) throws CommandException, ParseException {
- logger.info("----------------[USER COMMAND][" + commandText + "]");
-
- CommandResult commandResult;
- Command command = addressBookParser.parseCommand(commandText);
- commandResult = command.execute(model);
-
- try {
- storage.saveAddressBook(model.getAddressBook());
- } catch (IOException ioe) {
- throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
- }
-
- return commandResult;
- }
-
- @Override
- public ReadOnlyAddressBook getAddressBook() {
- return model.getAddressBook();
- }
-
- @Override
- public ObservableList<Person> getFilteredPersonList() {
- return model.getFilteredPersonList();
- }
-
- @Override
- public Path getAddressBookFilePath() {
- return model.getAddressBookFilePath();
- }
-
- @Override
- public GuiSettings getGuiSettings() {
- return model.getGuiSettings();
- }
-
- @Override
- public void setGuiSettings(GuiSettings guiSettings) {
- model.setGuiSettings(guiSettings);
- }
-}
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
deleted file mode 100644
index 71656d7c5c8..00000000000
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-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.person.Person;
-
-/**
- * Adds a person to the address book.
- */
-public class AddCommand extends Command {
-
- public static final String COMMAND_WORD = "add";
-
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
- + "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 = "New person added: %1$s";
- public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
-
- private final Person toAdd;
-
- /**
- * Creates an AddCommand to add the specified {@code Person}
- */
- public AddCommand(Person person) {
- requireNonNull(person);
- toAdd = person;
- }
-
- @Override
- public CommandResult execute(Model model) throws CommandException {
- requireNonNull(model);
-
- if (model.hasPerson(toAdd)) {
- throw new CommandException(MESSAGE_DUPLICATE_PERSON);
- }
-
- model.addPerson(toAdd);
- return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof AddCommand // instanceof handles nulls
- && toAdd.equals(((AddCommand) other).toAdd));
- }
-}
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
deleted file mode 100644
index 9c86b1fa6e4..00000000000
--- a/src/main/java/seedu/address/logic/commands/ClearCommand.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-
-/**
- * Clears the address book.
- */
-public class ClearCommand extends Command {
-
- public static final String COMMAND_WORD = "clear";
- public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
-
-
- @Override
- public CommandResult execute(Model model) {
- requireNonNull(model);
- model.setAddressBook(new AddressBook());
- return new CommandResult(MESSAGE_SUCCESS);
- }
-}
diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/seedu/address/logic/commands/CommandResult.java
deleted file mode 100644
index 92f900b7916..00000000000
--- a/src/main/java/seedu/address/logic/commands/CommandResult.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.Objects;
-
-/**
- * Represents the result of a command execution.
- */
-public class CommandResult {
-
- private final String feedbackToUser;
-
- /** Help information should be shown to the user. */
- private final boolean showHelp;
-
- /** The application should exit. */
- private final boolean exit;
-
- /**
- * Constructs a {@code CommandResult} with the specified fields.
- */
- public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
- this.feedbackToUser = requireNonNull(feedbackToUser);
- this.showHelp = showHelp;
- this.exit = exit;
- }
-
- /**
- * Constructs a {@code CommandResult} with the specified {@code feedbackToUser},
- * and other fields set to their default value.
- */
- public CommandResult(String feedbackToUser) {
- this(feedbackToUser, false, false);
- }
-
- public String getFeedbackToUser() {
- return feedbackToUser;
- }
-
- public boolean isShowHelp() {
- return showHelp;
- }
-
- public boolean isExit() {
- return exit;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
-
- // instanceof handles nulls
- if (!(other instanceof CommandResult)) {
- return false;
- }
-
- CommandResult otherCommandResult = (CommandResult) other;
- return feedbackToUser.equals(otherCommandResult.feedbackToUser)
- && showHelp == otherCommandResult.showHelp
- && exit == otherCommandResult.exit;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(feedbackToUser, showHelp, exit);
- }
-
-}
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
deleted file mode 100644
index 02fd256acba..00000000000
--- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.List;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
-
-/**
- * Deletes a person identified using it's displayed index from the address book.
- */
-public class DeleteCommand extends Command {
-
- public static final String COMMAND_WORD = "delete";
-
- public static final String MESSAGE_USAGE = COMMAND_WORD
- + ": Deletes the person identified by the index number used in the displayed person list.\n"
- + "Parameters: INDEX (must be a positive integer)\n"
- + "Example: " + COMMAND_WORD + " 1";
-
- public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
-
- private final Index targetIndex;
-
- public DeleteCommand(Index targetIndex) {
- this.targetIndex = targetIndex;
- }
-
- @Override
- public CommandResult execute(Model model) throws CommandException {
- requireNonNull(model);
- List<Person> lastShownList = model.getFilteredPersonList();
-
- if (targetIndex.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- Person personToDelete = lastShownList.get(targetIndex.getZeroBased());
- model.deletePerson(personToDelete);
- return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, personToDelete));
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof DeleteCommand // instanceof handles nulls
- && targetIndex.equals(((DeleteCommand) other).targetIndex)); // state check
- }
-}
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
deleted file mode 100644
index 7e36114902f..00000000000
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ /dev/null
@@ -1,226 +0,0 @@
-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 static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.commons.util.CollectionUtil;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Edits the details of an existing person in the address book.
- */
-public class EditCommand extends Command {
-
- public static final String COMMAND_WORD = "edit";
-
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified "
- + "by the index number used in the displayed person list. "
- + "Existing values will be overwritten by the input values.\n"
- + "Parameters: INDEX (must be a positive integer) "
- + "[" + PREFIX_NAME + "NAME] "
- + "[" + PREFIX_PHONE + "PHONE] "
- + "[" + PREFIX_EMAIL + "EMAIL] "
- + "[" + PREFIX_ADDRESS + "ADDRESS] "
- + "[" + PREFIX_TAG + "TAG]...\n"
- + "Example: " + COMMAND_WORD + " 1 "
- + PREFIX_PHONE + "91234567 "
- + PREFIX_EMAIL + "johndoe@example.com";
-
- public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s";
- public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
- public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book.";
-
- private final Index index;
- private final EditPersonDescriptor editPersonDescriptor;
-
- /**
- * @param index of the person in the filtered person list to edit
- * @param editPersonDescriptor details to edit the person with
- */
- public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {
- requireNonNull(index);
- requireNonNull(editPersonDescriptor);
-
- this.index = index;
- this.editPersonDescriptor = new EditPersonDescriptor(editPersonDescriptor);
- }
-
- @Override
- public CommandResult execute(Model model) throws CommandException {
- requireNonNull(model);
- List<Person> lastShownList = model.getFilteredPersonList();
-
- if (index.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
-
- if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
- throw new CommandException(MESSAGE_DUPLICATE_PERSON);
- }
-
- model.setPerson(personToEdit, editedPerson);
- model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
- return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedPerson));
- }
-
- /**
- * Creates and returns a {@code Person} with the details of {@code personToEdit}
- * edited with {@code editPersonDescriptor}.
- */
- private static Person createEditedPerson(Person personToEdit, EditPersonDescriptor editPersonDescriptor) {
- assert personToEdit != null;
-
- Name updatedName = editPersonDescriptor.getName().orElse(personToEdit.getName());
- Phone updatedPhone = editPersonDescriptor.getPhone().orElse(personToEdit.getPhone());
- Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
- Address updatedAddress = editPersonDescriptor.getAddress().orElse(personToEdit.getAddress());
- Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
-
- return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress, updatedTags);
- }
-
- @Override
- public boolean equals(Object other) {
- // short circuit if same object
- if (other == this) {
- return true;
- }
-
- // instanceof handles nulls
- if (!(other instanceof EditCommand)) {
- return false;
- }
-
- // state check
- EditCommand e = (EditCommand) other;
- return index.equals(e.index)
- && editPersonDescriptor.equals(e.editPersonDescriptor);
- }
-
- /**
- * Stores the details to edit the person with. Each non-empty field value will replace the
- * corresponding field value of the person.
- */
- public static class EditPersonDescriptor {
- private Name name;
- private Phone phone;
- private Email email;
- private Address address;
- private Set<Tag> tags;
-
- public EditPersonDescriptor() {}
-
- /**
- * Copy constructor.
- * A defensive copy of {@code tags} is used internally.
- */
- public EditPersonDescriptor(EditPersonDescriptor toCopy) {
- setName(toCopy.name);
- setPhone(toCopy.phone);
- setEmail(toCopy.email);
- setAddress(toCopy.address);
- setTags(toCopy.tags);
- }
-
- /**
- * Returns true if at least one field is edited.
- */
- public boolean isAnyFieldEdited() {
- return CollectionUtil.isAnyNonNull(name, phone, email, address, tags);
- }
-
- public void setName(Name name) {
- this.name = name;
- }
-
- public Optional<Name> getName() {
- return Optional.ofNullable(name);
- }
-
- public void setPhone(Phone phone) {
- this.phone = phone;
- }
-
- public Optional<Phone> getPhone() {
- return Optional.ofNullable(phone);
- }
-
- public void setEmail(Email email) {
- this.email = email;
- }
-
- public Optional<Email> getEmail() {
- return Optional.ofNullable(email);
- }
-
- public void setAddress(Address address) {
- this.address = address;
- }
-
- public Optional<Address> getAddress() {
- return Optional.ofNullable(address);
- }
-
- /**
- * Sets {@code tags} to this object's {@code tags}.
- * A defensive copy of {@code tags} is used internally.
- */
- public void setTags(Set<Tag> tags) {
- this.tags = (tags != null) ? new HashSet<>(tags) : null;
- }
-
- /**
- * Returns an unmodifiable tag set, which throws {@code UnsupportedOperationException}
- * if modification is attempted.
- * Returns {@code Optional#empty()} if {@code tags} is null.
- */
- public Optional<Set<Tag>> getTags() {
- return (tags != null) ? Optional.of(Collections.unmodifiableSet(tags)) : Optional.empty();
- }
-
- @Override
- public boolean equals(Object other) {
- // short circuit if same object
- if (other == this) {
- return true;
- }
-
- // instanceof handles nulls
- if (!(other instanceof EditPersonDescriptor)) {
- return false;
- }
-
- // state check
- EditPersonDescriptor e = (EditPersonDescriptor) other;
-
- return getName().equals(e.getName())
- && getPhone().equals(e.getPhone())
- && getEmail().equals(e.getEmail())
- && getAddress().equals(e.getAddress())
- && getTags().equals(e.getTags());
- }
- }
-}
diff --git a/src/main/java/seedu/address/logic/commands/FindCommand.java b/src/main/java/seedu/address/logic/commands/FindCommand.java
deleted file mode 100644
index d6b19b0a0de..00000000000
--- a/src/main/java/seedu/address/logic/commands/FindCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.model.Model;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-
-/**
- * Finds and lists all persons in address book whose name contains any of the argument keywords.
- * Keyword matching is case insensitive.
- */
-public class FindCommand extends Command {
-
- public static final String COMMAND_WORD = "find";
-
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons whose names contain any of "
- + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
- + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
- + "Example: " + COMMAND_WORD + " alice bob charlie";
-
- private final NameContainsKeywordsPredicate predicate;
-
- public FindCommand(NameContainsKeywordsPredicate predicate) {
- this.predicate = predicate;
- }
-
- @Override
- public CommandResult execute(Model model) {
- requireNonNull(model);
- model.updateFilteredPersonList(predicate);
- return new CommandResult(
- String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, model.getFilteredPersonList().size()));
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof FindCommand // instanceof handles nulls
- && predicate.equals(((FindCommand) other).predicate)); // state check
- }
-}
diff --git a/src/main/java/seedu/address/logic/commands/ListCommand.java b/src/main/java/seedu/address/logic/commands/ListCommand.java
deleted file mode 100644
index 84be6ad2596..00000000000
--- a/src/main/java/seedu/address/logic/commands/ListCommand.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-
-import seedu.address.model.Model;
-
-/**
- * Lists all persons in the address book to the user.
- */
-public class ListCommand extends Command {
-
- public static final String COMMAND_WORD = "list";
-
- public static final String MESSAGE_SUCCESS = "Listed all persons";
-
-
- @Override
- public CommandResult execute(Model model) {
- requireNonNull(model);
- model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
- return new CommandResult(MESSAGE_SUCCESS);
- }
-}
diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
deleted file mode 100644
index 3b8bfa035e8..00000000000
--- a/src/main/java/seedu/address/logic/parser/AddCommandParser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-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 java.util.Set;
-import java.util.stream.Stream;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Parses input arguments and creates a new AddCommand object
- */
-public class AddCommandParser implements Parser<AddCommand> {
-
- /**
- * Parses the given {@code String} of arguments in the context of the AddCommand
- * and returns an AddCommand object for execution.
- * @throws ParseException if the user input does not conform the expected format
- */
- public AddCommand parse(String args) throws ParseException {
- ArgumentMultimap argMultimap =
- ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_TAG);
-
- if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_ADDRESS, PREFIX_PHONE, PREFIX_EMAIL)
- || !argMultimap.getPreamble().isEmpty()) {
- throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
- }
-
- Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
- Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
- Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
- Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
- Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
-
- Person person = new Person(name, phone, email, address, tagList);
-
- return new AddCommand(person);
- }
-
- /**
- * 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());
- }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
deleted file mode 100644
index 1e466792b46..00000000000
--- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.ExitCommand;
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.commands.HelpCommand;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-
-/**
- * Parses user input.
- */
-public class AddressBookParser {
-
- /**
- * Used for initial separation of command word and args.
- */
- private static final Pattern BASIC_COMMAND_FORMAT = Pattern.compile("(?<commandWord>\\S+)(?<arguments>.*)");
-
- /**
- * Parses user input into command for execution.
- *
- * @param userInput full user input string
- * @return the command based on the user input
- * @throws ParseException if the user input does not conform the expected format
- */
- public Command parseCommand(String userInput) throws ParseException {
- final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(userInput.trim());
- if (!matcher.matches()) {
- throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE));
- }
-
- final String commandWord = matcher.group("commandWord");
- final String arguments = matcher.group("arguments");
- switch (commandWord) {
-
- case AddCommand.COMMAND_WORD:
- return new AddCommandParser().parse(arguments);
-
- case EditCommand.COMMAND_WORD:
- return new EditCommandParser().parse(arguments);
-
- case DeleteCommand.COMMAND_WORD:
- return new DeleteCommandParser().parse(arguments);
-
- case ClearCommand.COMMAND_WORD:
- return new ClearCommand();
-
- case FindCommand.COMMAND_WORD:
- return new FindCommandParser().parse(arguments);
-
- case ListCommand.COMMAND_WORD:
- return new ListCommand();
-
- case ExitCommand.COMMAND_WORD:
- return new ExitCommand();
-
- case HelpCommand.COMMAND_WORD:
- return new HelpCommand();
-
- default:
- throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
- }
- }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
deleted file mode 100644
index 75b1a9bf119..00000000000
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package seedu.address.logic.parser;
-
-/**
- * Contains Command Line Interface (CLI) syntax definitions common to multiple commands
- */
-public class CliSyntax {
-
- /* Prefix definitions */
- public static final Prefix PREFIX_NAME = new Prefix("n/");
- public static final Prefix PREFIX_PHONE = new Prefix("p/");
- public static final Prefix PREFIX_EMAIL = new Prefix("e/");
- public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
- public static final Prefix PREFIX_TAG = new Prefix("t/");
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
deleted file mode 100644
index 845644b7dea..00000000000
--- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package seedu.address.logic.parser;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-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 java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.Set;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.tag.Tag;
-
-/**
- * Parses input arguments and creates a new EditCommand object
- */
-public class EditCommandParser implements Parser<EditCommand> {
-
- /**
- * Parses the given {@code String} of arguments in the context of the EditCommand
- * and returns an EditCommand object for execution.
- * @throws ParseException if the user input does not conform the expected format
- */
- public EditCommand parse(String args) throws ParseException {
- requireNonNull(args);
- ArgumentMultimap argMultimap =
- ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_TAG);
-
- Index index;
-
- try {
- index = ParserUtil.parseIndex(argMultimap.getPreamble());
- } catch (ParseException pe) {
- throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
- }
-
- EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
- if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
- editPersonDescriptor.setName(ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get()));
- }
- if (argMultimap.getValue(PREFIX_PHONE).isPresent()) {
- editPersonDescriptor.setPhone(ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get()));
- }
- if (argMultimap.getValue(PREFIX_EMAIL).isPresent()) {
- editPersonDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
- }
- if (argMultimap.getValue(PREFIX_ADDRESS).isPresent()) {
- editPersonDescriptor.setAddress(ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get()));
- }
- parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPersonDescriptor::setTags);
-
- if (!editPersonDescriptor.isAnyFieldEdited()) {
- throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
- }
-
- return new EditCommand(index, editPersonDescriptor);
- }
-
- /**
- * Parses {@code Collection<String> tags} into a {@code Set<Tag>} if {@code tags} is non-empty.
- * If {@code tags} contain only one element which is an empty string, it will be parsed into a
- * {@code Set<Tag>} containing zero tags.
- */
- private Optional<Set<Tag>> parseTagsForEdit(Collection<String> tags) throws ParseException {
- assert tags != null;
-
- if (tags.isEmpty()) {
- return Optional.empty();
- }
- Collection<String> tagSet = tags.size() == 1 && tags.contains("") ? Collections.emptySet() : tags;
- return Optional.of(ParserUtil.parseTags(tagSet));
- }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/FindCommandParser.java b/src/main/java/seedu/address/logic/parser/FindCommandParser.java
deleted file mode 100644
index 4fb71f23103..00000000000
--- a/src/main/java/seedu/address/logic/parser/FindCommandParser.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-
-import java.util.Arrays;
-
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-
-/**
- * Parses input arguments and creates a new FindCommand object
- */
-public class FindCommandParser implements Parser<FindCommand> {
-
- /**
- * Parses the given {@code String} of arguments in the context of the FindCommand
- * and returns a FindCommand object for execution.
- * @throws ParseException if the user input does not conform the expected format
- */
- public FindCommand parse(String args) throws ParseException {
- String trimmedArgs = args.trim();
- if (trimmedArgs.isEmpty()) {
- throw new ParseException(
- String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
- }
-
- String[] nameKeywords = trimmedArgs.split("\\s+");
-
- return new FindCommand(new NameContainsKeywordsPredicate(Arrays.asList(nameKeywords)));
- }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
deleted file mode 100644
index b117acb9c55..00000000000
--- a/src/main/java/seedu/address/logic/parser/ParserUtil.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package seedu.address.logic.parser;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.commons.util.StringUtil;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Contains utility methods used for parsing strings in the various *Parser classes.
- */
-public class ParserUtil {
-
- public static final String MESSAGE_INVALID_INDEX = "Index is not a non-zero unsigned integer.";
-
- /**
- * Parses {@code oneBasedIndex} into an {@code Index} and returns it. Leading and trailing whitespaces will be
- * trimmed.
- * @throws ParseException if the specified index is invalid (not non-zero unsigned integer).
- */
- public static Index parseIndex(String oneBasedIndex) throws ParseException {
- String trimmedIndex = oneBasedIndex.trim();
- if (!StringUtil.isNonZeroUnsignedInteger(trimmedIndex)) {
- throw new ParseException(MESSAGE_INVALID_INDEX);
- }
- return Index.fromOneBased(Integer.parseInt(trimmedIndex));
- }
-
- /**
- * Parses a {@code String name} into a {@code Name}.
- * Leading and trailing whitespaces will be trimmed.
- *
- * @throws ParseException if the given {@code name} is invalid.
- */
- public static Name parseName(String name) throws ParseException {
- requireNonNull(name);
- String trimmedName = name.trim();
- if (!Name.isValidName(trimmedName)) {
- throw new ParseException(Name.MESSAGE_CONSTRAINTS);
- }
- return new Name(trimmedName);
- }
-
- /**
- * Parses a {@code String phone} into a {@code Phone}.
- * Leading and trailing whitespaces will be trimmed.
- *
- * @throws ParseException if the given {@code phone} is invalid.
- */
- public static Phone parsePhone(String phone) throws ParseException {
- requireNonNull(phone);
- String trimmedPhone = phone.trim();
- if (!Phone.isValidPhone(trimmedPhone)) {
- throw new ParseException(Phone.MESSAGE_CONSTRAINTS);
- }
- return new Phone(trimmedPhone);
- }
-
- /**
- * Parses a {@code String address} into an {@code Address}.
- * Leading and trailing whitespaces will be trimmed.
- *
- * @throws ParseException if the given {@code address} is invalid.
- */
- public static Address parseAddress(String address) throws ParseException {
- requireNonNull(address);
- String trimmedAddress = address.trim();
- if (!Address.isValidAddress(trimmedAddress)) {
- throw new ParseException(Address.MESSAGE_CONSTRAINTS);
- }
- return new Address(trimmedAddress);
- }
-
- /**
- * Parses a {@code String email} into an {@code Email}.
- * Leading and trailing whitespaces will be trimmed.
- *
- * @throws ParseException if the given {@code email} is invalid.
- */
- public static Email parseEmail(String email) throws ParseException {
- requireNonNull(email);
- String trimmedEmail = email.trim();
- if (!Email.isValidEmail(trimmedEmail)) {
- throw new ParseException(Email.MESSAGE_CONSTRAINTS);
- }
- return new Email(trimmedEmail);
- }
-
- /**
- * Parses a {@code String tag} into a {@code Tag}.
- * Leading and trailing whitespaces will be trimmed.
- *
- * @throws ParseException if the given {@code tag} is invalid.
- */
- public static Tag parseTag(String tag) throws ParseException {
- requireNonNull(tag);
- String trimmedTag = tag.trim();
- if (!Tag.isValidTagName(trimmedTag)) {
- throw new ParseException(Tag.MESSAGE_CONSTRAINTS);
- }
- return new Tag(trimmedTag);
- }
-
- /**
- * Parses {@code Collection<String> tags} into a {@code Set<Tag>}.
- */
- public static Set<Tag> parseTags(Collection<String> tags) throws ParseException {
- requireNonNull(tags);
- final Set<Tag> tagSet = new HashSet<>();
- for (String tagName : tags) {
- tagSet.add(parseTag(tagName));
- }
- return tagSet;
- }
-}
diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java
deleted file mode 100644
index 1a943a0781a..00000000000
--- a/src/main/java/seedu/address/model/AddressBook.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package seedu.address.model;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.List;
-
-import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.UniquePersonList;
-
-/**
- * Wraps all data at the address-book level
- * Duplicates are not allowed (by .isSamePerson comparison)
- */
-public class AddressBook implements ReadOnlyAddressBook {
-
- private final UniquePersonList persons;
-
- /*
- * The 'unusual' code block below is a non-static initialization block, sometimes used to avoid duplication
- * between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
- *
- * Note that non-static init blocks are not recommended to use. There are other ways to avoid duplication
- * among constructors.
- */
- {
- persons = new UniquePersonList();
- }
-
- public AddressBook() {}
-
- /**
- * Creates an AddressBook using the Persons in the {@code toBeCopied}
- */
- public AddressBook(ReadOnlyAddressBook toBeCopied) {
- this();
- resetData(toBeCopied);
- }
-
- //// list overwrite operations
-
- /**
- * Replaces the contents of the person list with {@code persons}.
- * {@code persons} must not contain duplicate persons.
- */
- public void setPersons(List<Person> persons) {
- this.persons.setPersons(persons);
- }
-
- /**
- * Resets the existing data of this {@code AddressBook} with {@code newData}.
- */
- public void resetData(ReadOnlyAddressBook newData) {
- requireNonNull(newData);
-
- setPersons(newData.getPersonList());
- }
-
- //// person-level operations
-
- /**
- * Returns true if a person with the same identity as {@code person} exists in the address book.
- */
- public boolean hasPerson(Person person) {
- requireNonNull(person);
- return persons.contains(person);
- }
-
- /**
- * Adds a person to the address book.
- * The person must not already exist in the address book.
- */
- public void addPerson(Person p) {
- persons.add(p);
- }
-
- /**
- * Replaces the given person {@code target} in the list with {@code editedPerson}.
- * {@code target} must exist in the address book.
- * The person identity of {@code editedPerson} must not be the same as another existing person in the address book.
- */
- public void setPerson(Person target, Person editedPerson) {
- requireNonNull(editedPerson);
-
- persons.setPerson(target, editedPerson);
- }
-
- /**
- * Removes {@code key} from this {@code AddressBook}.
- * {@code key} must exist in the address book.
- */
- public void removePerson(Person key) {
- persons.remove(key);
- }
-
- //// util methods
-
- @Override
- public String toString() {
- return persons.asUnmodifiableObservableList().size() + " persons";
- // TODO: refine later
- }
-
- @Override
- public ObservableList<Person> getPersonList() {
- return persons.asUnmodifiableObservableList();
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof AddressBook // instanceof handles nulls
- && persons.equals(((AddressBook) other).persons));
- }
-
- @Override
- public int hashCode() {
- return persons.hashCode();
- }
-}
diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
deleted file mode 100644
index d54df471c1f..00000000000
--- a/src/main/java/seedu/address/model/Model.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package seedu.address.model;
-
-import java.nio.file.Path;
-import java.util.function.Predicate;
-
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.person.Person;
-
-/**
- * The API of the Model component.
- */
-public interface Model {
- /** {@code Predicate} that always evaluate to true */
- Predicate<Person> PREDICATE_SHOW_ALL_PERSONS = unused -> true;
-
- /**
- * Replaces user prefs data with the data in {@code userPrefs}.
- */
- void setUserPrefs(ReadOnlyUserPrefs userPrefs);
-
- /**
- * Returns the user prefs.
- */
- ReadOnlyUserPrefs getUserPrefs();
-
- /**
- * Returns the user prefs' GUI settings.
- */
- GuiSettings getGuiSettings();
-
- /**
- * Sets the user prefs' GUI settings.
- */
- void setGuiSettings(GuiSettings guiSettings);
-
- /**
- * Returns the user prefs' address book file path.
- */
- Path getAddressBookFilePath();
-
- /**
- * Sets the user prefs' address book file path.
- */
- void setAddressBookFilePath(Path addressBookFilePath);
-
- /**
- * Replaces address book data with the data in {@code addressBook}.
- */
- void setAddressBook(ReadOnlyAddressBook addressBook);
-
- /** Returns the AddressBook */
- ReadOnlyAddressBook getAddressBook();
-
- /**
- * Returns true if a person with the same identity as {@code person} exists in the address book.
- */
- boolean hasPerson(Person person);
-
- /**
- * Deletes the given person.
- * The person must exist in the address book.
- */
- void deletePerson(Person target);
-
- /**
- * Adds the given person.
- * {@code person} must not already exist in the address book.
- */
- void addPerson(Person person);
-
- /**
- * Replaces the given person {@code target} with {@code editedPerson}.
- * {@code target} must exist in the address book.
- * The person identity of {@code editedPerson} must not be the same as another existing person in the address book.
- */
- void setPerson(Person target, Person editedPerson);
-
- /** Returns an unmodifiable view of the filtered person list */
- ObservableList<Person> getFilteredPersonList();
-
- /**
- * Updates the filter of the filtered person list to filter by the given {@code predicate}.
- * @throws NullPointerException if {@code predicate} is null.
- */
- void updateFilteredPersonList(Predicate<Person> predicate);
-}
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
deleted file mode 100644
index 0650c954f5c..00000000000
--- a/src/main/java/seedu/address/model/ModelManager.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package seedu.address.model;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
-import java.nio.file.Path;
-import java.util.function.Predicate;
-import java.util.logging.Logger;
-
-import javafx.collections.ObservableList;
-import javafx.collections.transformation.FilteredList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.model.person.Person;
-
-/**
- * Represents the in-memory model of the address book data.
- */
-public class ModelManager implements Model {
- private static final Logger logger = LogsCenter.getLogger(ModelManager.class);
-
- private final AddressBook addressBook;
- private final UserPrefs userPrefs;
- private final FilteredList<Person> filteredPersons;
-
- /**
- * Initializes a ModelManager with the given addressBook and userPrefs.
- */
- public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyUserPrefs userPrefs) {
- super();
- requireAllNonNull(addressBook, userPrefs);
-
- logger.fine("Initializing with address book: " + addressBook + " and user prefs " + userPrefs);
-
- this.addressBook = new AddressBook(addressBook);
- this.userPrefs = new UserPrefs(userPrefs);
- filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
- }
-
- public ModelManager() {
- this(new AddressBook(), new UserPrefs());
- }
-
- //=========== UserPrefs ==================================================================================
-
- @Override
- public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
- requireNonNull(userPrefs);
- this.userPrefs.resetData(userPrefs);
- }
-
- @Override
- public ReadOnlyUserPrefs getUserPrefs() {
- return userPrefs;
- }
-
- @Override
- public GuiSettings getGuiSettings() {
- return userPrefs.getGuiSettings();
- }
-
- @Override
- public void setGuiSettings(GuiSettings guiSettings) {
- requireNonNull(guiSettings);
- userPrefs.setGuiSettings(guiSettings);
- }
-
- @Override
- public Path getAddressBookFilePath() {
- return userPrefs.getAddressBookFilePath();
- }
-
- @Override
- public void setAddressBookFilePath(Path addressBookFilePath) {
- requireNonNull(addressBookFilePath);
- userPrefs.setAddressBookFilePath(addressBookFilePath);
- }
-
- //=========== AddressBook ================================================================================
-
- @Override
- public void setAddressBook(ReadOnlyAddressBook addressBook) {
- this.addressBook.resetData(addressBook);
- }
-
- @Override
- public ReadOnlyAddressBook getAddressBook() {
- return addressBook;
- }
-
- @Override
- public boolean hasPerson(Person person) {
- requireNonNull(person);
- return addressBook.hasPerson(person);
- }
-
- @Override
- public void deletePerson(Person target) {
- addressBook.removePerson(target);
- }
-
- @Override
- public void addPerson(Person person) {
- addressBook.addPerson(person);
- updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
- }
-
- @Override
- public void setPerson(Person target, Person editedPerson) {
- requireAllNonNull(target, editedPerson);
-
- addressBook.setPerson(target, editedPerson);
- }
-
- //=========== Filtered Person List Accessors =============================================================
-
- /**
- * Returns an unmodifiable view of the list of {@code Person} backed by the internal list of
- * {@code versionedAddressBook}
- */
- @Override
- public ObservableList<Person> getFilteredPersonList() {
- return filteredPersons;
- }
-
- @Override
- public void updateFilteredPersonList(Predicate<Person> predicate) {
- requireNonNull(predicate);
- filteredPersons.setPredicate(predicate);
- }
-
- @Override
- public boolean equals(Object obj) {
- // short circuit if same object
- if (obj == this) {
- return true;
- }
-
- // instanceof handles nulls
- if (!(obj instanceof ModelManager)) {
- return false;
- }
-
- // state check
- ModelManager other = (ModelManager) obj;
- return addressBook.equals(other.addressBook)
- && userPrefs.equals(other.userPrefs)
- && filteredPersons.equals(other.filteredPersons);
- }
-
-}
diff --git a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java b/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
deleted file mode 100644
index 6ddc2cd9a29..00000000000
--- a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package seedu.address.model;
-
-import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
-
-/**
- * Unmodifiable view of an address book
- */
-public interface ReadOnlyAddressBook {
-
- /**
- * Returns an unmodifiable view of the persons list.
- * This list will not contain any duplicate persons.
- */
- ObservableList<Person> getPersonList();
-
-}
diff --git a/src/main/java/seedu/address/model/person/Address.java b/src/main/java/seedu/address/model/person/Address.java
deleted file mode 100644
index 60472ca22a0..00000000000
--- a/src/main/java/seedu/address/model/person/Address.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's address in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidAddress(String)}
- */
-public class Address {
-
- public static final String MESSAGE_CONSTRAINTS = "Addresses can take any values, and it should not be blank";
-
- /*
- * The first character of the address must not be a whitespace,
- * otherwise " " (a blank string) becomes a valid input.
- */
- public static final String VALIDATION_REGEX = "[^\\s].*";
-
- public final String value;
-
- /**
- * Constructs an {@code Address}.
- *
- * @param address A valid address.
- */
- public Address(String address) {
- requireNonNull(address);
- checkArgument(isValidAddress(address), MESSAGE_CONSTRAINTS);
- value = address;
- }
-
- /**
- * Returns true if a given string is a valid email.
- */
- public static boolean isValidAddress(String test) {
- return test.matches(VALIDATION_REGEX);
- }
-
- @Override
- public String toString() {
- return value;
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof Address // instanceof handles nulls
- && value.equals(((Address) other).value)); // state check
- }
-
- @Override
- public int hashCode() {
- return value.hashCode();
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Email.java b/src/main/java/seedu/address/model/person/Email.java
deleted file mode 100644
index a5bbe0b6a5f..00000000000
--- a/src/main/java/seedu/address/model/person/Email.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's email in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidEmail(String)}
- */
-public class Email {
-
- private static final String SPECIAL_CHARACTERS = "!#$%&'*+/=?`{|}~^.-";
- public static final String MESSAGE_CONSTRAINTS = "Emails should be of the format local-part@domain "
- + "and adhere to the following constraints:\n"
- + "1. The local-part should only contain alphanumeric characters and these special characters, excluding "
- + "the parentheses, (" + SPECIAL_CHARACTERS + ") .\n"
- + "2. This is followed by a '@' and then a domain name. "
- + "The domain name must:\n"
- + " - be at least 2 characters long\n"
- + " - start and end with alphanumeric characters\n"
- + " - consist of alphanumeric characters, a period or a hyphen for the characters in between, if any.";
- // alphanumeric and special characters
- private static final String LOCAL_PART_REGEX = "^[\\w" + SPECIAL_CHARACTERS + "]+";
- private static final String DOMAIN_FIRST_CHARACTER_REGEX = "[^\\W_]"; // alphanumeric characters except underscore
- private static final String DOMAIN_MIDDLE_REGEX = "[a-zA-Z0-9.-]*"; // alphanumeric, period and hyphen
- private static final String DOMAIN_LAST_CHARACTER_REGEX = "[^\\W_]$";
- public static final String VALIDATION_REGEX = LOCAL_PART_REGEX + "@"
- + DOMAIN_FIRST_CHARACTER_REGEX + DOMAIN_MIDDLE_REGEX + DOMAIN_LAST_CHARACTER_REGEX;
-
- public final String value;
-
- /**
- * Constructs an {@code Email}.
- *
- * @param email A valid email address.
- */
- public Email(String email) {
- requireNonNull(email);
- checkArgument(isValidEmail(email), MESSAGE_CONSTRAINTS);
- value = email;
- }
-
- /**
- * Returns if a given string is a valid email.
- */
- public static boolean isValidEmail(String test) {
- return test.matches(VALIDATION_REGEX);
- }
-
- @Override
- public String toString() {
- return value;
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof Email // instanceof handles nulls
- && value.equals(((Email) other).value)); // state check
- }
-
- @Override
- public int hashCode() {
- return value.hashCode();
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Name.java b/src/main/java/seedu/address/model/person/Name.java
deleted file mode 100644
index 79244d71cf7..00000000000
--- a/src/main/java/seedu/address/model/person/Name.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's name in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidName(String)}
- */
-public class Name {
-
- public static final String MESSAGE_CONSTRAINTS =
- "Names should only contain alphanumeric characters and spaces, and it should not be blank";
-
- /*
- * The first character of the address must not be a whitespace,
- * otherwise " " (a blank string) becomes a valid input.
- */
- public static final String VALIDATION_REGEX = "[\\p{Alnum}][\\p{Alnum} ]*";
-
- public final String fullName;
-
- /**
- * Constructs a {@code Name}.
- *
- * @param name A valid name.
- */
- public Name(String name) {
- requireNonNull(name);
- checkArgument(isValidName(name), MESSAGE_CONSTRAINTS);
- fullName = name;
- }
-
- /**
- * Returns true if a given string is a valid name.
- */
- public static boolean isValidName(String test) {
- return test.matches(VALIDATION_REGEX);
- }
-
-
- @Override
- public String toString() {
- return fullName;
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof Name // instanceof handles nulls
- && fullName.equals(((Name) other).fullName)); // state check
- }
-
- @Override
- public int hashCode() {
- return fullName.hashCode();
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java b/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java
deleted file mode 100644
index c9b5868427c..00000000000
--- a/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package seedu.address.model.person;
-
-import java.util.List;
-import java.util.function.Predicate;
-
-import seedu.address.commons.util.StringUtil;
-
-/**
- * Tests that a {@code Person}'s {@code Name} matches any of the keywords given.
- */
-public class NameContainsKeywordsPredicate implements Predicate<Person> {
- private final List<String> keywords;
-
- public NameContainsKeywordsPredicate(List<String> keywords) {
- this.keywords = keywords;
- }
-
- @Override
- public boolean test(Person person) {
- return keywords.stream()
- .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(person.getName().fullName, keyword));
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof NameContainsKeywordsPredicate // instanceof handles nulls
- && keywords.equals(((NameContainsKeywordsPredicate) other).keywords)); // state check
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
deleted file mode 100644
index 557a7a60cd5..00000000000
--- a/src/main/java/seedu/address/model/person/Person.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package seedu.address.model.person;
-
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import seedu.address.model.tag.Tag;
-
-/**
- * Represents a Person in the address book.
- * Guarantees: details are present and not null, field values are validated, immutable.
- */
-public class Person {
-
- // Identity fields
- private final Name name;
- private final Phone phone;
- private final Email email;
-
- // Data fields
- private final Address address;
- private final Set<Tag> tags = new HashSet<>();
-
- /**
- * Every field must be present and not null.
- */
- public Person(Name name, Phone phone, Email email, Address address, Set<Tag> tags) {
- requireAllNonNull(name, phone, email, address, tags);
- this.name = name;
- this.phone = phone;
- this.email = email;
- this.address = address;
- this.tags.addAll(tags);
- }
-
- public Name getName() {
- return name;
- }
-
- public Phone getPhone() {
- return phone;
- }
-
- public Email getEmail() {
- return email;
- }
-
- public Address getAddress() {
- return address;
- }
-
- /**
- * Returns an immutable tag set, which throws {@code UnsupportedOperationException}
- * if modification is attempted.
- */
- public Set<Tag> getTags() {
- return Collections.unmodifiableSet(tags);
- }
-
- /**
- * Returns true if both persons of the same name have at least one other identity field that is the same.
- * This defines a weaker notion of equality between two persons.
- */
- public boolean isSamePerson(Person otherPerson) {
- if (otherPerson == this) {
- return true;
- }
-
- return otherPerson != null
- && otherPerson.getName().equals(getName())
- && (otherPerson.getPhone().equals(getPhone()) || otherPerson.getEmail().equals(getEmail()));
- }
-
- /**
- * Returns true if both persons have the same identity and data fields.
- * This defines a stronger notion of equality between two persons.
- */
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
-
- if (!(other instanceof Person)) {
- return false;
- }
-
- Person otherPerson = (Person) other;
- return otherPerson.getName().equals(getName())
- && otherPerson.getPhone().equals(getPhone())
- && otherPerson.getEmail().equals(getEmail())
- && otherPerson.getAddress().equals(getAddress())
- && otherPerson.getTags().equals(getTags());
- }
-
- @Override
- public int hashCode() {
- // use this method for custom fields hashing instead of implementing your own
- return Objects.hash(name, phone, email, address, tags);
- }
-
- @Override
- public String toString() {
- final StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" Phone: ")
- .append(getPhone())
- .append(" Email: ")
- .append(getEmail())
- .append(" Address: ")
- .append(getAddress())
- .append(" Tags: ");
- getTags().forEach(builder::append);
- return builder.toString();
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Phone.java b/src/main/java/seedu/address/model/person/Phone.java
deleted file mode 100644
index 872c76b382f..00000000000
--- a/src/main/java/seedu/address/model/person/Phone.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's phone number in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)}
- */
-public class Phone {
-
-
- public static final String MESSAGE_CONSTRAINTS =
- "Phone numbers should only contain numbers, and it should be at least 3 digits long";
- public static final String VALIDATION_REGEX = "\\d{3,}";
- public final String value;
-
- /**
- * Constructs a {@code Phone}.
- *
- * @param phone A valid phone number.
- */
- public Phone(String phone) {
- requireNonNull(phone);
- checkArgument(isValidPhone(phone), MESSAGE_CONSTRAINTS);
- value = phone;
- }
-
- /**
- * Returns true if a given string is a valid phone number.
- */
- public static boolean isValidPhone(String test) {
- return test.matches(VALIDATION_REGEX);
- }
-
- @Override
- public String toString() {
- return value;
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof Phone // instanceof handles nulls
- && value.equals(((Phone) other).value)); // state check
- }
-
- @Override
- public int hashCode() {
- return value.hashCode();
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/UniquePersonList.java b/src/main/java/seedu/address/model/person/UniquePersonList.java
deleted file mode 100644
index 0fee4fe57e6..00000000000
--- a/src/main/java/seedu/address/model/person/UniquePersonList.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
-
-/**
- * A list of persons that enforces uniqueness between its elements and does not allow nulls.
- * A person is considered unique by comparing using {@code Person#isSamePerson(Person)}. As such, adding and updating of
- * persons uses Person#isSamePerson(Person) for equality so as to ensure that the person being added or updated is
- * unique in terms of identity in the UniquePersonList. However, the removal of a person uses Person#equals(Object) so
- * as to ensure that the person with exactly the same fields will be removed.
- *
- * Supports a minimal set of list operations.
- *
- * @see Person#isSamePerson(Person)
- */
-public class UniquePersonList implements Iterable<Person> {
-
- private final ObservableList<Person> internalList = FXCollections.observableArrayList();
- private final ObservableList<Person> internalUnmodifiableList =
- FXCollections.unmodifiableObservableList(internalList);
-
- /**
- * Returns true if the list contains an equivalent person as the given argument.
- */
- public boolean contains(Person toCheck) {
- requireNonNull(toCheck);
- return internalList.stream().anyMatch(toCheck::isSamePerson);
- }
-
- /**
- * Adds a person to the list.
- * The person must not already exist in the list.
- */
- public void add(Person toAdd) {
- requireNonNull(toAdd);
- if (contains(toAdd)) {
- throw new DuplicatePersonException();
- }
- internalList.add(toAdd);
- }
-
- /**
- * Replaces the person {@code target} in the list with {@code editedPerson}.
- * {@code target} must exist in the list.
- * The person identity of {@code editedPerson} must not be the same as another existing person in the list.
- */
- public void setPerson(Person target, Person editedPerson) {
- requireAllNonNull(target, editedPerson);
-
- int index = internalList.indexOf(target);
- if (index == -1) {
- throw new PersonNotFoundException();
- }
-
- if (!target.isSamePerson(editedPerson) && contains(editedPerson)) {
- throw new DuplicatePersonException();
- }
-
- internalList.set(index, editedPerson);
- }
-
- /**
- * Removes the equivalent person from the list.
- * The person must exist in the list.
- */
- public void remove(Person toRemove) {
- requireNonNull(toRemove);
- if (!internalList.remove(toRemove)) {
- throw new PersonNotFoundException();
- }
- }
-
- public void setPersons(UniquePersonList replacement) {
- requireNonNull(replacement);
- internalList.setAll(replacement.internalList);
- }
-
- /**
- * Replaces the contents of this list with {@code persons}.
- * {@code persons} must not contain duplicate persons.
- */
- public void setPersons(List<Person> persons) {
- requireAllNonNull(persons);
- if (!personsAreUnique(persons)) {
- throw new DuplicatePersonException();
- }
-
- internalList.setAll(persons);
- }
-
- /**
- * Returns the backing list as an unmodifiable {@code ObservableList}.
- */
- public ObservableList<Person> asUnmodifiableObservableList() {
- return internalUnmodifiableList;
- }
-
- @Override
- public Iterator<Person> iterator() {
- return internalList.iterator();
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof UniquePersonList // instanceof handles nulls
- && internalList.equals(((UniquePersonList) other).internalList));
- }
-
- @Override
- public int hashCode() {
- return internalList.hashCode();
- }
-
- /**
- * Returns true if {@code persons} contains only unique persons.
- */
- private boolean personsAreUnique(List<Person> persons) {
- for (int i = 0; i < persons.size() - 1; i++) {
- for (int j = i + 1; j < persons.size(); j++) {
- if (persons.get(i).isSamePerson(persons.get(j))) {
- return false;
- }
- }
- }
- return true;
- }
-}
diff --git a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java b/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java
deleted file mode 100644
index d7290f59442..00000000000
--- a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package seedu.address.model.person.exceptions;
-
-/**
- * Signals that the operation will result in duplicate Persons (Persons are considered duplicates if they have the same
- * identity).
- */
-public class DuplicatePersonException extends RuntimeException {
- public DuplicatePersonException() {
- super("Operation would result in duplicate persons");
- }
-}
diff --git a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java b/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java
deleted file mode 100644
index fa764426ca7..00000000000
--- a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package seedu.address.model.person.exceptions;
-
-/**
- * Signals that the operation is unable to find the specified person.
- */
-public class PersonNotFoundException extends RuntimeException {}
diff --git a/src/main/java/seedu/address/model/tag/Tag.java b/src/main/java/seedu/address/model/tag/Tag.java
deleted file mode 100644
index b0ea7e7dad7..00000000000
--- a/src/main/java/seedu/address/model/tag/Tag.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package seedu.address.model.tag;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Tag in the address book.
- * Guarantees: immutable; name is valid as declared in {@link #isValidTagName(String)}
- */
-public class Tag {
-
- public static final String MESSAGE_CONSTRAINTS = "Tags names should be alphanumeric";
- public static final String VALIDATION_REGEX = "\\p{Alnum}+";
-
- public final String tagName;
-
- /**
- * Constructs a {@code Tag}.
- *
- * @param tagName A valid tag name.
- */
- public Tag(String tagName) {
- requireNonNull(tagName);
- checkArgument(isValidTagName(tagName), MESSAGE_CONSTRAINTS);
- this.tagName = tagName;
- }
-
- /**
- * Returns true if a given string is a valid tag name.
- */
- public static boolean isValidTagName(String test) {
- return test.matches(VALIDATION_REGEX);
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof Tag // instanceof handles nulls
- && tagName.equals(((Tag) other).tagName)); // state check
- }
-
- @Override
- public int hashCode() {
- return tagName.hashCode();
- }
-
- /**
- * Format state as text for viewing.
- */
- public String toString() {
- return '[' + tagName + ']';
- }
-
-}
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
deleted file mode 100644
index 1806da4facf..00000000000
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package seedu.address.model.util;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Contains utility methods for populating {@code AddressBook} with sample data.
- */
-public class SampleDataUtil {
- public static Person[] getSamplePersons() {
- return new Person[] {
- new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
- new Address("Blk 30 Geylang Street 29, #06-40"),
- getTagSet("friends")),
- new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
- new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
- getTagSet("colleagues", "friends")),
- new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
- new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
- getTagSet("neighbours")),
- new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
- new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
- getTagSet("family")),
- new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
- new Address("Blk 47 Tampines Street 20, #17-35"),
- getTagSet("classmates")),
- new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
- new Address("Blk 45 Aljunied Street 85, #11-31"),
- getTagSet("colleagues"))
- };
- }
-
- public static ReadOnlyAddressBook getSampleAddressBook() {
- AddressBook sampleAb = new AddressBook();
- for (Person samplePerson : getSamplePersons()) {
- sampleAb.addPerson(samplePerson);
- }
- return sampleAb;
- }
-
- /**
- * Returns a tag set containing the list of strings given.
- */
- public static Set<Tag> getTagSet(String... strings) {
- return Arrays.stream(strings)
- .map(Tag::new)
- .collect(Collectors.toSet());
- }
-
-}
diff --git a/src/main/java/seedu/address/storage/AddressBookStorage.java b/src/main/java/seedu/address/storage/AddressBookStorage.java
deleted file mode 100644
index 4599182b3f9..00000000000
--- a/src/main/java/seedu/address/storage/AddressBookStorage.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package seedu.address.storage;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
-
-/**
- * Represents a storage for {@link seedu.address.model.AddressBook}.
- */
-public interface AddressBookStorage {
-
- /**
- * Returns the file path of the data file.
- */
- Path getAddressBookFilePath();
-
- /**
- * Returns AddressBook data as a {@link ReadOnlyAddressBook}.
- * Returns {@code Optional.empty()} if storage file is not found.
- * @throws DataConversionException if the data in storage is not in the expected format.
- * @throws IOException if there was any problem when reading from the storage.
- */
- Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException;
-
- /**
- * @see #getAddressBookFilePath()
- */
- Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException, IOException;
-
- /**
- * Saves the given {@link ReadOnlyAddressBook} to the storage.
- * @param addressBook cannot be null.
- * @throws IOException if there was any problem writing to the file.
- */
- void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException;
-
- /**
- * @see #saveAddressBook(ReadOnlyAddressBook)
- */
- void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException;
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
deleted file mode 100644
index a6321cec2ea..00000000000
--- a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package seedu.address.storage;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Jackson-friendly version of {@link Person}.
- */
-class JsonAdaptedPerson {
-
- public static final String MISSING_FIELD_MESSAGE_FORMAT = "Person's %s field is missing!";
-
- private final String name;
- private final String phone;
- private final String email;
- private final String address;
- private final List<JsonAdaptedTag> tagged = new ArrayList<>();
-
- /**
- * Constructs a {@code JsonAdaptedPerson} with the given person details.
- */
- @JsonCreator
- public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone") String phone,
- @JsonProperty("email") String email, @JsonProperty("address") String address,
- @JsonProperty("tagged") List<JsonAdaptedTag> tagged) {
- this.name = name;
- this.phone = phone;
- this.email = email;
- this.address = address;
- if (tagged != null) {
- this.tagged.addAll(tagged);
- }
- }
-
- /**
- * Converts a given {@code Person} into this class for Jackson use.
- */
- public JsonAdaptedPerson(Person source) {
- name = source.getName().fullName;
- phone = source.getPhone().value;
- email = source.getEmail().value;
- address = source.getAddress().value;
- tagged.addAll(source.getTags().stream()
- .map(JsonAdaptedTag::new)
- .collect(Collectors.toList()));
- }
-
- /**
- * Converts this Jackson-friendly adapted person object into the model's {@code Person} object.
- *
- * @throws IllegalValueException if there were any data constraints violated in the adapted person.
- */
- public Person toModelType() throws IllegalValueException {
- final List<Tag> personTags = new ArrayList<>();
- for (JsonAdaptedTag tag : tagged) {
- personTags.add(tag.toModelType());
- }
-
- if (name == null) {
- throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName()));
- }
- if (!Name.isValidName(name)) {
- throw new IllegalValueException(Name.MESSAGE_CONSTRAINTS);
- }
- final Name modelName = new Name(name);
-
- if (phone == null) {
- throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName()));
- }
- if (!Phone.isValidPhone(phone)) {
- throw new IllegalValueException(Phone.MESSAGE_CONSTRAINTS);
- }
- final Phone modelPhone = new Phone(phone);
-
- if (email == null) {
- throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName()));
- }
- if (!Email.isValidEmail(email)) {
- throw new IllegalValueException(Email.MESSAGE_CONSTRAINTS);
- }
- final Email modelEmail = new Email(email);
-
- if (address == null) {
- throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName()));
- }
- if (!Address.isValidAddress(address)) {
- throw new IllegalValueException(Address.MESSAGE_CONSTRAINTS);
- }
- final Address modelAddress = new Address(address);
-
- final Set<Tag> modelTags = new HashSet<>(personTags);
- return new Person(modelName, modelPhone, modelEmail, modelAddress, modelTags);
- }
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedTag.java b/src/main/java/seedu/address/storage/JsonAdaptedTag.java
deleted file mode 100644
index 0df22bdb754..00000000000
--- a/src/main/java/seedu/address/storage/JsonAdaptedTag.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package seedu.address.storage;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.tag.Tag;
-
-/**
- * Jackson-friendly version of {@link Tag}.
- */
-class JsonAdaptedTag {
-
- private final String tagName;
-
- /**
- * Constructs a {@code JsonAdaptedTag} with the given {@code tagName}.
- */
- @JsonCreator
- public JsonAdaptedTag(String tagName) {
- this.tagName = tagName;
- }
-
- /**
- * Converts a given {@code Tag} into this class for Jackson use.
- */
- public JsonAdaptedTag(Tag source) {
- tagName = source.tagName;
- }
-
- @JsonValue
- public String getTagName() {
- return tagName;
- }
-
- /**
- * Converts this Jackson-friendly adapted tag object into the model's {@code Tag} object.
- *
- * @throws IllegalValueException if there were any data constraints violated in the adapted tag.
- */
- public Tag toModelType() throws IllegalValueException {
- if (!Tag.isValidTagName(tagName)) {
- throw new IllegalValueException(Tag.MESSAGE_CONSTRAINTS);
- }
- return new Tag(tagName);
- }
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java b/src/main/java/seedu/address/storage/JsonAddressBookStorage.java
deleted file mode 100644
index dfab9daaa0d..00000000000
--- a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package seedu.address.storage;
-
-import static java.util.Objects.requireNonNull;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.logging.Logger;
-
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.commons.util.FileUtil;
-import seedu.address.commons.util.JsonUtil;
-import seedu.address.model.ReadOnlyAddressBook;
-
-/**
- * A class to access AddressBook data stored as a json file on the hard disk.
- */
-public class JsonAddressBookStorage implements AddressBookStorage {
-
- private static final Logger logger = LogsCenter.getLogger(JsonAddressBookStorage.class);
-
- private Path filePath;
-
- public JsonAddressBookStorage(Path filePath) {
- this.filePath = filePath;
- }
-
- public Path getAddressBookFilePath() {
- return filePath;
- }
-
- @Override
- public Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException {
- return readAddressBook(filePath);
- }
-
- /**
- * Similar to {@link #readAddressBook()}.
- *
- * @param filePath location of the data. Cannot be null.
- * @throws DataConversionException if the file is not in the correct format.
- */
- public Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException {
- requireNonNull(filePath);
-
- Optional<JsonSerializableAddressBook> jsonAddressBook = JsonUtil.readJsonFile(
- filePath, JsonSerializableAddressBook.class);
- if (!jsonAddressBook.isPresent()) {
- return Optional.empty();
- }
-
- try {
- return Optional.of(jsonAddressBook.get().toModelType());
- } catch (IllegalValueException ive) {
- logger.info("Illegal values found in " + filePath + ": " + ive.getMessage());
- throw new DataConversionException(ive);
- }
- }
-
- @Override
- public void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException {
- saveAddressBook(addressBook, filePath);
- }
-
- /**
- * Similar to {@link #saveAddressBook(ReadOnlyAddressBook)}.
- *
- * @param filePath location of the data. Cannot be null.
- */
- public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
- requireNonNull(addressBook);
- requireNonNull(filePath);
-
- FileUtil.createIfMissing(filePath);
- JsonUtil.saveJsonFile(new JsonSerializableAddressBook(addressBook), filePath);
- }
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java b/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
deleted file mode 100644
index 5efd834091d..00000000000
--- a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package seedu.address.storage;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonRootName;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * An Immutable AddressBook that is serializable to JSON format.
- */
-@JsonRootName(value = "addressbook")
-class JsonSerializableAddressBook {
-
- public static final String MESSAGE_DUPLICATE_PERSON = "Persons list contains duplicate person(s).";
-
- private final List<JsonAdaptedPerson> persons = new ArrayList<>();
-
- /**
- * Constructs a {@code JsonSerializableAddressBook} with the given persons.
- */
- @JsonCreator
- public JsonSerializableAddressBook(@JsonProperty("persons") List<JsonAdaptedPerson> persons) {
- this.persons.addAll(persons);
- }
-
- /**
- * Converts a given {@code ReadOnlyAddressBook} into this class for Jackson use.
- *
- * @param source future changes to this will not affect the created {@code JsonSerializableAddressBook}.
- */
- public JsonSerializableAddressBook(ReadOnlyAddressBook source) {
- persons.addAll(source.getPersonList().stream().map(JsonAdaptedPerson::new).collect(Collectors.toList()));
- }
-
- /**
- * Converts this address book into the model's {@code AddressBook} object.
- *
- * @throws IllegalValueException if there were any data constraints violated.
- */
- public AddressBook toModelType() throws IllegalValueException {
- AddressBook addressBook = new AddressBook();
- for (JsonAdaptedPerson jsonAdaptedPerson : persons) {
- Person person = jsonAdaptedPerson.toModelType();
- if (addressBook.hasPerson(person)) {
- throw new IllegalValueException(MESSAGE_DUPLICATE_PERSON);
- }
- addressBook.addPerson(person);
- }
- return addressBook;
- }
-
-}
diff --git a/src/main/java/seedu/address/storage/Storage.java b/src/main/java/seedu/address/storage/Storage.java
deleted file mode 100644
index beda8bd9f11..00000000000
--- a/src/main/java/seedu/address/storage/Storage.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package seedu.address.storage;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
-
-/**
- * API of the Storage component
- */
-public interface Storage extends AddressBookStorage, UserPrefsStorage {
-
- @Override
- Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException;
-
- @Override
- void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException;
-
- @Override
- Path getAddressBookFilePath();
-
- @Override
- Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException;
-
- @Override
- void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException;
-
-}
diff --git a/src/main/java/seedu/address/storage/StorageManager.java b/src/main/java/seedu/address/storage/StorageManager.java
deleted file mode 100644
index 79868290974..00000000000
--- a/src/main/java/seedu/address/storage/StorageManager.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package seedu.address.storage;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.logging.Logger;
-
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.UserPrefs;
-
-/**
- * Manages storage of AddressBook data in local storage.
- */
-public class StorageManager implements Storage {
-
- private static final Logger logger = LogsCenter.getLogger(StorageManager.class);
- private AddressBookStorage addressBookStorage;
- private UserPrefsStorage userPrefsStorage;
-
- /**
- * Creates a {@code StorageManager} with the given {@code AddressBookStorage} and {@code UserPrefStorage}.
- */
- public StorageManager(AddressBookStorage addressBookStorage, UserPrefsStorage userPrefsStorage) {
- super();
- this.addressBookStorage = addressBookStorage;
- this.userPrefsStorage = userPrefsStorage;
- }
-
- // ================ UserPrefs methods ==============================
-
- @Override
- public Path getUserPrefsFilePath() {
- return userPrefsStorage.getUserPrefsFilePath();
- }
-
- @Override
- public Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException {
- return userPrefsStorage.readUserPrefs();
- }
-
- @Override
- public void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException {
- userPrefsStorage.saveUserPrefs(userPrefs);
- }
-
-
- // ================ AddressBook methods ==============================
-
- @Override
- public Path getAddressBookFilePath() {
- return addressBookStorage.getAddressBookFilePath();
- }
-
- @Override
- public Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException {
- return readAddressBook(addressBookStorage.getAddressBookFilePath());
- }
-
- @Override
- public Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException, IOException {
- logger.fine("Attempting to read data from file: " + filePath);
- return addressBookStorage.readAddressBook(filePath);
- }
-
- @Override
- public void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException {
- saveAddressBook(addressBook, addressBookStorage.getAddressBookFilePath());
- }
-
- @Override
- public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
- logger.fine("Attempting to write to data file: " + filePath);
- addressBookStorage.saveAddressBook(addressBook, filePath);
- }
-
-}
diff --git a/src/main/java/seedu/address/ui/CommandBox.java b/src/main/java/seedu/address/ui/CommandBox.java
deleted file mode 100644
index 5cc21e47889..00000000000
--- a/src/main/java/seedu/address/ui/CommandBox.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package seedu.address.ui;
-
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.Region;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.exceptions.ParseException;
-
-/**
- * The UI component that is responsible for receiving user command inputs.
- */
-public class CommandBox extends UiPart<Region> {
-
- public static final String ERROR_STYLE_CLASS = "error";
- private static final String FXML = "CommandBox.fxml";
-
- private final CommandExecutor commandExecutor;
-
- @FXML
- private TextField commandTextField;
-
- /**
- * Creates a {@code CommandBox} with the given {@code CommandExecutor}.
- */
- public CommandBox(CommandExecutor commandExecutor) {
- super(FXML);
- this.commandExecutor = commandExecutor;
- // calls #setStyleToDefault() whenever there is a change to the text of the command box.
- commandTextField.textProperty().addListener((unused1, unused2, unused3) -> setStyleToDefault());
- }
-
- /**
- * Handles the Enter button pressed event.
- */
- @FXML
- private void handleCommandEntered() {
- try {
- commandExecutor.execute(commandTextField.getText());
- commandTextField.setText("");
- } catch (CommandException | ParseException e) {
- setStyleToIndicateCommandFailure();
- }
- }
-
- /**
- * Sets the command box style to use the default style.
- */
- private void setStyleToDefault() {
- commandTextField.getStyleClass().remove(ERROR_STYLE_CLASS);
- }
-
- /**
- * Sets the command box style to indicate a failed command.
- */
- private void setStyleToIndicateCommandFailure() {
- ObservableList<String> styleClass = commandTextField.getStyleClass();
-
- if (styleClass.contains(ERROR_STYLE_CLASS)) {
- return;
- }
-
- styleClass.add(ERROR_STYLE_CLASS);
- }
-
- /**
- * Represents a function that can execute commands.
- */
- @FunctionalInterface
- public interface CommandExecutor {
- /**
- * Executes the command and returns the result.
- *
- * @see seedu.address.logic.Logic#execute(String)
- */
- CommandResult execute(String commandText) throws CommandException, ParseException;
- }
-
-}
diff --git a/src/main/java/seedu/address/ui/HelpWindow.java b/src/main/java/seedu/address/ui/HelpWindow.java
deleted file mode 100644
index 9a665915949..00000000000
--- a/src/main/java/seedu/address/ui/HelpWindow.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package seedu.address.ui;
-
-import java.util.logging.Logger;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
-import javafx.stage.Stage;
-import seedu.address.commons.core.LogsCenter;
-
-/**
- * Controller for a help page
- */
-public class HelpWindow extends UiPart<Stage> {
-
- public static final String USERGUIDE_URL = "https://se-education.org/addressbook-level3/UserGuide.html";
- public static final String HELP_MESSAGE = "Refer to the user guide: " + USERGUIDE_URL;
-
- private static final Logger logger = LogsCenter.getLogger(HelpWindow.class);
- private static final String FXML = "HelpWindow.fxml";
-
- @FXML
- private Button copyButton;
-
- @FXML
- private Label helpMessage;
-
- /**
- * Creates a new HelpWindow.
- *
- * @param root Stage to use as the root of the HelpWindow.
- */
- public HelpWindow(Stage root) {
- super(FXML, root);
- helpMessage.setText(HELP_MESSAGE);
- }
-
- /**
- * Creates a new HelpWindow.
- */
- public HelpWindow() {
- this(new Stage());
- }
-
- /**
- * Shows the help window.
- * @throws IllegalStateException
- * <ul>
- * <li>
- * if this method is called on a thread other than the JavaFX Application Thread.
- * </li>
- * <li>
- * if this method is called during animation or layout processing.
- * </li>
- * <li>
- * if this method is called on the primary stage.
- * </li>
- * <li>
- * if {@code dialogStage} is already showing.
- * </li>
- * </ul>
- */
- public void show() {
- logger.fine("Showing help page about the application.");
- getRoot().show();
- getRoot().centerOnScreen();
- }
-
- /**
- * Returns true if the help window is currently being shown.
- */
- public boolean isShowing() {
- return getRoot().isShowing();
- }
-
- /**
- * Hides the help window.
- */
- public void hide() {
- getRoot().hide();
- }
-
- /**
- * Focuses on the help window.
- */
- public void focus() {
- getRoot().requestFocus();
- }
-
- /**
- * Copies the URL to the user guide to the clipboard.
- */
- @FXML
- private void copyUrl() {
- final Clipboard clipboard = Clipboard.getSystemClipboard();
- final ClipboardContent url = new ClipboardContent();
- url.putString(USERGUIDE_URL);
- clipboard.setContent(url);
- }
-}
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
deleted file mode 100644
index 9106c3aa6e5..00000000000
--- a/src/main/java/seedu/address/ui/MainWindow.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package seedu.address.ui;
-
-import java.util.logging.Logger;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.TextInputControl;
-import javafx.scene.input.KeyCombination;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.logic.Logic;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.exceptions.ParseException;
-
-/**
- * The Main Window. Provides the basic application layout containing
- * a menu bar and space where other JavaFX elements can be placed.
- */
-public class MainWindow extends UiPart<Stage> {
-
- private static final String FXML = "MainWindow.fxml";
-
- private final Logger logger = LogsCenter.getLogger(getClass());
-
- private Stage primaryStage;
- private Logic logic;
-
- // Independent Ui parts residing in this Ui container
- private PersonListPanel personListPanel;
- private ResultDisplay resultDisplay;
- private HelpWindow helpWindow;
-
- @FXML
- private StackPane commandBoxPlaceholder;
-
- @FXML
- private MenuItem helpMenuItem;
-
- @FXML
- private StackPane personListPanelPlaceholder;
-
- @FXML
- private StackPane resultDisplayPlaceholder;
-
- @FXML
- private StackPane statusbarPlaceholder;
-
- /**
- * Creates a {@code MainWindow} with the given {@code Stage} and {@code Logic}.
- */
- public MainWindow(Stage primaryStage, Logic logic) {
- super(FXML, primaryStage);
-
- // Set dependencies
- this.primaryStage = primaryStage;
- this.logic = logic;
-
- // Configure the UI
- setWindowDefaultSize(logic.getGuiSettings());
-
- setAccelerators();
-
- helpWindow = new HelpWindow();
- }
-
- public Stage getPrimaryStage() {
- return primaryStage;
- }
-
- private void setAccelerators() {
- setAccelerator(helpMenuItem, KeyCombination.valueOf("F1"));
- }
-
- /**
- * Sets the accelerator of a MenuItem.
- * @param keyCombination the KeyCombination value of the accelerator
- */
- private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
- menuItem.setAccelerator(keyCombination);
-
- /*
- * TODO: the code below can be removed once the bug reported here
- * https://bugs.openjdk.java.net/browse/JDK-8131666
- * is fixed in later version of SDK.
- *
- * According to the bug report, TextInputControl (TextField, TextArea) will
- * consume function-key events. Because CommandBox contains a TextField, and
- * ResultDisplay contains a TextArea, thus some accelerators (e.g F1) will
- * not work when the focus is in them because the key event is consumed by
- * the TextInputControl(s).
- *
- * For now, we add following event filter to capture such key events and open
- * help window purposely so to support accelerators even when focus is
- * in CommandBox or ResultDisplay.
- */
- getRoot().addEventFilter(KeyEvent.KEY_PRESSED, event -> {
- if (event.getTarget() instanceof TextInputControl && keyCombination.match(event)) {
- menuItem.getOnAction().handle(new ActionEvent());
- event.consume();
- }
- });
- }
-
- /**
- * Fills up all the placeholders of this window.
- */
- void fillInnerParts() {
- personListPanel = new PersonListPanel(logic.getFilteredPersonList());
- personListPanelPlaceholder.getChildren().add(personListPanel.getRoot());
-
- resultDisplay = new ResultDisplay();
- resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
-
- StatusBarFooter statusBarFooter = new StatusBarFooter(logic.getAddressBookFilePath());
- statusbarPlaceholder.getChildren().add(statusBarFooter.getRoot());
-
- CommandBox commandBox = new CommandBox(this::executeCommand);
- commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
- }
-
- /**
- * Sets the default size based on {@code guiSettings}.
- */
- private void setWindowDefaultSize(GuiSettings guiSettings) {
- primaryStage.setHeight(guiSettings.getWindowHeight());
- primaryStage.setWidth(guiSettings.getWindowWidth());
- if (guiSettings.getWindowCoordinates() != null) {
- primaryStage.setX(guiSettings.getWindowCoordinates().getX());
- primaryStage.setY(guiSettings.getWindowCoordinates().getY());
- }
- }
-
- /**
- * Opens the help window or focuses on it if it's already opened.
- */
- @FXML
- public void handleHelp() {
- if (!helpWindow.isShowing()) {
- helpWindow.show();
- } else {
- helpWindow.focus();
- }
- }
-
- void show() {
- primaryStage.show();
- }
-
- /**
- * Closes the application.
- */
- @FXML
- private void handleExit() {
- GuiSettings guiSettings = new GuiSettings(primaryStage.getWidth(), primaryStage.getHeight(),
- (int) primaryStage.getX(), (int) primaryStage.getY());
- logic.setGuiSettings(guiSettings);
- helpWindow.hide();
- primaryStage.hide();
- }
-
- public PersonListPanel getPersonListPanel() {
- return personListPanel;
- }
-
- /**
- * Executes the command and returns the result.
- *
- * @see seedu.address.logic.Logic#execute(String)
- */
- private CommandResult executeCommand(String commandText) throws CommandException, ParseException {
- try {
- CommandResult commandResult = logic.execute(commandText);
- logger.info("Result: " + commandResult.getFeedbackToUser());
- resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
-
- if (commandResult.isShowHelp()) {
- handleHelp();
- }
-
- if (commandResult.isExit()) {
- handleExit();
- }
-
- return commandResult;
- } catch (CommandException | ParseException e) {
- logger.info("Invalid command: " + commandText);
- resultDisplay.setFeedbackToUser(e.getMessage());
- throw e;
- }
- }
-}
diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/PersonCard.java
deleted file mode 100644
index 7fc927bc5d9..00000000000
--- a/src/main/java/seedu/address/ui/PersonCard.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package seedu.address.ui;
-
-import java.util.Comparator;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.layout.FlowPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
-import seedu.address.model.person.Person;
-
-/**
- * An UI component that displays information of a {@code Person}.
- */
-public class PersonCard extends UiPart<Region> {
-
- private static final String FXML = "PersonListCard.fxml";
-
- /**
- * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
- * As a consequence, UI elements' variable names cannot be set to such keywords
- * or an exception will be thrown by JavaFX during runtime.
- *
- * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
- */
-
- public final Person person;
-
- @FXML
- private HBox cardPane;
- @FXML
- private Label name;
- @FXML
- private Label id;
- @FXML
- private Label phone;
- @FXML
- private Label address;
- @FXML
- private Label email;
- @FXML
- private FlowPane tags;
-
- /**
- * Creates a {@code PersonCode} with the given {@code Person} and index to display.
- */
- public PersonCard(Person person, int displayedIndex) {
- super(FXML);
- this.person = person;
- id.setText(displayedIndex + ". ");
- name.setText(person.getName().fullName);
- phone.setText(person.getPhone().value);
- address.setText(person.getAddress().value);
- email.setText(person.getEmail().value);
- person.getTags().stream()
- .sorted(Comparator.comparing(tag -> tag.tagName))
- .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
- }
-
- @Override
- public boolean equals(Object other) {
- // short circuit if same object
- if (other == this) {
- return true;
- }
-
- // instanceof handles nulls
- if (!(other instanceof PersonCard)) {
- return false;
- }
-
- // state check
- PersonCard card = (PersonCard) other;
- return id.getText().equals(card.id.getText())
- && person.equals(card.person);
- }
-}
diff --git a/src/main/java/seedu/address/ui/PersonListPanel.java b/src/main/java/seedu/address/ui/PersonListPanel.java
deleted file mode 100644
index f4c501a897b..00000000000
--- a/src/main/java/seedu/address/ui/PersonListPanel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package seedu.address.ui;
-
-import java.util.logging.Logger;
-
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.layout.Region;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.model.person.Person;
-
-/**
- * Panel containing the list of persons.
- */
-public class PersonListPanel extends UiPart<Region> {
- private static final String FXML = "PersonListPanel.fxml";
- private final Logger logger = LogsCenter.getLogger(PersonListPanel.class);
-
- @FXML
- private ListView<Person> personListView;
-
- /**
- * Creates a {@code PersonListPanel} with the given {@code ObservableList}.
- */
- public PersonListPanel(ObservableList<Person> personList) {
- super(FXML);
- personListView.setItems(personList);
- personListView.setCellFactory(listView -> new PersonListViewCell());
- }
-
- /**
- * Custom {@code ListCell} that displays the graphics of a {@code Person} using a {@code PersonCard}.
- */
- class PersonListViewCell extends ListCell<Person> {
- @Override
- protected void updateItem(Person person, boolean empty) {
- super.updateItem(person, empty);
-
- if (empty || person == null) {
- setGraphic(null);
- setText(null);
- } else {
- setGraphic(new PersonCard(person, getIndex() + 1).getRoot());
- }
- }
- }
-
-}
diff --git a/src/main/java/seedu/address/ui/StatusBarFooter.java b/src/main/java/seedu/address/ui/StatusBarFooter.java
deleted file mode 100644
index b577f829423..00000000000
--- a/src/main/java/seedu/address/ui/StatusBarFooter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package seedu.address.ui;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
-
-/**
- * A ui for the status bar that is displayed at the footer of the application.
- */
-public class StatusBarFooter extends UiPart<Region> {
-
- private static final String FXML = "StatusBarFooter.fxml";
-
- @FXML
- private Label saveLocationStatus;
-
- /**
- * Creates a {@code StatusBarFooter} with the given {@code Path}.
- */
- public StatusBarFooter(Path saveLocation) {
- super(FXML);
- saveLocationStatus.setText(Paths.get(".").resolve(saveLocation).toString());
- }
-
-}
diff --git a/src/main/resources/fonts/Eczar-Regular.ttf b/src/main/resources/fonts/Eczar-Regular.ttf
new file mode 100644
index 00000000000..ae8176a71a2
Binary files /dev/null and b/src/main/resources/fonts/Eczar-Regular.ttf differ
diff --git a/src/main/resources/fonts/RobotoCondensed-Regular.ttf b/src/main/resources/fonts/RobotoCondensed-Regular.ttf
new file mode 100644
index 00000000000..62dd61e5d00
Binary files /dev/null and b/src/main/resources/fonts/RobotoCondensed-Regular.ttf differ
diff --git a/src/main/resources/images/SavingsImage.png b/src/main/resources/images/SavingsImage.png
new file mode 100644
index 00000000000..b4394d69af0
Binary files /dev/null and b/src/main/resources/images/SavingsImage.png differ
diff --git a/src/main/resources/images/sus.png b/src/main/resources/images/sus.png
new file mode 100644
index 00000000000..15359d39bc6
Binary files /dev/null and b/src/main/resources/images/sus.png differ
diff --git a/src/main/resources/view/AnalyticsTabPane.fxml b/src/main/resources/view/AnalyticsTabPane.fxml
new file mode 100644
index 00000000000..d5e29a16800
--- /dev/null
+++ b/src/main/resources/view/AnalyticsTabPane.fxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" styleClass="pane-with-border">
+ <VBox styleClass="pane-with-border" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS" alignment="TOP_CENTER">
+ <Label fx:id="expenseAnalyticsLabel" styleClass="panel-label"/>
+ <padding>
+ <Insets top="10" right="10" bottom="10" left="10" />
+ </padding>
+ <StackPane fx:id="expenseAnalyticsPane" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS"/>
+ </VBox>
+ <VBox styleClass="pane-with-border" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS" alignment="TOP_CENTER">
+ <Label fx:id="incomeAnalyticsLabel" styleClass="panel-label"/>
+ <padding>
+ <Insets top="10" right="10" bottom="10" left="10" />
+ </padding>
+ <StackPane fx:id="incomeAnalyticsPane" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS"/>
+ </VBox>
+ <VBox styleClass="pane-with-border" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS" alignment="TOP_CENTER">
+ <Label fx:id="savingsAnalyticsLabel" styleClass="panel-label"/>
+ <padding>
+ <Insets top="10" right="10" bottom="10" left="10" />
+ </padding>
+ <StackPane fx:id="savingsAnalyticsPane" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS"/>
+ </VBox>
+</HBox>
diff --git a/src/main/resources/view/BookmarkTransactionListCard.fxml b/src/main/resources/view/BookmarkTransactionListCard.fxml
new file mode 100644
index 00000000000..d696271f3a6
--- /dev/null
+++ b/src/main/resources/view/BookmarkTransactionListCard.fxml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<BorderPane id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <left>
+ <GridPane>
+ <children>
+ <Label fx:id="id" GridPane.rowIndex="0" styleClass="cell-big-label" />
+ </children>
+ <rowConstraints>
+ <RowConstraints vgrow="ALWAYS" percentHeight="50.0" />
+ <RowConstraints vgrow="ALWAYS" percentHeight="50.0" />
+ </rowConstraints>
+ </GridPane>
+ </left>
+ <center>
+ <GridPane>
+ <children>
+ <Label fx:id="title" GridPane.rowIndex="0" text="\$title" styleClass="cell-big-label" />
+ <ScrollPane fx:id="scrollPane" styleClass="cell-categories-scrollpane" GridPane.rowIndex="1" vbarPolicy="NEVER">
+ <HBox fx:id="categories" styleClass="cell-categories" spacing="5" />
+ </ScrollPane>
+ </children>
+ <rowConstraints>
+ <RowConstraints vgrow="ALWAYS" percentHeight="50.0" />
+ <RowConstraints vgrow="ALWAYS" percentHeight="50.0" />
+ </rowConstraints>
+ </GridPane>
+ </center>
+ <right>
+ <HBox alignment="CENTER">
+ <Label fx:id="amount" styleClass="cell-small-label" style="-fx-padding: 0 10 0 20;" text="\$amount" />
+ </HBox>
+ </right>
+ <padding>
+ <Insets top="5" right="10" bottom="5" left="10" />
+ </padding>
+</BorderPane>
diff --git a/src/main/resources/view/BookmarkTransactionPanel.fxml b/src/main/resources/view/BookmarkTransactionPanel.fxml
new file mode 100644
index 00000000000..1f5055de48e
--- /dev/null
+++ b/src/main/resources/view/BookmarkTransactionPanel.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <ListView fx:id="bookmarkTransactionList" styleClass="list-view" VBox.vgrow="ALWAYS"/>
+</VBox>
diff --git a/src/main/resources/view/CommandBox.fxml b/src/main/resources/view/CommandBox.fxml
index 09f6d6fe9e4..b63e0c242d4 100644
--- a/src/main/resources/view/CommandBox.fxml
+++ b/src/main/resources/view/CommandBox.fxml
@@ -1,9 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.control.Button?>
<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.HBox?>
-<StackPane styleClass="stack-pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <TextField fx:id="commandTextField" onAction="#handleCommandEntered" promptText="Enter command here..."/>
-</StackPane>
+<?import javafx.scene.control.Label?>
+<HBox fx:id="commandBoxContainer" styleClass="stack-pane" xmlns="http://javafx.com/javafx/8"
+ xmlns:fx="http://javafx.com/fxml/1" alignment="CENTER_LEFT">
+ <Label fx:id="commandBoxLabel" styleClass="command-box-label" text="Enter Command: " />
+ <TextField fx:id="commandTextField" onAction="#handleCommandEntered" prefWidth="330" HBox.hgrow="ALWAYS"
+ promptText="Enter command here..." styleClass="command-box"/>
+ <Button fx:id="commandBoxButton" styleClass="command-box-button" prefWidth="100" text="Enter"
+ onAction="#handleCommandEntered"/>
+</HBox>
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 36e6b001cd8..f29adef50b0 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -1,6 +1,10 @@
.background {
- -fx-background-color: derive(#1d1d1d, 20%);
- background-color: #383838; /* Used in the default.html file */
+ -fx-background-color: #2E2E36;
+ background-color: #2E2E36; /* Used in the default.html file */
+}
+
+.root {
+ -tab-text-color: #888888;
}
.label {
@@ -30,19 +34,20 @@
}
.tab-pane {
- -fx-padding: 0 0 0 1;
+ -fx-padding: 0 0 0 0;
+ -fx-border-color: #2E2E36;
+ -fx-tab-min-height:30px;
+ -fx-tab-max-height:30px;
}
.tab-pane .tab-header-area {
-fx-padding: 0 0 0 0;
- -fx-min-height: 0;
- -fx-max-height: 0;
}
.table-view {
- -fx-base: #1d1d1d;
- -fx-control-inner-background: #1d1d1d;
- -fx-background-color: #1d1d1d;
+ -fx-base: #2E2E36;
+ -fx-control-inner-background: #2E2E36;
+ -fx-background-color: #2E2E36;
-fx-table-cell-border-color: transparent;
-fx-table-header-border-color: transparent;
-fx-padding: 5;
@@ -55,7 +60,7 @@
.table-view .column-header, .table-view .filler {
-fx-size: 35;
-fx-border-width: 0 0 1 0;
- -fx-background-color: transparent;
+ -fx-background-color: #2E2E36;
-fx-border-color:
transparent
transparent
@@ -77,34 +82,39 @@
}
.split-pane:horizontal .split-pane-divider {
- -fx-background-color: derive(#1d1d1d, 20%);
-fx-border-color: transparent transparent transparent #4d4d4d;
}
.split-pane {
-fx-border-radius: 1;
-fx-border-width: 1;
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: #2E2E36;
+}
+
+.list-cell {
+ -fx-padding: 8px;
+ -fx-background-color: transparent, -fx-background ;
+ -fx-background-insets: 0px, 2px;
}
.list-view {
-fx-background-insets: 0;
-fx-padding: 0;
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: #2E2E36;
}
-.list-cell {
- -fx-label-padding: 0 0 0 0;
- -fx-graphic-text-gap : 0;
- -fx-padding: 0 0 0 0;
+.list-cell:empty {
+ -fx-background-color: #2E2E36;
+ -fx-padding: 2px;
+ -fx-background-insets:0;
}
.list-cell:filled:even {
- -fx-background-color: #3c3e3f;
+ -fx-background-color: #2E2E36;
}
.list-cell:filled:odd {
- -fx-background-color: #515658;
+ -fx-background-color: #2E2E36;
}
.list-cell:filled:selected {
@@ -120,36 +130,85 @@
-fx-text-fill: white;
}
-.cell_big_label {
- -fx-font-family: "Segoe UI Semibold";
- -fx-font-size: 16px;
+.cell-big-label {
+ -fx-font-family: "Eczar";
+ -fx-font-size: 14px;
+ -fx-text-fill: #010504;
+}
+
+.cell-categories {
+ -fx-font-size: 14px;
-fx-text-fill: #010504;
}
-.cell_small_label {
- -fx-font-family: "Segoe UI";
- -fx-font-size: 13px;
+.cell-categories-scrollpane {
+ -fx-background: #3B3B44;
+ -fx-background-color: transparent;
+}
+
+.cell-small-label {
+ -fx-font-family: "Eczar";
+ -fx-font-size: 14px;
-fx-text-fill: #010504;
}
.stack-pane {
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: #2E2E36;
+ -fx-hgap: 7;
+}
+
+.command-box {
+ -fx-background-color: #3B3B44 !important;
+ -fx-background-radius: 5;
+ -fx-border-radius: 5;
+}
+
+.result-container {
+ -fx-background-color: #3B3B44;
+ -fx-background-insets: 3, 3, 3, 3;
+ -fx-background-radius: 10, 10, 10, 10;
+ -fx-border-radius: 10, 10, 10, 10;
+ -fx-padding: 0 8 0 5;
+ -fx-border-insets: 5, 5, 5, 5;
+ -fx-border-color: #3B3B44;
}
.pane-with-border {
- -fx-background-color: derive(#1d1d1d, 20%);
- -fx-border-color: derive(#1d1d1d, 10%);
+ -fx-background-color: #2E2E36;
+ -fx-border-color: #2E2E36;
+ -fx-border-top-width: 1px;
+}
+
+.right-panel {
+ -fx-background-color: #3B3B44;
+ -fx-border-color: #3B3B44;
-fx-border-top-width: 1px;
+ -fx-background-radius: 5;
+ -fx-border-radius: 5;
+}
+
+.right-panel-content {
+ -fx-font-family: "Roboto Condensed";
+ -fx-text-fill: white;
+ -fx-font-size: 16pt;
+ -fx-line-spacing: 10px;
+}
+
+.command-pane{
+ -fx-background-color: #2E2E36;
+ -fx-border-color: #2E2E36;
+ -fx-border-top-width: 1px;
+ -fx-padding: 3 5 3 19;
}
.status-bar {
- -fx-background-color: derive(#1d1d1d, 30%);
+ -fx-background-color: #2E2E36;
}
.result-display {
-fx-background-color: transparent;
- -fx-font-family: "Segoe UI Light";
- -fx-font-size: 13pt;
+ -fx-font-family: "Eczar";
+ -fx-font-size: 16px;
-fx-text-fill: white;
}
@@ -158,15 +217,15 @@
}
.status-bar .label {
- -fx-font-family: "Segoe UI Light";
+ -fx-font-family: "Eczar";
-fx-text-fill: white;
-fx-padding: 4px;
-fx-pref-height: 30px;
}
.status-bar-with-border {
- -fx-background-color: derive(#1d1d1d, 30%);
- -fx-border-color: derive(#1d1d1d, 25%);
+ -fx-background-color: #2E2E36;
+ -fx-border-color: #2E2E36;
-fx-border-width: 1px;
}
@@ -175,93 +234,115 @@
}
.grid-pane {
- -fx-background-color: derive(#1d1d1d, 30%);
- -fx-border-color: derive(#1d1d1d, 30%);
+ -fx-background-color: #2E2E36;
+ -fx-border-color: #2E2E36;
-fx-border-width: 1px;
}
.grid-pane .stack-pane {
- -fx-background-color: derive(#1d1d1d, 30%);
+ -fx-background-color: #2E2E36;
}
-.context-menu {
- -fx-background-color: derive(#1d1d1d, 50%);
+.tab-pane .tab-header-area .tab-header-background {
+ -fx-background-color: #2E2E36;
+ -fx-border-color: #2E2E36;
}
-.context-menu .label {
- -fx-text-fill: white;
+.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
+ -fx-border-color: #2E2E36;
}
-.menu-bar {
- -fx-background-color: derive(#1d1d1d, 20%);
+.tab-label {
+ -fx-text-fill: -tab-text-color;
+ -fx-font-family: "Roboto Condensed";
+ -fx-font-size: 24px;
}
-.menu-bar .label {
- -fx-font-size: 14pt;
- -fx-font-family: "Segoe UI Light";
+.tab {
+ -fx-background-color: #2E2E36;
+ -fx-border-color: #2E2E36;
+ -fx-text-fill: #888888;
+ -fx-padding: 15, 0, 0, 0;
+}
+
+.tab:selected .tab-label {
-fx-text-fill: white;
- -fx-opacity: 0.9;
}
-.menu .left-container {
- -fx-background-color: black;
+.tab:hover .tab-label {
+ -fx-text-fill: white;
}
-/*
- * Metro style Push Button
- * Author: Pedro Duque Vieira
- * http://pixelduke.wordpress.com/2012/10/23/jmetro-windows-8-controls-on-java/
- */
-.button {
- -fx-padding: 5 22 5 22;
- -fx-border-color: #e2e2e2;
- -fx-border-width: 2;
- -fx-background-radius: 0;
- -fx-background-color: #1d1d1d;
- -fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
- -fx-font-size: 11pt;
- -fx-text-fill: #d8d8d8;
- -fx-background-insets: 0 0 0 0, 0, 1, 2;
+#userGuideButton {
+ -fx-background-color: transparent;
+ -fx-font-family: "Roboto Condensed";
+ -fx-font-size: 24px;
+ -fx-text-fill: #888888;
+ -fx-padding: 15, 0, 0, 0;
}
-.button:hover {
- -fx-background-color: #3a3a3a;
+#userGuideButton:hover, #userGuideButton:selected {
+ -fx-text-fill: white;
}
-.button:pressed, .button:default:hover:pressed {
- -fx-background-color: white;
- -fx-text-fill: #1d1d1d;
+.tab-pane .label {
+ -fx-font-size: 18pt;
+ -fx-font-family: "Roboto Condensed";
+ -fx-text-fill: white;
}
-.button:focused {
- -fx-border-color: white, white;
- -fx-border-width: 1, 1;
- -fx-border-style: solid, segments(1, 1);
- -fx-border-radius: 0, 0;
- -fx-border-insets: 1 1 1 1, 0;
+.command-box-label {
+ -fx-background-color: #2E2E36;
+ -fx-text-fill: white;
+ -fx-font-family: "Roboto Condensed";
+ -fx-font-size: 12pt;
}
-.button:disabled, .button:default:disabled {
- -fx-opacity: 0.4;
- -fx-background-color: #1d1d1d;
+.panel-label {
+ -fx-font-family: "Roboto Condensed";
-fx-text-fill: white;
+ -fx-font-size: 18pt;
}
-.button:default {
- -fx-background-color: -fx-focus-color;
- -fx-text-fill: #ffffff;
+.command-box-button {
+ -fx-opacity: 1;
+ -fx-background-color: #3B3B44;
+ -fx-border-color: #3B3B44;
+ -fx-border-radius: 5, 4;
+ -fx-background-radius: 5, 4;
+ -fx-background-insets: 0,3,2,3;
+ -fx-font-family: "Roboto Condensed";
+ -fx-font-size: 12pt;
+ -fx-text-fill: white;
}
-.button:default:hover {
- -fx-background-color: derive(-fx-focus-color, 30%);
+/*
+ * Metro style Push Button
+ * Author: Pedro Duque Vieira
+ * http://pixelduke.wordpress.com/2012/10/23/jmetro-windows-8-controls-on-java/
+ */
+.button:pressed, .button:default:hover:pressed {
+ -fx-background-color: white;
+ -fx-text-fill: #1d1d1d;
+}
+
+.button:hover {
+ -fx-background-color: white;
+ -fx-text-fill: #1d1d1d;
+}
+
+.button:disabled {
+ -fx-opacity: 0.4;
+ -fx-background-color: #3B3B44;
+ -fx-text-fill: #d8d8d8;
}
.dialog-pane {
- -fx-background-color: #1d1d1d;
+ -fx-background-color: #2E2E36;
}
.dialog-pane > *.button-bar > *.container {
- -fx-background-color: #1d1d1d;
+ -fx-background-color: #2E2E36;
}
.dialog-pane > *.label.content {
@@ -271,7 +352,7 @@
}
.dialog-pane:header *.header-panel {
- -fx-background-color: derive(#1d1d1d, 25%);
+ -fx-background-color: #2E2E36;
}
.dialog-pane:header *.header-panel *.label {
@@ -282,11 +363,11 @@
}
.scroll-bar {
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: #3B3B44;
}
.scroll-bar .thumb {
- -fx-background-color: derive(#1d1d1d, 50%);
+ -fx-background-color: #C4C4C4;
-fx-background-insets: 3;
}
@@ -304,12 +385,14 @@
}
.scroll-bar:horizontal .increment-arrow, .scroll-bar:horizontal .decrement-arrow {
- -fx-padding: 8 1 8 1;
+ -fx-padding: 4 0 4 0;
}
#cardPane {
- -fx-background-color: transparent;
+ -fx-background-color: #3B3B44;
-fx-border-width: 0;
+ -fx-background-radius: 12;
+ -fx-border-radius: 12;
}
#commandTypeLabel {
@@ -318,9 +401,9 @@
}
#commandTextField {
- -fx-background-color: transparent #383838 transparent #383838;
+ -fx-background-color: transparent #2E2E36 transparent #2E2E36;
-fx-background-insets: 0;
- -fx-border-color: #383838 #383838 #ffffff #383838;
+ -fx-border-color: #2E2E36 #2E2E36 #2E2E36 #2E2E36;
-fx-border-insets: 0;
-fx-border-width: 1;
-fx-font-family: "Segoe UI Light";
@@ -333,20 +416,35 @@
}
#resultDisplay .content {
- -fx-background-color: transparent, #383838, transparent, #383838;
+ -fx-background-color: #3B3B44;
+ -fx-border-color: transparent, #3B3B44, transparent, #3B3B44;
-fx-background-radius: 0;
}
-#tags {
- -fx-hgap: 7;
+#categories {
+ -fx-hgap: 5;
-fx-vgap: 3;
+ -fx-background-insets: 10;
+}
+
+#categories .label {
+ -fx-font-family: "Eczar";
+ -fx-text-fill: white;
+ -fx-background-color: #4527A0;
+ -fx-padding: 3 7 0 7;
+ -fx-border-radius: 5;
+ -fx-background-radius: 5;
+ -fx-font-size: 13;
+}
+
+.temporal-label {
+ -fx-font-size: 30px;
+ -fx-text-fill: white;
+ -fx-padding: 20px;
}
-#tags .label {
+.credits-label {
+ -fx-font-size: 10px;
-fx-text-fill: white;
- -fx-background-color: #3e7b91;
- -fx-padding: 1 3 1 3;
- -fx-border-radius: 2;
- -fx-background-radius: 2;
- -fx-font-size: 11;
+ -fx-padding: 20px;
}
diff --git a/src/main/resources/view/DisabledWindow.fxml b/src/main/resources/view/DisabledWindow.fxml
new file mode 100644
index 00000000000..3d3557ba89e
--- /dev/null
+++ b/src/main/resources/view/DisabledWindow.fxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.net.URL?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane styleClass="background" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <stylesheets>
+ <URL value="@DarkTheme.css" />
+ </stylesheets>
+ <top>
+ <HBox alignment="CENTER">
+ <Label fx:id="creditsLabel" styleClass="credits-label" wrapText="true" textAlignment="CENTER" maxWidth="1000" />
+ </HBox>
+ </top>
+ <center>
+ <Pane fx:id="imageContainer" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
+ <ImageView fx:id="imageView" preserveRatio="true" pickOnBounds="true" fitWidth="${imageContainer.width}"
+ fitHeight="${imageContainer.height}" />
+ </Pane>
+ </center>
+ <bottom>
+ <HBox alignment="CENTER">
+ <Label fx:id="detailsLabel" styleClass="temporal-label" wrapText="true" textAlignment="CENTER" maxWidth="1000" />
+ </HBox>
+ </bottom>
+</BorderPane>
diff --git a/src/main/resources/view/ExpensePanel.fxml b/src/main/resources/view/ExpensePanel.fxml
new file mode 100644
index 00000000000..9af83829fa6
--- /dev/null
+++ b/src/main/resources/view/ExpensePanel.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" alignment="CENTER">
+ <ListView fx:id="expenseListView" styleClass="list-view" VBox.vgrow="ALWAYS" />
+</VBox>
diff --git a/src/main/resources/view/HelpWindow.fxml b/src/main/resources/view/HelpWindow.fxml
deleted file mode 100644
index fa0fb54d9f4..00000000000
--- a/src/main/resources/view/HelpWindow.fxml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.Scene?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.stage.Stage?>
-
-<fx:root resizable="false" title="Help" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1">
- <icons>
- <Image url="@/images/help_icon.png" />
- </icons>
- <scene>
- <Scene>
- <HBox alignment="CENTER">
- <children>
- <Label fx:id="helpMessage" text="Label">
- <HBox.margin>
- <Insets right="5.0" />
- </HBox.margin>
- </Label>
- <Button fx:id="copyButton" mnemonicParsing="false" onAction="#copyUrl" text="Copy URL">
- <HBox.margin>
- <Insets left="5.0" />
- </HBox.margin>
- </Button>
- </children>
- <opaqueInsets>
- <Insets bottom="10.0" left="5.0" right="10.0" top="5.0" />
- </opaqueInsets>
- <padding>
- <Insets bottom="10.0" left="5.0" right="10.0" top="5.0" />
- </padding>
- </HBox>
- </Scene>
- </scene>
-</fx:root>
diff --git a/src/main/resources/view/IncomePanel.fxml b/src/main/resources/view/IncomePanel.fxml
new file mode 100644
index 00000000000..1ea8919b286
--- /dev/null
+++ b/src/main/resources/view/IncomePanel.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" alignment="CENTER">
+ <ListView fx:id="incomeListView" styleClass="list-view" VBox.vgrow="ALWAYS" />
+</VBox>
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index a431648f6c0..08b00cb1341 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -3,19 +3,17 @@
<?import java.net.URL?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.Scene?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.image.Image?>
+<?import javafx.scene.control.Tab?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.control.ToggleButton?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.layout.HBox?>
<fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
- title="Address App" minWidth="450" minHeight="600" onCloseRequest="#handleExit">
- <icons>
- <Image url="@/images/address_book_32.png" />
- </icons>
+ title="Fine$$e" onCloseRequest="#handleExit">
<scene>
<Scene>
<stylesheets>
@@ -23,38 +21,42 @@
<URL value="@Extensions.css" />
</stylesheets>
- <VBox>
- <MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
- <Menu mnemonicParsing="false" text="File">
- <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
- </Menu>
- <Menu mnemonicParsing="false" text="Help">
- <MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
- </Menu>
- </MenuBar>
+ <BorderPane styleClass="background">
+ <center>
+ <AnchorPane>
+ <!-- Bottom anchor of AnchorPane has to be set programmatically after tabs are initialized. -->
+ <TabPane fx:id="tabPane" VBox.vgrow="NEVER" styleClass="tab-pane" tabMinHeight="30" AnchorPane.topAnchor="0.0"
+ AnchorPane.rightAnchor="0.0" AnchorPane.leftAnchor="0.0">
+ <Tab fx:id="overviewTab" text="Overview" closable="false" />
+ <Tab fx:id="incomeTab" text="Incomes" closable="false" />
+ <Tab fx:id="expenseTab" text="Expenses" closable="false" />
+ <Tab fx:id="analyticsTab" text="Analytics" closable="false" />
+ <Tab fx:id="userGuideTab" text="" closable="false" />
+ </TabPane>
+ <ToggleButton fx:id="userGuideButton" text="User Guide" onMouseClicked="#switchToUserGuideTab"
+ AnchorPane.topAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+ </AnchorPane>
+ </center>
- <StackPane VBox.vgrow="NEVER" fx:id="commandBoxPlaceholder" styleClass="pane-with-border">
- <padding>
- <Insets top="5" right="10" bottom="5" left="10" />
- </padding>
- </StackPane>
+ <bottom>
+ <VBox>
+ <StackPane VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS" fx:id="resultDisplayPlaceholder"
+ styleClass="pane-with-border" minHeight="150" prefHeight="150" maxHeight="150">
+ <padding>
+ <Insets right="15" left="15" />
+ </padding>
+ </StackPane>
- <StackPane VBox.vgrow="NEVER" fx:id="resultDisplayPlaceholder" styleClass="pane-with-border"
- minHeight="100" prefHeight="100" maxHeight="100">
- <padding>
- <Insets top="5" right="10" bottom="5" left="10" />
- </padding>
- </StackPane>
-
- <VBox fx:id="personList" styleClass="pane-with-border" minWidth="340" prefWidth="340" VBox.vgrow="ALWAYS">
- <padding>
- <Insets top="10" right="10" bottom="10" left="10" />
- </padding>
- <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
- </VBox>
-
- <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
- </VBox>
+ <HBox styleClass="command-pane" alignment="CENTER">
+ <StackPane VBox.vgrow="NEVER" HBox.hgrow="SOMETIMES" fx:id="commandBoxPlaceholder" styleClass="pane-with-border">
+ <padding>
+ <Insets top="5" right="10" bottom="10" left="10" />
+ </padding>
+ </StackPane>
+ </HBox>
+ </VBox>
+ </bottom>
+ </BorderPane>
</Scene>
</scene>
</fx:root>
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
deleted file mode 100644
index f08ea32ad55..00000000000
--- a/src/main/resources/view/PersonListCard.fxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.FlowPane?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.VBox?>
-
-<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <GridPane HBox.hgrow="ALWAYS">
- <columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
- </columnConstraints>
- <VBox alignment="CENTER_LEFT" minHeight="105" GridPane.columnIndex="0">
- <padding>
- <Insets top="5" right="5" bottom="5" left="15" />
- </padding>
- <HBox spacing="5" alignment="CENTER_LEFT">
- <Label fx:id="id" styleClass="cell_big_label">
- <minWidth>
- <!-- Ensures that the label text is never truncated -->
- <Region fx:constant="USE_PREF_SIZE" />
- </minWidth>
- </Label>
- <Label fx:id="name" text="\$first" styleClass="cell_big_label" />
- </HBox>
- <FlowPane fx:id="tags" />
- <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
- <Label fx:id="address" styleClass="cell_small_label" text="\$address" />
- <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
- </VBox>
- </GridPane>
-</HBox>
diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml
index 58d5ad3dc56..07ddad6278a 100644
--- a/src/main/resources/view/ResultDisplay.fxml
+++ b/src/main/resources/view/ResultDisplay.fxml
@@ -3,7 +3,6 @@
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.StackPane?>
-<StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/8"
- xmlns:fx="http://javafx.com/fxml/1">
- <TextArea fx:id="resultDisplay" editable="false" styleClass="result-display"/>
+<StackPane styleClass="result-container" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" >
+ <TextArea fx:id="resultDisplay" editable="false" wrapText="true" styleClass="result-display" />
</StackPane>
diff --git a/src/main/resources/view/SavingsGoalCard.fxml b/src/main/resources/view/SavingsGoalCard.fxml
new file mode 100644
index 00000000000..ad5b214e673
--- /dev/null
+++ b/src/main/resources/view/SavingsGoalCard.fxml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" alignment="TOP_CENTER"
+ styleClass="right-panel">
+ <padding>
+ <Insets left="10" top="5" right="10" bottom="10" />
+ </padding>
+ <HBox alignment="CENTER" VBox.vgrow="ALWAYS" maxHeight="20.0">
+ <padding>
+ <Insets bottom="5" top="5" />
+ </padding>
+ <Label fx:id="monthlyExpenseLimit" wrapText="true" styleClass="right-panel-content" />
+ </HBox>
+ <HBox alignment="CENTER" VBox.vgrow="ALWAYS" maxHeight="20.0">
+ <padding>
+ <Insets bottom="5" top="5" />
+ </padding>
+ <Label fx:id="monthlySavingsGoal" wrapText="true" styleClass="right-panel-content" />
+ </HBox>
+ <HBox alignment="CENTER" VBox.vgrow="ALWAYS" maxHeight="20.0">
+ <padding>
+ <Insets bottom="5" top="5" />
+ </padding>
+ <Label fx:id="budgetStatus" wrapText="true" styleClass="right-panel-content" />
+ </HBox>
+ <HBox alignment="CENTER" VBox.vgrow="ALWAYS" maxHeight="20.0">
+ <padding>
+ <Insets bottom="8" top="5" />
+ </padding>
+ <Label fx:id="savingsStatus" wrapText="true" styleClass="right-panel-content" />
+ </HBox>
+ <Pane fx:id="imageContainer" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
+ <ImageView fx:id="savingsPicture" fitHeight="${imageContainer.height}" fitWidth="${imageContainer.width}"
+ pickOnBounds="true" preserveRatio="true" />
+ </Pane>
+</VBox>
diff --git a/src/main/resources/view/SavingsGoalPanel.fxml b/src/main/resources/view/SavingsGoalPanel.fxml
new file mode 100644
index 00000000000..4a56141e5a2
--- /dev/null
+++ b/src/main/resources/view/SavingsGoalPanel.fxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" alignment="TOP_CENTER">
+ <padding>
+ <Insets top="7.0" />
+ </padding>
+ <StackPane fx:id="savingsGoalDataPane" VBox.vgrow="ALWAYS" />
+</VBox>
diff --git a/src/main/resources/view/StatusBarFooter.fxml b/src/main/resources/view/StatusBarFooter.fxml
deleted file mode 100644
index 149f62bd29c..00000000000
--- a/src/main/resources/view/StatusBarFooter.fxml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-
-<GridPane styleClass="status-bar" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10" />
- </columnConstraints>
- <Label fx:id="saveLocationStatus" />
-</GridPane>
diff --git a/src/main/resources/view/TransactionListCard.fxml b/src/main/resources/view/TransactionListCard.fxml
new file mode 100644
index 00000000000..8bb51557d6a
--- /dev/null
+++ b/src/main/resources/view/TransactionListCard.fxml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<BorderPane id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <left>
+ <GridPane>
+ <children>
+ <Label fx:id="id" GridPane.rowIndex="0" styleClass="cell-big-label" />
+ </children>
+ <rowConstraints>
+ <RowConstraints vgrow="ALWAYS" percentHeight="50.0" />
+ <RowConstraints vgrow="ALWAYS" percentHeight="50.0" />
+ </rowConstraints>
+ </GridPane>
+ </left>
+ <center>
+ <GridPane>
+ <children>
+ <Label fx:id="title" GridPane.rowIndex="0" text="\$title" styleClass="cell-big-label" />
+ <ScrollPane fx:id="scrollPane" styleClass="cell-categories-scrollpane" GridPane.rowIndex="1" vbarPolicy="NEVER">
+ <HBox fx:id="categories" styleClass="cell-categories" spacing="5" />
+ </ScrollPane>
+ </children>
+ <rowConstraints>
+ <RowConstraints vgrow="ALWAYS" percentHeight="50.0" />
+ <RowConstraints vgrow="ALWAYS" percentHeight="50.0" />
+ </rowConstraints>
+ </GridPane>
+ </center>
+ <right>
+ <HBox alignment="CENTER">
+ <Label fx:id="amount" styleClass="cell-small-label" style="-fx-padding: 0 0 0 20;" text="\$amount" />
+ <Label fx:id="date" styleClass="cell-small-label" style="-fx-padding: 0 10 0 30;" text="\$date" />
+ </HBox>
+ </right>
+ <padding>
+ <Insets top="5" right="10" bottom="5" left="10" />
+ </padding>
+</BorderPane>
diff --git a/src/main/resources/view/PersonListPanel.fxml b/src/main/resources/view/TransactionListPanel.fxml
similarity index 70%
rename from src/main/resources/view/PersonListPanel.fxml
rename to src/main/resources/view/TransactionListPanel.fxml
index 8836d323cc5..10e1d1690b6 100644
--- a/src/main/resources/view/PersonListPanel.fxml
+++ b/src/main/resources/view/TransactionListPanel.fxml
@@ -4,5 +4,5 @@
<?import javafx.scene.layout.VBox?>
<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <ListView fx:id="personListView" VBox.vgrow="ALWAYS" />
+ <ListView fx:id="transactionListView" styleClass="list-view" VBox.vgrow="ALWAYS" />
</VBox>
diff --git a/src/main/resources/view/TwoColumnTabPane.fxml b/src/main/resources/view/TwoColumnTabPane.fxml
new file mode 100644
index 00000000000..21aeea71a8f
--- /dev/null
+++ b/src/main/resources/view/TwoColumnTabPane.fxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+
+<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox styleClass="pane-with-border" alignment="TOP_CENTER" GridPane.columnIndex="0">
+ <Label fx:id="mainPanelLabel" styleClass="panel-label" />
+ <padding>
+ <Insets top="10" right="10" bottom="10" left="10" />
+ </padding>
+ <StackPane fx:id="mainPanelPlaceholder" VBox.vgrow="ALWAYS" />
+ </VBox>
+ <VBox styleClass="pane-with-border" alignment="TOP_CENTER" GridPane.columnIndex="1">
+ <Label fx:id="sidePanelLabel" styleClass="panel-label" />
+ <padding>
+ <Insets bottom="10" left="10" right="10" top="10" />
+ </padding>
+ <StackPane fx:id="sidePanelPlaceholder" VBox.vgrow="ALWAYS" />
+ </VBox>
+ </children>
+ <columnConstraints>
+ <ColumnConstraints hgrow="ALWAYS" percentWidth="60.0" />
+ <ColumnConstraints hgrow="ALWAYS" percentWidth="40.0" />
+ </columnConstraints>
+ <rowConstraints>
+ <RowConstraints vgrow="ALWAYS" />
+ </rowConstraints>
+</GridPane>
diff --git a/src/main/resources/view/UserGuideTabPane.fxml b/src/main/resources/view/UserGuideTabPane.fxml
new file mode 100644
index 00000000000..0602bdcbc68
--- /dev/null
+++ b/src/main/resources/view/UserGuideTabPane.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.web.WebView?>
+
+<StackPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <WebView fx:id="webView" />
+</StackPane>
diff --git a/src/main/resources/view/WebView.css b/src/main/resources/view/WebView.css
new file mode 100644
index 00000000000..bfdf38d836a
--- /dev/null
+++ b/src/main/resources/view/WebView.css
@@ -0,0 +1,15 @@
+/**
+ * WebView is unable to load '-apple-system', and 'San Francisco' (the default macOS
+ * font) cannot be called by name. Thus, we call '.SFNSText-Regular' on failure.
+ */
+body {
+ font-family: -apple-system,
+ ".SFNSText-Regular",
+ "San Francisco",
+ "Roboto",
+ "Segoe UI",
+ "Helvetica Neue",
+ "Lucida Grande",
+ sans-serif
+ !important;
+}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
deleted file mode 100644
index 6a4d2b7181c..00000000000
--- a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "persons": [ {
- "name": "Valid Person",
- "phone": "9482424",
- "email": "hans@example.com",
- "address": "4th street"
- }, {
- "name": "Person With Invalid Phone Field",
- "phone": "948asdf2424",
- "email": "hans@example.com",
- "address": "4th street"
- } ]
-}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
deleted file mode 100644
index ccd21f7d1a9..00000000000
--- a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "persons": [ {
- "name": "Person with invalid name field: Ha!ns Mu@ster",
- "phone": "9482424",
- "email": "hans@example.com",
- "address": "4th street"
- } ]
-}
diff --git a/src/test/data/JsonFinanceTrackerStorageTest/invalidAndValidTransactionsFinanceTracker.json b/src/test/data/JsonFinanceTrackerStorageTest/invalidAndValidTransactionsFinanceTracker.json
new file mode 100644
index 00000000000..cc481de3ed0
--- /dev/null
+++ b/src/test/data/JsonFinanceTrackerStorageTest/invalidAndValidTransactionsFinanceTracker.json
@@ -0,0 +1,24 @@
+{
+ "expenses": [ {
+ "title": "Bubble Tea",
+ "amount": "$4.80",
+ "date": "14/10/2020",
+ "categories": [ "Food & Beverage" ]
+ }, {
+ "title": "Bubble Tea",
+ "amount": "$4.80",
+ "date": "not a date",
+ "categories": [ "Food & Beverage" ]
+ } ],
+ "incomes": [ {
+ "title": "Internship",
+ "amount": "$560.00",
+ "date": "06/10/2020",
+ "categories": [ "Work" ]
+ }, {
+ "title": "Internship",
+ "amount": "$560.00",
+ "date": "not a date",
+ "categories": [ "Work" ]
+ } ]
+}
diff --git a/src/test/data/JsonFinanceTrackerStorageTest/invalidTransactionsFinanceTracker.json b/src/test/data/JsonFinanceTrackerStorageTest/invalidTransactionsFinanceTracker.json
new file mode 100644
index 00000000000..cd8e35a4645
--- /dev/null
+++ b/src/test/data/JsonFinanceTrackerStorageTest/invalidTransactionsFinanceTracker.json
@@ -0,0 +1,14 @@
+{
+ "expenses": [ {
+ "title": "Bubble Tea",
+ "amount": "$4.80",
+ "date": "not a date",
+ "categories": [ "Food & Beverage" ]
+ } ],
+ "incomes": [ {
+ "title": "Internship",
+ "amount": "$560.00",
+ "date": "not a date",
+ "categories": [ "Work" ]
+ } ]
+}
diff --git a/src/test/data/JsonAddressBookStorageTest/notJsonFormatAddressBook.json b/src/test/data/JsonFinanceTrackerStorageTest/notJsonFormatFinanceTracker.json
similarity index 100%
rename from src/test/data/JsonAddressBookStorageTest/notJsonFormatAddressBook.json
rename to src/test/data/JsonFinanceTrackerStorageTest/notJsonFormatFinanceTracker.json
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
deleted file mode 100644
index 48831cc7674..00000000000
--- a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "persons": [ {
- "name": "Alice Pauline",
- "phone": "94351253",
- "email": "alice@example.com",
- "address": "123, Jurong West Ave 6, #08-111",
- "tagged": [ "friends" ]
- }, {
- "name": "Alice Pauline",
- "phone": "94351253",
- "email": "pauline@example.com",
- "address": "4th street"
- } ]
-}
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
deleted file mode 100644
index ad3f135ae42..00000000000
--- a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "persons": [ {
- "name": "Hans Muster",
- "phone": "9482424",
- "email": "invalid@email!3e",
- "address": "4th street"
- } ]
-}
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
deleted file mode 100644
index f10eddee12e..00000000000
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "_comment": "AddressBook save file which contains the same Person values as in TypicalPersons#getTypicalAddressBook()",
- "persons" : [ {
- "name" : "Alice Pauline",
- "phone" : "94351253",
- "email" : "alice@example.com",
- "address" : "123, Jurong West Ave 6, #08-111",
- "tagged" : [ "friends" ]
- }, {
- "name" : "Benson Meier",
- "phone" : "98765432",
- "email" : "johnd@example.com",
- "address" : "311, Clementi Ave 2, #02-25",
- "tagged" : [ "owesMoney", "friends" ]
- }, {
- "name" : "Carl Kurz",
- "phone" : "95352563",
- "email" : "heinz@example.com",
- "address" : "wall street",
- "tagged" : [ ]
- }, {
- "name" : "Daniel Meier",
- "phone" : "87652533",
- "email" : "cornelia@example.com",
- "address" : "10th street",
- "tagged" : [ "friends" ]
- }, {
- "name" : "Elle Meyer",
- "phone" : "9482224",
- "email" : "werner@example.com",
- "address" : "michegan ave",
- "tagged" : [ ]
- }, {
- "name" : "Fiona Kunz",
- "phone" : "9482427",
- "email" : "lydia@example.com",
- "address" : "little tokyo",
- "tagged" : [ ]
- }, {
- "name" : "George Best",
- "phone" : "9482442",
- "email" : "anna@example.com",
- "address" : "4th street",
- "tagged" : [ ]
- } ]
-}
diff --git a/src/test/data/JsonSerializableFinanceTrackerTest/duplicateTransactionsFinanceTracker.json b/src/test/data/JsonSerializableFinanceTrackerTest/duplicateTransactionsFinanceTracker.json
new file mode 100644
index 00000000000..5c350fa4145
--- /dev/null
+++ b/src/test/data/JsonSerializableFinanceTrackerTest/duplicateTransactionsFinanceTracker.json
@@ -0,0 +1,24 @@
+{
+ "expenses": [ {
+ "title": "Bubble Tea",
+ "amount": "$4.80",
+ "date": "14/10/2020",
+ "categories": [ "Food & Beverage" ]
+ }, {
+ "title": "Bubble Tea",
+ "amount": "$4.80",
+ "date": "14/10/2020",
+ "categories": [ "Food & Beverage" ]
+ } ],
+ "incomes": [ {
+ "title": "Internship",
+ "amount": "$560.00",
+ "date": "06/10/2020",
+ "categories": [ "Work" ]
+ }, {
+ "title": "Internship",
+ "amount": "$560.00",
+ "date": "06/10/2020",
+ "categories": [ "Work" ]
+ } ]
+}
diff --git a/src/test/data/JsonSerializableFinanceTrackerTest/invalidTransactionsFinanceTracker.json b/src/test/data/JsonSerializableFinanceTrackerTest/invalidTransactionsFinanceTracker.json
new file mode 100644
index 00000000000..599423c5e77
--- /dev/null
+++ b/src/test/data/JsonSerializableFinanceTrackerTest/invalidTransactionsFinanceTracker.json
@@ -0,0 +1,26 @@
+{
+ "expenses": [ {
+ "title": "Bubble Tea",
+ "amount": "$4.80",
+ "date": "not a date",
+ "categories": [ "Food & Beverage" ]
+ } ],
+ "incomes": [ {
+ "title": "Internship",
+ "amount": "$560.00",
+ "date": "not a date",
+ "categories": [ "Work" ]
+ } ],
+ "bookmarkExpenses": [ {
+ "title": "Phone Bill",
+ "amount": "$60.00",
+ "date": "not a date",
+ "categories": [ "Utilities" ]
+ } ],
+ "bookmarkIncomes": [ {
+ "title": "Internship",
+ "amount": "$1000",
+ "date": "not a date",
+ "categories": [ "Work" ]
+ } ]
+}
diff --git a/src/test/data/JsonSerializableFinanceTrackerTest/typicalTransactionsFinanceTracker.json b/src/test/data/JsonSerializableFinanceTrackerTest/typicalTransactionsFinanceTracker.json
new file mode 100644
index 00000000000..9a7f6a5f4fb
--- /dev/null
+++ b/src/test/data/JsonSerializableFinanceTrackerTest/typicalTransactionsFinanceTracker.json
@@ -0,0 +1,96 @@
+{
+ "_comment": "Fine$$e save file which contains the same Transaction values as in TypicalTransactions#getTypicalFinanceTracker()",
+ "expenses": [ {
+ "title": "Bubble Tea",
+ "amount": "$4.80",
+ "date": "14/10/2020",
+ "categories": [ "Food & Beverage" ]
+ }, {
+ "title": "Tuition Fees",
+ "amount": "$4221.00",
+ "date": "05/10/2020",
+ "categories": [ "NUS", "GIRO" ]
+ }, {
+ "title": "Carl's Jr.",
+ "amount": "$11.60",
+ "date": "06/10/2020",
+ "categories": [ "Food & Beverage" ]
+ }, {
+ "title": "EZ-Link Top-up",
+ "amount": "$20.00",
+ "date": "06/10/2020",
+ "categories": [ "Transport" ]
+ }, {
+ "title": "Artificial Intelligence: A Modern Approach",
+ "amount": "$139.00",
+ "date": "06/10/2020",
+ "categories": [ ]
+ }, {
+ "title": "Pen Refills",
+ "amount": "$6.00",
+ "date": "06/10/2020",
+ "categories": [ ]
+ }, {
+ "title": "Movie",
+ "amount": "$9.00",
+ "date": "06/10/2020",
+ "categories": [ ]
+ } ],
+ "incomes": [ {
+ "title": "Internship",
+ "amount": "$560.00",
+ "date": "06/10/2020",
+ "categories": [ "Work" ]
+ }, {
+ "title": "Teaching Assistant",
+ "amount": "$1920.00",
+ "date": "05/10/2020",
+ "categories": [ "NUS", "GIRO" ]
+ }, {
+ "title": "Start-up Funding",
+ "amount": "$10000.00",
+ "date": "20/09/2020",
+ "categories": [ "NUS Enterprise" ]
+ }, {
+ "title": "Allowance",
+ "amount": "$100.00",
+ "date": "06/10/2020",
+ "categories": [ ]
+ }, {
+ "title": "Ang Pao",
+ "amount": "$88.00",
+ "date": "06/10/2020",
+ "categories": [ ]
+ }, {
+ "title": "GST Voucher",
+ "amount": "$300.00",
+ "date": "06/10/2020",
+ "categories": [ ]
+ }, {
+ "title": "Hackathon Winnings",
+ "amount": "$1000.00",
+ "date": "22/09/2020",
+ "categories": [ ]
+ } ],
+ "bookmarkExpenses": [ {
+ "title": "Spotify Subscription",
+ "amount": "$9.90",
+ "date": "10/10/2020",
+ "categories": [ "Miscellaneous" ]
+ }, {
+ "title": "Phone Bill",
+ "amount": "$60.00",
+ "date": "08/10/2020",
+ "categories": [ "Utilities" ]
+ } ],
+ "bookmarkIncomes": [ {
+ "title": "Internship",
+ "amount": "$1000",
+ "date": "10/10/2020",
+ "categories": [ "Work" ]
+ } ],
+ "monthlyBudget" : {
+ "expenseLimit" : "500.00",
+ "savingsGoal" : "500.00"
+ }
+}
diff --git a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
index 1037548a9cd..df8791b6e2d 100644
--- a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
+++ b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
@@ -9,5 +9,5 @@
"z" : 99
}
},
- "addressBookFilePath" : "addressbook.json"
+ "financeTrackerFilePath" : "fine$$e.json"
}
diff --git a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
index b819bed900a..0c8cc6a1856 100644
--- a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
+++ b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
@@ -7,5 +7,5 @@
"y" : 100
}
},
- "addressBookFilePath" : "addressbook.json"
+ "financeTrackerFilePath" : "fine$$e.json"
}
diff --git a/src/test/java/seedu/address/AppParametersTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/AppParametersTest.java
similarity index 97%
rename from src/test/java/seedu/address/AppParametersTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/AppParametersTest.java
index 61326b2d31a..277f20bc9f1 100644
--- a/src/test/java/seedu/address/AppParametersTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/AppParametersTest.java
@@ -1,4 +1,4 @@
-package seedu.address;
+package ay2021s1_cs2103_w16_3.finesse;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/seedu/address/commons/core/ConfigTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/ConfigTest.java
similarity index 93%
rename from src/test/java/seedu/address/commons/core/ConfigTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/ConfigTest.java
index 07cd7f73d53..c5cee3fd007 100644
--- a/src/test/java/seedu/address/commons/core/ConfigTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/ConfigTest.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.core;
+package ay2021s1_cs2103_w16_3.finesse.commons.core;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/src/test/java/seedu/address/commons/core/VersionTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/VersionTest.java
similarity index 97%
rename from src/test/java/seedu/address/commons/core/VersionTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/VersionTest.java
index 495cd231554..b9b6a62b727 100644
--- a/src/test/java/seedu/address/commons/core/VersionTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/VersionTest.java
@@ -1,8 +1,8 @@
-package seedu.address.commons.core;
+package ay2021s1_cs2103_w16_3.finesse.commons.core;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/seedu/address/commons/core/index/IndexTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/index/IndexTest.java
similarity index 71%
rename from src/test/java/seedu/address/commons/core/index/IndexTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/index/IndexTest.java
index a3ec6f8e747..862952501ff 100644
--- a/src/test/java/seedu/address/commons/core/index/IndexTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/core/index/IndexTest.java
@@ -1,9 +1,9 @@
-package seedu.address.commons.core.index;
+package ay2021s1_cs2103_w16_3.finesse.commons.core.index;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
import org.junit.jupiter.api.Test;
@@ -39,22 +39,22 @@ public void createZeroBasedIndex() {
@Test
public void equals() {
- final Index fifthPersonIndex = Index.fromOneBased(5);
+ final Index fifthTransactionIndex = Index.fromOneBased(5);
// same values -> returns true
- assertTrue(fifthPersonIndex.equals(Index.fromOneBased(5)));
- assertTrue(fifthPersonIndex.equals(Index.fromZeroBased(4)));
+ assertTrue(fifthTransactionIndex.equals(Index.fromOneBased(5)));
+ assertTrue(fifthTransactionIndex.equals(Index.fromZeroBased(4)));
// same object -> returns true
- assertTrue(fifthPersonIndex.equals(fifthPersonIndex));
+ assertTrue(fifthTransactionIndex.equals(fifthTransactionIndex));
// null -> returns false
- assertFalse(fifthPersonIndex.equals(null));
+ assertFalse(fifthTransactionIndex.equals(null));
// different types -> returns false
- assertFalse(fifthPersonIndex.equals(5.0f));
+ assertFalse(fifthTransactionIndex.equals(5.0f));
// different index -> returns false
- assertFalse(fifthPersonIndex.equals(Index.fromOneBased(1)));
+ assertFalse(fifthTransactionIndex.equals(Index.fromOneBased(1)));
}
}
diff --git a/src/test/java/seedu/address/commons/util/AppUtilTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/AppUtilTest.java
similarity index 89%
rename from src/test/java/seedu/address/commons/util/AppUtilTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/AppUtilTest.java
index 594de1e6365..0ecddf39864 100644
--- a/src/test/java/seedu/address/commons/util/AppUtilTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/AppUtilTest.java
@@ -1,7 +1,7 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static seedu.address.testutil.Assert.assertThrows;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/seedu/address/commons/util/CollectionUtilTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/CollectionUtilTest.java
similarity index 95%
rename from src/test/java/seedu/address/commons/util/CollectionUtilTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/CollectionUtilTest.java
index b467a3dc025..eb177794c3d 100644
--- a/src/test/java/seedu/address/commons/util/CollectionUtilTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/CollectionUtilTest.java
@@ -1,9 +1,9 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
+import static ay2021s1_cs2103_w16_3.finesse.commons.util.CollectionUtil.requireAllNonNull;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-import static seedu.address.testutil.Assert.assertThrows;
import java.util.Arrays;
import java.util.Collection;
diff --git a/src/test/java/seedu/address/commons/util/ConfigUtilTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/ConfigUtilTest.java
similarity index 93%
rename from src/test/java/seedu/address/commons/util/ConfigUtilTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/ConfigUtilTest.java
index d2ab2839a52..704bc3cf23d 100644
--- a/src/test/java/seedu/address/commons/util/ConfigUtilTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/ConfigUtilTest.java
@@ -1,8 +1,8 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static seedu.address.testutil.Assert.assertThrows;
import java.io.IOException;
import java.nio.file.Path;
@@ -13,8 +13,8 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-import seedu.address.commons.core.Config;
-import seedu.address.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.Config;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
public class ConfigUtilTest {
diff --git a/src/test/java/seedu/address/commons/util/FileUtilTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/FileUtilTest.java
similarity index 80%
rename from src/test/java/seedu/address/commons/util/FileUtilTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/FileUtilTest.java
index 1fe5478c756..2264a1e6deb 100644
--- a/src/test/java/seedu/address/commons/util/FileUtilTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/FileUtilTest.java
@@ -1,8 +1,8 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/seedu/address/commons/util/JsonUtilTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/JsonUtilTest.java
similarity index 90%
rename from src/test/java/seedu/address/commons/util/JsonUtilTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/JsonUtilTest.java
index d4907539dee..a181fa36b18 100644
--- a/src/test/java/seedu/address/commons/util/JsonUtilTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/JsonUtilTest.java
@@ -1,4 +1,4 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -7,8 +7,8 @@
import org.junit.jupiter.api.Test;
-import seedu.address.testutil.SerializableTestClass;
-import seedu.address.testutil.TestUtil;
+import ay2021s1_cs2103_w16_3.finesse.testutil.SerializableTestClass;
+import ay2021s1_cs2103_w16_3.finesse.testutil.TestUtil;
/**
* Tests JSON Read and Write
diff --git a/src/test/java/seedu/address/commons/util/StringUtilTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/StringUtilTest.java
similarity index 55%
rename from src/test/java/seedu/address/commons/util/StringUtilTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/StringUtilTest.java
index c56d407bf3f..c3cb1060351 100644
--- a/src/test/java/seedu/address/commons/util/StringUtilTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/commons/util/StringUtilTest.java
@@ -1,8 +1,8 @@
-package seedu.address.commons.util;
+package ay2021s1_cs2103_w16_3.finesse.commons.util;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
import java.io.FileNotFoundException;
@@ -46,41 +46,35 @@ public void isNonZeroUnsignedInteger() {
}
- //---------------- Tests for containsWordIgnoreCase --------------------------------------
+ //---------------- Tests for containsIgnoreCase --------------------------------------
/*
- * Invalid equivalence partitions for word: null, empty, multiple words
+ * Invalid equivalence partitions for word: null, empty
* Invalid equivalence partitions for sentence: null
* The four test cases below test one invalid input at a time.
*/
@Test
- public void containsWordIgnoreCase_nullWord_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> StringUtil.containsWordIgnoreCase("typical sentence", null));
+ public void containsIgnoreCase_nullWord_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> StringUtil.containsIgnoreCase("typical sentence", null));
}
@Test
- public void containsWordIgnoreCase_emptyWord_throwsIllegalArgumentException() {
- assertThrows(IllegalArgumentException.class, "Word parameter cannot be empty", ()
- -> StringUtil.containsWordIgnoreCase("typical sentence", " "));
+ public void containsIgnoreCase_emptyWord_throwsIllegalArgumentException() {
+ assertThrows(IllegalArgumentException.class, "Keyphrase cannot be empty", ()
+ -> StringUtil.containsIgnoreCase("typical sentence", " "));
}
@Test
- public void containsWordIgnoreCase_multipleWords_throwsIllegalArgumentException() {
- assertThrows(IllegalArgumentException.class, "Word parameter should be a single word", ()
- -> StringUtil.containsWordIgnoreCase("typical sentence", "aaa BBB"));
- }
-
- @Test
- public void containsWordIgnoreCase_nullSentence_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> StringUtil.containsWordIgnoreCase(null, "abc"));
+ public void containsIgnoreCase_nullSentence_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> StringUtil.containsIgnoreCase(null, "abc"));
}
/*
- * Valid equivalence partitions for word:
- * - any word
- * - word containing symbols/numbers
- * - word with leading/trailing spaces
+ * Valid equivalence partitions for keyphrase:
+ * - any word/phrase
+ * - word/phrase containing symbols/numbers
+ * - word/phrase with leading/trailing spaces
*
* Valid equivalence partitions for sentence:
* - empty string
@@ -89,38 +83,37 @@ public void containsWordIgnoreCase_nullSentence_throwsNullPointerException() {
* - sentence with extra spaces
*
* Possible scenarios returning true:
- * - matches first word in sentence
- * - last word in sentence
- * - middle word in sentence
- * - matches multiple words
+ * - matches first phrase in sentence
+ * - last phrase in sentence
+ * - middle phrase in sentence
+ * - matches multiple phrases
*
* Possible scenarios returning false:
- * - query word matches part of a sentence word
* - sentence word matches part of the query word
*
* The test method below tries to verify all above with a reasonably low number of test cases.
*/
@Test
- public void containsWordIgnoreCase_validInputs_correctResult() {
+ public void containsIgnoreCase_validInputs_correctResult() {
// Empty sentence
- assertFalse(StringUtil.containsWordIgnoreCase("", "abc")); // Boundary case
- assertFalse(StringUtil.containsWordIgnoreCase(" ", "123"));
+ assertFalse(StringUtil.containsIgnoreCase("", "abc")); // Boundary case
+ assertFalse(StringUtil.containsIgnoreCase(" ", "123"));
// Matches a partial word only
- assertFalse(StringUtil.containsWordIgnoreCase("aaa bbb ccc", "bb")); // Sentence word bigger than query word
- assertFalse(StringUtil.containsWordIgnoreCase("aaa bbb ccc", "bbbb")); // Query word bigger than sentence word
+ assertTrue(StringUtil.containsIgnoreCase("aaa bbb ccc", "bb")); // Sentence word bigger than query word
+ assertFalse(StringUtil.containsIgnoreCase("aaa bbb ccc", "bbbb")); // Query word bigger than sentence word
// Matches word in the sentence, different upper/lower case letters
- assertTrue(StringUtil.containsWordIgnoreCase("aaa bBb ccc", "Bbb")); // First word (boundary case)
- assertTrue(StringUtil.containsWordIgnoreCase("aaa bBb ccc@1", "CCc@1")); // Last word (boundary case)
- assertTrue(StringUtil.containsWordIgnoreCase(" AAA bBb ccc ", "aaa")); // Sentence has extra spaces
- assertTrue(StringUtil.containsWordIgnoreCase("Aaa", "aaa")); // Only one word in sentence (boundary case)
- assertTrue(StringUtil.containsWordIgnoreCase("aaa bbb ccc", " ccc ")); // Leading/trailing spaces
+ assertTrue(StringUtil.containsIgnoreCase("aaa bBb ccc", "Bbb")); // First word (boundary case)
+ assertTrue(StringUtil.containsIgnoreCase("aaa bBb ccc@1", "CCc@1")); // Last word (boundary case)
+ assertTrue(StringUtil.containsIgnoreCase(" AAA bBb ccc ", "aaa")); // Sentence has extra spaces
+ assertTrue(StringUtil.containsIgnoreCase("Aaa", "aaa")); // Only one word in sentence (boundary case)
+ assertTrue(StringUtil.containsIgnoreCase("aaa bbb ccc", " ccc ")); // Leading/trailing spaces
// Matches multiple words in sentence
- assertTrue(StringUtil.containsWordIgnoreCase("AAA bBb ccc bbb", "bbB"));
+ assertTrue(StringUtil.containsIgnoreCase("AAA bBb ccc bbb", "bbB"));
}
//---------------- Tests for getDetails --------------------------------------
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/LogicManagerTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/LogicManagerTest.java
new file mode 100644
index 00000000000..ea986bef684
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/LogicManagerTest.java
@@ -0,0 +1,209 @@
+package ay2021s1_cs2103_w16_3.finesse.logic;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FinanceTrackerParser.ADD_COMMAND_COMMAND_WORD;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.BUBBLE_TEA_2;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.FinanceTrackerParserTest.ExpensesUiStateStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions.TemporalException;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.storage.JsonFinanceTrackerStorage;
+import ay2021s1_cs2103_w16_3.finesse.storage.JsonUserPrefsStorage;
+import ay2021s1_cs2103_w16_3.finesse.storage.StorageManager;
+
+public class LogicManagerTest {
+ private static final IOException DUMMY_IO_EXCEPTION = new IOException("dummy exception");
+
+ @TempDir
+ public Path temporaryFolder;
+
+ private Model model = new ModelManager();
+ private Logic logic;
+ private ExpensesUiStateStub expensesUiStateStub = new ExpensesUiStateStub();
+
+ @BeforeEach
+ public void setUp() {
+ JsonFinanceTrackerStorage financeTrackerStorage =
+ new JsonFinanceTrackerStorage(temporaryFolder.resolve("fine$$e.json"));
+ JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.resolve("userPrefs.json"));
+ StorageManager storage = new StorageManager(financeTrackerStorage, userPrefsStorage);
+ logic = new LogicManager(model, storage);
+ }
+
+ @Test
+ public void execute_invalidCommandFormat_throwsParseException() {
+ String invalidCommand = "uicfhmowqewca";
+ assertParseException(invalidCommand, MESSAGE_UNKNOWN_COMMAND);
+ }
+
+ @Test
+ public void execute_commandExecutionError_throwsCommandException() {
+ String deleteCommand = "delete 9";
+ assertCommandException(deleteCommand, MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validCommand_success() throws Exception {
+ String listIncomeCommand = ListIncomeCommand.COMMAND_WORD;
+ assertCommandSuccess(listIncomeCommand, ListIncomeCommand.MESSAGE_SUCCESS, model);
+ }
+
+ @Test
+ public void execute_storageThrowsIoException_throwsCommandException() {
+ // Setup LogicManager with JsonFinanceTrackerIoExceptionThrowingStub
+ JsonFinanceTrackerStorage financeTrackerStorage =
+ new JsonFinanceTrackerIoExceptionThrowingStub(
+ temporaryFolder.resolve("ioExceptionFinanceTracker.json"));
+ JsonUserPrefsStorage userPrefsStorage =
+ new JsonUserPrefsStorage(temporaryFolder.resolve("ioExceptionUserPrefs.json"));
+ StorageManager storage = new StorageManager(financeTrackerStorage, userPrefsStorage);
+ logic = new LogicManager(model, storage);
+
+ // Execute add command - adds an Expense as assertCommandFailure uses the expensesUiStateStub
+ String addCommand = ADD_COMMAND_COMMAND_WORD + TITLE_DESC_BUBBLE_TEA
+ + AMOUNT_DESC_BUBBLE_TEA + DATE_DESC_BUBBLE_TEA;
+ Expense expectedExpense = new TransactionBuilder(BUBBLE_TEA_2).withCategories().buildExpense();
+ ModelManager expectedModel = new ModelManager();
+ expectedModel.addExpense(expectedExpense);
+ String expectedMessage = LogicManager.FILE_OPS_ERROR_MESSAGE + DUMMY_IO_EXCEPTION;
+ assertCommandFailure(addCommand, CommandException.class, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void getFinanceTracker() {
+ // Since a FinanceTracker was not specified for 'model',
+ // the FinanceTracker returned is the default FinanceTracker.
+ assertEquals(new FinanceTracker(), logic.getFinanceTracker());
+ }
+
+ @Test
+ public void getFilteredTransactionList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredTransactionList().remove(0));
+ }
+
+ @Test
+ public void getFilteredExpenseList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredExpenseList().remove(0));
+ }
+
+ @Test
+ public void getFilteredIncomeList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredIncomeList().remove(0));
+ }
+
+ @Test
+ public void getFinanceTrackerFilePath() {
+ // By default, the file path is set to 'data/fine$$e.json' in UserPrefs.
+ assertEquals(Paths.get("data" , "fine$$e.json"), logic.getFinanceTrackerFilePath());
+ }
+
+ @Test
+ public void getGuiSettings() {
+ // Since a UserPrefs was not specified for 'model', the GuiSettings returned is the default GuiSettings.
+ assertEquals(new GuiSettings(), logic.getGuiSettings());
+ }
+
+ @Test
+ public void setGuiSettings_nullGuiSettings_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> logic.setGuiSettings(null));
+ }
+
+ @Test
+ public void setGuiSettings_validGuiSettings_setsGuiSettings() {
+ GuiSettings guiSettings = new GuiSettings(800, 1200, 100, 100, false);
+ logic.setGuiSettings(guiSettings);
+ assertEquals(guiSettings, logic.getGuiSettings());
+ }
+
+ /**
+ * Executes the command and confirms that
+ * - no exceptions are thrown <br>
+ * - the feedback message is equal to {@code expectedMessage} <br>
+ * - the internal model manager state is the same as that in {@code expectedModel} <br>
+ * @see #assertCommandFailure(String, Class, String, Model)
+ */
+ private void assertCommandSuccess(String inputCommand, String expectedMessage,
+ Model expectedModel) throws CommandException, ParseException, TemporalException {
+ CommandResult result = logic.execute(inputCommand, expensesUiStateStub);
+ assertEquals(expectedMessage, result.getFeedbackToUser());
+ assertEquals(expectedModel, model);
+ }
+
+ /**
+ * Executes the command, confirms that a ParseException is thrown and that the result message is correct.
+ * @see #assertCommandFailure(String, Class, String, Model)
+ */
+ private void assertParseException(String inputCommand, String expectedMessage) {
+ assertCommandFailure(inputCommand, ParseException.class, expectedMessage);
+ }
+
+ /**
+ * Executes the command, confirms that a CommandException is thrown and that the result message is correct.
+ * @see #assertCommandFailure(String, Class, String, Model)
+ */
+ private void assertCommandException(String inputCommand, String expectedMessage) {
+ assertCommandFailure(inputCommand, CommandException.class, expectedMessage);
+ }
+
+ /**
+ * Executes the command, confirms that the exception is thrown and that the result message is correct.
+ * @see #assertCommandFailure(String, Class, String, Model)
+ */
+ private void assertCommandFailure(String inputCommand, Class<? extends Throwable> expectedException,
+ String expectedMessage) {
+ Model expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ assertCommandFailure(inputCommand, expectedException, expectedMessage, expectedModel);
+ }
+
+ /**
+ * Executes the command and confirms that
+ * - the {@code expectedException} is thrown <br>
+ * - the resulting error message is equal to {@code expectedMessage} <br>
+ * - the internal model manager state is the same as that in {@code expectedModel} <br>
+ * @see #assertCommandSuccess(String, String, Model)
+ */
+ private void assertCommandFailure(String inputCommand, Class<? extends Throwable> expectedException,
+ String expectedMessage, Model expectedModel) {
+ assertThrows(expectedException, expectedMessage, () -> logic.execute(inputCommand, expensesUiStateStub));
+ assertEquals(expectedModel, model);
+ }
+
+ /**
+ * A stub class to throw an {@code IOException} when the save method is called.
+ */
+ private static class JsonFinanceTrackerIoExceptionThrowingStub extends JsonFinanceTrackerStorage {
+ private JsonFinanceTrackerIoExceptionThrowingStub(Path filePath) {
+ super(filePath);
+ }
+
+ @Override
+ public void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker, Path filePath) throws IOException {
+ throw DUMMY_IO_EXCEPTION;
+ }
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddExpenseCommandTest.java
new file mode 100644
index 00000000000..979a1639c02
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddExpenseCommandTest.java
@@ -0,0 +1,82 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.ModelStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+public class AddExpenseCommandTest {
+
+ @Test
+ public void constructor_nullTransaction_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new AddExpenseCommand(null));
+ }
+
+ @Test
+ public void execute_transactionAcceptedByModel_addSuccessful() throws Exception {
+ ModelStubAcceptingExpenseAdded modelStub = new ModelStubAcceptingExpenseAdded();
+ Expense validExpense = new TransactionBuilder().buildExpense();
+
+ CommandResult commandResult = new AddExpenseCommand(validExpense).execute(modelStub);
+
+ assertEquals(String.format(AddExpenseCommand.MESSAGE_SUCCESS, validExpense), commandResult.getFeedbackToUser());
+ assertEquals(Arrays.asList(validExpense), modelStub.expensesAdded);
+ assertEquals(commandResult.getTabToSwitchTo().get(), Tab.EXPENSES);
+ }
+
+ @Test
+ public void equals() {
+ Expense bubbleTea = new TransactionBuilder().withTitle("Bubble Tea").buildExpense();
+ Expense tuitionFees = new TransactionBuilder().withTitle("Tuition Fees").buildExpense();
+ AddExpenseCommand addBubbleTeaCommand = new AddExpenseCommand(bubbleTea);
+ AddExpenseCommand addTuitionFeesCommand = new AddExpenseCommand(tuitionFees);
+
+ // same object -> returns true
+ assertTrue(addBubbleTeaCommand.equals(addBubbleTeaCommand));
+
+ // same values -> returns true
+ AddExpenseCommand addBubbleTeaCommandCopy = new AddExpenseCommand(bubbleTea);
+ assertTrue(addBubbleTeaCommand.equals(addBubbleTeaCommandCopy));
+
+ // different types -> returns false
+ assertFalse(addBubbleTeaCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(addBubbleTeaCommand.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(addBubbleTeaCommand.equals(addTuitionFeesCommand));
+ }
+
+ /**
+ * A Model stub that always accepts the expense being added.
+ */
+ private class ModelStubAcceptingExpenseAdded extends ModelStub {
+ final ArrayList<Expense> expensesAdded = new ArrayList<>();
+
+ @Override
+ public void addExpense(Expense expense) {
+ requireNonNull(expense);
+ expensesAdded.add(expense);
+ }
+
+ @Override
+ public ReadOnlyFinanceTracker getFinanceTracker() {
+ return new FinanceTracker();
+ }
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddIncomeCommandTest.java
new file mode 100644
index 00000000000..e8e83179e5a
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/AddIncomeCommandTest.java
@@ -0,0 +1,81 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.ModelStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+public class AddIncomeCommandTest {
+
+ @Test
+ public void constructor_nullTransaction_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new AddIncomeCommand(null));
+ }
+
+ @Test
+ public void execute_transactionAcceptedByModel_addSuccessful() throws Exception {
+ ModelStubAcceptingIncomeAdded modelStub = new ModelStubAcceptingIncomeAdded();
+ Income validIncome = new TransactionBuilder().buildIncome();
+
+ CommandResult commandResult = new AddIncomeCommand(validIncome).execute(modelStub);
+
+ assertEquals(String.format(AddIncomeCommand.MESSAGE_SUCCESS, validIncome), commandResult.getFeedbackToUser());
+ assertEquals(Arrays.asList(validIncome), modelStub.incomesAdded);
+ assertEquals(commandResult.getTabToSwitchTo().get(), Tab.INCOME);
+ }
+
+ @Test
+ public void equals() {
+ Income internship = new TransactionBuilder().withTitle("Internship").buildIncome();
+ Income teachingAssistant = new TransactionBuilder().withTitle("Teaching Assistant").buildIncome();
+ AddIncomeCommand addInternshipCommand = new AddIncomeCommand(internship);
+ AddIncomeCommand addTeachingAssistantCommand = new AddIncomeCommand(teachingAssistant);
+
+ // same object -> returns true
+ assertTrue(addInternshipCommand.equals(addInternshipCommand));
+
+ // same values -> returns true
+ AddIncomeCommand addInternshipCommandCopy = new AddIncomeCommand(internship);
+ assertTrue(addInternshipCommand.equals(addInternshipCommandCopy));
+
+ // different types -> returns false
+ assertFalse(addInternshipCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(addInternshipCommand.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(addInternshipCommand.equals(addTeachingAssistantCommand));
+ }
+
+ /**
+ * A Model stub that always accepts the income being added.
+ */
+ private class ModelStubAcceptingIncomeAdded extends ModelStub {
+ final ArrayList<Income> incomesAdded = new ArrayList<>();
+
+ @Override
+ public void addIncome(Income income) {
+ requireNonNull(income);
+ incomesAdded.add(income);
+ }
+
+ @Override
+ public ReadOnlyFinanceTracker getFinanceTracker() {
+ return new FinanceTracker();
+ }
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ClearCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ClearCommandTest.java
new file mode 100644
index 00000000000..848b71382ea
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ClearCommandTest.java
@@ -0,0 +1,118 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.FinanceTrackerParser;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState;
+
+public class ClearCommandTest {
+
+ @Test
+ public void execute_emptyFinanceTracker_success() {
+ Model model = new ModelManager();
+ Model expectedModel = new ModelManager();
+
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_PRIMED, expectedModel, false);
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel, true);
+ }
+
+ @Test
+ public void execute_nonEmptyFinanceTracker_success() {
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ Model expectedModel = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ // 1st run - command is primed (model is unchanged)
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_PRIMED, expectedModel, false);
+ // 2nd run - command clears data
+ expectedModel.setFinanceTracker(new FinanceTracker());
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel, true);
+ }
+
+ @Test
+ public void execute_nonEmptyFinanceTracker_intermediateCommand() throws Exception {
+ // test to check if the clear command works across multiple uses,
+ // when another command is injected in between
+
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ Model expectedModel = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ FinanceTrackerParser cmdParser = new FinanceTrackerParser();
+ UiState uiState = new UiState();
+ uiState.setCurrentTab(UiState.Tab.INCOME);
+
+ // 1st run - command is primed (model is unchanged)
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(cmdParser.parseCommand("clear", uiState), model,
+ ClearCommand.MESSAGE_PRIMED, expectedModel, false);
+
+ // intermediate command 'lsi' - prime is reset
+ model.getCommandHistory().addCommand("lsi");
+ expectedModel.getCommandHistory().addCommand("lsi");
+
+ // 2nd run - command is primed (model is unchanged)
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(cmdParser.parseCommand("clear", uiState), model,
+ ClearCommand.MESSAGE_PRIMED, expectedModel, false);
+
+ // 3rd run - command clears data
+ expectedModel.setFinanceTracker(new FinanceTracker());
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(cmdParser.parseCommand("clear", uiState), model,
+ ClearCommand.MESSAGE_SUCCESS, expectedModel, true);
+ }
+
+ @Test
+ public void execute_nonEmptyFinanceTracker_invalidIntermediateCommand() throws Exception {
+ // test to check if the clear command works across multiple uses,
+ // when another (invalid) command is injected in between
+
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ Model expectedModel = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ FinanceTrackerParser cmdParser = new FinanceTrackerParser();
+ UiState uiState = new UiState();
+ uiState.setCurrentTab(UiState.Tab.INCOME);
+
+ // 1st run - command is primed (model is unchanged)
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(cmdParser.parseCommand("clear", uiState), model,
+ ClearCommand.MESSAGE_PRIMED, expectedModel, false);
+
+ // invalid intermediate command 'foo' - prime is reset
+ model.getCommandHistory().addCommand("foo");
+ expectedModel.getCommandHistory().addCommand("foo");
+
+ // 2nd run - command is primed (model is unchanged)
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(cmdParser.parseCommand("clear", uiState), model,
+ ClearCommand.MESSAGE_PRIMED, expectedModel, false);
+
+ // 3rd run - command clears data
+ expectedModel.setFinanceTracker(new FinanceTracker());
+ model.getCommandHistory().addCommand("clear");
+ expectedModel.getCommandHistory().addCommand("clear");
+ assertCommandSuccess(cmdParser.parseCommand("clear", uiState), model,
+ ClearCommand.MESSAGE_SUCCESS, expectedModel, true);
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandResultTest.java
similarity index 55%
rename from src/test/java/seedu/address/logic/commands/CommandResultTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandResultTest.java
index 4f3eb46e9ef..cd4fa375c75 100644
--- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandResultTest.java
@@ -1,12 +1,16 @@
-package seedu.address.logic.commands;
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Optional;
+
import org.junit.jupiter.api.Test;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
public class CommandResultTest {
@Test
public void equals() {
@@ -14,7 +18,7 @@ public void equals() {
// same values -> returns true
assertTrue(commandResult.equals(new CommandResult("feedback")));
- assertTrue(commandResult.equals(new CommandResult("feedback", false, false)));
+ assertTrue(commandResult.equals(new CommandResult("feedback", false, false, false, null)));
// same object -> returns true
assertTrue(commandResult.equals(commandResult));
@@ -28,11 +32,17 @@ public void equals() {
// different feedbackToUser value -> returns false
assertFalse(commandResult.equals(new CommandResult("different")));
+ // different calculateBudgetInfo value -> returns false
+ assertFalse(commandResult.equals(new CommandResult("feedback", true, false, false)));
+
// different showHelp value -> returns false
- assertFalse(commandResult.equals(new CommandResult("feedback", true, false)));
+ assertFalse(commandResult.equals(new CommandResult("feedback", false, true, false)));
// different exit value -> returns false
- assertFalse(commandResult.equals(new CommandResult("feedback", false, true)));
+ assertFalse(commandResult.equals(new CommandResult("feedback", false, false, true)));
+
+ // different tabToSwitchTo value -> returns false
+ assertFalse(commandResult.equals(new CommandResult("feedback", Tab.ANALYTICS)));
}
@Test
@@ -46,9 +56,28 @@ public void hashcode() {
assertNotEquals(commandResult.hashCode(), new CommandResult("different").hashCode());
// different showHelp value -> returns different hashcode
- assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", true, false).hashCode());
+ assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, true, false).hashCode());
// different exit value -> returns different hashcode
- assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, true).hashCode());
+ assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, false, true).hashCode());
+
+ // different tabToSwitchTo value -> returns different hashcode
+ assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, false, false, Tab.INCOME));
+ }
+
+ @Test
+ public void getters_returnSameValue() {
+ String feedback = "Hello world!";
+ boolean calculateBudgetInfo = true;
+ boolean showHelp = true;
+ boolean exit = true;
+ Tab tabToSwitchTo = Tab.ANALYTICS;
+ CommandResult commandResult = new CommandResult(feedback, calculateBudgetInfo, showHelp, exit, tabToSwitchTo);
+
+ assertEquals(feedback, commandResult.getFeedbackToUser());
+ assertEquals(calculateBudgetInfo, commandResult.isCalculateBudgetInfo());
+ assertEquals(showHelp, commandResult.isShowHelp());
+ assertEquals(exit, commandResult.isExit());
+ assertEquals(Optional.of(tabToSwitchTo), commandResult.getTabToSwitchTo());
}
}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandTestUtil.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandTestUtil.java
new file mode 100644
index 00000000000..9aeab44a1f5
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/CommandTestUtil.java
@@ -0,0 +1,225 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditBookmarkTransactionDescriptorBuilder;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditTransactionDescriptorBuilder;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Contains helper methods for testing commands.
+ */
+public class CommandTestUtil {
+
+ public static final String VALID_TITLE_BUBBLE_TEA = "Bubble Tea";
+ public static final String VALID_TITLE_INTERNSHIP = "Internship";
+ public static final String VALID_TITLE_SPOTIFY_SUBSCRIPTION = "Spotify Subscription";
+ public static final String VALID_TITLE_PHONE_BILL = "Phone Bill";
+ public static final String VALID_TITLE_PART_TIME = "Part Time";
+ public static final String VALID_AMOUNT_BUBBLE_TEA = "$4.80";
+ public static final String VALID_AMOUNT_INTERNSHIP = "$560";
+ public static final String VALID_AMOUNT_SPOTIFY_SUBSCRIPTION = "$9.90";
+ public static final String VALID_AMOUNT_PHONE_BILL = "$60";
+ public static final String VALID_AMOUNT_PART_TIME = "$450";
+ public static final String VALID_DATE_BUBBLE_TEA = "14/10/2020";
+ public static final String VALID_DATE_INTERNSHIP = "06/10/2020";
+ public static final String VALID_DATE_SPOTIFY_SUBSCRIPTION = "08/10/2020";
+ public static final String VALID_CATEGORY_FOOD_BEVERAGE = "Food & Beverage";
+ public static final String VALID_CATEGORY_WORK = "Work";
+ public static final String VALID_CATEGORY_UTILITIES = "Utilities";
+ public static final String VALID_CATEGORY_MISCELLANEOUS = "Miscellaneous";
+
+ public static final String TITLE_DESC_BUBBLE_TEA = " " + PREFIX_TITLE + VALID_TITLE_BUBBLE_TEA;
+ public static final String TITLE_DESC_INTERNSHIP = " " + PREFIX_TITLE + VALID_TITLE_INTERNSHIP;
+ public static final String TITLE_DESC_PHONE_BILL = " " + PREFIX_TITLE + VALID_TITLE_PHONE_BILL;
+ public static final String TITLE_DESC_SPOTIFY_SUBSCRIPTION = " " + PREFIX_TITLE + VALID_TITLE_SPOTIFY_SUBSCRIPTION;
+ public static final String TITLE_DESC_PART_TIME = " " + PREFIX_TITLE + VALID_TITLE_PART_TIME;
+ public static final String AMOUNT_DESC_BUBBLE_TEA = " " + PREFIX_AMOUNT + VALID_AMOUNT_BUBBLE_TEA;
+ public static final String AMOUNT_DESC_INTERNSHIP = " " + PREFIX_AMOUNT + VALID_AMOUNT_INTERNSHIP;
+ public static final String AMOUNT_DESC_PHONE_BILL = " " + PREFIX_AMOUNT + VALID_AMOUNT_PHONE_BILL;
+ public static final String AMOUNT_DESC_SPOTIFY_SUBSCRIPTION = " " + PREFIX_AMOUNT
+ + VALID_AMOUNT_SPOTIFY_SUBSCRIPTION;
+ public static final String AMOUNT_DESC_PART_TIME = " " + PREFIX_AMOUNT + VALID_AMOUNT_PART_TIME;
+ public static final String DATE_DESC_BUBBLE_TEA = " " + PREFIX_DATE + VALID_DATE_BUBBLE_TEA;
+ public static final String DATE_DESC_INTERNSHIP = " " + PREFIX_DATE + VALID_DATE_INTERNSHIP;
+ public static final String DATE_DESC_SPOTIFY_SUBSCRIPTION = " " + PREFIX_DATE + VALID_DATE_SPOTIFY_SUBSCRIPTION;
+ public static final String CATEGORY_DESC_FOOD_BEVERAGE = " " + PREFIX_CATEGORY + VALID_CATEGORY_FOOD_BEVERAGE;
+ public static final String CATEGORY_DESC_WORK = " " + PREFIX_CATEGORY + VALID_CATEGORY_WORK;
+ public static final String CATEGORY_DESC_UTILITIES = " " + PREFIX_CATEGORY
+ + VALID_CATEGORY_UTILITIES;
+ public static final String CATEGORY_DESC_MISCELLANEOUS = " " + PREFIX_CATEGORY
+ + VALID_CATEGORY_MISCELLANEOUS;
+
+ public static final String INVALID_TITLE_DESC = " " + PREFIX_TITLE + "Movie\u2416"; // 'SYN' not allowed in titles
+ public static final String INVALID_AMOUNT_DESC = " " + PREFIX_AMOUNT + "911a"; // 'a' not allowed in amounts
+ public static final String INVALID_DATE_DESC = " " + PREFIX_DATE + "bobby!zijian"; // only numbers and '/' allowed
+ public static final String INVALID_CATEGORY_DESC = " " + PREFIX_CATEGORY + "CS2103T\u2416";
+ // 'SYN' not allowed in categories
+
+ public static final String PREAMBLE_WHITESPACE = "\t \r \n";
+ public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble";
+
+ public static final EditCommand.EditTransactionDescriptor DESC_BUBBLE_TEA;
+ public static final EditCommand.EditTransactionDescriptor DESC_INTERNSHIP;
+ public static final EditBookmarkTransactionDescriptor DESC_SPOTIFY_SUBSCRIPTION;
+ public static final EditBookmarkTransactionDescriptor DESC_PHONE_BILL;
+
+ static {
+ DESC_BUBBLE_TEA = new EditTransactionDescriptorBuilder().withTitle(VALID_TITLE_BUBBLE_TEA)
+ .withAmount(VALID_AMOUNT_BUBBLE_TEA).withDate(VALID_DATE_BUBBLE_TEA)
+ .withCategories(VALID_CATEGORY_FOOD_BEVERAGE).build();
+ DESC_INTERNSHIP = new EditTransactionDescriptorBuilder().withTitle(VALID_TITLE_INTERNSHIP)
+ .withAmount(VALID_AMOUNT_INTERNSHIP).withDate(VALID_DATE_INTERNSHIP)
+ .withCategories(VALID_CATEGORY_WORK, VALID_CATEGORY_FOOD_BEVERAGE).build();
+ DESC_SPOTIFY_SUBSCRIPTION = new EditBookmarkTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).withAmount(VALID_AMOUNT_SPOTIFY_SUBSCRIPTION)
+ .withCategories(VALID_CATEGORY_MISCELLANEOUS).build();
+ DESC_PHONE_BILL = new EditBookmarkTransactionDescriptorBuilder().withTitle(VALID_TITLE_PHONE_BILL)
+ .withAmount(VALID_AMOUNT_PHONE_BILL).withCategories(VALID_CATEGORY_UTILITIES).build();
+ }
+
+ /**
+ * Executes the given {@code command}, confirms that <br>
+ * - the returned {@link CommandResult} matches {@code expectedCommandResult} <br>
+ * - the {@code actualModel} matches {@code expectedModel}
+ */
+ public static void assertCommandSuccess(Command command, Model actualModel, CommandResult expectedCommandResult,
+ Model expectedModel) {
+ try {
+ CommandResult result = command.execute(actualModel);
+ assertEquals(expectedCommandResult, result);
+ assertEquals(expectedModel, actualModel);
+ } catch (CommandException ce) {
+ throw new AssertionError("Execution of command should not fail.", ce);
+ }
+ }
+
+ /**
+ * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)}
+ * that takes a string {@code expectedMessage}.
+ */
+ public static void assertCommandSuccess(Command command, Model actualModel, String expectedMessage,
+ Model expectedModel) {
+ CommandResult expectedCommandResult = new CommandResult(expectedMessage);
+ assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel);
+ }
+
+ /**
+ * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)}
+ * that takes a string {@code expectedMessage} and a boolean {@code isCalculateBudgetInfo}.
+ */
+ public static void assertCommandSuccess(Command command, Model actualModel, String expectedMessage,
+ Model expectedModel, boolean isCalculateBudgetInfo) {
+ CommandResult expectedCommandResult = new CommandResult(expectedMessage, isCalculateBudgetInfo);
+ assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel);
+ }
+
+ /**
+ * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)}
+ * that takes a string {@code expectedMessage}, a boolean {@code isCalculateBudgetInfo}
+ * and a Tab {@code tabToSwitchTo}.
+ */
+ public static void assertCommandSuccess(Command command, Model actualModel, String expectedMessage,
+ Model expectedModel, boolean isCalculateBudgetInfo, Tab tabToSwitchTo) {
+ CommandResult expectedCommandResult = new CommandResult(expectedMessage, isCalculateBudgetInfo, tabToSwitchTo);
+ assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel);
+ }
+
+ /**
+ * Executes the given {@code command}, confirms that <br>
+ * - a {@code CommandException} is thrown <br>
+ * - the CommandException message matches {@code expectedMessage} <br>
+ * - the finance tracker, filtered transaction list, filtered bookmark expense list, filtered bookmark income list
+ * and selected transaction in {@code actualModel} remain unchanged
+ */
+ public static void assertCommandFailure(Command command, Model actualModel, String expectedMessage) {
+ // we are unable to defensively copy the model for comparison later, so we can
+ // only do so by copying its components.
+ FinanceTracker expectedFinanceTracker = new FinanceTracker(actualModel.getFinanceTracker());
+ List<Transaction> expectedFilteredList = new ArrayList<>(actualModel.getFilteredTransactionList());
+ List<BookmarkExpense> expectedFilteredBookmarkExpenseList =
+ new ArrayList<>(actualModel.getFilteredBookmarkExpenseList());
+ List<BookmarkIncome> expectedFilteredBookmarkIncomeList =
+ new ArrayList<>(actualModel.getFilteredBookmarkIncomeList());
+
+ assertThrows(CommandException.class, expectedMessage, () -> command.execute(actualModel));
+ assertEquals(expectedFinanceTracker, actualModel.getFinanceTracker());
+ assertEquals(expectedFilteredList, actualModel.getFilteredTransactionList());
+ assertEquals(expectedFilteredBookmarkExpenseList, actualModel.getFilteredBookmarkExpenseList());
+ }
+
+ /**
+ * Updates {@code model}'s filtered list to show only the expense at the given {@code targetIndex} in the
+ * {@code model}'s finance tracker.
+ */
+ public static void showExpenseAtIndex(Model model, Index targetIndex) {
+ assertTrue(targetIndex.getZeroBased() < model.getFilteredExpenseList().size());
+
+ Expense expense = model.getFilteredExpenseList().get(targetIndex.getZeroBased());
+ final String[] splitTitle = expense.getTitle().toString().split("\\s+");
+ model.updateFilteredExpenseList(e -> e == expense);
+
+ assertEquals(1, model.getFilteredExpenseList().size());
+ }
+
+ /**
+ * Updates {@code model}'s filtered list to show only the bookmark expense at the given {@code targetIndex} in the
+ * {@code model}'s finance tracker.
+ */
+ public static void showBookmarkExpenseAtIndex(Model model, Index targetIndex) {
+ assertTrue(targetIndex.getZeroBased() < model.getFilteredBookmarkExpenseList().size());
+
+ BookmarkExpense bookmarkExpense = model.getFilteredBookmarkExpenseList().get(targetIndex.getZeroBased());
+ final String[] splitTitle = bookmarkExpense.getTitle().toString().split("\\s+");
+ model.updateFilteredBookmarkExpenseList(e -> e == bookmarkExpense);
+
+ assertEquals(1, model.getFilteredBookmarkExpenseList().size());
+ }
+
+ /**
+ * Updates {@code model}'s filtered list to show only the bookmark income at the given {@code targetIndex} in the
+ * {@code model}'s finance tracker.
+ */
+ public static void showBookmarkIncomeAtIndex(Model model, Index targetIndex) {
+ assertTrue(targetIndex.getZeroBased() < model.getFilteredBookmarkIncomeList().size());
+
+ BookmarkIncome bookmarkIncome = model.getFilteredBookmarkIncomeList().get(targetIndex.getZeroBased());
+ final String[] splitTitle = bookmarkIncome.getTitle().toString().split("\\s+");
+ model.updateFilteredBookmarkIncomeList(e -> e == bookmarkIncome);
+
+ assertEquals(1, model.getFilteredBookmarkIncomeList().size());
+ }
+
+ /**
+ * Updates {@code model}'s filtered list to show only the income at the given {@code targetIndex} in the
+ * {@code model}'s finance tracker.
+ */
+ public static void showIncomeAtIndex(Model model, Index targetIndex) {
+ assertTrue(targetIndex.getZeroBased() < model.getFilteredIncomeList().size());
+
+ Income income = model.getFilteredIncomeList().get(targetIndex.getZeroBased());
+ final String[] splitTitle = income.getTitle().toString().split("\\s+");
+ model.updateFilteredIncomeList(i -> i == income);
+
+ assertEquals(1, model.getFilteredIncomeList().size());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteCommandTest.java
new file mode 100644
index 00000000000..7e98aace1da
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteCommandTest.java
@@ -0,0 +1,51 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code DeleteCommand}.
+ */
+public class DeleteCommandTest {
+
+ @Test
+ public void execute_throwsCommandException() {
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ assertCommandFailure(new DeleteCommand(INDEX_FIRST), model, MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Test
+ public void equals() {
+ DeleteCommand deleteFirstCommand = new DeleteCommand(INDEX_FIRST);
+ DeleteCommand deleteSecondCommand = new DeleteCommand(INDEX_SECOND);
+
+ // same object -> returns true
+ assertTrue(deleteFirstCommand.equals(deleteFirstCommand));
+
+ // same values -> returns true
+ DeleteCommand deleteFirstCommandCopy = new DeleteCommand(INDEX_FIRST);
+ assertTrue(deleteFirstCommand.equals(deleteFirstCommandCopy));
+
+ // different types -> returns false
+ assertFalse(deleteFirstCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(deleteFirstCommand.equals(null));
+
+ // different transactions -> returns false
+ assertFalse(deleteFirstCommand.equals(deleteSecondCommand));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteExpenseCommandTest.java
new file mode 100644
index 00000000000..5bd439d0729
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteExpenseCommandTest.java
@@ -0,0 +1,117 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showExpenseAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.DeleteCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code DeleteExpenseCommand}.
+ */
+public class DeleteExpenseCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ Expense expenseToDelete = model.getFilteredExpenseList().get(INDEX_FIRST.getZeroBased());
+ DeleteCommandStub superCommand = new DeleteCommandStub(INDEX_FIRST);
+ DeleteExpenseCommand deleteExpenseCommand = new DeleteExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(DeleteExpenseCommand.MESSAGE_DELETE_EXPENSE_SUCCESS, expenseToDelete);
+
+ ModelManager expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.deleteTransaction(expenseToDelete);
+
+ assertCommandSuccess(deleteExpenseCommand, model, expectedMessage, expectedModel, true);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredExpenseList().size() + 1);
+ DeleteCommandStub superCommand = new DeleteCommandStub(outOfBoundIndex);
+ DeleteExpenseCommand deleteExpenseCommand = new DeleteExpenseCommand(superCommand);
+
+ assertCommandFailure(deleteExpenseCommand, model, MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showExpenseAtIndex(model, INDEX_FIRST);
+
+ Expense expenseToDelete = model.getFilteredExpenseList().get(INDEX_FIRST.getZeroBased());
+ DeleteCommandStub superCommand = new DeleteCommandStub(INDEX_FIRST);
+ DeleteExpenseCommand deleteExpenseCommand = new DeleteExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(DeleteExpenseCommand.MESSAGE_DELETE_EXPENSE_SUCCESS, expenseToDelete);
+
+ Model expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.deleteTransaction(expenseToDelete);
+ showNoExpenses(expectedModel);
+
+ assertCommandSuccess(deleteExpenseCommand, model, expectedMessage, expectedModel, true);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showExpenseAtIndex(model, INDEX_FIRST);
+
+ Index outOfBoundIndex = INDEX_SECOND;
+ // Ensures that outOfBoundIndex is still within the boundaries of the finance tracker's list of expenses.
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getExpenseList().size());
+
+ DeleteCommandStub superCommand = new DeleteCommandStub(outOfBoundIndex);
+ DeleteExpenseCommand deleteExpenseCommand = new DeleteExpenseCommand(superCommand);
+
+ assertCommandFailure(deleteExpenseCommand, model, MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ DeleteCommandStub firstSuperCommand = new DeleteCommandStub(INDEX_FIRST);
+ DeleteExpenseCommand firstDeleteExpenseCommand = new DeleteExpenseCommand(firstSuperCommand);
+ DeleteCommand secondSuperCommand = new DeleteCommand(INDEX_SECOND);
+ DeleteExpenseCommand secondDeleteExpenseCommand = new DeleteExpenseCommand(secondSuperCommand);
+
+ // same object -> returns true
+ assertTrue(firstDeleteExpenseCommand.equals(firstDeleteExpenseCommand));
+
+ // same values -> returns true
+ DeleteCommandStub firstSuperCommandCopy = new DeleteCommandStub(INDEX_FIRST);
+ DeleteExpenseCommand firstDeleteExpenseCommandCopy = new DeleteExpenseCommand(firstSuperCommandCopy);
+ assertTrue(firstDeleteExpenseCommand.equals(firstDeleteExpenseCommandCopy));
+
+ // different types -> returns false
+ assertFalse(firstDeleteExpenseCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstDeleteExpenseCommand.equals(null));
+
+ // different expenses -> returns false
+ assertFalse(firstDeleteExpenseCommand.equals(secondDeleteExpenseCommand));
+ }
+
+ /**
+ * Updates {@code model}'s filtered list to show no expenses.
+ */
+ private void showNoExpenses(Model model) {
+ model.updateFilteredExpenseList(p -> false);
+
+ assertTrue(model.getFilteredExpenseList().isEmpty());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteIncomeCommandTest.java
new file mode 100644
index 00000000000..a07daa4286f
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/DeleteIncomeCommandTest.java
@@ -0,0 +1,117 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_INCOME_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showIncomeAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.DeleteCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code DeleteIncomeCommand}.
+ */
+public class DeleteIncomeCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ Income incomeToDelete = model.getFilteredIncomeList().get(INDEX_FIRST.getZeroBased());
+ DeleteCommandStub superCommand = new DeleteCommandStub(INDEX_FIRST);
+ DeleteIncomeCommand deleteIncomeCommand = new DeleteIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(DeleteIncomeCommand.MESSAGE_DELETE_INCOME_SUCCESS, incomeToDelete);
+
+ ModelManager expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.deleteTransaction(incomeToDelete);
+
+ assertCommandSuccess(deleteIncomeCommand, model, expectedMessage, expectedModel, true);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredIncomeList().size() + 1);
+ DeleteCommandStub superCommand = new DeleteCommandStub(outOfBoundIndex);
+ DeleteIncomeCommand deleteIncomeCommand = new DeleteIncomeCommand(superCommand);
+
+ assertCommandFailure(deleteIncomeCommand, model, MESSAGE_INVALID_INCOME_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showIncomeAtIndex(model, INDEX_FIRST);
+
+ Income incomeToDelete = model.getFilteredIncomeList().get(INDEX_FIRST.getZeroBased());
+ DeleteCommandStub superCommand = new DeleteCommandStub(INDEX_FIRST);
+ DeleteIncomeCommand deleteIncomeCommand = new DeleteIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(DeleteIncomeCommand.MESSAGE_DELETE_INCOME_SUCCESS, incomeToDelete);
+
+ Model expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.deleteTransaction(incomeToDelete);
+ showNoIncomes(expectedModel);
+
+ assertCommandSuccess(deleteIncomeCommand, model, expectedMessage, expectedModel, true);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showIncomeAtIndex(model, INDEX_FIRST);
+
+ Index outOfBoundIndex = INDEX_SECOND;
+ // Ensures that outOfBoundIndex is still within the boundaries of the finance tracker's list of incomes.
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getIncomeList().size());
+
+ DeleteCommandStub superCommand = new DeleteCommandStub(outOfBoundIndex);
+ DeleteIncomeCommand deleteIncomeCommand = new DeleteIncomeCommand(superCommand);
+
+ assertCommandFailure(deleteIncomeCommand, model, MESSAGE_INVALID_INCOME_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ DeleteCommandStub firstSuperCommand = new DeleteCommandStub(INDEX_FIRST);
+ DeleteIncomeCommand firstDeleteIncomeCommand = new DeleteIncomeCommand(firstSuperCommand);
+ DeleteCommand secondSuperCommand = new DeleteCommand(INDEX_SECOND);
+ DeleteIncomeCommand secondDeleteIncomeCommand = new DeleteIncomeCommand(secondSuperCommand);
+
+ // same object -> returns true
+ assertTrue(firstDeleteIncomeCommand.equals(firstDeleteIncomeCommand));
+
+ // same values -> returns true
+ DeleteCommandStub firstSuperCommandCopy = new DeleteCommandStub(INDEX_FIRST);
+ DeleteIncomeCommand firstDeleteIncomeCommandCopy = new DeleteIncomeCommand(firstSuperCommandCopy);
+ assertTrue(firstDeleteIncomeCommand.equals(firstDeleteIncomeCommandCopy));
+
+ // different types -> returns false
+ assertFalse(firstDeleteIncomeCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstDeleteIncomeCommand.equals(null));
+
+ // different incomes -> returns false
+ assertFalse(firstDeleteIncomeCommand.equals(secondDeleteIncomeCommand));
+ }
+
+ /**
+ * Updates {@code model}'s filtered list to show no incomes.
+ */
+ private void showNoIncomes(Model model) {
+ model.updateFilteredIncomeList(p -> false);
+
+ assertTrue(model.getFilteredIncomeList().isEmpty());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditCommandTest.java
new file mode 100644
index 00000000000..45530191aba
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditCommandTest.java
@@ -0,0 +1,82 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand.EditTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for EditCommand.
+ */
+public class EditCommandTest {
+
+ @Test
+ public void execute_throwsCommandExcepion() {
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ assertCommandFailure(new EditCommand(INDEX_FIRST, new EditTransactionDescriptor()), model,
+ MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Test
+ public void isAmountOrDateEdited() {
+ Amount amount = new Amount(VALID_AMOUNT_BUBBLE_TEA);
+ Date date = new Date(VALID_DATE_BUBBLE_TEA);
+
+ EditTransactionDescriptor uneditedEditTransactionDescriptor = new EditTransactionDescriptor();
+ assertFalse(uneditedEditTransactionDescriptor.isAmountOrDateEdited());
+
+ EditTransactionDescriptor amountEditedEditTransactionDescriptor = new EditTransactionDescriptor();
+ amountEditedEditTransactionDescriptor.setAmount(amount);
+ assertTrue(amountEditedEditTransactionDescriptor.isAmountOrDateEdited());
+
+ EditTransactionDescriptor dateEditedEditTransactionDescriptor = new EditTransactionDescriptor();
+ dateEditedEditTransactionDescriptor.setDate(date);
+ assertTrue(dateEditedEditTransactionDescriptor.isAmountOrDateEdited());
+
+ EditTransactionDescriptor bothEditedEditTransactionDescriptor = new EditTransactionDescriptor();
+ bothEditedEditTransactionDescriptor.setAmount(amount);
+ bothEditedEditTransactionDescriptor.setDate(date);
+ assertTrue(bothEditedEditTransactionDescriptor.isAmountOrDateEdited());
+ }
+
+ @Test
+ public void equals() {
+ final EditCommand standardCommand = new EditCommand(INDEX_FIRST, DESC_BUBBLE_TEA);
+
+ // same values -> returns true
+ EditTransactionDescriptor copyDescriptor = new EditTransactionDescriptor(DESC_BUBBLE_TEA);
+ EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST, copyDescriptor);
+ assertTrue(standardCommand.equals(commandWithSameValues));
+
+ // same object -> returns true
+ assertTrue(standardCommand.equals(standardCommand));
+
+ // null -> returns false
+ assertFalse(standardCommand.equals(null));
+
+ // different types -> returns false
+ assertFalse(standardCommand.equals(new ClearCommand()));
+
+ // different index -> returns false
+ assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND, DESC_BUBBLE_TEA)));
+
+ // different descriptor -> returns false
+ assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST, DESC_INTERNSHIP)));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditExpenseCommandTest.java
new file mode 100644
index 00000000000..47f3d87db32
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditExpenseCommandTest.java
@@ -0,0 +1,180 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showExpenseAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand.EditTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.EditCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditTransactionDescriptorBuilder;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for EditExpenseCommand.
+ */
+public class EditExpenseCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_allFieldsSpecifiedUnfilteredList_success() {
+ Expense editedExpense = new TransactionBuilder().buildExpense();
+ EditTransactionDescriptor descriptor =
+ new EditTransactionDescriptorBuilder(editedExpense).build();
+ EditCommandStub superCommand = new EditCommandStub(INDEX_FIRST, descriptor);
+ EditExpenseCommand editExpenseCommand = new EditExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(EditExpenseCommand.MESSAGE_EDIT_EXPENSE_SUCCESS, editedExpense);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setTransaction(model.getFilteredExpenseList().get(0), editedExpense);
+ if (descriptor.isAmountOrDateEdited()) {
+ expectedModel.calculateBudgetInfo();
+ }
+
+ assertCommandSuccess(editExpenseCommand, model, expectedMessage, expectedModel,
+ descriptor.isAmountOrDateEdited());
+ }
+
+ @Test
+ public void execute_someFieldsSpecifiedUnfilteredList_success() {
+ Index indexLastExpense = Index.fromOneBased(model.getFilteredExpenseList().size());
+ Expense lastExpense = model.getFilteredExpenseList().get(indexLastExpense.getZeroBased());
+
+ TransactionBuilder expenseInList = new TransactionBuilder(lastExpense);
+ Expense editedExpense = expenseInList.withTitle(VALID_TITLE_INTERNSHIP).withAmount(VALID_AMOUNT_INTERNSHIP)
+ .withCategories(VALID_CATEGORY_WORK).buildExpense();
+
+ EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_INTERNSHIP).withAmount(VALID_AMOUNT_INTERNSHIP)
+ .withCategories(VALID_CATEGORY_WORK).build();
+ EditCommandStub superCommand = new EditCommandStub(indexLastExpense, descriptor);
+ EditExpenseCommand editExpenseCommand = new EditExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(EditExpenseCommand.MESSAGE_EDIT_EXPENSE_SUCCESS, editedExpense);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setTransaction(lastExpense, editedExpense);
+ if (descriptor.isAmountOrDateEdited()) {
+ expectedModel.calculateBudgetInfo();
+ }
+
+ assertCommandSuccess(editExpenseCommand, model, expectedMessage, expectedModel,
+ descriptor.isAmountOrDateEdited());
+ }
+
+ @Test
+ public void execute_noFieldSpecifiedUnfilteredList_success() {
+ EditCommandStub superCommand = new EditCommandStub(INDEX_FIRST, new EditTransactionDescriptor());
+ EditExpenseCommand editExpenseCommand = new EditExpenseCommand(superCommand);
+ Expense editedExpense = model.getFilteredExpenseList().get(INDEX_FIRST.getZeroBased());
+
+ String expectedMessage = String.format(EditExpenseCommand.MESSAGE_EDIT_EXPENSE_SUCCESS, editedExpense);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+
+ assertCommandSuccess(editExpenseCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_filteredList_success() {
+ showExpenseAtIndex(model, INDEX_FIRST);
+
+ Expense expenseInFilteredList = model.getFilteredExpenseList()
+ .get(INDEX_FIRST.getZeroBased());
+ Expense editedExpense =
+ new TransactionBuilder(expenseInFilteredList).withTitle(VALID_TITLE_INTERNSHIP).buildExpense();
+ EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_INTERNSHIP).build();
+ EditCommandStub superCommand = new EditCommandStub(INDEX_FIRST, descriptor);
+ EditExpenseCommand editExpenseCommand = new EditExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(EditExpenseCommand.MESSAGE_EDIT_EXPENSE_SUCCESS, editedExpense);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setTransaction(model.getFilteredExpenseList().get(0), editedExpense);
+ if (descriptor.isAmountOrDateEdited()) {
+ expectedModel.calculateBudgetInfo();
+ }
+
+ assertCommandSuccess(editExpenseCommand, model, expectedMessage, expectedModel,
+ descriptor.isAmountOrDateEdited());
+ }
+
+ @Test
+ public void execute_invalidExpenseIndexUnfilteredList_failure() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredExpenseList().size() + 1);
+ EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_INTERNSHIP).build();
+ EditCommandStub superCommand = new EditCommandStub(outOfBoundIndex, descriptor);
+ EditExpenseCommand editExpenseCommand = new EditExpenseCommand(superCommand);
+
+ assertCommandFailure(editExpenseCommand, model, MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ /**
+ * Edit filtered list where index is larger than size of filtered list,
+ * but smaller than size of finance tracker
+ */
+ @Test
+ public void execute_invalidExpenseIndexFilteredList_failure() {
+ showExpenseAtIndex(model, INDEX_FIRST);
+ Index outOfBoundIndex = INDEX_SECOND;
+ // Ensures that outOfBoundIndex is still within the boundaries of the finance tracker's list of expenses.
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getExpenseList().size());
+
+ EditCommandStub superCommand = new EditCommandStub(outOfBoundIndex,
+ new EditTransactionDescriptorBuilder().withTitle(VALID_TITLE_INTERNSHIP).build());
+ EditExpenseCommand editExpenseCommand = new EditExpenseCommand(superCommand);
+
+ assertCommandFailure(editExpenseCommand, model, MESSAGE_INVALID_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ final EditCommandStub superCommand = new EditCommandStub(INDEX_FIRST, DESC_BUBBLE_TEA);
+ final EditExpenseCommand standardCommand = new EditExpenseCommand(superCommand);
+
+ // same values -> returns true
+ EditTransactionDescriptor copyDescriptor = new EditTransactionDescriptor(DESC_BUBBLE_TEA);
+ EditCommandStub superCommandWithSameValues = new EditCommandStub(INDEX_FIRST, copyDescriptor);
+ EditExpenseCommand commandWithSameValues = new EditExpenseCommand(superCommandWithSameValues);
+ assertTrue(standardCommand.equals(commandWithSameValues));
+
+ // same object -> returns true
+ assertTrue(standardCommand.equals(standardCommand));
+
+ // null -> returns false
+ assertFalse(standardCommand.equals(null));
+
+ // different types -> returns false
+ assertFalse(standardCommand.equals(new ClearCommand()));
+
+ // different index -> returns false
+ assertFalse(standardCommand.equals(new EditExpenseCommand(
+ new EditCommandStub(INDEX_SECOND, DESC_BUBBLE_TEA))));
+
+ // different descriptor -> returns false
+ assertFalse(standardCommand.equals(new EditExpenseCommand(
+ new EditCommandStub(INDEX_FIRST, DESC_INTERNSHIP))));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditIncomeCommandTest.java
new file mode 100644
index 00000000000..a6e772bc005
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditIncomeCommandTest.java
@@ -0,0 +1,174 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_INCOME_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showIncomeAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand.EditTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.EditCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditTransactionDescriptorBuilder;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for EditIncomeCommand.
+ */
+public class EditIncomeCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_allFieldsSpecifiedUnfilteredList_success() {
+ Income editedIncome = new TransactionBuilder().buildIncome();
+ EditTransactionDescriptor descriptor =
+ new EditTransactionDescriptorBuilder(editedIncome).build();
+ EditCommandStub superCommand = new EditCommandStub(INDEX_FIRST, descriptor);
+ EditIncomeCommand editIncomeCommand = new EditIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(EditIncomeCommand.MESSAGE_EDIT_INCOME_SUCCESS, editedIncome);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setTransaction(model.getFilteredIncomeList().get(0), editedIncome);
+ if (descriptor.isAmountOrDateEdited()) {
+ expectedModel.calculateBudgetInfo();
+ }
+
+ assertCommandSuccess(editIncomeCommand, model, expectedMessage, expectedModel,
+ descriptor.isAmountOrDateEdited());
+ }
+
+ @Test
+ public void execute_someFieldsSpecifiedUnfilteredList_success() {
+ Index indexLastIncome = Index.fromOneBased(model.getFilteredIncomeList().size());
+ Income lastIncome = model.getFilteredIncomeList().get(indexLastIncome.getZeroBased());
+
+ TransactionBuilder incomeInList = new TransactionBuilder(lastIncome);
+ Income editedIncome = incomeInList.withTitle(VALID_TITLE_INTERNSHIP).withAmount(VALID_AMOUNT_INTERNSHIP)
+ .withCategories(VALID_CATEGORY_WORK).buildIncome();
+
+ EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_INTERNSHIP).withAmount(VALID_AMOUNT_INTERNSHIP)
+ .withCategories(VALID_CATEGORY_WORK).build();
+ EditCommandStub superCommand = new EditCommandStub(indexLastIncome, descriptor);
+ EditIncomeCommand editIncomeCommand = new EditIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(EditIncomeCommand.MESSAGE_EDIT_INCOME_SUCCESS, editedIncome);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setTransaction(lastIncome, editedIncome);
+ if (descriptor.isAmountOrDateEdited()) {
+ expectedModel.calculateBudgetInfo();
+ }
+
+ assertCommandSuccess(editIncomeCommand, model, expectedMessage, expectedModel,
+ descriptor.isAmountOrDateEdited());
+ }
+
+ @Test
+ public void execute_noFieldSpecifiedUnfilteredList_success() {
+ EditCommandStub superCommand = new EditCommandStub(INDEX_FIRST, new EditTransactionDescriptor());
+ EditIncomeCommand editIncomeCommand = new EditIncomeCommand(superCommand);
+ Income editedIncome = model.getFilteredIncomeList().get(INDEX_FIRST.getZeroBased());
+
+ String expectedMessage = String.format(EditIncomeCommand.MESSAGE_EDIT_INCOME_SUCCESS, editedIncome);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+
+ assertCommandSuccess(editIncomeCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_filteredList_success() {
+ showIncomeAtIndex(model, INDEX_FIRST);
+
+ Income incomeInFilteredList = model.getFilteredIncomeList().get(INDEX_FIRST.getZeroBased());
+ Income editedIncome = new TransactionBuilder(incomeInFilteredList)
+ .withTitle(VALID_TITLE_INTERNSHIP).buildIncome();
+ EditCommandStub superCommand = new EditCommandStub(INDEX_FIRST,
+ new EditTransactionDescriptorBuilder().withTitle(VALID_TITLE_INTERNSHIP).build());
+ EditIncomeCommand editIncomeCommand = new EditIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(EditIncomeCommand.MESSAGE_EDIT_INCOME_SUCCESS, editedIncome);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setTransaction(model.getFilteredIncomeList().get(0), editedIncome);
+
+ assertCommandSuccess(editIncomeCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIncomeIndexUnfilteredList_failure() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredIncomeList().size() + 1);
+ EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_INTERNSHIP).build();
+ EditCommandStub superCommand = new EditCommandStub(outOfBoundIndex, descriptor);
+ EditIncomeCommand editIncomeCommand = new EditIncomeCommand(superCommand);
+
+ assertCommandFailure(editIncomeCommand, model, MESSAGE_INVALID_INCOME_DISPLAYED_INDEX);
+ }
+
+ /**
+ * Edit filtered list where index is larger than size of filtered list,
+ * but smaller than size of finance tracker
+ */
+ @Test
+ public void execute_invalidIncomeIndexFilteredList_failure() {
+ showIncomeAtIndex(model, INDEX_FIRST);
+ Index outOfBoundIndex = INDEX_SECOND;
+ // Ensures that outOfBoundIndex is still within the boundaries of the finance tracker's list of incomes.
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getIncomeList().size());
+
+ EditIncomeCommand editIncomeCommand = new EditIncomeCommand(new EditCommand(outOfBoundIndex,
+ new EditTransactionDescriptorBuilder().withTitle(VALID_TITLE_INTERNSHIP).build()));
+
+ assertCommandFailure(editIncomeCommand, model, MESSAGE_INVALID_INCOME_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ final EditCommandStub superCommand = new EditCommandStub(INDEX_FIRST, DESC_BUBBLE_TEA);
+ final EditIncomeCommand standardCommand = new EditIncomeCommand(superCommand);
+
+ // same values -> returns true
+ EditTransactionDescriptor copyDescriptor = new EditTransactionDescriptor(DESC_BUBBLE_TEA);
+ EditCommandStub superCommandWithSameValues = new EditCommandStub(INDEX_FIRST, copyDescriptor);
+ EditIncomeCommand commandWithSameValues = new EditIncomeCommand(superCommandWithSameValues);
+ assertTrue(standardCommand.equals(commandWithSameValues));
+
+ // same object -> returns true
+ assertTrue(standardCommand.equals(standardCommand));
+
+ // null -> returns false
+ assertFalse(standardCommand.equals(null));
+
+ // different types -> returns false
+ assertFalse(standardCommand.equals(new ClearCommand()));
+
+ // different index -> returns false
+ assertFalse(standardCommand.equals(new EditIncomeCommand(
+ new EditCommandStub(INDEX_SECOND, DESC_BUBBLE_TEA))));
+
+ // different descriptor -> returns false
+ assertFalse(standardCommand.equals(new EditIncomeCommand(
+ new EditCommandStub(INDEX_FIRST, DESC_INTERNSHIP))));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditTransactionDescriptorTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditTransactionDescriptorTest.java
new file mode 100644
index 00000000000..b5a0d6dabd8
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/EditTransactionDescriptorTest.java
@@ -0,0 +1,54 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_INTERNSHIP;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand.EditTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditTransactionDescriptorBuilder;
+
+public class EditTransactionDescriptorTest {
+
+ @Test
+ public void equals() {
+ // same values -> returns true
+ EditTransactionDescriptor descriptorWithSameValues = new EditCommand.EditTransactionDescriptor(DESC_BUBBLE_TEA);
+ assertTrue(DESC_BUBBLE_TEA.equals(descriptorWithSameValues));
+
+ // same object -> returns true
+ assertTrue(DESC_BUBBLE_TEA.equals(DESC_BUBBLE_TEA));
+
+ // null -> returns false
+ assertFalse(DESC_BUBBLE_TEA.equals(null));
+
+ // different types -> returns false
+ assertFalse(DESC_BUBBLE_TEA.equals(5));
+
+ // different values -> returns false
+ assertFalse(DESC_BUBBLE_TEA.equals(DESC_INTERNSHIP));
+
+ // different title -> returns false
+ EditCommand.EditTransactionDescriptor editedAmy = new EditTransactionDescriptorBuilder(DESC_BUBBLE_TEA)
+ .withTitle(VALID_TITLE_INTERNSHIP).build();
+ assertFalse(DESC_BUBBLE_TEA.equals(editedAmy));
+
+ // different amount -> returns false
+ editedAmy = new EditTransactionDescriptorBuilder(DESC_BUBBLE_TEA).withAmount(VALID_AMOUNT_INTERNSHIP).build();
+ assertFalse(DESC_BUBBLE_TEA.equals(editedAmy));
+
+ // different date -> returns false
+ editedAmy = new EditTransactionDescriptorBuilder(DESC_BUBBLE_TEA).withDate(VALID_DATE_INTERNSHIP).build();
+ assertFalse(DESC_BUBBLE_TEA.equals(editedAmy));
+
+ // different categories -> returns false
+ editedAmy = new EditTransactionDescriptorBuilder(DESC_BUBBLE_TEA).withCategories(VALID_CATEGORY_WORK).build();
+ assertFalse(DESC_BUBBLE_TEA.equals(editedAmy));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ExitCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ExitCommandTest.java
new file mode 100644
index 00000000000..0c808ea96ad
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ExitCommandTest.java
@@ -0,0 +1,20 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.ExitCommand.MESSAGE_EXIT_ACKNOWLEDGEMENT;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+
+public class ExitCommandTest {
+ private Model model = new ModelManager();
+ private Model expectedModel = new ModelManager();
+
+ @Test
+ public void execute_exit_success() {
+ CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, false, true);
+ assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindCommandTest.java
new file mode 100644
index 00000000000..c81486caa30
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindCommandTest.java
@@ -0,0 +1,74 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.TitleContainsKeyphrasesPredicate;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindCommand}.
+ */
+public class FindCommandTest {
+
+ @Test
+ public void execute_throwsCommandException() {
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ assertCommandFailure(new FindCommand(List.of(preparePredicate(""))), model,
+ MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Test
+ public void equals() {
+ TitleContainsKeyphrasesPredicate firstPredicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("first"));
+ TitleContainsKeyphrasesPredicate secondPredicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("second"));
+ List<Predicate<Transaction>> firstPredicateList = new ArrayList<>();
+ firstPredicateList.add(firstPredicate);
+ List<Predicate<Transaction>> secondPredicateList = new ArrayList<>();
+ secondPredicateList.add(secondPredicate);
+
+ FindCommand findFirstCommand = new FindCommand(firstPredicateList);
+ FindCommand findSecondCommand = new FindCommand(secondPredicateList);
+
+ // same object -> returns true
+ assertTrue(findFirstCommand.equals(findFirstCommand));
+
+ List<Predicate<Transaction>> firstPredicateListCopy = new ArrayList<>();
+ firstPredicateListCopy.add(firstPredicate);
+ // same values -> returns true
+ FindCommand findFirstCommandCopy = new FindCommand(firstPredicateListCopy);
+ assertTrue(findFirstCommand.equals(findFirstCommandCopy));
+
+ // different types -> returns false
+ assertFalse(findFirstCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(findFirstCommand.equals(null));
+
+ // different predicates -> returns false
+ assertFalse(findFirstCommand.equals(findSecondCommand));
+ }
+
+ /**
+ * Parses {@code userInput} into a {@code TitleContainsKeyphrasesPredicate}.
+ */
+ private TitleContainsKeyphrasesPredicate preparePredicate(String userInput) {
+ return new TitleContainsKeyphrasesPredicate(Arrays.asList(userInput.split("\\s+")));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindExpenseCommandTest.java
new file mode 100644
index 00000000000..68694b77935
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindExpenseCommandTest.java
@@ -0,0 +1,103 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_EXPENSES_LISTED_OVERVIEW;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.AIMA;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.CARLS_JR;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.PEN_REFILLS;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.FindCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.TitleContainsKeyphrasesPredicate;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindExpenseCommand}.
+ */
+public class FindExpenseCommandTest {
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ private Model expectedModel = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void equals() {
+ TitleContainsKeyphrasesPredicate firstPredicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("first"));
+ TitleContainsKeyphrasesPredicate secondPredicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("second"));
+ List<Predicate<Transaction>> firstPredicateList = new ArrayList<>();
+ firstPredicateList.add(firstPredicate);
+ List<Predicate<Transaction>> secondPredicateList = new ArrayList<>();
+ secondPredicateList.add(secondPredicate);
+
+ FindCommand firstSuperCommand = new FindCommand(firstPredicateList);
+ FindExpenseCommand firstFindExpenseCommand = new FindExpenseCommand(firstSuperCommand);
+ FindCommand secondSuperCommand = new FindCommand(secondPredicateList);
+ FindExpenseCommand secondFindExpenseCommand = new FindExpenseCommand(secondSuperCommand);
+
+ // same object -> returns true
+ assertTrue(firstFindExpenseCommand.equals(firstFindExpenseCommand));
+
+ List<Predicate<Transaction>> firstPredicateListCopy = new ArrayList<>();
+ firstPredicateListCopy.add(firstPredicate);
+ // same values -> returns true
+ FindExpenseCommand firstFindExpenseCommandCopy = new FindExpenseCommand(firstSuperCommand);
+ assertTrue(firstFindExpenseCommand.equals(firstFindExpenseCommandCopy));
+
+ // different types -> returns false
+ assertFalse(firstFindExpenseCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstFindExpenseCommand.equals(null));
+
+ // different predicates -> returns false
+ assertFalse(firstFindExpenseCommand.equals(secondFindExpenseCommand));
+ }
+
+ @Test
+ public void execute_zeroKeywords_noExpensesFound() {
+ String expectedMessage = String.format(MESSAGE_EXPENSES_LISTED_OVERVIEW, 0);
+ TitleContainsKeyphrasesPredicate predicate = preparePredicate(" ");
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(predicate);
+ FindCommandStub superCommand = new FindCommandStub(predicateList);
+ FindExpenseCommand findExpenseCommand = new FindExpenseCommand(superCommand);
+ expectedModel.updateFilteredExpenseList(predicate);
+ assertCommandSuccess(findExpenseCommand, model, expectedMessage, expectedModel);
+ assertEquals(Collections.emptyList(), model.getFilteredExpenseList());
+ }
+
+ @Test
+ public void execute_multipleKeywords_multipleExpensesFound() {
+ String expectedMessage = String.format(MESSAGE_EXPENSES_LISTED_OVERVIEW, 3);
+ TitleContainsKeyphrasesPredicate predicate = preparePredicate("carl's artificial pen");
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(predicate);
+ FindCommandStub superCommand = new FindCommandStub(predicateList);
+ FindExpenseCommand findExpenseCommand = new FindExpenseCommand(superCommand);
+ expectedModel.updateFilteredExpenseList(predicate);
+ assertCommandSuccess(findExpenseCommand, model, expectedMessage, expectedModel);
+ // Ordered by date, then by title.
+ assertEquals(Arrays.asList(AIMA, CARLS_JR, PEN_REFILLS), model.getFilteredExpenseList());
+ }
+
+ /**
+ * Parses {@code userInput} into a {@code TitleContainsKeyphrasesPredicate}.
+ */
+ private TitleContainsKeyphrasesPredicate preparePredicate(String userInput) {
+ return new TitleContainsKeyphrasesPredicate(Arrays.asList(userInput.split("\\s+")));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindIncomeCommandTest.java
new file mode 100644
index 00000000000..c4c44b11b24
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindIncomeCommandTest.java
@@ -0,0 +1,103 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INCOMES_LISTED_OVERVIEW;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.GST_VOUCHER;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.TEACHING_ASSISTANT;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.FindCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.TitleContainsKeyphrasesPredicate;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindIncomeCommand}.
+ */
+public class FindIncomeCommandTest {
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ private Model expectedModel = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void equals() {
+ TitleContainsKeyphrasesPredicate firstPredicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("first"));
+ TitleContainsKeyphrasesPredicate secondPredicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("second"));
+ List<Predicate<Transaction>> firstPredicateList = new ArrayList<>();
+ firstPredicateList.add(firstPredicate);
+ List<Predicate<Transaction>> secondPredicateList = new ArrayList<>();
+ secondPredicateList.add(secondPredicate);
+
+ FindCommand firstSuperCommand = new FindCommand(firstPredicateList);
+ FindIncomeCommand firstFindIncomeCommand = new FindIncomeCommand(firstSuperCommand);
+ FindCommand secondSuperCommand = new FindCommand(secondPredicateList);
+ FindIncomeCommand secondFindIncomeCommand = new FindIncomeCommand(secondSuperCommand);
+
+ // same object -> returns true
+ assertTrue(firstFindIncomeCommand.equals(firstFindIncomeCommand));
+
+ List<Predicate<Transaction>> firstPredicateListCopy = new ArrayList<>();
+ firstPredicateListCopy.add(firstPredicate);
+ // same values -> returns true
+ FindIncomeCommand firstFindIncomeCommandCopy = new FindIncomeCommand(firstSuperCommand);
+ assertTrue(firstFindIncomeCommand.equals(firstFindIncomeCommandCopy));
+
+ // different types -> returns false
+ assertFalse(firstFindIncomeCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstFindIncomeCommand.equals(null));
+
+ // different predicates -> returns false
+ assertFalse(firstFindIncomeCommand.equals(secondFindIncomeCommand));
+ }
+
+ @Test
+ public void execute_zeroKeywords_noIncomesFound() {
+ String expectedMessage = String.format(MESSAGE_INCOMES_LISTED_OVERVIEW, 0);
+ TitleContainsKeyphrasesPredicate predicate = preparePredicate(" ");
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(predicate);
+ FindCommandStub superCommand = new FindCommandStub(predicateList);
+ FindIncomeCommand findIncomeCommand = new FindIncomeCommand(superCommand);
+ expectedModel.updateFilteredIncomeList(predicate);
+ assertCommandSuccess(findIncomeCommand, model, expectedMessage, expectedModel);
+ assertEquals(Collections.emptyList(), model.getFilteredIncomeList());
+ }
+
+ @Test
+ public void execute_multipleKeywords_multipleIncomesFound() {
+ String expectedMessage = String.format(MESSAGE_INCOMES_LISTED_OVERVIEW, 3);
+ TitleContainsKeyphrasesPredicate predicate = preparePredicate("gst internship teaching");
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(predicate);
+ FindCommandStub superCommand = new FindCommandStub(predicateList);
+ FindIncomeCommand findIncomeCommand = new FindIncomeCommand(superCommand);
+ expectedModel.updateFilteredIncomeList(predicate);
+ assertCommandSuccess(findIncomeCommand, model, expectedMessage, expectedModel);
+ // Ordered by date, then by title.
+ assertEquals(Arrays.asList(GST_VOUCHER, INTERNSHIP, TEACHING_ASSISTANT), model.getFilteredIncomeList());
+ }
+
+ /**
+ * Parses {@code userInput} into a {@code TitleContainsKeyphrasesPredicate}.
+ */
+ private TitleContainsKeyphrasesPredicate preparePredicate(String userInput) {
+ return new TitleContainsKeyphrasesPredicate(Arrays.asList(userInput.split("\\s+")));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindTransactionCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindTransactionCommandTest.java
new file mode 100644
index 00000000000..9f8b18d890a
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/FindTransactionCommandTest.java
@@ -0,0 +1,113 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_TRANSACTIONS_LISTED_OVERVIEW;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.AIMA;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.CARLS_JR;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.GST_VOUCHER;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.PEN_REFILLS;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.TEACHING_ASSISTANT;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.FindCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.TitleContainsKeyphrasesPredicate;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindTransactionCommand}.
+ */
+public class FindTransactionCommandTest {
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ private Model expectedModel = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void equals() {
+ TitleContainsKeyphrasesPredicate firstPredicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("first"));
+ TitleContainsKeyphrasesPredicate secondPredicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("second"));
+ List<Predicate<Transaction>> firstPredicateList = new ArrayList<>();
+ firstPredicateList.add(firstPredicate);
+ List<Predicate<Transaction>> secondPredicateList = new ArrayList<>();
+ secondPredicateList.add(secondPredicate);
+
+ FindCommand firstSuperCommand = new FindCommand(firstPredicateList);
+ FindTransactionCommand firstFindTransactionCommand = new FindTransactionCommand(firstSuperCommand);
+ FindCommand secondSuperCommand = new FindCommand(secondPredicateList);
+ FindTransactionCommand secondFindTransactionCommand = new FindTransactionCommand(secondSuperCommand);
+
+ // same object -> returns true
+ assertTrue(firstFindTransactionCommand.equals(firstFindTransactionCommand));
+
+ List<Predicate<Transaction>> firstPredicateListCopy = new ArrayList<>();
+ firstPredicateListCopy.add(firstPredicate);
+ // same values -> returns true
+ FindTransactionCommand firstFindTransactionCommandCopy = new FindTransactionCommand(firstSuperCommand);
+ assertTrue(firstFindTransactionCommand.equals(firstFindTransactionCommandCopy));
+
+ // different types -> returns false
+ assertFalse(firstFindTransactionCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstFindTransactionCommand.equals(null));
+
+ // different predicates -> returns false
+ assertFalse(firstFindTransactionCommand.equals(secondFindTransactionCommand));
+ }
+
+ @Test
+ public void execute_zeroKeywords_noTransactionsFound() {
+ String expectedMessage = String.format(MESSAGE_TRANSACTIONS_LISTED_OVERVIEW, 0);
+ TitleContainsKeyphrasesPredicate predicate = preparePredicate(" ");
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(predicate);
+ FindCommandStub superCommand = new FindCommandStub(predicateList);
+ FindTransactionCommand findTransactionCommand = new FindTransactionCommand(superCommand);
+ expectedModel.updateFilteredTransactionList(predicate);
+ assertCommandSuccess(findTransactionCommand, model, expectedMessage, expectedModel);
+ assertEquals(Collections.emptyList(), model.getFilteredTransactionList());
+ }
+
+ @Test
+ public void execute_multipleKeywords_multipleTransactionsFound() {
+ String expectedMessage = String.format(MESSAGE_TRANSACTIONS_LISTED_OVERVIEW, 6);
+ TitleContainsKeyphrasesPredicate predicate = preparePredicate("gst carl's artificial internship pen teaching");
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(predicate);
+ FindCommandStub superCommand = new FindCommandStub(predicateList);
+ FindTransactionCommand findTransactionCommand = new FindTransactionCommand(superCommand);
+ expectedModel.updateFilteredTransactionList(predicate);
+ assertCommandSuccess(findTransactionCommand, model, expectedMessage, expectedModel);
+ assertEquals(Arrays.asList(
+ new TransactionBuilder(AIMA).buildExpense(),
+ new TransactionBuilder(CARLS_JR).buildExpense(),
+ new TransactionBuilder(GST_VOUCHER).buildIncome(),
+ new TransactionBuilder(INTERNSHIP).buildIncome(),
+ new TransactionBuilder(PEN_REFILLS).buildExpense(),
+ new TransactionBuilder(TEACHING_ASSISTANT).buildIncome()
+ ), model.getFilteredTransactionList());
+ }
+
+ /**
+ * Parses {@code userInput} into a {@code TitleContainsKeyphrasesPredicate}.
+ */
+ private TitleContainsKeyphrasesPredicate preparePredicate(String userInput) {
+ return new TitleContainsKeyphrasesPredicate(Arrays.asList(userInput.split("\\s+")));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/HelpCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/HelpCommandTest.java
new file mode 100644
index 00000000000..cb5112d2572
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/HelpCommandTest.java
@@ -0,0 +1,20 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.HelpCommand.SHOWING_HELP_MESSAGE;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+
+public class HelpCommandTest {
+ private Model model = new ModelManager();
+ private Model expectedModel = new ModelManager();
+
+ @Test
+ public void execute_help_success() {
+ CommandResult expectedCommandResult = new CommandResult(SHOWING_HELP_MESSAGE, false, true, false);
+ assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListCommandTest.java
new file mode 100644
index 00000000000..107eed445ad
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListCommandTest.java
@@ -0,0 +1,23 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for ListCommand.
+ */
+public class ListCommandTest {
+
+ @Test
+ public void execute_throwsCommandException() {
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ assertCommandFailure(new ListCommand(), model, MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListExpenseCommandTest.java
new file mode 100644
index 00000000000..9d201ec034a
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListExpenseCommandTest.java
@@ -0,0 +1,39 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalExpenses;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for ListExpenseCommand.
+ */
+public class ListExpenseCommandTest {
+
+ private Model model;
+ private Model expectedModel;
+
+ @BeforeEach
+ public void setUp() {
+ model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ }
+
+ @Test
+ public void execute_showsAllExpenses() {
+ expectedModel.updateFilteredExpenseList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ assertCommandSuccess(new ListExpenseCommand(), model,
+ new CommandResult(ListExpenseCommand.MESSAGE_SUCCESS, Tab.EXPENSES), expectedModel);
+ assertEquals(getTypicalExpenses().size(), model.getFilteredExpenseList().size());
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListIncomeCommandTest.java
new file mode 100644
index 00000000000..d692fd28d45
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListIncomeCommandTest.java
@@ -0,0 +1,39 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalIncomes;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for ListIncomeCommand.
+ */
+public class ListIncomeCommandTest {
+
+ private Model model;
+ private Model expectedModel;
+
+ @BeforeEach
+ public void setUp() {
+ model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ }
+
+ @Test
+ public void execute_showAllIncomes() {
+ expectedModel.updateFilteredIncomeList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ assertCommandSuccess(new ListIncomeCommand(), model,
+ new CommandResult(ListIncomeCommand.MESSAGE_SUCCESS, Tab.INCOME), expectedModel);
+ assertEquals(getTypicalIncomes().size(), model.getFilteredIncomeList().size());
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListTransactionCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListTransactionCommandTest.java
new file mode 100644
index 00000000000..c162958efde
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/ListTransactionCommandTest.java
@@ -0,0 +1,61 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for ListTransactionCommand.
+ */
+public class ListTransactionCommandTest {
+
+ private Model model;
+ private Model expectedModel;
+
+ @BeforeEach
+ public void setUp() {
+ model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ }
+
+ @Test
+ public void execute_showsAllTransactions() {
+ expectedModel.updateFilteredTransactionList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+ assertCommandSuccess(new ListTransactionCommand(), model,
+ new CommandResult(ListTransactionCommand.MESSAGE_SUCCESS, Tab.OVERVIEW), expectedModel);
+ assertEquals(getTypicalFinanceTracker().getTransactionList().size(), model.getFilteredTransactionList().size());
+ }
+
+ @Test
+ public void execute_hasSomeIncome() {
+ model.addIncome(new TransactionBuilder().buildIncome());
+ expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.updateFilteredTransactionList(transaction -> true);
+ assertCommandSuccess(new ListTransactionCommand(), model,
+ new CommandResult(ListTransactionCommand.MESSAGE_SUCCESS, Tab.OVERVIEW), expectedModel);
+ assertEquals(getTypicalFinanceTracker().getTransactionList().size() + 1,
+ model.getFilteredTransactionList().size());
+ }
+
+ @Test
+ public void execute_hasSomeExpense() {
+ model.addExpense(new TransactionBuilder().buildExpense());
+ expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.updateFilteredTransactionList(transaction -> true);
+ assertCommandSuccess(new ListTransactionCommand(), model,
+ new CommandResult(ListTransactionCommand.MESSAGE_SUCCESS, Tab.OVERVIEW), expectedModel);
+ assertEquals(getTypicalFinanceTracker().getTransactionList().size() + 1,
+ model.getFilteredTransactionList().size());
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/TabCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/TabCommandTest.java
new file mode 100644
index 00000000000..356fc70d915
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/TabCommandTest.java
@@ -0,0 +1,82 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.TabCommand.MESSAGE_SWITCH_TABS_SUCCESS;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+public class TabCommandTest {
+
+ private Model model;
+ private Model expectedModel;
+
+ @BeforeEach
+ public void setUp() {
+ model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ }
+
+ @Test
+ public void execute_switchToOverviewTab_success() {
+ String formattedSuccessMessage = String.format(MESSAGE_SWITCH_TABS_SUCCESS, Tab.OVERVIEW);
+ CommandResult expectedCommandResult = new CommandResult(formattedSuccessMessage, Tab.OVERVIEW);
+ assertCommandSuccess(new TabCommand(Index.fromOneBased(1)), model, expectedCommandResult, expectedModel);
+ }
+
+ @Test
+ public void execute_switchToIncomeTab_success() {
+ String formattedSuccessMessage = String.format(MESSAGE_SWITCH_TABS_SUCCESS, Tab.INCOME);
+ CommandResult expectedCommandResult = new CommandResult(formattedSuccessMessage, Tab.INCOME);
+ assertCommandSuccess(new TabCommand(Index.fromOneBased(2)), model, expectedCommandResult, expectedModel);
+ }
+
+ @Test
+ public void execute_switchToExpensesTab_success() {
+ String formattedSuccessMessage = String.format(MESSAGE_SWITCH_TABS_SUCCESS, Tab.EXPENSES);
+ CommandResult expectedCommandResult = new CommandResult(formattedSuccessMessage, Tab.EXPENSES);
+ assertCommandSuccess(new TabCommand(Index.fromOneBased(3)), model, expectedCommandResult, expectedModel);
+ }
+
+ @Test
+ public void execute_switchToAnalyticsTab_success() {
+ String formattedSuccessMessage = String.format(MESSAGE_SWITCH_TABS_SUCCESS, Tab.ANALYTICS);
+ CommandResult expectedCommandResult = new CommandResult(formattedSuccessMessage, Tab.ANALYTICS);
+ assertCommandSuccess(new TabCommand(Index.fromOneBased(4)), model, expectedCommandResult, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndex_throwsCommandException() {
+ assertCommandFailure(new TabCommand(Index.fromOneBased(5)), model, TabCommand.MESSAGE_TAB_DOES_NOT_EXIST);
+ }
+
+ @Test
+ public void equals() {
+ TabCommand tabCommand = new TabCommand(Index.fromOneBased(1));
+
+ // Same object -> returns true
+ assertTrue(tabCommand.equals(tabCommand));
+
+ // Same index -> returns true
+ assertTrue(tabCommand.equals(new TabCommand(Index.fromOneBased(1))));
+
+ // Different index -> returns false
+ assertFalse(tabCommand.equals(new TabCommand(Index.fromOneBased(3))));
+
+ // Different types -> returns false
+ assertFalse(tabCommand.equals(5));
+
+ // null -> returns false
+ assertFalse(tabCommand.equals(null));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/AddBookmarkExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/AddBookmarkExpenseCommandTest.java
new file mode 100644
index 00000000000..9198c796235
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/AddBookmarkExpenseCommandTest.java
@@ -0,0 +1,103 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.ModelStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+
+public class AddBookmarkExpenseCommandTest {
+
+ @Test
+ public void constructor_nullBookmarkExpense_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new AddBookmarkExpenseCommand(null));
+ }
+
+ @Test
+ public void execute_bookmarkExpenseAcceptedByModel_addSuccessful() throws Exception {
+ ModelStubAcceptingBookmarkExpenseAdded modelStub = new ModelStubAcceptingBookmarkExpenseAdded();
+ BookmarkExpense validBookmarkExpense = new BookmarkTransactionBuilder().buildBookmarkExpense();
+
+ CommandResult commandResult = new AddBookmarkExpenseCommand(validBookmarkExpense).execute(modelStub);
+
+ assertEquals(String.format(AddBookmarkExpenseCommand.MESSAGE_SUCCESS, validBookmarkExpense),
+ commandResult.getFeedbackToUser());
+ assertEquals(Arrays.asList(validBookmarkExpense), modelStub.bookmarkExpensesAdded);
+ }
+
+ @Test
+ public void execute_duplicateBookmarkExpense_throwsDuplicateBookmarkTransactionException() {
+ ModelStubRejectingDuplicateBookmarkExpense modelStub = new ModelStubRejectingDuplicateBookmarkExpense();
+ BookmarkExpense validBookmarkExpense = new BookmarkTransactionBuilder().buildBookmarkExpense();
+ AddBookmarkExpenseCommand addBookmarkExpenseCommand = new AddBookmarkExpenseCommand(validBookmarkExpense);
+ assertThrows(CommandException.class, () -> addBookmarkExpenseCommand.execute(modelStub));
+ }
+
+ @Test
+ public void equals() {
+ BookmarkExpense bubbleTea = new BookmarkTransactionBuilder().withTitle("Bubble Tea").buildBookmarkExpense();
+ BookmarkExpense tuitionFees = new BookmarkTransactionBuilder().withTitle("Tuition Fees").buildBookmarkExpense();
+ AddBookmarkExpenseCommand addBubbleTeaCommand = new AddBookmarkExpenseCommand(bubbleTea);
+ AddBookmarkExpenseCommand addTuitionFeesCommand = new AddBookmarkExpenseCommand(tuitionFees);
+
+ // same object -> returns true
+ assertTrue(addBubbleTeaCommand.equals(addBubbleTeaCommand));
+
+ // same values -> returns true
+ AddBookmarkExpenseCommand addBubbleTeaCommandCopy = new AddBookmarkExpenseCommand(bubbleTea);
+ assertTrue(addBubbleTeaCommand.equals(addBubbleTeaCommandCopy));
+
+ // different types -> returns false
+ assertFalse(addBubbleTeaCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(addBubbleTeaCommand.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(addBubbleTeaCommand.equals(addTuitionFeesCommand));
+ }
+
+ /**
+ * A model stub that always accepts the bookmark expense being added.
+ */
+ private class ModelStubAcceptingBookmarkExpenseAdded extends ModelStub {
+ final ArrayList<BookmarkExpense> bookmarkExpensesAdded = new ArrayList<>();
+
+ @Override
+ public void addBookmarkExpense(BookmarkExpense expense) {
+ requireNonNull(expense);
+ bookmarkExpensesAdded.add(expense);
+ }
+
+ @Override
+ public ReadOnlyFinanceTracker getFinanceTracker() {
+ return new FinanceTracker();
+ }
+ }
+
+ /**
+ * A model stub that always throws a {@code DuplicateBookmarkTransactionException}
+ * when a {@code BookmarkExpense} is added.
+ */
+ private class ModelStubRejectingDuplicateBookmarkExpense extends ModelStub {
+ @Override
+ public void addBookmarkExpense(BookmarkExpense bookmarkExpense) {
+ throw new DuplicateBookmarkTransactionException("Cannot add duplicate bookmark expense.");
+ }
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/AddBookmarkIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/AddBookmarkIncomeCommandTest.java
new file mode 100644
index 00000000000..75906911c46
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/AddBookmarkIncomeCommandTest.java
@@ -0,0 +1,103 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.exceptions.CommandException;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.ModelStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+
+public class AddBookmarkIncomeCommandTest {
+
+ @Test
+ public void constructor_nullBookmarkIncome_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new AddBookmarkIncomeCommand(null));
+ }
+
+ @Test
+ public void execute_bookmarkIncomeAcceptedByModel_addSuccessful() throws Exception {
+ ModelStubAcceptingBookmarkIncomeAdded modelStub = new ModelStubAcceptingBookmarkIncomeAdded();
+ BookmarkIncome validBookmarkIncome = new BookmarkTransactionBuilder().buildBookmarkIncome();
+
+ CommandResult commandResult = new AddBookmarkIncomeCommand(validBookmarkIncome).execute(modelStub);
+
+ assertEquals(String.format(AddBookmarkIncomeCommand.MESSAGE_SUCCESS, validBookmarkIncome),
+ commandResult.getFeedbackToUser());
+ assertEquals(Arrays.asList(validBookmarkIncome), modelStub.bookmarkIncomesAdded);
+ }
+
+ @Test
+ public void execute_duplicateBookmarkIncome_throwsDuplicateBookmarkTransactionException() {
+ ModelStubRejectingDuplicateBookmarkIncome modelStub = new ModelStubRejectingDuplicateBookmarkIncome();
+ BookmarkIncome validBookmarkIncome = new BookmarkTransactionBuilder().buildBookmarkIncome();
+ AddBookmarkIncomeCommand addBookmarkIncomeCommand = new AddBookmarkIncomeCommand(validBookmarkIncome);
+ assertThrows(CommandException.class, () -> addBookmarkIncomeCommand.execute(modelStub));
+ }
+
+ @Test
+ public void equals() {
+ BookmarkIncome bubbleTea = new BookmarkTransactionBuilder().withTitle("Bubble Tea").buildBookmarkIncome();
+ BookmarkIncome tuitionFees = new BookmarkTransactionBuilder().withTitle("Tuition Fees").buildBookmarkIncome();
+ AddBookmarkIncomeCommand addBubbleTeaCommand = new AddBookmarkIncomeCommand(bubbleTea);
+ AddBookmarkIncomeCommand addTuitionFeesCommand = new AddBookmarkIncomeCommand(tuitionFees);
+
+ // same object -> returns true
+ assertTrue(addBubbleTeaCommand.equals(addBubbleTeaCommand));
+
+ // same values -> returns true
+ AddBookmarkIncomeCommand addBubbleTeaCommandCopy = new AddBookmarkIncomeCommand(bubbleTea);
+ assertTrue(addBubbleTeaCommand.equals(addBubbleTeaCommandCopy));
+
+ // different types -> returns false
+ assertFalse(addBubbleTeaCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(addBubbleTeaCommand.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(addBubbleTeaCommand.equals(addTuitionFeesCommand));
+ }
+
+ /**
+ * A model stub that always accepts the bookmark income being added.
+ */
+ private class ModelStubAcceptingBookmarkIncomeAdded extends ModelStub {
+ final ArrayList<BookmarkIncome> bookmarkIncomesAdded = new ArrayList<>();
+
+ @Override
+ public void addBookmarkIncome(BookmarkIncome bookmarkIncome) {
+ requireNonNull(bookmarkIncome);
+ bookmarkIncomesAdded.add(bookmarkIncome);
+ }
+
+ @Override
+ public ReadOnlyFinanceTracker getFinanceTracker() {
+ return new FinanceTracker();
+ }
+ }
+
+ /**
+ * A model stub that always throws a {@code DuplicateBookmarkTransactionException}
+ * when a {@code BookmarkIncome} is added.
+ */
+ private class ModelStubRejectingDuplicateBookmarkIncome extends ModelStub {
+ @Override
+ public void addBookmarkIncome(BookmarkIncome bookmarkIncome) {
+ throw new DuplicateBookmarkTransactionException("Cannot add duplicate bookmark income.");
+ }
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkCommandTest.java
new file mode 100644
index 00000000000..3bfa711a50b
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkCommandTest.java
@@ -0,0 +1,59 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code ConvertBookmarkCommand}.
+ */
+public class ConvertBookmarkCommandTest {
+
+ @Test
+ public void execute_throwsCommandException() {
+ Date dateOfConvertedTransaction = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ assertCommandFailure(new ConvertBookmarkCommand(INDEX_FIRST, dateOfConvertedTransaction), model,
+ MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Test
+ public void equals() {
+ Date dateOfConvertedTransaction = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ ConvertBookmarkCommand deleteBookmarkFirstCommand =
+ new ConvertBookmarkCommand(INDEX_FIRST, dateOfConvertedTransaction);
+ ConvertBookmarkCommand deleteBookmarkSecondCommand =
+ new ConvertBookmarkCommand(INDEX_SECOND, dateOfConvertedTransaction);
+
+ // same object -> returns true
+ assertTrue(deleteBookmarkFirstCommand.equals(deleteBookmarkFirstCommand));
+
+ // same values -> returns true
+ ConvertBookmarkCommand deleteBookmarkFirstCommandCopy =
+ new ConvertBookmarkCommand(INDEX_FIRST, dateOfConvertedTransaction);
+ assertTrue(deleteBookmarkFirstCommand.equals(deleteBookmarkFirstCommandCopy));
+
+ // different types -> returns false
+ assertFalse(deleteBookmarkFirstCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(deleteBookmarkFirstCommand.equals(null));
+
+ // different transactions -> returns false
+ assertFalse(deleteBookmarkFirstCommand.equals(deleteBookmarkSecondCommand));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkExpenseCommandTest.java
new file mode 100644
index 00000000000..55bd12c6974
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkExpenseCommandTest.java
@@ -0,0 +1,143 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showBookmarkExpenseAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.ConvertBookmarkCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code ConvertBookmarkExpenseCommand}.
+ */
+public class ConvertBookmarkExpenseCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ BookmarkExpense bookmarkExpenseToBeConverted = model.getFinanceTracker().getBookmarkExpenseList()
+ .get(INDEX_FIRST.getZeroBased());
+ Date dateOfConvertedExpense = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ ConvertBookmarkCommandStub superCommand = new ConvertBookmarkCommandStub(INDEX_FIRST, dateOfConvertedExpense);
+ ConvertBookmarkExpenseCommand convertBookmarkExpenseCommand =
+ new ConvertBookmarkExpenseCommand(superCommand);
+
+ ModelManager expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ Expense convertedExpense = bookmarkExpenseToBeConverted.convert(dateOfConvertedExpense);
+ expectedModel.addExpense(convertedExpense);
+
+ String expectedMessage = String.format(ConvertBookmarkExpenseCommand.MESSAGE_CONVERT_BOOKMARK_EXPENSE_SUCCESS,
+ convertedExpense);
+
+ assertCommandSuccess(convertBookmarkExpenseCommand, model, expectedMessage, expectedModel, true);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredBookmarkExpenseList().size() + 1);
+ Date dateOfConvertedExpense = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+
+ ConvertBookmarkCommandStub superCommand =
+ new ConvertBookmarkCommandStub(outOfBoundIndex, dateOfConvertedExpense);
+ ConvertBookmarkExpenseCommand convertBookmarkExpenseCommand =
+ new ConvertBookmarkExpenseCommand(superCommand);
+
+ assertCommandFailure(convertBookmarkExpenseCommand, model, MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showBookmarkExpenseAtIndex(model, INDEX_FIRST);
+
+ Date dateOfConvertedExpense = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ ConvertBookmarkCommandStub superCommand = new ConvertBookmarkCommandStub(INDEX_FIRST, dateOfConvertedExpense);
+ BookmarkExpense bookmarkExpenseToBeConverted = model.getFilteredBookmarkExpenseList()
+ .get(INDEX_FIRST.getZeroBased());
+
+ ConvertBookmarkExpenseCommand convertBookmarkExpenseCommand = new ConvertBookmarkExpenseCommand(superCommand);
+
+ Model expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ Expense convertedExpense = bookmarkExpenseToBeConverted.convert(dateOfConvertedExpense);
+ expectedModel.addExpense(convertedExpense);
+
+ String expectedMessage = String.format(ConvertBookmarkExpenseCommand.MESSAGE_CONVERT_BOOKMARK_EXPENSE_SUCCESS,
+ convertedExpense);
+
+ assertCommandSuccess(convertBookmarkExpenseCommand, model, expectedMessage, expectedModel, true);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showBookmarkExpenseAtIndex(model, INDEX_FIRST);
+
+ Index outOfBoundIndex = INDEX_SECOND;
+ Date dateOfConvertedExpense = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ // ensures that outOfBoundIndex is still in bounds of bookmark expense list
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getBookmarkExpenseList().size());
+
+ ConvertBookmarkCommandStub superCommand =
+ new ConvertBookmarkCommandStub(outOfBoundIndex, dateOfConvertedExpense);
+ ConvertBookmarkExpenseCommand convertBookmarkExpenseCommand =
+ new ConvertBookmarkExpenseCommand(superCommand);
+
+ assertCommandFailure(convertBookmarkExpenseCommand, model, MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ Date dateOfConvertedExpense = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ ConvertBookmarkCommandStub firstSuperCommand =
+ new ConvertBookmarkCommandStub(INDEX_FIRST, dateOfConvertedExpense);
+ ConvertBookmarkExpenseCommand firstConvertBookmarkExpenseCommand =
+ new ConvertBookmarkExpenseCommand(firstSuperCommand);
+ ConvertBookmarkCommandStub secondSuperCommand =
+ new ConvertBookmarkCommandStub(INDEX_SECOND, dateOfConvertedExpense);
+ ConvertBookmarkExpenseCommand secondConvertBookmarkExpenseCommand =
+ new ConvertBookmarkExpenseCommand(secondSuperCommand);
+
+ // Same object -> returns true
+ assertTrue(firstConvertBookmarkExpenseCommand.equals(firstConvertBookmarkExpenseCommand));
+
+ // Same values -> returns true
+ ConvertBookmarkCommandStub firstCopySuperCommand =
+ new ConvertBookmarkCommandStub(INDEX_FIRST, dateOfConvertedExpense);
+ ConvertBookmarkExpenseCommand deleteFirstCommandCopy =
+ new ConvertBookmarkExpenseCommand(firstCopySuperCommand);
+ assertTrue(firstConvertBookmarkExpenseCommand.equals(deleteFirstCommandCopy));
+
+ // Different types -> returns false
+ assertFalse(firstConvertBookmarkExpenseCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstConvertBookmarkExpenseCommand.equals(null));
+
+ // Different expense -> returns false
+ assertFalse(firstConvertBookmarkExpenseCommand.equals(secondConvertBookmarkExpenseCommand));
+
+ // Different dates -> returns false
+ ConvertBookmarkCommandStub thirdSuperCommand =
+ new ConvertBookmarkCommandStub(INDEX_FIRST, new Date(VALID_DATE_BUBBLE_TEA));
+ ConvertBookmarkExpenseCommand thirdConvertBookmarkExpenseCommand =
+ new ConvertBookmarkExpenseCommand(thirdSuperCommand);
+ assertFalse(firstConvertBookmarkExpenseCommand.equals(thirdConvertBookmarkExpenseCommand));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkIncomeCommandTest.java
new file mode 100644
index 00000000000..b2e4fb32c19
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/ConvertBookmarkIncomeCommandTest.java
@@ -0,0 +1,142 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showBookmarkIncomeAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.ConvertBookmarkCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code ConvertBookmarkIncomeCommand}.
+ */
+public class ConvertBookmarkIncomeCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ BookmarkIncome bookmarkIncomeToBeConverted = model.getFinanceTracker().getBookmarkIncomeList()
+ .get(INDEX_FIRST.getZeroBased());
+ Date dateOfConvertedIncome = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ ConvertBookmarkCommandStub superCommand = new ConvertBookmarkCommandStub(INDEX_FIRST, dateOfConvertedIncome);
+ ConvertBookmarkIncomeCommand convertBookmarkIncomeCommand = new ConvertBookmarkIncomeCommand(superCommand);
+
+ ModelManager expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ Income convertedIncome = bookmarkIncomeToBeConverted.convert(dateOfConvertedIncome);
+ expectedModel.addIncome(convertedIncome);
+
+ String expectedMessage = String.format(ConvertBookmarkIncomeCommand.MESSAGE_CONVERT_BOOKMARK_INCOME_SUCCESS,
+ convertedIncome);
+
+ assertCommandSuccess(convertBookmarkIncomeCommand, model, expectedMessage, expectedModel, true);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredBookmarkIncomeList().size() + 1);
+ Date dateOfConvertedIncome = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+
+ ConvertBookmarkCommandStub superCommand =
+ new ConvertBookmarkCommandStub(outOfBoundIndex, dateOfConvertedIncome);
+ ConvertBookmarkIncomeCommand convertBookmarkIncomeCommand = new ConvertBookmarkIncomeCommand(superCommand);
+
+ assertCommandFailure(convertBookmarkIncomeCommand, model, MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showBookmarkIncomeAtIndex(model, INDEX_FIRST);
+
+ Date dateOfConvertedIncome = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ ConvertBookmarkCommandStub superCommand = new ConvertBookmarkCommandStub(INDEX_FIRST, dateOfConvertedIncome);
+
+ BookmarkIncome bookmarkIncomeToBeConverted = model.getFilteredBookmarkIncomeList()
+ .get(INDEX_FIRST.getZeroBased());
+ ConvertBookmarkIncomeCommand convertBookmarkIncomeCommand =
+ new ConvertBookmarkIncomeCommand(superCommand);
+
+ Model expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ Income convertedIncome = bookmarkIncomeToBeConverted.convert(dateOfConvertedIncome);
+ expectedModel.addIncome(convertedIncome);
+
+ String expectedMessage = String.format(ConvertBookmarkIncomeCommand.MESSAGE_CONVERT_BOOKMARK_INCOME_SUCCESS,
+ convertedIncome);
+
+ assertCommandSuccess(convertBookmarkIncomeCommand, model, expectedMessage, expectedModel, true);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showBookmarkIncomeAtIndex(model, INDEX_FIRST);
+
+ Index outOfBoundIndex = INDEX_SECOND;
+ Date dateOfConvertedIncome = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ // ensures that outOfBoundIndex is still in bounds of bookmark income list
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getBookmarkIncomeList().size());
+
+ ConvertBookmarkCommandStub superCommand =
+ new ConvertBookmarkCommandStub(outOfBoundIndex, dateOfConvertedIncome);
+ ConvertBookmarkIncomeCommand convertBookmarkIncomeCommand =
+ new ConvertBookmarkIncomeCommand(superCommand);
+
+ assertCommandFailure(convertBookmarkIncomeCommand, model, MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ Date dateOfConvertedIncome = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+ ConvertBookmarkCommandStub firstSuperCommand =
+ new ConvertBookmarkCommandStub(INDEX_FIRST, dateOfConvertedIncome);
+ ConvertBookmarkIncomeCommand firstConvertBookmarkIncomeCommand =
+ new ConvertBookmarkIncomeCommand(firstSuperCommand);
+ ConvertBookmarkCommandStub secondSuperCommand =
+ new ConvertBookmarkCommandStub(INDEX_SECOND, dateOfConvertedIncome);
+ ConvertBookmarkIncomeCommand secondConvertBookmarkIncomeCommand =
+ new ConvertBookmarkIncomeCommand(secondSuperCommand);
+
+ // Same object -> returns true
+ assertTrue(firstConvertBookmarkIncomeCommand.equals(firstConvertBookmarkIncomeCommand));
+
+ // Same values -> returns true
+ ConvertBookmarkCommandStub firstCopySuperCommand =
+ new ConvertBookmarkCommandStub(INDEX_FIRST, dateOfConvertedIncome);
+ ConvertBookmarkIncomeCommand deleteFirstCommandCopy =
+ new ConvertBookmarkIncomeCommand(firstCopySuperCommand);
+ assertTrue(firstConvertBookmarkIncomeCommand.equals(deleteFirstCommandCopy));
+
+ // Different types -> returns false
+ assertFalse(firstConvertBookmarkIncomeCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstConvertBookmarkIncomeCommand.equals(null));
+
+ // Different income -> returns false
+ assertFalse(firstConvertBookmarkIncomeCommand.equals(secondConvertBookmarkIncomeCommand));
+
+ // Different dates -> returns false
+ ConvertBookmarkCommandStub thirdSuperCommand =
+ new ConvertBookmarkCommandStub(INDEX_FIRST, new Date(VALID_DATE_BUBBLE_TEA));
+ ConvertBookmarkIncomeCommand thirdConvertBookmarkIncomeCommand =
+ new ConvertBookmarkIncomeCommand(thirdSuperCommand);
+ assertFalse(firstConvertBookmarkIncomeCommand.equals(thirdConvertBookmarkIncomeCommand));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkCommandTest.java
new file mode 100644
index 00000000000..4715df38d7a
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkCommandTest.java
@@ -0,0 +1,52 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code DeleteBookmarkCommand}.
+ */
+public class DeleteBookmarkCommandTest {
+
+ @Test
+ public void execute_throwsCommandException() {
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ assertCommandFailure(new DeleteBookmarkCommand(INDEX_FIRST), model, MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Test
+ public void equals() {
+ DeleteBookmarkCommand deleteBookmarkFirstCommand = new DeleteBookmarkCommand(INDEX_FIRST);
+ DeleteBookmarkCommand deleteBookmarkSecondCommand = new DeleteBookmarkCommand(INDEX_SECOND);
+
+ // same object -> returns true
+ assertTrue(deleteBookmarkFirstCommand.equals(deleteBookmarkFirstCommand));
+
+ // same values -> returns true
+ DeleteBookmarkCommand deleteBookmarkFirstCommandCopy = new DeleteBookmarkCommand(INDEX_FIRST);
+ assertTrue(deleteBookmarkFirstCommand.equals(deleteBookmarkFirstCommandCopy));
+
+ // different types -> returns false
+ assertFalse(deleteBookmarkFirstCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(deleteBookmarkFirstCommand.equals(null));
+
+ // different transactions -> returns false
+ assertFalse(deleteBookmarkFirstCommand.equals(deleteBookmarkSecondCommand));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkExpenseCommandTest.java
new file mode 100644
index 00000000000..5ef34ecc9e8
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkExpenseCommandTest.java
@@ -0,0 +1,126 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showBookmarkExpenseAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.DeleteBookmarkCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code DeleteBookmarkExpenseCommand}.
+ */
+public class DeleteBookmarkExpenseCommandTest {
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ BookmarkExpense bookmarkExpenseToDelete = model.getFilteredBookmarkExpenseList()
+ .get(INDEX_FIRST.getZeroBased());
+ DeleteBookmarkCommandStub superCommand = new DeleteBookmarkCommandStub(INDEX_FIRST);
+ DeleteBookmarkExpenseCommand deleteBookmarkExpenseCommand =
+ new DeleteBookmarkExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(DeleteBookmarkExpenseCommand.MESSAGE_DELETE_BOOKMARK_EXPENSE_SUCCESS,
+ bookmarkExpenseToDelete);
+
+ ModelManager expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.deleteBookmarkExpense(bookmarkExpenseToDelete);
+
+ assertCommandSuccess(deleteBookmarkExpenseCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredBookmarkExpenseList().size() + 1);
+ DeleteBookmarkCommandStub superCommand = new DeleteBookmarkCommandStub(outOfBoundIndex);
+ DeleteBookmarkExpenseCommand deleteBookmarkExpenseCommand = new DeleteBookmarkExpenseCommand(superCommand);
+
+ assertCommandFailure(deleteBookmarkExpenseCommand, model, MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showBookmarkExpenseAtIndex(model, INDEX_FIRST);
+
+ BookmarkExpense bookmarkExpenseToDelete = model.getFilteredBookmarkExpenseList()
+ .get(INDEX_FIRST.getZeroBased());
+ DeleteBookmarkCommandStub superCommand = new DeleteBookmarkCommandStub(INDEX_FIRST);
+ DeleteBookmarkExpenseCommand deleteBookmarkExpenseCommand =
+ new DeleteBookmarkExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(DeleteBookmarkExpenseCommand.MESSAGE_DELETE_BOOKMARK_EXPENSE_SUCCESS,
+ bookmarkExpenseToDelete);
+
+ Model expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.deleteBookmarkExpense(bookmarkExpenseToDelete);
+ showNoBookmarkExpenses(expectedModel);
+
+ assertCommandSuccess(deleteBookmarkExpenseCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showBookmarkExpenseAtIndex(model, INDEX_FIRST);
+
+ Index outOfBoundIndex = INDEX_SECOND;
+ // ensures that outOfBoundIndex is still in bounds of bookmark expense list
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getBookmarkExpenseList().size());
+
+ DeleteBookmarkCommandStub superCommand = new DeleteBookmarkCommandStub(outOfBoundIndex);
+ DeleteBookmarkExpenseCommand deleteBookmarkExpenseCommand = new DeleteBookmarkExpenseCommand(superCommand);
+
+ assertCommandFailure(deleteBookmarkExpenseCommand, model, MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ DeleteBookmarkCommandStub firstSuperCommand = new DeleteBookmarkCommandStub(INDEX_FIRST);
+ DeleteBookmarkExpenseCommand firstDeleteBookmarkExpenseCommand =
+ new DeleteBookmarkExpenseCommand(firstSuperCommand);
+ DeleteBookmarkCommandStub secondSuperCommand = new DeleteBookmarkCommandStub(INDEX_SECOND);
+ DeleteBookmarkExpenseCommand secondDeleteBookmarkExpenseCommand =
+ new DeleteBookmarkExpenseCommand(secondSuperCommand);
+
+ // same object -> returns true
+ assertTrue(firstDeleteBookmarkExpenseCommand.equals(firstDeleteBookmarkExpenseCommand));
+
+ // same values -> returns true
+ DeleteBookmarkCommandStub firstSuperCommandCopy = new DeleteBookmarkCommandStub(INDEX_FIRST);
+ DeleteBookmarkExpenseCommand deleteFirstCommandCopy =
+ new DeleteBookmarkExpenseCommand(firstSuperCommandCopy);
+ assertTrue(firstDeleteBookmarkExpenseCommand.equals(deleteFirstCommandCopy));
+
+ // different types -> returns false
+ assertFalse(firstDeleteBookmarkExpenseCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstDeleteBookmarkExpenseCommand.equals(null));
+
+ // different expense -> returns false
+ assertFalse(firstDeleteBookmarkExpenseCommand.equals(secondDeleteBookmarkExpenseCommand));
+ }
+
+ /**
+ * Updates {@code model}'s filtered list to show no bookmark expenses.
+ */
+ private void showNoBookmarkExpenses(Model model) {
+ model.updateFilteredBookmarkExpenseList(p -> false);
+
+ assertTrue(model.getFilteredBookmarkExpenseList().isEmpty());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkIncomeCommandTest.java
new file mode 100644
index 00000000000..cd093e23138
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/DeleteBookmarkIncomeCommandTest.java
@@ -0,0 +1,126 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showBookmarkIncomeAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.DeleteBookmarkCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code DeleteBookmarkIncomeCommand}.
+ */
+public class DeleteBookmarkIncomeCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ BookmarkIncome bookmarkIncomeToDelete = model.getFilteredBookmarkIncomeList().get(INDEX_FIRST.getZeroBased());
+ DeleteBookmarkCommandStub superCommand = new DeleteBookmarkCommandStub(INDEX_FIRST);
+ DeleteBookmarkIncomeCommand deleteBookmarkIncomeCommand =
+ new DeleteBookmarkIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(DeleteBookmarkIncomeCommand.MESSAGE_DELETE_BOOKMARK_INCOME_SUCCESS,
+ bookmarkIncomeToDelete);
+
+ ModelManager expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.deleteBookmarkIncome(bookmarkIncomeToDelete);
+
+ assertCommandSuccess(deleteBookmarkIncomeCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredBookmarkIncomeList().size() + 1);
+ DeleteBookmarkCommandStub superCommand = new DeleteBookmarkCommandStub(outOfBoundIndex);
+ DeleteBookmarkIncomeCommand deleteBookmarkIncomeCommand = new DeleteBookmarkIncomeCommand(superCommand);
+
+ assertCommandFailure(deleteBookmarkIncomeCommand, model, MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showBookmarkIncomeAtIndex(model, INDEX_FIRST);
+
+ BookmarkIncome bookmarkIncomeToDelete = model.getFilteredBookmarkIncomeList()
+ .get(INDEX_FIRST.getZeroBased());
+ DeleteBookmarkCommandStub superCommand = new DeleteBookmarkCommandStub(INDEX_FIRST);
+ DeleteBookmarkIncomeCommand deleteBookmarkIncomeCommand =
+ new DeleteBookmarkIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(DeleteBookmarkIncomeCommand.MESSAGE_DELETE_BOOKMARK_INCOME_SUCCESS,
+ bookmarkIncomeToDelete);
+
+ Model expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.deleteBookmarkIncome(bookmarkIncomeToDelete);
+ showNoBookmarkIncomes(expectedModel);
+
+ assertCommandSuccess(deleteBookmarkIncomeCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showBookmarkIncomeAtIndex(model, INDEX_FIRST);
+
+ Index outOfBoundIndex = INDEX_SECOND;
+ // ensures that outOfBoundIndex is still in bounds of bookmark income list
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getBookmarkIncomeList().size());
+
+ DeleteBookmarkCommandStub superCommand = new DeleteBookmarkCommandStub(outOfBoundIndex);
+ DeleteBookmarkIncomeCommand deleteBookmarkIncomeCommand = new DeleteBookmarkIncomeCommand(superCommand);
+
+ assertCommandFailure(deleteBookmarkIncomeCommand, model, MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ DeleteBookmarkCommandStub firstSuperCommand = new DeleteBookmarkCommandStub(INDEX_FIRST);
+ DeleteBookmarkIncomeCommand firstDeleteBookmarkIncomeCommand =
+ new DeleteBookmarkIncomeCommand(firstSuperCommand);
+ DeleteBookmarkCommandStub secondSuperCommand = new DeleteBookmarkCommandStub(INDEX_SECOND);
+ DeleteBookmarkIncomeCommand secondDeleteBookmarkIncomeCommand =
+ new DeleteBookmarkIncomeCommand(secondSuperCommand);
+
+ // same object -> returns true
+ assertTrue(firstDeleteBookmarkIncomeCommand.equals(firstDeleteBookmarkIncomeCommand));
+
+ // same values -> returns true
+ DeleteBookmarkCommandStub firstSuperCommandCopy = new DeleteBookmarkCommandStub(INDEX_FIRST);
+ DeleteBookmarkIncomeCommand firstDeleteBookmarkIncomeCommandCopy =
+ new DeleteBookmarkIncomeCommand(firstSuperCommandCopy);
+ assertTrue(firstDeleteBookmarkIncomeCommand.equals(firstDeleteBookmarkIncomeCommandCopy));
+
+ // different types -> returns false
+ assertFalse(firstDeleteBookmarkIncomeCommand.equals(1));
+
+ // null -> returns false
+ assertFalse(firstDeleteBookmarkIncomeCommand.equals(null));
+
+ // different income -> returns false
+ assertFalse(firstDeleteBookmarkIncomeCommand.equals(secondDeleteBookmarkIncomeCommand));
+ }
+
+ /**
+ * Updates {@code model}'s filtered list to show no bookmark incomes.
+ */
+ private void showNoBookmarkIncomes(Model model) {
+ model.updateFilteredBookmarkIncomeList(p -> false);
+
+ assertTrue(model.getFilteredBookmarkIncomeList().isEmpty());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkExpenseCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkExpenseCommandTest.java
new file mode 100644
index 00000000000..ba75f1b9455
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkExpenseCommandTest.java
@@ -0,0 +1,160 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_MISCELLANEOUS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showBookmarkExpenseAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.EditBookmarkCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpenseList;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditBookmarkTransactionDescriptorBuilder;
+
+public class EditBookmarkExpenseCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_allFieldsSpecifiedUnfilteredList_success() {
+ BookmarkExpense editedBookmarkExpense = new BookmarkTransactionBuilder()
+ .withTitle(VALID_TITLE_BUBBLE_TEA).withAmount(VALID_AMOUNT_SPOTIFY_SUBSCRIPTION)
+ .buildBookmarkExpense();
+ EditBookmarkTransactionDescriptor descriptor =
+ new EditBookmarkTransactionDescriptorBuilder(editedBookmarkExpense).build();
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(INDEX_FIRST, descriptor);
+ EditBookmarkExpenseCommand editBookmarkExpenseCommand = new EditBookmarkExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(EditBookmarkExpenseCommand.MESSAGE_EDIT_BOOKMARK_EXPENSE_SUCCESS,
+ editedBookmarkExpense);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setBookmarkExpense(model.getFilteredBookmarkExpenseList().get(0), editedBookmarkExpense);
+
+ assertCommandSuccess(editBookmarkExpenseCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_someFieldsSpecifiedUnfilteredList_success() {
+ Index indexLastExpense = Index.fromOneBased(model.getFilteredBookmarkExpenseList().size());
+ BookmarkExpense lastExpense = model.getFilteredBookmarkExpenseList().get(indexLastExpense.getZeroBased());
+
+ BookmarkTransactionBuilder expenseInList = new BookmarkTransactionBuilder(lastExpense);
+ BookmarkExpense editedExpense = expenseInList.withTitle(VALID_TITLE_BUBBLE_TEA)
+ .withAmount(VALID_AMOUNT_BUBBLE_TEA)
+ .withCategories(VALID_CATEGORY_MISCELLANEOUS).buildBookmarkExpense();
+
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_BUBBLE_TEA).withAmount(VALID_AMOUNT_BUBBLE_TEA)
+ .withCategories(VALID_CATEGORY_MISCELLANEOUS).build();
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(indexLastExpense, descriptor);
+ EditBookmarkExpenseCommand editBookmarkExpenseCommand = new EditBookmarkExpenseCommand(superCommand);
+
+ String expectedMessage = String.format(EditBookmarkExpenseCommand.MESSAGE_EDIT_BOOKMARK_EXPENSE_SUCCESS,
+ editedExpense);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setBookmarkExpense(lastExpense, editedExpense);
+
+ assertCommandSuccess(editBookmarkExpenseCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidBookmarkExpenseIndexUnfilteredList_failure() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredBookmarkExpenseList().size() + 1);
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).build();
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(outOfBoundIndex, descriptor);
+ EditBookmarkExpenseCommand editExpenseCommand = new EditBookmarkExpenseCommand(superCommand);
+
+ assertCommandFailure(editExpenseCommand, model, MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+
+ /**
+ * Edit filtered bookmark expense list where index is larger than size of filtered bookmark expense list,
+ * but smaller than size of finance tracker
+ */
+ @Test
+ public void execute_invalidBookmarkExpenseIndexFilteredList_failure() {
+ showBookmarkExpenseAtIndex(model, INDEX_FIRST);
+ Index outOfBoundIndex = INDEX_SECOND;
+
+ // ensures that outOfBoundIndex is still in bounds of bookmark expense list
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getBookmarkExpenseList().size());
+
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(outOfBoundIndex,
+ new EditBookmarkTransactionDescriptorBuilder().withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).build());
+ EditBookmarkExpenseCommand editBookmarkExpenseCommand = new EditBookmarkExpenseCommand(superCommand);
+
+ assertCommandFailure(editBookmarkExpenseCommand, model, MESSAGE_INVALID_BOOKMARK_EXPENSE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_settingDuplicateEditedBookmarkExpense_throwsDuplicateBookmarkTransactionException() {
+ BookmarkExpense editedBookmarkExpense = new BookmarkTransactionBuilder()
+ .withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).withAmount(VALID_AMOUNT_SPOTIFY_SUBSCRIPTION)
+ .buildBookmarkExpense();
+ EditBookmarkTransactionDescriptor descriptor =
+ new EditBookmarkTransactionDescriptorBuilder(editedBookmarkExpense).build();
+
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(INDEX_FIRST, descriptor);
+ EditBookmarkExpenseCommand editBookmarkExpenseCommand = new EditBookmarkExpenseCommand(superCommand);
+
+ assertCommandFailure(editBookmarkExpenseCommand, model,
+ BookmarkExpenseList.MESSAGE_OPERATION_WILL_RESULT_IN_DUPLICATE_BOOKMARK_EXPENSE);
+ }
+
+ @Test
+ public void equals() {
+ final EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(INDEX_FIRST,
+ DESC_SPOTIFY_SUBSCRIPTION);
+ final EditBookmarkExpenseCommand standardCommand = new EditBookmarkExpenseCommand(superCommand);
+
+ // Same values -> returns true
+ EditBookmarkTransactionDescriptor copyDescriptor =
+ new EditBookmarkTransactionDescriptor(DESC_SPOTIFY_SUBSCRIPTION);
+ EditBookmarkCommandStub superCommandWithSameValues = new EditBookmarkCommandStub(INDEX_FIRST, copyDescriptor);
+ EditBookmarkExpenseCommand commandWithSameValues =
+ new EditBookmarkExpenseCommand(superCommandWithSameValues);
+ assertTrue(standardCommand.equals(commandWithSameValues));
+
+ // Same object -> returns true
+ assertTrue(standardCommand.equals(standardCommand));
+
+ // null -> returns false
+ assertFalse(standardCommand.equals(null));
+
+ // Different index -> returns false
+ assertFalse(standardCommand
+ .equals(new EditBookmarkExpenseCommand(
+ new EditBookmarkCommandStub(INDEX_SECOND, DESC_SPOTIFY_SUBSCRIPTION))));
+
+ // Different descriptor -> returns false
+ assertFalse(standardCommand
+ .equals(new EditBookmarkExpenseCommand(
+ new EditBookmarkCommandStub(INDEX_FIRST, DESC_PHONE_BILL))));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkIncomeCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkIncomeCommandTest.java
new file mode 100644
index 00000000000..51ac4f4eded
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkIncomeCommandTest.java
@@ -0,0 +1,160 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.showBookmarkIncomeAtIndex;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs.EditBookmarkCommandStub;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncomeList;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditBookmarkTransactionDescriptorBuilder;
+
+public class EditBookmarkIncomeCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void execute_allFieldsSpecifiedUnfilteredList_success() {
+ BookmarkIncome editedBookmarkIncome = new BookmarkTransactionBuilder().buildBookmarkIncome();
+ EditBookmarkTransactionDescriptor descriptor =
+ new EditBookmarkTransactionDescriptorBuilder(editedBookmarkIncome).build();
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(INDEX_FIRST, descriptor);
+ EditBookmarkIncomeCommand editBookmarkIncomeCommand =
+ new EditBookmarkIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(EditBookmarkIncomeCommand.MESSAGE_EDIT_BOOKMARK_INCOME_SUCCESS,
+ editedBookmarkIncome);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setBookmarkIncome(model.getFilteredBookmarkIncomeList().get(0), editedBookmarkIncome);
+
+ assertCommandSuccess(editBookmarkIncomeCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_someFieldsSpecifiedUnfilteredList_success() {
+ Index indexLastIncome = Index.fromOneBased(model.getFilteredBookmarkIncomeList().size());
+ BookmarkIncome lastIncome = model.getFilteredBookmarkIncomeList().get(indexLastIncome.getZeroBased());
+
+ BookmarkTransactionBuilder incomeInList = new BookmarkTransactionBuilder(lastIncome);
+ BookmarkIncome editedIncome = incomeInList.withTitle(VALID_TITLE_INTERNSHIP)
+ .withAmount(VALID_AMOUNT_PART_TIME)
+ .withCategories(VALID_CATEGORY_WORK).buildBookmarkIncome();
+
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_INTERNSHIP).withAmount(VALID_AMOUNT_PART_TIME)
+ .withCategories(VALID_CATEGORY_WORK).build();
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(indexLastIncome, descriptor);
+ EditBookmarkIncomeCommand editBookmarkIncomeCommand =
+ new EditBookmarkIncomeCommand(superCommand);
+
+ String expectedMessage = String.format(EditBookmarkIncomeCommand.MESSAGE_EDIT_BOOKMARK_INCOME_SUCCESS,
+ editedIncome);
+
+ Model expectedModel = new ModelManager(new FinanceTracker(model.getFinanceTracker()), new UserPrefs());
+ expectedModel.setBookmarkIncome(lastIncome, editedIncome);
+
+ assertCommandSuccess(editBookmarkIncomeCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidBookmarkIncomeIndexUnfilteredList_failure() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getFilteredBookmarkIncomeList().size() + 1);
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_PART_TIME).build();
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(outOfBoundIndex, descriptor);
+ EditBookmarkIncomeCommand editBookmarkIncomeCommand =
+ new EditBookmarkIncomeCommand(superCommand);
+
+ assertCommandFailure(editBookmarkIncomeCommand, model, MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ /**
+ * Edit filtered bookmark income list where index is larger than size of filtered bookmark income list,
+ * but smaller than size of finance tracker
+ */
+ @Test
+ public void execute_invalidBookmarkIncomeIndexFilteredList_failure() {
+ showBookmarkIncomeAtIndex(model, INDEX_FIRST);
+ Index outOfBoundIndex = INDEX_SECOND;
+
+ // ensures that outOfBoundIndex is still in bounds of bookmark income list
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getFinanceTracker().getBookmarkIncomeList().size());
+
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(outOfBoundIndex,
+ new EditBookmarkTransactionDescriptorBuilder().withTitle(VALID_TITLE_PART_TIME).build());
+ EditBookmarkIncomeCommand editBookmarkIncomeCommand = new EditBookmarkIncomeCommand(superCommand);
+
+ assertCommandFailure(editBookmarkIncomeCommand, model, MESSAGE_INVALID_BOOKMARK_INCOME_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_settingDuplicateEditedBookmarkExpense_throwsDuplicateBookmarkTransactionException() {
+ BookmarkIncome editedBookmarkIncome = new BookmarkTransactionBuilder()
+ .withTitle(VALID_TITLE_PART_TIME).withAmount(VALID_AMOUNT_PART_TIME)
+ .buildBookmarkIncome();
+ EditBookmarkTransactionDescriptor descriptor =
+ new EditBookmarkTransactionDescriptorBuilder(editedBookmarkIncome).build();
+
+ EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(INDEX_SECOND, descriptor);
+ EditBookmarkIncomeCommand editBookmarkIncomeCommand = new EditBookmarkIncomeCommand(superCommand);
+
+ assertCommandFailure(editBookmarkIncomeCommand, model,
+ BookmarkIncomeList.MESSAGE_OPERATION_WOULD_RESULT_IN_DUPLICATE_BOOKMARK_INCOME);
+ }
+
+ @Test
+ public void equals() {
+ final EditBookmarkCommandStub superCommand = new EditBookmarkCommandStub(INDEX_FIRST,
+ DESC_SPOTIFY_SUBSCRIPTION);
+ final EditBookmarkIncomeCommand standardCommand =
+ new EditBookmarkIncomeCommand(superCommand);
+
+ // Same values -> returns true
+ EditBookmarkTransactionDescriptor copyDescriptor =
+ new EditBookmarkTransactionDescriptor(DESC_SPOTIFY_SUBSCRIPTION);
+ EditBookmarkCommandStub superCommandWithSameValues = new EditBookmarkCommandStub(INDEX_FIRST, copyDescriptor);
+ EditBookmarkIncomeCommand commandWithSameValues =
+ new EditBookmarkIncomeCommand(superCommandWithSameValues);
+ assertTrue(standardCommand.equals(commandWithSameValues));
+
+ // Same object -> returns true
+ assertTrue(standardCommand.equals(standardCommand));
+
+ // null -> returns false
+ assertFalse(standardCommand.equals(null));
+
+ // Different index -> returns false
+ assertFalse(standardCommand
+ .equals(new EditBookmarkIncomeCommand(
+ new EditBookmarkCommandStub(INDEX_SECOND, DESC_SPOTIFY_SUBSCRIPTION))));
+
+ // Different descriptor -> returns false
+ assertFalse(standardCommand
+ .equals(new EditBookmarkIncomeCommand(
+ new EditBookmarkCommandStub(INDEX_FIRST, DESC_PHONE_BILL))));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkTransactionCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkTransactionCommandTest.java
new file mode 100644
index 00000000000..a6c5eb35254
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkTransactionCommandTest.java
@@ -0,0 +1,56 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandFailure;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ClearCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+
+public class EditBookmarkTransactionCommandTest {
+
+ @Test
+ public void execute_throwsCommandExcepion() {
+ Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+ assertCommandFailure(new EditBookmarkCommand(INDEX_FIRST, new EditBookmarkTransactionDescriptor()), model,
+ MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Test
+ public void equals() {
+ final EditBookmarkCommand standardCommand = new EditBookmarkCommand(INDEX_FIRST, DESC_SPOTIFY_SUBSCRIPTION);
+
+ // same values -> returns true
+ EditBookmarkTransactionDescriptor copyDescriptor =
+ new EditBookmarkTransactionDescriptor(DESC_SPOTIFY_SUBSCRIPTION);
+ EditBookmarkCommand commandWithSameValues = new EditBookmarkCommand(INDEX_FIRST, copyDescriptor);
+ assertTrue(standardCommand.equals(commandWithSameValues));
+
+ // same object -> returns true
+ assertTrue(standardCommand.equals(standardCommand));
+
+ // null -> returns false
+ assertFalse(standardCommand.equals(null));
+
+ // different types -> returns false
+ assertFalse(standardCommand.equals(new ClearCommand()));
+
+ // different index -> returns false
+ assertFalse(standardCommand.equals(new EditBookmarkCommand(INDEX_SECOND, DESC_SPOTIFY_SUBSCRIPTION)));
+
+ // different descriptor -> returns false
+ assertFalse(standardCommand.equals(new EditBookmarkCommand(INDEX_FIRST, DESC_PHONE_BILL)));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkTransactionDescriptorTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkTransactionDescriptorTest.java
new file mode 100644
index 00000000000..29adbc7ff1a
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/bookmarkcommands/EditBookmarkTransactionDescriptorTest.java
@@ -0,0 +1,59 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmarkcommands;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_SPOTIFY_SUBSCRIPTION;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditBookmarkTransactionDescriptorBuilder;
+
+public class EditBookmarkTransactionDescriptorTest {
+ @Test
+ public void setCategories_nullSet_doesNotThrowNullPointerException() {
+ EditBookmarkTransactionDescriptor editBookmarkTransactionDescriptor = new EditBookmarkTransactionDescriptor();
+ editBookmarkTransactionDescriptor.setCategories(null);
+ assertTrue(editBookmarkTransactionDescriptor.getCategories().isEmpty());
+ }
+
+ @Test
+ public void equals() {
+ // same values -> returns true
+ EditBookmarkTransactionDescriptor descriptorWithSameValues =
+ new EditBookmarkTransactionDescriptor(DESC_PHONE_BILL);
+ assertTrue(DESC_PHONE_BILL.equals(descriptorWithSameValues));
+
+ // same object -> returns true
+ assertTrue(DESC_PHONE_BILL.equals(DESC_PHONE_BILL));
+
+ // null -> returns false
+ assertFalse(DESC_PHONE_BILL.equals(null));
+
+ // different types -> returns false
+ assertFalse(DESC_PHONE_BILL.equals(5));
+
+ // different values -> returns false
+ assertFalse(DESC_PHONE_BILL.equals(DESC_SPOTIFY_SUBSCRIPTION));
+
+ // different title -> returns false
+ EditBookmarkTransactionDescriptor editBookmarkTransactionDescriptor =
+ new EditBookmarkTransactionDescriptorBuilder(DESC_PHONE_BILL)
+ .withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).build();
+ assertFalse(DESC_PHONE_BILL.equals(editBookmarkTransactionDescriptor));
+
+ // different amount -> returns false
+ editBookmarkTransactionDescriptor = new EditBookmarkTransactionDescriptorBuilder(DESC_PHONE_BILL)
+ .withAmount(VALID_AMOUNT_SPOTIFY_SUBSCRIPTION).build();
+ assertFalse(DESC_PHONE_BILL.equals(editBookmarkTransactionDescriptor));
+
+ // different categories -> returns false
+ editBookmarkTransactionDescriptor = new EditBookmarkTransactionDescriptorBuilder(DESC_PHONE_BILL)
+ .withCategories(VALID_CATEGORY_WORK).build();
+ assertFalse(DESC_PHONE_BILL.equals(editBookmarkTransactionDescriptor));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetExpenseLimitCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetExpenseLimitCommandTest.java
new file mode 100644
index 00000000000..6a9b624531f
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetExpenseLimitCommandTest.java
@@ -0,0 +1,59 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.budget;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+public class SetExpenseLimitCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void constructor_nullAmount_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new SetExpenseLimitCommand(null));
+ }
+
+ @Test
+ public void execute_validAmount_success() {
+ Amount amountToSet = new Amount("500");
+
+ SetExpenseLimitCommand setExpenseLimitCommand = new SetExpenseLimitCommand(amountToSet);
+
+ String expectedMessage = String.format(SetExpenseLimitCommand.MESSAGE_SUCCESS, amountToSet);
+
+ ModelManager expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.setExpenseLimit(amountToSet);
+
+ assertCommandSuccess(setExpenseLimitCommand, model, expectedMessage, expectedModel, true, Tab.OVERVIEW);
+ }
+
+ @Test
+ public void equals() {
+ SetExpenseLimitCommand setExpenseLimitCommand = new SetExpenseLimitCommand(new Amount("5"));
+
+ // Same values -> returns true
+ assertTrue(setExpenseLimitCommand.equals(new SetExpenseLimitCommand(new Amount("5"))));
+
+ // Different amounts -> returns false
+ assertFalse(setExpenseLimitCommand.equals(new SetExpenseLimitCommand(new Amount("10"))));
+
+ // Same object -> returns true
+ assertTrue(setExpenseLimitCommand.equals(setExpenseLimitCommand));
+
+ // null -> returns false
+ assertFalse(setExpenseLimitCommand.equals(null));
+
+ // Different types -> returns false
+ assertFalse(setExpenseLimitCommand.equals(5));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetSavingsGoalCommandTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetSavingsGoalCommandTest.java
new file mode 100644
index 00000000000..1bf4669c8f1
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/budget/SetSavingsGoalCommandTest.java
@@ -0,0 +1,58 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.budget;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ModelManager;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+public class SetSavingsGoalCommandTest {
+
+ private Model model = new ModelManager(getTypicalFinanceTracker(), new UserPrefs());
+
+ @Test
+ public void constructor_nullAmount_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new SetSavingsGoalCommand(null));
+ }
+
+ @Test
+ public void execute_validAmount_success() {
+ Amount amountToSet = new Amount("500");
+ SetSavingsGoalCommand setSavingsGoalCommand = new SetSavingsGoalCommand(amountToSet);
+
+ String expectedMessage = String.format(SetSavingsGoalCommand.MESSAGE_SUCCESS, amountToSet);
+
+ ModelManager expectedModel = new ModelManager(model.getFinanceTracker(), new UserPrefs());
+ expectedModel.setSavingsGoal(amountToSet);
+
+ assertCommandSuccess(setSavingsGoalCommand, model, expectedMessage, expectedModel, true, Tab.OVERVIEW);
+ }
+
+ @Test
+ public void equals() {
+ SetSavingsGoalCommand setSavingsGoalCommand = new SetSavingsGoalCommand(new Amount("5"));
+
+ // Same values -> returns true
+ assertTrue(setSavingsGoalCommand.equals(new SetSavingsGoalCommand(new Amount("5"))));
+
+ // Different amounts -> returns false
+ assertFalse(setSavingsGoalCommand.equals(new SetSavingsGoalCommand(new Amount("10"))));
+
+ // Same object -> returns true
+ assertTrue(setSavingsGoalCommand.equals(setSavingsGoalCommand));
+
+ // null -> returns false
+ assertFalse(setSavingsGoalCommand.equals(null));
+
+ // Different types -> returns false
+ assertFalse(setSavingsGoalCommand.equals(5));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/ConvertBookmarkCommandStub.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/ConvertBookmarkCommandStub.java
new file mode 100644
index 00000000000..d1f4c7e15a4
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/ConvertBookmarkCommandStub.java
@@ -0,0 +1,49 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+/**
+ * A {@code ConvertBookmarkCommand} stub that takes in an {@code Index} and returns the same
+ * {@code Index} when its {@code getTargetIndex} method is called. All of its other
+ * methods fail when called.
+ */
+public class ConvertBookmarkCommandStub extends ConvertBookmarkCommand {
+ private final Index targetIndex;
+ private final Date convertedDate;
+
+ /**
+ * Constructs a {@code DeleteBookmarkCommandStub} object.
+ *
+ * @param targetIndex The target index in the displayed list.
+ */
+ public ConvertBookmarkCommandStub(Index targetIndex, Date convertedDate) {
+ super(targetIndex, convertedDate);
+ this.targetIndex = targetIndex;
+ this.convertedDate = convertedDate;
+ }
+
+ @Override
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ @Override
+ protected Date getConvertedDate() {
+ return convertedDate;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/DeleteBookmarkCommandStub.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/DeleteBookmarkCommandStub.java
new file mode 100644
index 00000000000..51efb425290
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/DeleteBookmarkCommandStub.java
@@ -0,0 +1,42 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * A {@code DeleteBookmarkCommand} stub that takes in an {@code Index} and returns the same
+ * {@code Index} when its {@code getTargetIndex} method is called. All of its other
+ * methods fail when called.
+ */
+public class DeleteBookmarkCommandStub extends DeleteBookmarkCommand {
+ private final Index targetIndex;
+
+ /**
+ * Constructs a {@code DeleteBookmarkCommandStub} object.
+ *
+ * @param targetIndex The target index in the displayed list.
+ */
+ public DeleteBookmarkCommandStub(Index targetIndex) {
+ super(targetIndex);
+ this.targetIndex = targetIndex;
+ }
+
+ @Override
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/DeleteCommandStub.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/DeleteCommandStub.java
new file mode 100644
index 00000000000..35c8fdef066
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/DeleteCommandStub.java
@@ -0,0 +1,42 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.DeleteCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * A {@code DeleteCommand} stub that takes in an {@code Index} and returns the same
+ * {@code Index} when its {@code getTargetIndex} method is called. All of its other
+ * methods fail when called.
+ */
+public class DeleteCommandStub extends DeleteCommand {
+ private final Index targetIndex;
+
+ /**
+ * Constructs a {@code DeleteCommandStub} object.
+ *
+ * @param targetIndex The target index in the displayed list.
+ */
+ public DeleteCommandStub(Index targetIndex) {
+ super(targetIndex);
+ this.targetIndex = targetIndex;
+ }
+
+ @Override
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/EditBookmarkCommandStub.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/EditBookmarkCommandStub.java
new file mode 100644
index 00000000000..7fd2a5d2063
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/EditBookmarkCommandStub.java
@@ -0,0 +1,51 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * A {@code EditBookmarkCommand} stub that takes in an {@code Index} and returns the same
+ * {@code Index} when its {@code getTargetIndex} method is called. All of its other
+ * methods fail when called.
+ */
+public class EditBookmarkCommandStub extends EditBookmarkCommand {
+ private final Index targetIndex;
+ private final EditBookmarkTransactionDescriptor editBookmarkTransactionDescriptor;
+
+ /**
+ * Constructs an {@code EditCommandStub} object.
+ *
+ * @param targetIndex The target index in the displayed list.
+ */
+ public EditBookmarkCommandStub(Index targetIndex,
+ EditBookmarkTransactionDescriptor editBookmarkTransactionDescriptor) {
+ super(targetIndex, editBookmarkTransactionDescriptor);
+ this.targetIndex = targetIndex;
+ this.editBookmarkTransactionDescriptor = editBookmarkTransactionDescriptor;
+ }
+
+ @Override
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ @Override
+ protected EditBookmarkTransactionDescriptor getEditBookmarkTransactionDescriptor() {
+ return editBookmarkTransactionDescriptor;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/EditCommandStub.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/EditCommandStub.java
new file mode 100644
index 00000000000..83dabd7c8ea
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/EditCommandStub.java
@@ -0,0 +1,54 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+
+/**
+ * An {@code EditCommand} stub that takes in an {@code Index} and returns the same
+ * {@code Index} when its {@code getTargetIndex} method is called. All of its other
+ * methods fail when called.
+ */
+public class EditCommandStub extends EditCommand {
+ private final Index targetIndex;
+ private final EditTransactionDescriptor editTransactionDescriptor;
+
+ /**
+ * Constructs an {@code EditCommandStub} object.
+ *
+ * @param targetIndex The target index in the displayed list.
+ */
+ public EditCommandStub(Index targetIndex, EditTransactionDescriptor editTransactionDescriptor) {
+ super(targetIndex, editTransactionDescriptor);
+ this.targetIndex = targetIndex;
+ this.editTransactionDescriptor = editTransactionDescriptor;
+ }
+
+ @Override
+ protected Index getTargetIndex() {
+ return targetIndex;
+ }
+
+ @Override
+ protected EditTransactionDescriptor getEditTransactionDescriptor() {
+ return editTransactionDescriptor;
+ }
+
+ @Override
+ protected boolean isAmountOrDateEdited() {
+ return editTransactionDescriptor.isAmountOrDateEdited();
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/FindCommandStub.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/FindCommandStub.java
new file mode 100644
index 00000000000..59c3a2bed68
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/FindCommandStub.java
@@ -0,0 +1,45 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandResult;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.FindCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * A {@code FindCommand} stub that takes in a {@code TitleContainsKeyphrasesPredicate}
+ * and returns the same {@code TitleContainsKeyphrasesPredicate} when its {@code getPredicate}
+ * method is called. All of its other methods fail when called.
+ */
+public class FindCommandStub extends FindCommand {
+ private final List<Predicate<Transaction>> predicates;
+
+ /**
+ * Constructs a {@code DeleteCommandStub} object.
+ *
+ * @param predicates The list of predicates to filter the displayed list by.
+ */
+ public FindCommandStub(List<Predicate<Transaction>> predicates) {
+ super(predicates);
+ this.predicates = predicates;
+ }
+
+ @Override
+ protected List<Predicate<Transaction>> getPredicates() {
+ return predicates;
+ }
+
+ @Override
+ public CommandResult execute(Model model) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/ModelStub.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/ModelStub.java
new file mode 100644
index 00000000000..e3a0199b124
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/commands/stubs/ModelStub.java
@@ -0,0 +1,206 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.commands.stubs;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.Predicate;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyUserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.command.history.CommandHistory;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import javafx.collections.ObservableList;
+
+/**
+ * A default model stub that has all of the methods failing.
+ */
+public class ModelStub implements Model {
+ @Override
+ public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public ReadOnlyUserPrefs getUserPrefs() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public GuiSettings getGuiSettings() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setGuiSettings(GuiSettings guiSettings) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public Path getFinanceTrackerFilePath() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setFinanceTrackerFilePath(Path financeTrackerFilePath) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public CommandHistory getCommandHistory() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void addExpense(Expense expense) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void addIncome(Income income) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void addBookmarkExpense(BookmarkExpense bookmarkExpense) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void addBookmarkIncome(BookmarkIncome bookmarkIncome) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setFinanceTracker(ReadOnlyFinanceTracker newData) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public ReadOnlyFinanceTracker getFinanceTracker() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void deleteTransaction(Transaction target) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void deleteBookmarkExpense(BookmarkExpense target) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void deleteBookmarkIncome(BookmarkIncome target) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setTransaction(Transaction target, Transaction editedTransaction) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setBookmarkExpense(BookmarkExpense target, BookmarkExpense editedBookmarkExpense) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setBookmarkIncome(BookmarkIncome target, BookmarkIncome editedBookmarkIncome) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public MonthlyBudget getMonthlyBudget() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setExpenseLimit(Amount limit) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setSavingsGoal(Amount goal) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void calculateBudgetInfo() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public ObservableList<Transaction> getFilteredTransactionList() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public ObservableList<Expense> getFilteredExpenseList() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public ObservableList<Income> getFilteredIncomeList() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public ObservableList<BookmarkExpense> getFilteredBookmarkExpenseList() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public ObservableList<BookmarkIncome> getFilteredBookmarkIncomeList() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void updateFilteredTransactionList(Predicate<Transaction> predicate) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void updateFilteredTransactionList(List<Predicate<Transaction>> predicates) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void updateFilteredExpenseList(Predicate<Transaction> predicate) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void updateFilteredExpenseList(List<Predicate<Transaction>> predicates) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void updateFilteredIncomeList(Predicate<Transaction> predicate) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void updateFilteredIncomeList(List<Predicate<Transaction>> predicates) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void updateFilteredBookmarkExpenseList(Predicate<BookmarkExpense> predicate) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void updateFilteredBookmarkIncomeList(Predicate<BookmarkIncome> predicate) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddExpenseCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddExpenseCommandParserTest.java
new file mode 100644
index 00000000000..4f75774f673
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddExpenseCommandParserTest.java
@@ -0,0 +1,139 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_AMOUNT_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_CATEGORY_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_DATE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_TITLE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.BUBBLE_TEA_2;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.INTERNSHIP_2;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+public class AddExpenseCommandParserTest {
+ private static final String CURRENT_DATE = LocalDate.now().format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+ private AddExpenseCommandParser parser = new AddExpenseCommandParser();
+
+ @Test
+ public void parse_allFieldsPresent_success() {
+ Expense expectedExpense = new TransactionBuilder(INTERNSHIP_2)
+ .withCategories(VALID_CATEGORY_FOOD_BEVERAGE).buildExpense();
+
+ // whitespace only preamble
+ assertParseSuccess(parser, PREAMBLE_WHITESPACE + TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_FOOD_BEVERAGE, new AddExpenseCommand(expectedExpense));
+
+ // multiple categories - all accepted
+ Expense expectedExpenseMultipleCategories = new TransactionBuilder(INTERNSHIP_2)
+ .withCategories(VALID_CATEGORY_FOOD_BEVERAGE, VALID_CATEGORY_WORK).buildExpense();
+ assertParseSuccess(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + DATE_DESC_INTERNSHIP
+ + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE,
+ new AddExpenseCommand(expectedExpenseMultipleCategories));
+ }
+
+ @Test
+ public void parse_optionalFieldsMissing_success() {
+ // zero categories
+ Expense expectedExpenseWithNoCategories = new TransactionBuilder(BUBBLE_TEA_2).withCategories().buildExpense();
+ assertParseSuccess(parser, TITLE_DESC_BUBBLE_TEA + AMOUNT_DESC_BUBBLE_TEA + DATE_DESC_BUBBLE_TEA,
+ new AddExpenseCommand(expectedExpenseWithNoCategories));
+
+ // arguments has no date
+ Expense expectedExpenseWithCurrentDate = new TransactionBuilder().withTitle(VALID_TITLE_INTERNSHIP)
+ .withAmount(VALID_AMOUNT_INTERNSHIP).withCategories(VALID_CATEGORY_WORK).withDate(CURRENT_DATE)
+ .buildExpense();
+ assertParseSuccess(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + CATEGORY_DESC_WORK,
+ new AddExpenseCommand(expectedExpenseWithCurrentDate));
+ }
+
+ @Test
+ public void parse_compulsoryFieldMissing_failure() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddExpenseCommand.MESSAGE_USAGE);
+
+ // missing title prefix
+ assertParseFailure(parser, VALID_TITLE_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + DATE_DESC_INTERNSHIP,
+ expectedMessage);
+
+ // missing amount prefix
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + VALID_AMOUNT_INTERNSHIP + DATE_DESC_INTERNSHIP,
+ expectedMessage);
+
+ // all prefixes missing
+ assertParseFailure(parser, VALID_TITLE_INTERNSHIP + VALID_AMOUNT_INTERNSHIP + VALID_DATE_INTERNSHIP,
+ expectedMessage);
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ // invalid title
+ assertParseFailure(parser, INVALID_TITLE_DESC + AMOUNT_DESC_INTERNSHIP + DATE_DESC_INTERNSHIP
+ + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE, Title.MESSAGE_CONSTRAINTS);
+
+ // invalid amount
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + INVALID_AMOUNT_DESC + DATE_DESC_INTERNSHIP
+ + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE, Amount.MESSAGE_CONSTRAINTS);
+
+ // invalid date
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + INVALID_DATE_DESC
+ + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE, Date.MESSAGE_CONSTRAINTS);
+
+ // invalid category
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + DATE_DESC_INTERNSHIP
+ + INVALID_CATEGORY_DESC + VALID_CATEGORY_FOOD_BEVERAGE, Category.MESSAGE_CONSTRAINTS);
+
+ // two invalid values, only first invalid value reported
+ assertParseFailure(parser, INVALID_TITLE_DESC + AMOUNT_DESC_INTERNSHIP + INVALID_DATE_DESC,
+ Title.MESSAGE_CONSTRAINTS);
+
+ // non-empty preamble
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY + TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddExpenseCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_multipleRepeatedFields_failure() {
+ // multiple titles
+ assertParseFailure(parser, TITLE_DESC_BUBBLE_TEA + TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_FOOD_BEVERAGE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_TITLE_CONSTRAINTS));
+
+ // multiple amounts
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_BUBBLE_TEA + AMOUNT_DESC_INTERNSHIP
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_FOOD_BEVERAGE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_AMOUNT_CONSTRAINTS));
+
+ // multiple dates
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + DATE_DESC_BUBBLE_TEA
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_FOOD_BEVERAGE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_DATE_CONSTRAINTS));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddIncomeCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddIncomeCommandParserTest.java
new file mode 100644
index 00000000000..9296db398bc
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/AddIncomeCommandParserTest.java
@@ -0,0 +1,139 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_AMOUNT_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_CATEGORY_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_DATE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_TITLE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.BUBBLE_TEA_2;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.INTERNSHIP_2;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+public class AddIncomeCommandParserTest {
+ private static final String CURRENT_DATE = LocalDate.now().format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+ private AddIncomeCommandParser parser = new AddIncomeCommandParser();
+
+ @Test
+ public void parse_allFieldsPresent_success() {
+ Income expectedIncome = new TransactionBuilder(INTERNSHIP_2)
+ .withCategories(VALID_CATEGORY_FOOD_BEVERAGE).buildIncome();
+
+ // whitespace only preamble
+ assertParseSuccess(parser, PREAMBLE_WHITESPACE + TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_FOOD_BEVERAGE, new AddIncomeCommand(expectedIncome));
+
+ // multiple categories - all accepted
+ Income expectedIncomeMultipleCategories = new TransactionBuilder(INTERNSHIP_2)
+ .withCategories(VALID_CATEGORY_FOOD_BEVERAGE, VALID_CATEGORY_WORK).buildIncome();
+ assertParseSuccess(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + DATE_DESC_INTERNSHIP
+ + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE,
+ new AddIncomeCommand(expectedIncomeMultipleCategories));
+ }
+
+ @Test
+ public void parse_optionalFieldsMissing_success() {
+ // zero categories
+ Income expectedIncomeWithNoCategories = new TransactionBuilder(BUBBLE_TEA_2).withCategories().buildIncome();
+ assertParseSuccess(parser, TITLE_DESC_BUBBLE_TEA + AMOUNT_DESC_BUBBLE_TEA + DATE_DESC_BUBBLE_TEA,
+ new AddIncomeCommand(expectedIncomeWithNoCategories));
+
+ // arguments has no date
+ Income expectedIncomeWithCurrentDate = new TransactionBuilder().withTitle(VALID_TITLE_INTERNSHIP)
+ .withAmount(VALID_AMOUNT_INTERNSHIP).withDate(CURRENT_DATE).withCategories(VALID_CATEGORY_WORK)
+ .buildIncome();
+ assertParseSuccess(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + CATEGORY_DESC_WORK,
+ new AddIncomeCommand(expectedIncomeWithCurrentDate));
+ }
+
+ @Test
+ public void parse_compulsoryFieldMissing_failure() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddIncomeCommand.MESSAGE_USAGE);
+
+ // missing title prefix
+ assertParseFailure(parser, VALID_TITLE_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + DATE_DESC_INTERNSHIP,
+ expectedMessage);
+
+ // missing amount prefix
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + VALID_AMOUNT_INTERNSHIP + DATE_DESC_INTERNSHIP,
+ expectedMessage);
+
+ // all prefixes missing
+ assertParseFailure(parser, VALID_TITLE_INTERNSHIP + VALID_AMOUNT_INTERNSHIP + VALID_DATE_INTERNSHIP,
+ expectedMessage);
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ // invalid title
+ assertParseFailure(parser, INVALID_TITLE_DESC + AMOUNT_DESC_INTERNSHIP + DATE_DESC_INTERNSHIP
+ + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE, Title.MESSAGE_CONSTRAINTS);
+
+ // invalid amount
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + INVALID_AMOUNT_DESC + DATE_DESC_INTERNSHIP
+ + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE, Amount.MESSAGE_CONSTRAINTS);
+
+ // invalid date
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + INVALID_DATE_DESC
+ + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE, Date.MESSAGE_CONSTRAINTS);
+
+ // invalid category
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + DATE_DESC_INTERNSHIP
+ + INVALID_CATEGORY_DESC + VALID_CATEGORY_FOOD_BEVERAGE, Category.MESSAGE_CONSTRAINTS);
+
+ // two invalid values, only first invalid value reported
+ assertParseFailure(parser, INVALID_TITLE_DESC + AMOUNT_DESC_INTERNSHIP + INVALID_DATE_DESC,
+ Title.MESSAGE_CONSTRAINTS);
+
+ // non-empty preamble
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY + TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_WORK + CATEGORY_DESC_FOOD_BEVERAGE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddIncomeCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_multipleRepeatedFields_failure() {
+ // multiple titles
+ assertParseFailure(parser, TITLE_DESC_BUBBLE_TEA + TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_FOOD_BEVERAGE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_TITLE_CONSTRAINTS));
+
+ // multiple amounts
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_BUBBLE_TEA + AMOUNT_DESC_INTERNSHIP
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_FOOD_BEVERAGE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_AMOUNT_CONSTRAINTS));
+
+ // multiple dates
+ assertParseFailure(parser, TITLE_DESC_INTERNSHIP + AMOUNT_DESC_INTERNSHIP + DATE_DESC_BUBBLE_TEA
+ + DATE_DESC_INTERNSHIP + CATEGORY_DESC_FOOD_BEVERAGE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_DATE_CONSTRAINTS));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentTokenizerTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentTokenizerTest.java
new file mode 100644
index 00000000000..fe685037aa6
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ArgumentTokenizerTest.java
@@ -0,0 +1,173 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+
+public class ArgumentTokenizerTest {
+
+ private final Prefix unknownPrefix = new Prefix("--u");
+
+ /**
+ * Calls the method {@code ArgumentTokenizer::tokenize} using the set of {@Prefix} in {@CliSyntax}.
+ *
+ * @param argsString Arguments string of the form: {@code preamble <prefix>value <prefix>value ...}.
+ * @param prefixes Subset of {@Prefix} in {@CliSyntax} that are considered valid. Any other prefixes is invalid
+ * and thus should throw ParseException.
+ * @return ArgumentMultimap object that maps prefixes to their arguments.
+ * @throws ParseException if any invalid prefixes are detected.
+ */
+ private ArgumentMultimap tokenize(String argsString, Prefix... prefixes) throws ParseException {
+ return ArgumentTokenizer.tokenize(argsString, "This is an exception message.", prefixes);
+ }
+
+ @Test
+ public void tokenize_emptyArgsString_noValues() throws ParseException {
+ String argsString = " ";
+ ArgumentMultimap argMultimapFromCliSyntaxPrefixes = tokenize(argsString, PREFIX_TITLE);
+
+ assertPreambleEmpty(argMultimapFromCliSyntaxPrefixes);
+ assertArgumentAbsent(argMultimapFromCliSyntaxPrefixes, PREFIX_TITLE);
+ }
+
+ private void assertPreamblePresent(ArgumentMultimap argMultimap, String expectedPreamble) {
+ assertEquals(expectedPreamble, argMultimap.getPreamble());
+ }
+
+ private void assertPreambleEmpty(ArgumentMultimap argMultimap) {
+ assertTrue(argMultimap.getPreamble().isEmpty());
+ }
+
+ /**
+ * Asserts all the arguments in {@code argMultimap} with {@code prefix} match the {@code expectedValues}
+ * and only the last value is returned upon calling {@code ArgumentMultimap#getValue(Prefix)}.
+ */
+ private void assertArgumentPresent(ArgumentMultimap argMultimap, Prefix prefix, String... expectedValues) {
+
+ // Verify the last value is returned
+ assertEquals(expectedValues[expectedValues.length - 1], argMultimap.getValue(prefix).get());
+
+ // Verify the number of values returned is as expected
+ assertEquals(expectedValues.length, argMultimap.getAllValues(prefix).size());
+
+ // Verify all values returned are as expected and in order
+ for (int i = 0; i < expectedValues.length; i++) {
+ assertEquals(expectedValues[i], argMultimap.getAllValues(prefix).get(i));
+ }
+ }
+
+ private void assertArgumentAbsent(ArgumentMultimap argMultimap, Prefix prefix) {
+ assertFalse(argMultimap.getValue(prefix).isPresent());
+ }
+
+ @Test
+ public void tokenize_noPrefixes_allTakenAsPreamble() throws ParseException {
+ String argsString = " some random string /t tag with leading and trailing spaces ";
+ ArgumentMultimap argMultimapFromCliSyntaxPrefixes = tokenize(argsString);
+
+ // Same string expected as preamble, but leading/trailing spaces should be trimmed
+ assertPreamblePresent(argMultimapFromCliSyntaxPrefixes, argsString.trim());
+ }
+
+ @Test
+ public void tokenize_oneArgument() throws ParseException {
+ ArgumentMultimap argMultimap;
+
+ // Preamble present
+ String argsString = " Some preamble string t/ Argument value ";
+ argMultimap = tokenize(argsString, PREFIX_TITLE);
+ assertPreamblePresent(argMultimap, "Some preamble string");
+ assertArgumentPresent(argMultimap, PREFIX_TITLE, "Argument value");
+
+ // No preamble
+ argsString = " t/ Argument value ";
+ argMultimap = tokenize(argsString, PREFIX_TITLE);
+ assertPreambleEmpty(argMultimap);
+ assertArgumentPresent(argMultimap, PREFIX_TITLE, "Argument value");
+
+ }
+
+ @Test
+ public void tokenize_multipleArguments() throws ParseException {
+ // Only two arguments are present
+ String argsString = "SomePreambleString t/ dashT-Value a/pSlash value";
+ ArgumentMultimap argMultimap = tokenize(argsString, PREFIX_TITLE, PREFIX_AMOUNT, PREFIX_DATE);
+ assertPreamblePresent(argMultimap, "SomePreambleString");
+ assertArgumentPresent(argMultimap, PREFIX_AMOUNT, "pSlash value");
+ assertArgumentPresent(argMultimap, PREFIX_TITLE, "dashT-Value");
+ assertArgumentAbsent(argMultimap, PREFIX_DATE);
+
+ // All three arguments are present
+ argsString = "Different Preamble String d/111 t/ dashT-Value a/pSlash value";
+ argMultimap = tokenize(argsString, PREFIX_AMOUNT, PREFIX_TITLE, PREFIX_DATE);
+ assertPreamblePresent(argMultimap, "Different Preamble String");
+ assertArgumentPresent(argMultimap, PREFIX_AMOUNT, "pSlash value");
+ assertArgumentPresent(argMultimap, PREFIX_TITLE, "dashT-Value");
+ assertArgumentPresent(argMultimap, PREFIX_DATE, "111");
+
+ /* Also covers: Reusing of the tokenizer multiple times */
+
+ // Reuse tokenizer on an empty string to ensure ArgumentMultimap is correctly reset
+ // (i.e. no stale values from the previous tokenizing remain)
+ argsString = "";
+ argMultimap = tokenize(argsString, PREFIX_AMOUNT, PREFIX_TITLE, PREFIX_DATE);
+ assertPreambleEmpty(argMultimap);
+ assertArgumentAbsent(argMultimap, PREFIX_AMOUNT);
+
+ /* Also covers: testing for prefixes not specified as a prefix */
+
+ // Prefixes not previously given to the tokenizer should not return any values
+ argsString = unknownPrefix + "some value";
+ argMultimap = tokenize(argsString, PREFIX_AMOUNT, PREFIX_TITLE, PREFIX_DATE);
+ assertArgumentAbsent(argMultimap, unknownPrefix);
+ assertPreamblePresent(argMultimap, argsString); // Unknown prefix is taken as part of preamble
+ }
+
+ @Test
+ public void tokenize_multipleArgumentsWithRepeats() throws ParseException {
+ // Two arguments repeated, some have empty values
+ String argsString = "SomePreambleString t/ dashT-Value d/ d/ t/ another dashT value a/ pSlash value t/";
+ ArgumentMultimap argMultimap = tokenize(argsString, PREFIX_AMOUNT, PREFIX_TITLE, PREFIX_DATE);
+ assertPreamblePresent(argMultimap, "SomePreambleString");
+ assertArgumentPresent(argMultimap, PREFIX_AMOUNT, "pSlash value");
+ assertArgumentPresent(argMultimap, PREFIX_TITLE, "dashT-Value", "another dashT value", "");
+ assertArgumentPresent(argMultimap, PREFIX_DATE, "", "");
+ }
+
+ @Test
+ public void tokenize_multipleArgumentsJoined() throws ParseException {
+ String argsString = "SomePreambleStringa/ pSlash joinedt/joined t/ not joinedd/joined";
+ ArgumentMultimap argMultimap = tokenize(argsString, PREFIX_AMOUNT, PREFIX_TITLE, PREFIX_DATE);
+ assertPreamblePresent(argMultimap, "SomePreambleStringa/ pSlash joinedt/joined");
+ assertArgumentAbsent(argMultimap, PREFIX_AMOUNT);
+ assertArgumentPresent(argMultimap, PREFIX_TITLE, "not joinedd/joined");
+ assertArgumentAbsent(argMultimap, PREFIX_DATE);
+ }
+
+ @Test
+ public void tokenize_invalidArgumentPresent_throwsParseException() {
+ String argsString = "SomePreableString t/ dashT-Value d/ invalid-hatQ a/ pSlash-value";
+ assertThrows(ParseException.class, () -> tokenize(argsString, PREFIX_AMOUNT, PREFIX_TITLE));
+ }
+
+ @Test
+ public void equalsMethod() {
+ Prefix aaa = new Prefix("aaa");
+
+ assertEquals(aaa, aaa);
+ assertEquals(aaa, new Prefix("aaa"));
+
+ assertNotEquals(aaa, "aaa");
+ assertNotEquals(aaa, new Prefix("aab"));
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/CommandParserTestUtil.java
similarity index 86%
rename from src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/CommandParserTestUtil.java
index e4c33515768..6bee555fbcc 100644
--- a/src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/CommandParserTestUtil.java
@@ -1,9 +1,9 @@
-package seedu.address.logic.parser;
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.Command;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
/**
* Contains helper methods for testing command parsers.
diff --git a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/DeleteCommandParserTest.java
similarity index 58%
rename from src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/DeleteCommandParserTest.java
index 27eaec84450..68532bafcd3 100644
--- a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/DeleteCommandParserTest.java
@@ -1,13 +1,13 @@
-package seedu.address.logic.parser;
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
import org.junit.jupiter.api.Test;
-import seedu.address.logic.commands.DeleteCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.DeleteCommand;
/**
* As we are only doing white-box testing, our test cases do not cover path variations
@@ -22,11 +22,12 @@ public class DeleteCommandParserTest {
@Test
public void parse_validArgs_returnsDeleteCommand() {
- assertParseSuccess(parser, "1", new DeleteCommand(INDEX_FIRST_PERSON));
+ assertParseSuccess(parser, "1", new DeleteCommand(INDEX_FIRST));
}
@Test
public void parse_invalidArgs_throwsParseException() {
assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
+ assertParseFailure(parser, "-1", String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
}
}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/EditCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/EditCommandParserTest.java
new file mode 100644
index 00000000000..d09cf2ccc10
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/EditCommandParserTest.java
@@ -0,0 +1,179 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_AMOUNT_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_CATEGORY_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_DATE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_TITLE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_THIRD;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand.EditTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditTransactionDescriptorBuilder;
+
+public class EditCommandParserTest {
+
+ private static final String CATEGORY_EMPTY = " " + PREFIX_CATEGORY;
+
+ private static final String MESSAGE_INVALID_FORMAT =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE);
+
+ private EditCommandParser parser = new EditCommandParser();
+
+ @Test
+ public void parse_missingParts_failure() {
+ // no index specified
+ assertParseFailure(parser, VALID_TITLE_BUBBLE_TEA, MESSAGE_INVALID_FORMAT);
+
+ // no field specified
+ assertParseFailure(parser, "1", EditCommand.MESSAGE_NOT_EDITED);
+
+ // no index and no field specified
+ assertParseFailure(parser, "", MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_invalidPreamble_failure() {
+ // negative index
+ assertParseFailure(parser, "-5" + TITLE_DESC_BUBBLE_TEA, MESSAGE_INVALID_FORMAT);
+
+ // zero index
+ assertParseFailure(parser, "0" + TITLE_DESC_BUBBLE_TEA, MESSAGE_INVALID_FORMAT);
+
+ // invalid arguments being parsed as preamble
+ assertParseFailure(parser, "1 some random string", MESSAGE_INVALID_FORMAT);
+
+ // invalid prefix being parsed as preamble
+ assertParseFailure(parser, "1 i/ string", MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ assertParseFailure(parser, "1" + INVALID_TITLE_DESC, Title.MESSAGE_CONSTRAINTS); // invalid title
+ assertParseFailure(parser, "1" + INVALID_AMOUNT_DESC, Amount.MESSAGE_CONSTRAINTS); // invalid amount
+ assertParseFailure(parser, "1" + INVALID_DATE_DESC, Date.MESSAGE_CONSTRAINTS); // invalid date
+ assertParseFailure(parser, "1" + INVALID_CATEGORY_DESC, Category.MESSAGE_CONSTRAINTS); // invalid category
+
+ // invalid amount followed by valid date
+ assertParseFailure(parser, "1" + INVALID_AMOUNT_DESC + DATE_DESC_BUBBLE_TEA, Amount.MESSAGE_CONSTRAINTS);
+
+ // while parsing {@code PREFIX_CATEGORY} alone will reset the categories of the {@code Transaction} being
+ // edited, parsing it together with a valid category results in error
+ assertParseFailure(parser, "1" + CATEGORY_DESC_FOOD_BEVERAGE + CATEGORY_DESC_WORK + CATEGORY_EMPTY,
+ Category.MESSAGE_EMPTY_CATEGORY);
+ assertParseFailure(parser, "1" + CATEGORY_DESC_FOOD_BEVERAGE + CATEGORY_EMPTY + CATEGORY_DESC_WORK,
+ Category.MESSAGE_EMPTY_CATEGORY);
+ assertParseFailure(parser, "1" + CATEGORY_EMPTY + CATEGORY_DESC_FOOD_BEVERAGE + CATEGORY_DESC_WORK,
+ Category.MESSAGE_EMPTY_CATEGORY);
+
+ // multiple invalid values, but only the first invalid value is captured
+ assertParseFailure(parser, "1" + INVALID_TITLE_DESC + INVALID_DATE_DESC + VALID_AMOUNT_BUBBLE_TEA,
+ Title.MESSAGE_CONSTRAINTS);
+ }
+
+ @Test
+ public void parse_allFieldsSpecified_success() {
+ Index targetIndex = INDEX_SECOND;
+ String userInput = targetIndex.getOneBased() + AMOUNT_DESC_INTERNSHIP + CATEGORY_DESC_WORK
+ + DATE_DESC_BUBBLE_TEA + TITLE_DESC_BUBBLE_TEA + CATEGORY_DESC_FOOD_BEVERAGE;
+
+ EditCommand.EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_BUBBLE_TEA).withAmount(VALID_AMOUNT_INTERNSHIP).withDate(VALID_DATE_BUBBLE_TEA)
+ .withCategories(VALID_CATEGORY_WORK, VALID_CATEGORY_FOOD_BEVERAGE).build();
+ EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_someFieldsSpecified_success() {
+ Index targetIndex = INDEX_FIRST;
+ String userInput = targetIndex.getOneBased() + AMOUNT_DESC_INTERNSHIP + DATE_DESC_BUBBLE_TEA;
+
+ EditCommand.EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder()
+ .withAmount(VALID_AMOUNT_INTERNSHIP).withDate(VALID_DATE_BUBBLE_TEA).build();
+ EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_oneFieldSpecified_success() {
+ // title
+ Index targetIndex = INDEX_THIRD;
+ String userInput = targetIndex.getOneBased() + TITLE_DESC_BUBBLE_TEA;
+ EditCommand.EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_BUBBLE_TEA).build();
+ EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // amount
+ userInput = targetIndex.getOneBased() + AMOUNT_DESC_BUBBLE_TEA;
+ descriptor = new EditTransactionDescriptorBuilder().withAmount(VALID_AMOUNT_BUBBLE_TEA).build();
+ expectedCommand = new EditCommand(targetIndex, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // date
+ userInput = targetIndex.getOneBased() + DATE_DESC_BUBBLE_TEA;
+ descriptor = new EditTransactionDescriptorBuilder().withDate(VALID_DATE_BUBBLE_TEA).build();
+ expectedCommand = new EditCommand(targetIndex, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // categories
+ userInput = targetIndex.getOneBased() + CATEGORY_DESC_FOOD_BEVERAGE;
+ descriptor = new EditTransactionDescriptorBuilder().withCategories(VALID_CATEGORY_FOOD_BEVERAGE).build();
+ expectedCommand = new EditCommand(targetIndex, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_multipleRepeatedFields_failure() {
+ // multiple titles
+ assertParseFailure(parser, "1" + TITLE_DESC_BUBBLE_TEA + TITLE_DESC_INTERNSHIP,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_TITLE_CONSTRAINTS));
+ // multiple amounts
+ assertParseFailure(parser, "1" + AMOUNT_DESC_BUBBLE_TEA + AMOUNT_DESC_INTERNSHIP,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_AMOUNT_CONSTRAINTS));
+ // multiple dates
+ assertParseFailure(parser, "1" + DATE_DESC_BUBBLE_TEA + DATE_DESC_INTERNSHIP,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, Transaction.MESSAGE_DATE_CONSTRAINTS));
+ }
+
+ @Test
+ public void parse_resetCategories_success() {
+ Index targetIndex = INDEX_THIRD;
+ String userInput = targetIndex.getOneBased() + CATEGORY_EMPTY;
+
+ EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder().withCategories().build();
+ EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FinanceTrackerParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FinanceTrackerParserTest.java
new file mode 100644
index 00000000000..27d59ec44ad
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FinanceTrackerParserTest.java
@@ -0,0 +1,1157 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_METHOD_SHOULD_NOT_BE_CALLED;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ClearCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.DeleteCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ExitCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.FindCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.HelpCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.ListTransactionCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.TabCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.budget.SetExpenseLimitCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.budget.SetSavingsGoalCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.TitleContainsKeyphrasesPredicate;
+import ay2021s1_cs2103_w16_3.finesse.testutil.BookmarkTransactionUtil;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditBookmarkTransactionDescriptorBuilder;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditTransactionDescriptorBuilder;
+import ay2021s1_cs2103_w16_3.finesse.testutil.TransactionUtil;
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState;
+
+/**
+ * Tests the result of parsing each command within each tab. Note that each tab is its own
+ * equivalence partition.
+ */
+public class FinanceTrackerParserTest {
+
+ private final FinanceTrackerParser parser = new FinanceTrackerParser();
+ private final OverviewUiStateStub overviewUiStateStub = new OverviewUiStateStub();
+ private final IncomesUiStateStub incomesUiStateStub = new IncomesUiStateStub();
+ private final ExpensesUiStateStub expensesUiStateStub = new ExpensesUiStateStub();
+ private final AnalyticsUiStateStub analyticsUiStateStub = new AnalyticsUiStateStub();
+ private final UserGuideUiStateStub userGuideUiStateStub = new UserGuideUiStateStub();
+
+ private void parseCommand_addCommandOnInvalidTab_throwsParseException(UiStateStub uiStateStub) {
+ // Similar result as using an Income object instead.
+ Expense expense = new TransactionBuilder().buildExpense();
+ assertThrows(ParseException.class, () -> parser.parseCommand(
+ TransactionUtil.getAddCommand(expense), uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_addCommandOnOverviewTab_throwsParseException() {
+ parseCommand_addCommandOnInvalidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addCommandOnIncomesTab_returnsAddIncomeCommand() throws ParseException {
+ Income income = new TransactionBuilder().buildIncome();
+ AddIncomeCommand command =
+ (AddIncomeCommand) parser.parseCommand(TransactionUtil.getAddCommand(income), incomesUiStateStub);
+ assertEquals(new AddIncomeCommand(income), command);
+ }
+
+ @Test
+ public void parseCommand_addCommandOnExpensesTab_returnsAddExpenseCommand() throws ParseException {
+ Expense expense = new TransactionBuilder().buildExpense();
+ AddExpenseCommand command =
+ (AddExpenseCommand) parser.parseCommand(TransactionUtil.getAddCommand(expense), expensesUiStateStub);
+ assertEquals(new AddExpenseCommand(expense), command);
+ }
+
+ @Test
+ public void parseCommand_addCommandOnAnalyticsTab_throwsParseException() {
+ parseCommand_addCommandOnInvalidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addCommandOnUserGuideTab_throwsParseException() {
+ parseCommand_addCommandOnInvalidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_addExpenseCommandOnValidTab_returnsAddExpenseCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ Expense expense = new TransactionBuilder().buildExpense();
+ AddExpenseCommand command =
+ (AddExpenseCommand) parser.parseCommand(TransactionUtil.getAddExpenseCommand(expense),
+ uiStateStub);
+ assertEquals(new AddExpenseCommand(expense), command);
+ }
+
+ @Test
+ public void parseCommand_addExpenseCommandOnOverviewTab_returnsAddExpenseCommand() throws ParseException {
+ parseCommand_addExpenseCommandOnValidTab_returnsAddExpenseCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addExpenseCommandOnIncomesTab_returnsAddExpenseCommand() throws ParseException {
+ parseCommand_addExpenseCommandOnValidTab_returnsAddExpenseCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addExpenseCommandOnExpensesTab_returnsAddExpenseCommand() throws ParseException {
+ parseCommand_addExpenseCommandOnValidTab_returnsAddExpenseCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addExpenseCommandOnAnalyticsTab_returnsAddExpenseCommand() throws ParseException {
+ parseCommand_addExpenseCommandOnValidTab_returnsAddExpenseCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addExpenseCommandOnUserGuideTab_returnsAddExpenseCommand() throws ParseException {
+ parseCommand_addExpenseCommandOnValidTab_returnsAddExpenseCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_addIncomeCommandOnValidTab_returnsAddIncomeCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ Income income = new TransactionBuilder().buildIncome();
+ AddIncomeCommand command =
+ (AddIncomeCommand) parser.parseCommand(TransactionUtil.getAddIncomeCommand(income),
+ uiStateStub);
+ assertEquals(new AddIncomeCommand(income), command);
+ }
+
+ @Test
+ public void parseCommand_addIncomeCommandOnOverviewTab_returnsAddIncomeCommand() throws ParseException {
+ parseCommand_addIncomeCommandOnValidTab_returnsAddIncomeCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addIncomeCommandOnIncomesTab_returnsAddIncomeCommand() throws ParseException {
+ parseCommand_addIncomeCommandOnValidTab_returnsAddIncomeCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addIncomeCommandOnExpensesTab_returnsAddIncomeCommand() throws ParseException {
+ parseCommand_addIncomeCommandOnValidTab_returnsAddIncomeCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addIncomeCommandOnAnalyticsTab_returnsAddIncomeCommand() throws ParseException {
+ parseCommand_addIncomeCommandOnValidTab_returnsAddIncomeCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addIncomeCommandOnUserGuideTab_returnsAddIncomeCommand() throws ParseException {
+ parseCommand_addIncomeCommandOnValidTab_returnsAddIncomeCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_addBookmarkIncomeCommandOnValidTab_returnsAddBookmarkIncomeCommand(
+ UiStateStub uiStateStub) throws ParseException {
+ BookmarkIncome bookmarkIncome = new BookmarkTransactionBuilder().buildBookmarkIncome();
+ AddBookmarkIncomeCommand command =
+ (AddBookmarkIncomeCommand) parser.parseCommand(BookmarkTransactionUtil
+ .getAddBookmarkIncomeCommand(bookmarkIncome), uiStateStub);
+ assertEquals(new AddBookmarkIncomeCommand(bookmarkIncome), command);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkIncomeCommandOnOverviewTab_returnsAddBookmarkIncomeCommand()
+ throws ParseException {
+ parseCommand_addBookmarkIncomeCommandOnValidTab_returnsAddBookmarkIncomeCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkIncomeCommandOnIncomesTab_returnsAddBookmarkIncomeCommand()
+ throws ParseException {
+ parseCommand_addBookmarkIncomeCommandOnValidTab_returnsAddBookmarkIncomeCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkIncomeCommandOnExpensesTab_returnsAddBookmarkIncomeCommand()
+ throws ParseException {
+ parseCommand_addBookmarkIncomeCommandOnValidTab_returnsAddBookmarkIncomeCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkIncomeCommandOnAnalyticsTab_returnsAddBookmarkIncomeCommand()
+ throws ParseException {
+ parseCommand_addBookmarkIncomeCommandOnValidTab_returnsAddBookmarkIncomeCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkIncomeCommandOnUserGuideTab_returnsAddBookmarkIncomeCommand()
+ throws ParseException {
+ parseCommand_addBookmarkIncomeCommandOnValidTab_returnsAddBookmarkIncomeCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_addBookmarkExpenseCommandOnValidTab_returnsAddBookmarkExpenseCommand(
+ UiStateStub uiStateStub) throws ParseException {
+ BookmarkExpense bookmarkExpense = new BookmarkTransactionBuilder().buildBookmarkExpense();
+ AddBookmarkExpenseCommand command =
+ (AddBookmarkExpenseCommand) parser.parseCommand(BookmarkTransactionUtil
+ .getAddBookmarkExpenseCommand(bookmarkExpense), uiStateStub);
+ assertEquals(new AddBookmarkExpenseCommand(bookmarkExpense), command);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkExpenseCommandOnOverviewTab_returnsAddBookmarkExpenseCommand()
+ throws ParseException {
+ parseCommand_addBookmarkExpenseCommandOnValidTab_returnsAddBookmarkExpenseCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkExpenseCommandOnIncomesTab_returnsAddBookmarkExpenseCommand()
+ throws ParseException {
+ parseCommand_addBookmarkExpenseCommandOnValidTab_returnsAddBookmarkExpenseCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkExpenseCommandOnExpensesTab_returnsAddBookmarkExpenseCommand()
+ throws ParseException {
+ parseCommand_addBookmarkExpenseCommandOnValidTab_returnsAddBookmarkExpenseCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkExpenseCommandOnAnalyticsTab_returnsAddBookmarkExpenseCommand()
+ throws ParseException {
+ parseCommand_addBookmarkExpenseCommandOnValidTab_returnsAddBookmarkExpenseCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_addBookmarkExpenseCommandOnUserGuideTab_returnsAddBookmarkExpenseCommand()
+ throws ParseException {
+ parseCommand_addBookmarkExpenseCommandOnValidTab_returnsAddBookmarkExpenseCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_clearCommandOnValidTab_returnsClearCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD, uiStateStub) instanceof ClearCommand);
+ }
+
+ @Test
+ public void parseCommand_clearCommandOnOverviewTab_returnsClearCommand() throws ParseException {
+ parseCommand_clearCommandOnValidTab_returnsClearCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_clearCommandOnIncomesTab_returnsClearCommand() throws ParseException {
+ parseCommand_clearCommandOnValidTab_returnsClearCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_clearCommandOnExpensesTab_returnsClearCommand() throws ParseException {
+ parseCommand_clearCommandOnValidTab_returnsClearCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_clearCommandOnAnalyticsTab_returnsClearCommand() throws ParseException {
+ parseCommand_clearCommandOnValidTab_returnsClearCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_clearCommandOnUserGuideTab_returnsClearCommand() throws ParseException {
+ parseCommand_clearCommandOnValidTab_returnsClearCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_clearCommandWithArgsOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () ->
+ parser.parseCommand(ClearCommand.COMMAND_WORD + " a", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_clearCommandWithArgsOnOverviewTab_throwsParseException() {
+ parseCommand_clearCommandWithArgsOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_clearCommandWithArgsOnIncomesTab_throwsParseException() {
+ parseCommand_clearCommandWithArgsOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_clearCommandWithArgsOnExpensesTab_throwsParseException() {
+ parseCommand_clearCommandWithArgsOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_clearCommandWithArgsOnAnalyticsTab_throwsParseException() {
+ parseCommand_clearCommandWithArgsOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_clearCommandWithArgsOnUserGuideTab_throwsParseException() {
+ parseCommand_clearCommandWithArgsOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_deleteCommandOnValidTab_returnsDeleteCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ DeleteCommand command = (DeleteCommand) parser.parseCommand(
+ DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased(), uiStateStub);
+ assertEquals(new DeleteCommand(INDEX_FIRST), command);
+ }
+
+ private void parseCommand_deleteCommandOnInvalidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () -> parser.parseCommand(
+ DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased(), uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_deleteCommandOnOverviewTab_throwsParseException() {
+ parseCommand_deleteCommandOnInvalidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_deleteCommandOnIncomesTab_returnsDeleteCommand() throws ParseException {
+ parseCommand_deleteCommandOnValidTab_returnsDeleteCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_deleteCommandOnExpensesTab_returnsDeleteCommand() throws ParseException {
+ parseCommand_deleteCommandOnValidTab_returnsDeleteCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_deleteCommandOnAnalyticsTab_throwsParseException() {
+ parseCommand_deleteCommandOnInvalidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_deleteCommandOnUserGuideTab_throwsParseException() {
+ parseCommand_deleteCommandOnInvalidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_deleteBookmarkCommandOnValidTab_returnsDeleteBookmarkCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ DeleteBookmarkCommand command = (DeleteBookmarkCommand) parser.parseCommand(
+ DeleteBookmarkCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased(), uiStateStub);
+ assertEquals(new DeleteBookmarkCommand(INDEX_FIRST), command);
+ }
+
+ private void parseCommand_deleteBookmarkCommandOnInvalidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () -> parser.parseCommand(
+ DeleteBookmarkCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased(), uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_deleteBookmarkCommandOnOverviewTab_throwsParseException() {
+ parseCommand_deleteBookmarkCommandOnInvalidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_deleteBookmarkCommandOnIncomesTab_returnsDeleteBookmarkCommand() throws ParseException {
+ parseCommand_deleteBookmarkCommandOnValidTab_returnsDeleteBookmarkCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_deleteBookmarkCommandOnExpensesTab_returnsDeleteBookmarkCommand() throws ParseException {
+ parseCommand_deleteBookmarkCommandOnValidTab_returnsDeleteBookmarkCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_deleteBookmarkCommandOnAnalyticsTab_throwsParseException() {
+ parseCommand_deleteBookmarkCommandOnInvalidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_deleteBookmarkCommandOnUserGuideTab_throwsParseException() {
+ parseCommand_deleteBookmarkCommandOnInvalidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_editCommandOnInvalidTab_throwsParseException(UiStateStub uiStateStub) {
+ Expense expense = new TransactionBuilder().buildExpense();
+ EditCommand.EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder(expense).build();
+ assertThrows(ParseException.class, () -> parser.parseCommand(EditCommand.COMMAND_WORD + " "
+ + INDEX_FIRST.getOneBased() + " "
+ + TransactionUtil.getEditTransactionDescriptorDetails(descriptor), uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_editCommandOnOverviewTab_throwsParseException() {
+ parseCommand_editCommandOnInvalidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_editCommandOnIncomesTab_returnsEditCommand() throws ParseException {
+ Income income = new TransactionBuilder().buildIncome();
+ EditCommand.EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder(income).build();
+ EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
+ + INDEX_FIRST.getOneBased() + " "
+ + TransactionUtil.getEditTransactionDescriptorDetails(descriptor), incomesUiStateStub);
+ assertEquals(new EditCommand(INDEX_FIRST, descriptor), command);
+ }
+
+ @Test
+ public void parseCommand_editCommandOnExpensesTab_returnsEditCommand() throws ParseException {
+ Expense expense = new TransactionBuilder().buildExpense();
+ EditCommand.EditTransactionDescriptor descriptor = new EditTransactionDescriptorBuilder(expense).build();
+ EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
+ + INDEX_FIRST.getOneBased() + " "
+ + TransactionUtil.getEditTransactionDescriptorDetails(descriptor), expensesUiStateStub);
+ assertEquals(new EditCommand(INDEX_FIRST, descriptor), command);
+ }
+
+ @Test
+ public void parseCommand_editCommandOnAnalyticsTab_throwsParseException() {
+ parseCommand_editCommandOnInvalidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_editCommandOnUserGuideTab_throwsParseException() {
+ parseCommand_editCommandOnInvalidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_editBookmarkCommandOnInvalidTab_throwsParseException(UiStateStub uiStateStub) {
+ BookmarkExpense bookmarkExpense = new BookmarkTransactionBuilder().buildBookmarkExpense();
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder(bookmarkExpense)
+ .build();
+ assertThrows(ParseException.class, () -> parser.parseCommand(EditBookmarkCommand.COMMAND_WORD + " "
+ + INDEX_FIRST.getOneBased() + " "
+ + BookmarkTransactionUtil
+ .getEditBookmarkTransactionDescriptorDetails(descriptor), uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_editBookmarkCommandOnOverviewTab_throwsParseException() {
+ parseCommand_editBookmarkCommandOnInvalidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_editBookmarkCommandOnIncomesTab_returnsEditBookmarkCommand() throws ParseException {
+ BookmarkIncome bookmarkIncome = new BookmarkTransactionBuilder().buildBookmarkIncome();
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder(bookmarkIncome)
+ .build();
+ EditBookmarkCommand command = (EditBookmarkCommand) parser.parseCommand(EditBookmarkCommand.COMMAND_WORD + " "
+ + INDEX_FIRST.getOneBased() + " "
+ + BookmarkTransactionUtil
+ .getEditBookmarkTransactionDescriptorDetails(descriptor), incomesUiStateStub);
+ assertEquals(new EditBookmarkCommand(INDEX_FIRST, descriptor), command);
+ }
+
+ @Test
+ public void parseCommand_editBookmarkCommandOnExpensesTab_returnsEditBookmarkCommand() throws ParseException {
+ BookmarkExpense bookmarkExpense = new BookmarkTransactionBuilder().buildBookmarkExpense();
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder(bookmarkExpense)
+ .build();
+ EditBookmarkCommand command = (EditBookmarkCommand) parser.parseCommand(EditBookmarkCommand.COMMAND_WORD + " "
+ + INDEX_FIRST.getOneBased() + " "
+ + BookmarkTransactionUtil
+ .getEditBookmarkTransactionDescriptorDetails(descriptor), expensesUiStateStub);
+ assertEquals(new EditBookmarkCommand(INDEX_FIRST, descriptor), command);
+ }
+
+ @Test
+ public void parseCommand_editBookmarkCommandOnAnalyticsTab_throwsParseException() {
+ parseCommand_editBookmarkCommandOnInvalidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_editBookmarkCommandOnUserGuideTab_throwsParseException() {
+ parseCommand_editBookmarkCommandOnInvalidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_convertBookmarkCommandOnValidTab_returnsConvertBookmarkCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ Date testDate = new Date(VALID_DATE_INTERNSHIP);
+ ConvertBookmarkCommand command = (ConvertBookmarkCommand) parser.parseCommand(
+ ConvertBookmarkCommand.COMMAND_WORD + " "
+ + INDEX_FIRST.getOneBased() + " "
+ + PREFIX_DATE + VALID_DATE_INTERNSHIP,
+ uiStateStub);
+ assertEquals(new ConvertBookmarkCommand(INDEX_FIRST, testDate), command);
+ }
+
+ private void parseCommand_convertBookmarkCommandOnInvalidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () -> parser.parseCommand(
+ ConvertBookmarkCommand.COMMAND_WORD + " " + INDEX_FIRST.getOneBased(), uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_convertBookmarkCommandOnOverviewTab_throwsParseException() {
+ parseCommand_convertBookmarkCommandOnInvalidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_convertBookmarkCommandOnIncomesTab_returnsConvertBookmarkCommand() throws ParseException {
+ parseCommand_convertBookmarkCommandOnValidTab_returnsConvertBookmarkCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_convertBookmarkCommandOnExpensesTab_returnsConvertBookmarkCommand() throws ParseException {
+ parseCommand_convertBookmarkCommandOnValidTab_returnsConvertBookmarkCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_convertBookmarkCommandOnAnalyticsTab_throwsParseException() {
+ parseCommand_convertBookmarkCommandOnInvalidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_convertBookmarkCommandOnUserGuideTab_throwsParseException() {
+ parseCommand_convertBookmarkCommandOnInvalidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_exitCommandOnValidTab_returnsExitCommand(UiStateStub uiStateStub) throws ParseException {
+ assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD, uiStateStub) instanceof ExitCommand);
+ }
+
+ @Test
+ public void parseCommand_exitCommandOnOverviewTab_returnsExitCommand() throws ParseException {
+ parseCommand_exitCommandOnValidTab_returnsExitCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_exitCommandOnIncomesTab_returnsExitCommand() throws ParseException {
+ parseCommand_exitCommandOnValidTab_returnsExitCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_exitCommandOnExpensesTab_returnsExitCommand() throws ParseException {
+ parseCommand_exitCommandOnValidTab_returnsExitCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_exitCommandOnAnalyticsTab_returnsExitCommand() throws ParseException {
+ parseCommand_exitCommandOnValidTab_returnsExitCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_exitCommandOnUserGuideTab_returnsExitCommand() throws ParseException {
+ parseCommand_exitCommandOnValidTab_returnsExitCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_exitCommandWithArgsOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () ->
+ parser.parseCommand(ExitCommand.COMMAND_WORD + " a", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_exitCommandWithArgsOnOverviewTab_throwsParseException() {
+ parseCommand_exitCommandWithArgsOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_exitCommandWithArgsOnIncomesTab_throwsParseException() {
+ parseCommand_exitCommandWithArgsOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_exitCommandWithArgsOnExpensesTab_throwsParseException() {
+ parseCommand_exitCommandWithArgsOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_exitCommandWithArgsOnAnalyticsTab_throwsParseException() {
+ parseCommand_exitCommandWithArgsOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_exitCommandWithArgsOnUserGuideTab_throwsParseException() {
+ parseCommand_exitCommandWithArgsOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_findCommandOnValidTab_returnsFindCommand(UiStateStub uiStateStub) throws ParseException {
+ List<String> keywords = Arrays.asList("foo", "bar", "baz");
+ FindCommand command = (FindCommand) parser.parseCommand(
+ FindCommand.COMMAND_WORD + " " + PREFIX_TITLE + keywords.stream()
+ .collect(Collectors.joining(" " + PREFIX_TITLE)), uiStateStub);
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(new TitleContainsKeyphrasesPredicate(keywords));
+ assertEquals(new FindCommand(predicateList), command);
+ }
+
+ private void parseCommand_findCommandOnInvalidTab_throwsParseException(UiStateStub uiStateStub) {
+ List<String> keywords = Arrays.asList("foo", "bar", "baz");
+ assertThrows(ParseException.class, () -> parser.parseCommand(
+ FindCommand.COMMAND_WORD + " " + PREFIX_TITLE + keywords.stream()
+ .collect(Collectors.joining(" " + PREFIX_TITLE)), uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_findCommandOnOverviewTab_returnsFindCommand() throws ParseException {
+ parseCommand_findCommandOnValidTab_returnsFindCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_findCommandOnIncomesTab_returnsFindCommand() throws ParseException {
+ parseCommand_findCommandOnValidTab_returnsFindCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_findCommandOnExpensesTab_returnsFindCommand() throws ParseException {
+ parseCommand_findCommandOnValidTab_returnsFindCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_findCommandOnAnalyticsTab_throwsParseException() {
+ parseCommand_findCommandOnInvalidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_findCommandOnUserGuideTab_throwsParseException() {
+ parseCommand_findCommandOnInvalidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_helpCommandOnValidTab_returnsHelpCommand(UiStateStub uiStateStub) throws ParseException {
+ assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD, uiStateStub) instanceof HelpCommand);
+ }
+
+ @Test
+ public void parseCommand_helpCommandOnOverviewTab_returnsHelpCommand() throws ParseException {
+ parseCommand_helpCommandOnValidTab_returnsHelpCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_helpCommandOnIncomesTab_returnsHelpCommand() throws ParseException {
+ parseCommand_helpCommandOnValidTab_returnsHelpCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_helpCommandOnExpensesTab_returnsHelpCommand() throws ParseException {
+ parseCommand_helpCommandOnValidTab_returnsHelpCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_helpCommandOnAnalyticsTab_returnsHelpCommand() throws ParseException {
+ parseCommand_helpCommandOnValidTab_returnsHelpCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_helpCommandOnUserGuideTab_returnsHelpCommand() throws ParseException {
+ parseCommand_helpCommandOnValidTab_returnsHelpCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_helpCommandWithArgsOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () ->
+ parser.parseCommand(HelpCommand.COMMAND_WORD + " a", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_helpCommandWithArgsOnOverviewTab_throwsParseException() {
+ parseCommand_helpCommandWithArgsOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_helpCommandWithArgsOnIncomesTab_throwsParseException() {
+ parseCommand_helpCommandWithArgsOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_helpCommandWithArgsOnExpensesTab_throwsParseException() {
+ parseCommand_helpCommandWithArgsOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_helpCommandWithArgsOnAnalyticsTab_throwsParseException() {
+ parseCommand_helpCommandWithArgsOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_helpCommandWithArgsOnUserGuideTab_throwsParseException() {
+ parseCommand_helpCommandWithArgsOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_setExpenseLimitCommandOnValidTab_returnsSetExpenseLimitCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ String amount = "$500.00";
+ SetExpenseLimitCommand command = (SetExpenseLimitCommand) parser.parseCommand(
+ SetExpenseLimitCommand.COMMAND_WORD + " " + PREFIX_AMOUNT + amount, uiStateStub);
+ assertEquals(new SetExpenseLimitCommand(new Amount(amount)), command);
+ }
+
+ @Test
+ public void parseCommand_setExpenseLimitCommandOnOverviewTab_returnsSetExpenseLimitCommand() throws ParseException {
+ parseCommand_setExpenseLimitCommandOnValidTab_returnsSetExpenseLimitCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_setExpenseLimitCommandOnIncomesTab_returnsSetExpenseLimitCommand() throws ParseException {
+ parseCommand_setExpenseLimitCommandOnValidTab_returnsSetExpenseLimitCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_setExpenseLimitCommandOnExpensesTab_returnsSetExpenseLimitCommand() throws ParseException {
+ parseCommand_setExpenseLimitCommandOnValidTab_returnsSetExpenseLimitCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_setExpenseLimitCommandOnAnalyticsTab_returnsSetExpenseLimitCommand()
+ throws ParseException {
+ parseCommand_setExpenseLimitCommandOnValidTab_returnsSetExpenseLimitCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_setExpenseLimitCommandOnUserGuideTab_returnsSetExpenseLimitCommand()
+ throws ParseException {
+ parseCommand_setExpenseLimitCommandOnValidTab_returnsSetExpenseLimitCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_setSavingsGoalCommandOnValidTab_returnsSetSavingsGoalCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ String amount = "$500.00";
+ SetSavingsGoalCommand command = (SetSavingsGoalCommand) parser.parseCommand(
+ SetSavingsGoalCommand.COMMAND_WORD + " " + PREFIX_AMOUNT + amount, uiStateStub);
+ assertEquals(new SetSavingsGoalCommand(new Amount(amount)), command);
+ }
+
+ @Test
+ public void parseCommand_setSavingsGoalCommandOnOverviewTab_returnsSetSavingsGoalCommand() throws ParseException {
+ parseCommand_setSavingsGoalCommandOnValidTab_returnsSetSavingsGoalCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_setSavingsGoalCommandOnIncomesTab_returnsSetSavingsGoalCommand() throws ParseException {
+ parseCommand_setSavingsGoalCommandOnValidTab_returnsSetSavingsGoalCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_setSavingsGoalCommandOnExpensesTab_returnsSetSavingsGoalCommand() throws ParseException {
+ parseCommand_setSavingsGoalCommandOnValidTab_returnsSetSavingsGoalCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_setSavingsGoalCommandOnAnalyticsTab_returnsSetSavingsGoalCommand() throws ParseException {
+ parseCommand_setSavingsGoalCommandOnValidTab_returnsSetSavingsGoalCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_setSavingsGoalCommandOnUserGuideTab_returnsSetSavingsGoalCommand() throws ParseException {
+ parseCommand_setSavingsGoalCommandOnValidTab_returnsSetSavingsGoalCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_listCommandOnInvalidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () ->
+ parser.parseCommand(ListCommand.COMMAND_WORD, uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_listCommandOnOverviewTab_returnsListCommand() throws ParseException {
+ assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD, overviewUiStateStub)
+ instanceof ListTransactionCommand);
+ }
+
+ @Test
+ public void parseCommand_listCommandOnIncomesTab_returnsListCommand() throws ParseException {
+ assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD, incomesUiStateStub)
+ instanceof ListIncomeCommand);
+ }
+
+ @Test
+ public void parseCommand_listCommandOnExpensesTab_returnsListCommand() throws ParseException {
+ assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD, expensesUiStateStub)
+ instanceof ListExpenseCommand);
+ }
+
+ @Test
+ public void parseCommand_listCommandOnAnalyticsTab_returnsListCommand() {
+ parseCommand_listCommandOnInvalidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listCommandOnUserGuideTab_returnsListCommand() {
+ parseCommand_listCommandOnInvalidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_listCommandWithArgsOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () ->
+ parser.parseCommand(ListCommand.COMMAND_WORD + " a", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_listCommandWithArgsOnOverviewTab_throwsParseException() {
+ parseCommand_listCommandWithArgsOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listCommandWithArgsOnIncomesTab_throwsParseException() {
+ parseCommand_listCommandWithArgsOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listCommandWithArgsOnExpensesTab_throwsParseException() {
+ parseCommand_listCommandWithArgsOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listCommandWithArgsOnAnalyticsTab_throwsParseException() {
+ parseCommand_listCommandWithArgsOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listCommandWithArgsOnUserGuideTab_throwsParseException() {
+ parseCommand_listCommandWithArgsOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_listTransactionCommandOnValidTab_returnsListTransactionCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ assertTrue(parser.parseCommand(ListTransactionCommand.COMMAND_WORD, uiStateStub)
+ instanceof ListTransactionCommand);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandOnOverviewTab_returnsListTransactionCommand() throws ParseException {
+ parseCommand_listTransactionCommandOnValidTab_returnsListTransactionCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandOnIncomesTab_returnsListTransactionCommand() throws ParseException {
+ parseCommand_listTransactionCommandOnValidTab_returnsListTransactionCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandOnExpensesTab_returnsListTransactionCommand() throws ParseException {
+ parseCommand_listTransactionCommandOnValidTab_returnsListTransactionCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandOnAnalyticsTab_returnsListTransactionCommand()
+ throws ParseException {
+ parseCommand_listTransactionCommandOnValidTab_returnsListTransactionCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandOnUserGuideTab_returnsListTransactionCommand()
+ throws ParseException {
+ parseCommand_listTransactionCommandOnValidTab_returnsListTransactionCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_listTransactionCommandWithArgsOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () ->
+ parser.parseCommand(ListTransactionCommand.COMMAND_WORD + " a", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandWithArgsOnOverviewTab_throwsParseException() {
+ parseCommand_listTransactionCommandWithArgsOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandWithArgsOnIncomesTab_throwsParseException() {
+ parseCommand_listTransactionCommandWithArgsOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandWithArgsOnExpensesTab_throwsParseException() {
+ parseCommand_listTransactionCommandWithArgsOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandWithArgsOnAnalyticsTab_throwsParseException() {
+ parseCommand_listTransactionCommandWithArgsOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listTransactionCommandWithArgsOnUserGuideTab_throwsParseException() {
+ parseCommand_listTransactionCommandWithArgsOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_listExpenseCommandOnValidTab_returnsListExpenseCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ assertTrue(parser.parseCommand(ListExpenseCommand.COMMAND_WORD, uiStateStub)
+ instanceof ListExpenseCommand);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandOnOverviewTab_returnsListExpenseCommand() throws ParseException {
+ parseCommand_listExpenseCommandOnValidTab_returnsListExpenseCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandOnIncomesTab_returnsListExpenseCommand() throws ParseException {
+ parseCommand_listExpenseCommandOnValidTab_returnsListExpenseCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandOnExpensesTab_returnsListExpenseCommand() throws ParseException {
+ parseCommand_listExpenseCommandOnValidTab_returnsListExpenseCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandOnAnalyticsTab_returnsListExpenseCommand() throws ParseException {
+ parseCommand_listExpenseCommandOnValidTab_returnsListExpenseCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandOnUserGuideTab_returnsListExpenseCommand() throws ParseException {
+ parseCommand_listExpenseCommandOnValidTab_returnsListExpenseCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_listExpenseCommandWithArgsOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () ->
+ parser.parseCommand(ListExpenseCommand.COMMAND_WORD + " a", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandWithArgsOnOverviewTab_throwsParseException() {
+ parseCommand_listExpenseCommandWithArgsOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandWithArgsOnIncomesTab_throwsParseException() {
+ parseCommand_listExpenseCommandWithArgsOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandWithArgsOnExpensesTab_throwsParseException() {
+ parseCommand_listExpenseCommandWithArgsOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandWithArgsOnAnalyticsTab_throwsParseException() {
+ parseCommand_listExpenseCommandWithArgsOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listExpenseCommandWithArgsOnUserGuideTab_throwsParseException() {
+ parseCommand_listExpenseCommandWithArgsOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_listIncomeCommandOnValidTab_returnsListIncomeCommand(UiStateStub uiStateStub)
+ throws ParseException {
+ assertTrue(parser.parseCommand(ListIncomeCommand.COMMAND_WORD, uiStateStub)
+ instanceof ListIncomeCommand);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandOnOverviewTab_returnsListIncomeCommand() throws ParseException {
+ parseCommand_listIncomeCommandOnValidTab_returnsListIncomeCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandOnIncomesTab_returnsListIncomeCommand() throws ParseException {
+ parseCommand_listIncomeCommandOnValidTab_returnsListIncomeCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandOnExpensesTab_returnsListIncomeCommand() throws ParseException {
+ parseCommand_listIncomeCommandOnValidTab_returnsListIncomeCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandOnAnalyticsTab_returnsListIncomeCommand() throws ParseException {
+ parseCommand_listIncomeCommandOnValidTab_returnsListIncomeCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandOnUserGuideTab_returnsListIncomeCommand() throws ParseException {
+ parseCommand_listIncomeCommandOnValidTab_returnsListIncomeCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_listIncomeCommandWithArgsOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, () ->
+ parser.parseCommand(ListIncomeCommand.COMMAND_WORD + " a", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandWithArgsOnOverviewTab_throwParseException() {
+ parseCommand_listIncomeCommandWithArgsOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandWithArgsOnIncomesTab_throwsParseException() {
+ parseCommand_listIncomeCommandWithArgsOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandWithArgsOnExpensesTab_throwsParseException() {
+ parseCommand_listIncomeCommandWithArgsOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandWithArgsOnAnalyticsTab_throwsParseException() {
+ parseCommand_listIncomeCommandWithArgsOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_listIncomeCommandWithArgsOnUserGuideTab_throwsParseException() {
+ parseCommand_listIncomeCommandWithArgsOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_tabCommandOnValidTab_returnsTabCommand(UiStateStub uiStateStub) throws ParseException {
+ TabCommand command = (TabCommand) parser.parseCommand(
+ TabCommand.COMMAND_WORD + " 1", uiStateStub);
+ assertEquals(new TabCommand(Index.fromOneBased(1)), command);
+ }
+
+ @Test
+ public void parseCommand_tabCommandOnOverviewTab_returnsTabCommand() throws ParseException {
+ parseCommand_tabCommandOnValidTab_returnsTabCommand(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_tabCommandOnIncomesTab_returnsTabCommand() throws ParseException {
+ parseCommand_tabCommandOnValidTab_returnsTabCommand(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_tabCommandOnExpensesTab_returnsTabCommand() throws ParseException {
+ parseCommand_tabCommandOnValidTab_returnsTabCommand(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_tabCommandOnAnalyticsTab_returnsTabCommand() throws ParseException {
+ parseCommand_tabCommandOnValidTab_returnsTabCommand(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_tabCommandOnUserGuideTab_returnsTabCommand() throws ParseException {
+ parseCommand_tabCommandOnValidTab_returnsTabCommand(userGuideUiStateStub);
+ }
+
+ private void parseCommand_unrecognizedInputOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), () ->
+ parser.parseCommand("", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_unrecognizedInputOnOverviewTab_throwsParseException() {
+ parseCommand_unrecognizedInputOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_unrecognizedInputOnIncomesTab_throwsParseException() {
+ parseCommand_unrecognizedInputOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_unrecognizedInputOnExpensesTab_throwsParseException() {
+ parseCommand_unrecognizedInputOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_unrecognizedInputOnAnalyticsTab_throwsParseException() {
+ parseCommand_unrecognizedInputOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_unrecognizedInputOnUserGuideTab_throwsParseException() {
+ parseCommand_unrecognizedInputOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ private void parseCommand_unknownCommandOnValidTab_throwsParseException(UiStateStub uiStateStub) {
+ assertThrows(ParseException.class, MESSAGE_UNKNOWN_COMMAND, () ->
+ parser.parseCommand("unknownCommand", uiStateStub));
+ }
+
+ @Test
+ public void parseCommand_unknownCommandOnOverviewTab_throwsParseException() {
+ parseCommand_unknownCommandOnValidTab_throwsParseException(overviewUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_unknownCommandOnIncomesTab_throwsParseException() {
+ parseCommand_unknownCommandOnValidTab_throwsParseException(incomesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_unknownCommandOnExpensesTab_throwsParseException() {
+ parseCommand_unknownCommandOnValidTab_throwsParseException(expensesUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_unknownCommandOnAnalyticsTab_throwsParseException() {
+ parseCommand_unknownCommandOnValidTab_throwsParseException(analyticsUiStateStub);
+ }
+
+ @Test
+ public void parseCommand_unknownCommandOnUserGuideTab_throwsParseException() {
+ parseCommand_unknownCommandOnValidTab_throwsParseException(userGuideUiStateStub);
+ }
+
+ /**
+ * A default {@code UiState} stub that has all of the methods failing.
+ */
+ private static class UiStateStub extends UiState {
+ @Override
+ public Tab getCurrentTab() {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+
+ @Override
+ public void setCurrentTab(Tab currentTab) {
+ throw new AssertionError(MESSAGE_METHOD_SHOULD_NOT_BE_CALLED);
+ }
+ }
+
+ /**
+ * A {@code UiState} stub that always returns the 'Overview' tab as the current tab.
+ */
+ public static class OverviewUiStateStub extends UiStateStub {
+ @Override
+ public Tab getCurrentTab() {
+ return Tab.OVERVIEW;
+ }
+ }
+
+ /**
+ * A {@code UiState} stub that always returns the 'Income' tab as the current tab.
+ */
+ public static class IncomesUiStateStub extends UiStateStub {
+ @Override
+ public Tab getCurrentTab() {
+ return Tab.INCOME;
+ }
+ }
+
+ /**
+ * A {@code UiState} stub that always returns the 'Expenses' tab as the current tab.
+ */
+ public static class ExpensesUiStateStub extends UiStateStub {
+ @Override
+ public Tab getCurrentTab() {
+ return Tab.EXPENSES;
+ }
+ }
+
+ /**
+ * A {@code UiState} stub that always returns the 'Analytics' tab as the current tab.
+ */
+ public static class AnalyticsUiStateStub extends UiStateStub {
+ @Override
+ public Tab getCurrentTab() {
+ return Tab.ANALYTICS;
+ }
+ }
+
+ /**
+ * A {@code UiState} stub that always returns the 'User Guide' tab as the current tab.
+ */
+ public static class UserGuideUiStateStub extends UiStateStub {
+ @Override
+ public Tab getCurrentTab() {
+ return Tab.USER_GUIDE;
+ }
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FindCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FindCommandParserTest.java
new file mode 100644
index 00000000000..9960dfaf7a9
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/FindCommandParserTest.java
@@ -0,0 +1,267 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT_FROM;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT_TO;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE_FROM;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE_TO;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_AMOUNT_DUPLICATE_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_AMOUNT_FROM_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_AMOUNT_RANGE_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_AMOUNT_SEARCH_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_AMOUNT_TO_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_DATE_DUPLICATE_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_DATE_FROM_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_DATE_RANGE_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_DATE_SEARCH_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_DATE_TO_CONSTRAINTS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FindCommandParser.MESSAGE_EMPTY_TITLE_KEYPHRASE;
+import static ay2021s1_cs2103_w16_3.finesse.model.category.Category.MESSAGE_EMPTY_CATEGORY;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.FindCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.HasCategoriesPredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.HasExactAmountPredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.InAmountRangePredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.InDateRangePredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.OnExactDatePredicate;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.TitleContainsKeyphrasesPredicate;
+
+public class FindCommandParserTest {
+
+ // These strings are only used in FindCommandParserTest, hence are defined here instead of in CommandTestUtil
+ public static final String AMOUNT_FROM_DESC_BUBBLE_TEA = " " + PREFIX_AMOUNT_FROM + VALID_AMOUNT_BUBBLE_TEA;
+ public static final String AMOUNT_TO_DESC_BUBBLE_TEA = " " + PREFIX_AMOUNT_TO + VALID_AMOUNT_BUBBLE_TEA;
+ public static final String AMOUNT_FROM_DESC_INTERNSHIP = " " + PREFIX_AMOUNT_FROM + VALID_AMOUNT_INTERNSHIP;
+ public static final String AMOUNT_TO_DESC_INTERNSHIP = " " + PREFIX_AMOUNT_TO + VALID_AMOUNT_INTERNSHIP;
+ public static final String DATE_FROM_DESC_BUBBLE_TEA = " " + PREFIX_DATE_FROM + VALID_DATE_BUBBLE_TEA;
+ public static final String DATE_TO_DESC_BUBBLE_TEA = " " + PREFIX_DATE_TO + VALID_DATE_BUBBLE_TEA;
+ public static final String DATE_FROM_DESC_INTERNSHIP = " " + PREFIX_DATE_FROM + VALID_DATE_INTERNSHIP;
+ public static final String DATE_TO_DESC_INTERNSHIP = " " + PREFIX_DATE_TO + VALID_DATE_INTERNSHIP;
+
+ private FindCommandParser parser = new FindCommandParser();
+
+ @Test
+ public void parse_validTitleKeyphrases_success() {
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ // one title keyphrase
+ predicateList.add(new TitleContainsKeyphrasesPredicate(Arrays.asList(VALID_TITLE_BUBBLE_TEA)));
+ FindCommand expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, TITLE_DESC_BUBBLE_TEA, expectedFindCommand);
+
+ // multiple title keyphrases
+ predicateList = new ArrayList<>();
+ predicateList.add(new TitleContainsKeyphrasesPredicate(
+ Arrays.asList(VALID_TITLE_BUBBLE_TEA, VALID_TITLE_INTERNSHIP)));
+ expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, TITLE_DESC_BUBBLE_TEA + TITLE_DESC_INTERNSHIP, expectedFindCommand);
+ }
+
+ @Test
+ public void parse_validAmount_success() {
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(new HasExactAmountPredicate(new Amount(VALID_AMOUNT_BUBBLE_TEA)));
+ FindCommand expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, AMOUNT_DESC_BUBBLE_TEA, expectedFindCommand);
+ }
+
+ @Test
+ public void parse_validDate_success() {
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(new OnExactDatePredicate(new Date(VALID_DATE_BUBBLE_TEA)));
+ FindCommand expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, DATE_DESC_BUBBLE_TEA, expectedFindCommand);
+ }
+
+ @Test
+ public void parse_validCategories_success() {
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ // one category
+ predicateList.add(new HasCategoriesPredicate(Arrays.asList(VALID_CATEGORY_FOOD_BEVERAGE)));
+ FindCommand expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, CATEGORY_DESC_FOOD_BEVERAGE, expectedFindCommand);
+
+ // multiple categories
+ predicateList = new ArrayList<>();
+ predicateList.add(new HasCategoriesPredicate(
+ Arrays.asList(VALID_CATEGORY_FOOD_BEVERAGE, VALID_CATEGORY_WORK)));
+ expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, CATEGORY_DESC_FOOD_BEVERAGE + CATEGORY_DESC_WORK, expectedFindCommand);
+ }
+
+ @Test
+ public void parse_validAmountRange_success() {
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ // VALID_AMOUNT_BUBBLE_TEA is less than VALID_AMOUNT_INTERNSHIP
+ Optional<Amount> lowerBound = Optional.of(new Amount(VALID_AMOUNT_BUBBLE_TEA));
+ Optional<Amount> upperBound = Optional.of(new Amount(VALID_AMOUNT_INTERNSHIP));
+
+ // lower bound only
+ predicateList.add(new InAmountRangePredicate(lowerBound, Optional.empty()));
+ FindCommand expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, AMOUNT_FROM_DESC_BUBBLE_TEA, expectedFindCommand);
+
+ // upper bound only
+ predicateList = new ArrayList<>();
+ predicateList.add(new InAmountRangePredicate(Optional.empty(), upperBound));
+ expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, AMOUNT_TO_DESC_INTERNSHIP, expectedFindCommand);
+
+ // upper and lower bound
+ predicateList = new ArrayList<>();
+ predicateList.add(new InAmountRangePredicate(lowerBound, upperBound));
+ expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, AMOUNT_FROM_DESC_BUBBLE_TEA + AMOUNT_TO_DESC_INTERNSHIP, expectedFindCommand);
+
+ // same upper and lower bound values
+ predicateList = new ArrayList<>();
+ predicateList.add(new InAmountRangePredicate(upperBound, upperBound));
+ expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, AMOUNT_FROM_DESC_INTERNSHIP + AMOUNT_TO_DESC_INTERNSHIP, expectedFindCommand);
+ }
+
+ @Test
+ public void parse_validDateRange_success() {
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ // VALID_DATE_INTERNSHIP is earlier than VALID_DATE_BUBBLE_TEA
+ Optional<Date> lowerBound = Optional.of(new Date(VALID_DATE_INTERNSHIP));
+ Optional<Date> upperBound = Optional.of(new Date(VALID_DATE_BUBBLE_TEA));
+
+ // lower bound only
+ predicateList.add(new InDateRangePredicate(lowerBound, Optional.empty()));
+ FindCommand expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, DATE_FROM_DESC_INTERNSHIP, expectedFindCommand);
+
+ // upper bound only
+ predicateList = new ArrayList<>();
+ predicateList.add(new InDateRangePredicate(Optional.empty(), upperBound));
+ expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, DATE_TO_DESC_BUBBLE_TEA, expectedFindCommand);
+
+ // upper and lower bound
+ predicateList = new ArrayList<>();
+ predicateList.add(new InDateRangePredicate(lowerBound, upperBound));
+ expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, DATE_FROM_DESC_INTERNSHIP + DATE_TO_DESC_BUBBLE_TEA, expectedFindCommand);
+
+ // same upper and lower bound values
+ predicateList = new ArrayList<>();
+ predicateList.add(new InDateRangePredicate(upperBound, upperBound));
+ expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, DATE_FROM_DESC_BUBBLE_TEA + DATE_TO_DESC_BUBBLE_TEA, expectedFindCommand);
+ }
+
+ @Test
+ public void parse_multipleSearchParameters_success() {
+ List<Predicate<Transaction>> predicateList = new ArrayList<>();
+ predicateList.add(new TitleContainsKeyphrasesPredicate(Arrays.asList(VALID_TITLE_BUBBLE_TEA)));
+ predicateList.add(new HasExactAmountPredicate(new Amount(VALID_AMOUNT_BUBBLE_TEA)));
+ FindCommand expectedFindCommand = new FindCommand(predicateList);
+ assertParseSuccess(parser, TITLE_DESC_BUBBLE_TEA + AMOUNT_DESC_BUBBLE_TEA, expectedFindCommand);
+ }
+
+ @Test
+ public void parse_invalidCommandFormat_failure() {
+ assertParseFailure(parser, PREAMBLE_WHITESPACE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_hasEmptyArgs_failure() {
+ // empty title keyphrase
+ assertParseFailure(parser, " " + PREFIX_TITLE, MESSAGE_EMPTY_TITLE_KEYPHRASE);
+
+ // empty title keyphrase followed by non-empty title keyphrase
+ assertParseFailure(parser, " " + PREFIX_TITLE + TITLE_DESC_BUBBLE_TEA, MESSAGE_EMPTY_TITLE_KEYPHRASE);
+
+ // empty category
+ assertParseFailure(parser, " " + PREFIX_CATEGORY, MESSAGE_EMPTY_CATEGORY);
+
+ // empty category followed by non-empty category
+ assertParseFailure(parser, " " + PREFIX_CATEGORY + CATEGORY_DESC_FOOD_BEVERAGE, MESSAGE_EMPTY_CATEGORY);
+
+ // multiple empty search parameters, first error message thrown
+ assertParseFailure(parser, " " + PREFIX_TITLE + " " + PREFIX_CATEGORY, MESSAGE_EMPTY_TITLE_KEYPHRASE);
+ }
+
+ @Test
+ public void parse_hasDuplicateArgs_failure() {
+ assertParseFailure(parser, PREAMBLE_WHITESPACE,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+
+ // duplicate amount search parameters
+ assertParseFailure(parser, AMOUNT_DESC_BUBBLE_TEA + AMOUNT_DESC_INTERNSHIP,
+ MESSAGE_AMOUNT_DUPLICATE_CONSTRAINTS);
+ assertParseFailure(parser, AMOUNT_FROM_DESC_BUBBLE_TEA + AMOUNT_FROM_DESC_INTERNSHIP,
+ MESSAGE_AMOUNT_FROM_CONSTRAINTS);
+ assertParseFailure(parser, AMOUNT_TO_DESC_BUBBLE_TEA + AMOUNT_TO_DESC_INTERNSHIP,
+ MESSAGE_AMOUNT_TO_CONSTRAINTS);
+
+ // duplicate date search parameters
+ assertParseFailure(parser, DATE_DESC_BUBBLE_TEA + DATE_DESC_INTERNSHIP,
+ MESSAGE_DATE_DUPLICATE_CONSTRAINTS);
+ assertParseFailure(parser, DATE_FROM_DESC_BUBBLE_TEA + DATE_FROM_DESC_INTERNSHIP,
+ MESSAGE_DATE_FROM_CONSTRAINTS);
+ assertParseFailure(parser, DATE_TO_DESC_BUBBLE_TEA + DATE_TO_DESC_INTERNSHIP,
+ MESSAGE_DATE_TO_CONSTRAINTS);
+ }
+
+ @Test
+ public void parse_invalidRangeSearch_failure() {
+ // amount cannot be used with amount range
+ assertParseFailure(parser, AMOUNT_DESC_BUBBLE_TEA + AMOUNT_FROM_DESC_INTERNSHIP,
+ MESSAGE_AMOUNT_SEARCH_CONSTRAINTS);
+ assertParseFailure(parser, AMOUNT_DESC_BUBBLE_TEA + AMOUNT_TO_DESC_INTERNSHIP,
+ MESSAGE_AMOUNT_SEARCH_CONSTRAINTS);
+
+ // invalid amount range - VALID_AMOUNT_BUBBLE_TEA is less than VALID_AMOUNT_INTERNSHIP
+ assertParseFailure(parser, AMOUNT_FROM_DESC_INTERNSHIP + AMOUNT_TO_DESC_BUBBLE_TEA,
+ MESSAGE_AMOUNT_RANGE_CONSTRAINTS);
+
+ // date cannot be used with date range
+ assertParseFailure(parser, DATE_DESC_BUBBLE_TEA + DATE_FROM_DESC_INTERNSHIP,
+ MESSAGE_DATE_SEARCH_CONSTRAINTS);
+ assertParseFailure(parser, DATE_DESC_BUBBLE_TEA + DATE_TO_DESC_INTERNSHIP,
+ MESSAGE_DATE_SEARCH_CONSTRAINTS);
+
+ // invalid date range - VALID_DATE_INTERNSHIP is earlier than VALID_DATE_BUBBLE_TEA
+ assertParseFailure(parser, DATE_FROM_DESC_BUBBLE_TEA + DATE_TO_DESC_INTERNSHIP,
+ MESSAGE_DATE_RANGE_CONSTRAINTS);
+
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ParserUtilTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ParserUtilTest.java
new file mode 100644
index 00000000000..c74b7193d81
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/ParserUtilTest.java
@@ -0,0 +1,333 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE_FROM;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.ParserUtil.MESSAGE_INVALID_INDEX;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.exceptions.ParseException;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+public class ParserUtilTest {
+ private static final String INVALID_TITLE = "\u2416Bubble Tea";
+ private static final String INVALID_AMOUNT = "+651234";
+ private static final String INVALID_DATE = "example.com";
+ private static final String INVALID_CATEGORY = "\u2416friend";
+
+ private static final String VALID_TITLE = "Phone Bill";
+ private static final String VALID_AMOUNT = "123456";
+ private static final String VALID_DATE = "01/01/2020";
+ private static final String VALID_CATEGORY_1 = "friend";
+ private static final String VALID_CATEGORY_2 = "neighbour";
+
+ private static final String WHITESPACE = " \t\r\n";
+
+ private static final String EXCEPTION_MESSAGE = "This is an exception message.";
+
+ @Test
+ public void parseIndex_invalidInput_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseIndex("10 a"));
+ }
+
+ @Test
+ public void parseIndex_outOfRangeInput_throwsParseException() {
+ assertThrows(ParseException.class, MESSAGE_INVALID_INDEX, ()
+ -> ParserUtil.parseIndex(Long.toString(Integer.MAX_VALUE + 1)));
+ }
+
+ @Test
+ public void parseIndex_validInput_success() throws Exception {
+ // No whitespaces
+ assertEquals(INDEX_FIRST, ParserUtil.parseIndex("1"));
+
+ // Leading and trailing whitespaces
+ assertEquals(INDEX_FIRST, ParserUtil.parseIndex(" 1 "));
+ }
+
+ @Test
+ public void parseTitle_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseTitle((String) null));
+ }
+
+ @Test
+ public void parseTitle_emptyValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseTitle(WHITESPACE));
+ }
+
+ @Test
+ public void parseTitle_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseTitle(INVALID_TITLE));
+ }
+
+ @Test
+ public void parseTitle_validValueWithoutWhitespace_returnsTitle() throws Exception {
+ Title expectedTitle = new Title(VALID_TITLE);
+ assertEquals(expectedTitle, ParserUtil.parseTitle(VALID_TITLE));
+ }
+
+ @Test
+ public void parseTitle_validValueWithWhitespace_returnsTrimmedTitle() throws Exception {
+ String titleWithWhitespace = WHITESPACE + VALID_TITLE + WHITESPACE;
+ Title expectedTitle = new Title(VALID_TITLE);
+ assertEquals(expectedTitle, ParserUtil.parseTitle(titleWithWhitespace));
+ }
+
+ @Test
+ public void parseTitleWithAdditionalWhitespace_returnsTitle() throws Exception {
+ String moreThanOneWhitespace = WHITESPACE + WHITESPACE + WHITESPACE;
+ String titleWithExtraWhitespaceBetweenWords = VALID_TITLE.replaceAll(WHITESPACE, moreThanOneWhitespace);
+ Title expectedTitle = new Title(VALID_TITLE);
+ assertEquals(expectedTitle,
+ ParserUtil.parseTitleAndTrimBetweenWords(titleWithExtraWhitespaceBetweenWords));
+ }
+
+ @Test
+ public void parseAmount_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseAmount((String) null));
+ }
+
+ @Test
+ public void parseAmount_emptyValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseAmount(WHITESPACE));
+ }
+
+ @Test
+ public void parseAmount_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseAmount(INVALID_AMOUNT));
+ }
+
+ @Test
+ public void parseAmount_validValueWithoutWhitespace_returnsAmount() throws Exception {
+ Amount expectedAmount = new Amount(VALID_AMOUNT);
+ assertEquals(expectedAmount, ParserUtil.parseAmount(VALID_AMOUNT));
+ }
+
+ @Test
+ public void parseAmount_validValueWithWhitespace_returnsTrimmedAmount() throws Exception {
+ String amountWithWhitespace = WHITESPACE + VALID_AMOUNT + WHITESPACE;
+ Amount expectedAmount = new Amount(VALID_AMOUNT);
+ assertEquals(expectedAmount, ParserUtil.parseAmount(amountWithWhitespace));
+ }
+
+ @Test
+ public void parseDate_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseDate((String) null));
+ }
+
+ @Test
+ public void parseDate_emptyValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseDate(WHITESPACE));
+ }
+
+ @Test
+ public void parseDate_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseDate(INVALID_DATE));
+ }
+
+ @Test
+ public void parseDate_validValueWithoutWhitespace_returnsDate() throws Exception {
+ Date expectedDate = new Date(VALID_DATE);
+ assertEquals(expectedDate, ParserUtil.parseDate(VALID_DATE));
+ }
+
+ @Test
+ public void parseDate_validValueWithWhitespace_returnsTrimmedDate() throws Exception {
+ String dateWithWhitespace = WHITESPACE + VALID_DATE + WHITESPACE;
+ Date expectedDate = new Date(VALID_DATE);
+ assertEquals(expectedDate, ParserUtil.parseDate(dateWithWhitespace));
+ }
+
+ @Test
+ public void parseCategory_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseCategory(null));
+ }
+
+ @Test
+ public void parseCategory_emptyValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseCategory(WHITESPACE));
+ }
+
+ @Test
+ public void parseCategory_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseCategory(INVALID_CATEGORY));
+ }
+
+ @Test
+ public void parseCategory_validValueWithoutWhitespace_returnsCategory() throws Exception {
+ Category expectedCategory = new Category(VALID_CATEGORY_1);
+ assertEquals(expectedCategory, ParserUtil.parseCategory(VALID_CATEGORY_1));
+ }
+
+ @Test
+ public void parseCategory_validValueWithWhitespace_returnsTrimmedCategory() throws Exception {
+ String categoryWithWhitespace = WHITESPACE + VALID_CATEGORY_1 + WHITESPACE;
+ Category expectedCategory = new Category(VALID_CATEGORY_1);
+ assertEquals(expectedCategory, ParserUtil.parseCategory(categoryWithWhitespace));
+ }
+
+ @Test
+ public void parseCategories_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseCategories(null));
+ }
+
+ @Test
+ public void parseCategories_collectionWithInvalidCategories_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseCategories(
+ Arrays.asList(VALID_CATEGORY_1, INVALID_CATEGORY)));
+ }
+
+ @Test
+ public void parseCategories_emptyCollection_returnsEmptySet() throws Exception {
+ assertTrue(ParserUtil.parseCategories(Collections.emptyList()).isEmpty());
+ }
+
+ @Test
+ public void parseCategories_collectionWithValidCategories_returnsCategorySet() throws Exception {
+ Set<Category> actualCategorySet = ParserUtil.parseCategories(Arrays.asList(VALID_CATEGORY_1, VALID_CATEGORY_2));
+ Set<Category> expectedCategorySet = new HashSet<Category>(Arrays.asList(new Category(VALID_CATEGORY_1),
+ new Category(VALID_CATEGORY_2)));
+
+ assertEquals(expectedCategorySet, actualCategorySet);
+ }
+
+ @Test
+ public void parseBookmarkTransactionBuilder_missingTitle_throwsParseException() {
+ String args = " " + PREFIX_AMOUNT + VALID_AMOUNT;
+ assertThrows(ParseException.class, () ->
+ ParserUtil.parseBookmarkTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseBookmarkTransactionBuilder_missingAmount_throwsParseException() {
+ String args = " " + PREFIX_TITLE + VALID_TITLE;
+ assertThrows(ParseException.class, () ->
+ ParserUtil.parseBookmarkTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseBookmarkTransactionBuilder_nonEmptyPreamble_throwsParseException() {
+ String args = "hello " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_AMOUNT + VALID_AMOUNT;
+ assertThrows(ParseException.class, () ->
+ ParserUtil.parseBookmarkTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseBookmarkTransactionBuilder_moreThanOneTitle_throwsParseException() {
+ String args = " " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_TITLE + VALID_TITLE;
+ assertThrows(ParseException.class, () ->
+ ParserUtil.parseBookmarkTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseBookmarkTransactionBuilder_moreThanOneAmount_throwsParseException() {
+ String args = " " + PREFIX_AMOUNT + VALID_AMOUNT + " " + PREFIX_AMOUNT + VALID_AMOUNT;
+ assertThrows(ParseException.class, () ->
+ ParserUtil.parseBookmarkTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseBookmarkTransactionBuilder_invalidPrefixPresent_throwsParseException() {
+ String args = " " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_AMOUNT + VALID_AMOUNT
+ + " " + PREFIX_DATE + VALID_DATE;
+ assertThrows(ParseException.class, () ->
+ ParserUtil.parseBookmarkTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseBookmarkTransactionBuilder_validInputs_returnsBookmarkTransactionBuilder() throws ParseException {
+ String args = " " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_AMOUNT + VALID_AMOUNT
+ + " " + PREFIX_CATEGORY + VALID_CATEGORY_1;
+ Title title = new Title(VALID_TITLE);
+ Amount amount = new Amount(VALID_AMOUNT);
+ Set<Category> categorySet = new HashSet<>();
+ categorySet.add(new Category(VALID_CATEGORY_1));
+ assertEquals(new BookmarkTransactionBuilder(title, amount, categorySet),
+ ParserUtil.parseBookmarkTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_missingTitle_throwsParseException() {
+ String args = " " + PREFIX_AMOUNT + VALID_AMOUNT;
+ assertThrows(ParseException.class, () -> ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_missingAmount_throwsParseException() {
+ String args = " " + PREFIX_TITLE + VALID_TITLE;
+ assertThrows(ParseException.class, () -> ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_nonEmptyPreamble_throwsParseException() {
+ String args = "hello " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_AMOUNT + VALID_AMOUNT;
+ assertThrows(ParseException.class, () -> ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_moreThanOneTitle_throwsParseException() {
+ String args = " " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_TITLE + VALID_TITLE;
+ assertThrows(ParseException.class, () -> ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_moreThanOneAmount_throwsParseException() {
+ String args = " " + PREFIX_AMOUNT + VALID_AMOUNT + " " + PREFIX_AMOUNT + VALID_AMOUNT;
+ assertThrows(ParseException.class, () -> ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_moreThanOneDate_throwsParseException() {
+ String args = " " + PREFIX_DATE + VALID_DATE + " " + PREFIX_DATE + VALID_DATE;
+ assertThrows(ParseException.class, () -> ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_invalidPrefixPresent_throwsParseException() {
+ String args = " " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_AMOUNT + VALID_AMOUNT
+ + " " + PREFIX_DATE_FROM + VALID_DATE;
+ assertThrows(ParseException.class, () -> ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_validInputsWithoutDate_returnsTransactionBuilder() throws ParseException {
+ String args = " " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_AMOUNT + VALID_AMOUNT
+ + " " + PREFIX_CATEGORY + VALID_CATEGORY_1;
+ Title title = new Title(VALID_TITLE);
+ Amount amount = new Amount(VALID_AMOUNT);
+ Set<Category> categorySet = new HashSet<>();
+ categorySet.add(new Category(VALID_CATEGORY_1));
+ Date date = Date.getCurrentDate();
+ assertEquals(new TransactionBuilder(title, amount, date, categorySet),
+ ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+
+ @Test
+ public void parseTransactionBuilder_validInputsWithDate_returnsTransactionBuilder() throws ParseException {
+ String args = " " + PREFIX_TITLE + VALID_TITLE + " " + PREFIX_AMOUNT + VALID_AMOUNT
+ + " " + PREFIX_DATE + VALID_DATE + " " + PREFIX_CATEGORY + VALID_CATEGORY_1;
+ Title title = new Title(VALID_TITLE);
+ Amount amount = new Amount(VALID_AMOUNT);
+ Set<Category> categorySet = new HashSet<>();
+ categorySet.add(new Category(VALID_CATEGORY_1));
+ Date date = new Date(VALID_DATE);
+ assertEquals(new TransactionBuilder(title, amount, date, categorySet),
+ ParserUtil.parseTransactionBuilder(args, EXCEPTION_MESSAGE));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/PrefixTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/PrefixTest.java
new file mode 100644
index 00000000000..66418290cd4
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/PrefixTest.java
@@ -0,0 +1,49 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+public class PrefixTest {
+ private static final String PREFIX_T = "t/";
+
+ private final Prefix prefix = new Prefix(PREFIX_T);
+
+ @Test
+ public void constructor_nullPrefix_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Prefix(null));
+ }
+
+ @Test
+ public void getPrefix() {
+ assertEquals(PREFIX_T, prefix.getPrefix());
+ }
+
+ @Test
+ public void testToString() {
+ assertEquals(PREFIX_T, prefix.toString());
+ }
+
+ @Test
+ public void testHashCode() {
+ assertEquals(PREFIX_T.hashCode(), prefix.hashCode());
+ }
+
+ @Test
+ public void equals() {
+ // Same prefix -> returns true
+ assertTrue(prefix.equals(new Prefix(PREFIX_T)));
+
+ // Same object -> returns true
+ assertTrue(prefix.equals(prefix));
+
+ // null -> returns false
+ assertFalse(prefix.equals(null));
+
+ // Different types -> returns false
+ assertFalse(prefix.equals(5));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TabCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TabCommandParserTest.java
new file mode 100644
index 00000000000..4c53329065c
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TabCommandParserTest.java
@@ -0,0 +1,31 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.TabCommand;
+
+public class TabCommandParserTest {
+
+ private TabCommandParser parser = new TabCommandParser();
+
+ @Test
+ public void parse_validArgs_returnsTabCommand() {
+ assertParseSuccess(parser, "1", new TabCommand(Index.fromOneBased(1)));
+ assertParseSuccess(parser, "2", new TabCommand(Index.fromOneBased(2)));
+ assertParseSuccess(parser, "3", new TabCommand(Index.fromOneBased(3)));
+ assertParseSuccess(parser, "4", new TabCommand(Index.fromOneBased(4)));
+ }
+
+ @Test
+ public void parse_invalidArgs_throwsParseException() {
+ assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT, TabCommand.MESSAGE_USAGE));
+ assertParseFailure(parser, "0", String.format(MESSAGE_INVALID_COMMAND_FORMAT, TabCommand.MESSAGE_USAGE));
+ assertParseFailure(parser, "-5", String.format(MESSAGE_INVALID_COMMAND_FORMAT, TabCommand.MESSAGE_USAGE));
+ assertParseFailure(parser, "2 hello", String.format(MESSAGE_INVALID_COMMAND_FORMAT, TabCommand.MESSAGE_USAGE));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TransactionBuilderTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TransactionBuilderTest.java
new file mode 100644
index 00000000000..1e2db06b6d2
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/TransactionBuilderTest.java
@@ -0,0 +1,39 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import org.junit.jupiter.api.Test;
+
+public class TransactionBuilderTest {
+ @Test
+ public void equals() {
+ TransactionBuilder transactionBuilder = new TransactionBuilder();
+
+ // Same values -> returns true
+ assertNotSame(new TransactionBuilder(), transactionBuilder);
+ assertEquals(new TransactionBuilder(), transactionBuilder);
+
+ // Different titles -> returns false
+ assertNotEquals(new TransactionBuilder().withTitle("Internship"), transactionBuilder);
+
+ // Different amounts -> returns false
+ assertNotEquals(new TransactionBuilder().withAmount("5"), transactionBuilder);
+
+ // Different dates -> returns false
+ assertNotEquals(new TransactionBuilder().withDate("01/11/2020"), transactionBuilder);
+
+ // Different categories -> returns false
+ assertNotEquals(new TransactionBuilder().withCategories("Work"), transactionBuilder);
+
+ // Same object -> returns true
+ assertEquals(transactionBuilder, transactionBuilder);
+
+ // null -> returns false
+ assertNotEquals(transactionBuilder, null);
+
+ // Different types -> returns false
+ assertNotEquals(transactionBuilder, 5);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/AddBookmarkExpenseCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/AddBookmarkExpenseCommandParserTest.java
new file mode 100644
index 00000000000..a4a08130dbf
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/AddBookmarkExpenseCommandParserTest.java
@@ -0,0 +1,115 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_UTILITIES;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_AMOUNT_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_CATEGORY_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_TITLE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_UTILITIES;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.PHONE_BILL;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.AddBookmarkExpenseCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+public class AddBookmarkExpenseCommandParserTest {
+ private AddBookmarkExpenseCommandParser parser = new AddBookmarkExpenseCommandParser();
+
+ @Test
+ public void parse_allFieldsPresent_success() {
+ BookmarkExpense expectedBookmarkExpense = new BookmarkTransactionBuilder(PHONE_BILL)
+ .withCategories(VALID_CATEGORY_UTILITIES).buildBookmarkExpense();
+
+ // whitespace only preamble
+ assertParseSuccess(parser, PREAMBLE_WHITESPACE + TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL
+ + CATEGORY_DESC_UTILITIES, new AddBookmarkExpenseCommand(expectedBookmarkExpense));
+
+ // multiple categories - all accepted
+ BookmarkExpense expectedExpenseMultipleCategories = new BookmarkTransactionBuilder(PHONE_BILL)
+ .withCategories(VALID_CATEGORY_UTILITIES, VALID_CATEGORY_WORK).buildBookmarkExpense();
+
+ assertParseSuccess(parser, TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL
+ + CATEGORY_DESC_UTILITIES + CATEGORY_DESC_WORK,
+ new AddBookmarkExpenseCommand(expectedExpenseMultipleCategories));
+ }
+
+ @Test
+ public void parse_optionalFieldsMissing_success() {
+ // zero categories
+ BookmarkExpense expectedBookmarkExpense = new BookmarkTransactionBuilder(PHONE_BILL).withCategories()
+ .buildBookmarkExpense();
+ assertParseSuccess(parser, TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL,
+ new AddBookmarkExpenseCommand(expectedBookmarkExpense));
+ }
+
+ @Test
+ public void parse_compulsoryFieldMissing_failure() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddBookmarkExpenseCommand.MESSAGE_USAGE);
+
+ // missing title prefix
+ assertParseFailure(parser, VALID_TITLE_PHONE_BILL + AMOUNT_DESC_PHONE_BILL, expectedMessage);
+
+ // missing amount prefix
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + VALID_AMOUNT_PHONE_BILL, expectedMessage);
+
+ // all prefixes missing
+ assertParseFailure(parser, VALID_TITLE_PHONE_BILL + VALID_AMOUNT_PHONE_BILL, expectedMessage);
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ // invalid title
+ assertParseFailure(parser, INVALID_TITLE_DESC + AMOUNT_DESC_PHONE_BILL
+ + CATEGORY_DESC_UTILITIES + CATEGORY_DESC_WORK, Title.MESSAGE_CONSTRAINTS);
+
+ // invalid amount
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + INVALID_AMOUNT_DESC
+ + CATEGORY_DESC_UTILITIES + CATEGORY_DESC_WORK, Amount.MESSAGE_CONSTRAINTS);
+
+ // invalid category
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL
+ + INVALID_CATEGORY_DESC + CATEGORY_DESC_UTILITIES, Category.MESSAGE_CONSTRAINTS);
+
+ // two invalid values, only first invalid value reported
+ assertParseFailure(parser, INVALID_TITLE_DESC + INVALID_AMOUNT_DESC,
+ Title.MESSAGE_CONSTRAINTS);
+
+ // non-empty preamble
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY + TITLE_DESC_PHONE_BILL
+ + CATEGORY_DESC_UTILITIES + CATEGORY_DESC_WORK,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddBookmarkExpenseCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_multipleRepeatedFields_failure() {
+ // multiple titles
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + TITLE_DESC_SPOTIFY_SUBSCRIPTION
+ + AMOUNT_DESC_PHONE_BILL + CATEGORY_DESC_UTILITIES,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_TITLE_CONSTRAINTS));
+
+ // multiple amounts
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL
+ + AMOUNT_DESC_SPOTIFY_SUBSCRIPTION + CATEGORY_DESC_UTILITIES,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_AMOUNT_CONSTRAINTS));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/AddBookmarkIncomeCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/AddBookmarkIncomeCommandParserTest.java
new file mode 100644
index 00000000000..e05a2d177ec
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/AddBookmarkIncomeCommandParserTest.java
@@ -0,0 +1,127 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_PREFIX_PRESENT_HEADER;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_UTILITIES;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_AMOUNT_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_CATEGORY_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_TITLE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_UTILITIES;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.PART_TIME;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.AddBookmarkIncomeCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+public class AddBookmarkIncomeCommandParserTest {
+
+ private AddBookmarkIncomeCommandParser parser = new AddBookmarkIncomeCommandParser();
+
+ @Test
+ public void parse_allFieldsPresent_success() {
+ BookmarkIncome expectedBookmarkIncome = new BookmarkTransactionBuilder(PART_TIME)
+ .withCategories(VALID_CATEGORY_WORK).buildBookmarkIncome();
+
+ // whitespace only preamble
+ assertParseSuccess(parser, PREAMBLE_WHITESPACE + TITLE_DESC_PART_TIME + AMOUNT_DESC_PART_TIME
+ + CATEGORY_DESC_WORK, new AddBookmarkIncomeCommand(expectedBookmarkIncome));
+
+ // multiple categories - all accepted
+ BookmarkIncome expectedExpenseMultipleCategories = new BookmarkTransactionBuilder(PART_TIME)
+ .withCategories(VALID_CATEGORY_UTILITIES, VALID_CATEGORY_WORK).buildBookmarkIncome();
+
+ assertParseSuccess(parser, TITLE_DESC_PART_TIME + AMOUNT_DESC_PART_TIME
+ + CATEGORY_DESC_UTILITIES + CATEGORY_DESC_WORK,
+ new AddBookmarkIncomeCommand(expectedExpenseMultipleCategories));
+ }
+
+ @Test
+ public void parse_optionalFieldsMissing_success() {
+ // zero categories
+ BookmarkIncome expectedBookmarkExpense = new BookmarkTransactionBuilder(PART_TIME).withCategories()
+ .buildBookmarkIncome();
+ assertParseSuccess(parser, TITLE_DESC_PART_TIME + AMOUNT_DESC_PART_TIME,
+ new AddBookmarkIncomeCommand(expectedBookmarkExpense));
+ }
+
+ @Test
+ public void parse_compulsoryFieldMissing_failure() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddBookmarkIncomeCommand.MESSAGE_USAGE);
+
+ // missing title prefix
+ assertParseFailure(parser, VALID_TITLE_PART_TIME + AMOUNT_DESC_PHONE_BILL, expectedMessage);
+
+ // missing amount prefix
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + VALID_AMOUNT_PART_TIME, expectedMessage);
+
+ // all prefixes missing
+ assertParseFailure(parser, VALID_TITLE_PART_TIME + VALID_AMOUNT_PART_TIME, expectedMessage);
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ // invalid title
+ assertParseFailure(parser, INVALID_TITLE_DESC + AMOUNT_DESC_PHONE_BILL
+ + CATEGORY_DESC_UTILITIES + CATEGORY_DESC_WORK, Title.MESSAGE_CONSTRAINTS);
+
+ // invalid amount
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + INVALID_AMOUNT_DESC
+ + CATEGORY_DESC_UTILITIES + CATEGORY_DESC_WORK, Amount.MESSAGE_CONSTRAINTS);
+
+ // invalid category
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL
+ + INVALID_CATEGORY_DESC + CATEGORY_DESC_UTILITIES, Category.MESSAGE_CONSTRAINTS);
+
+ // two invalid values, only first invalid value reported
+ assertParseFailure(parser, INVALID_TITLE_DESC + INVALID_AMOUNT_DESC,
+ Title.MESSAGE_CONSTRAINTS);
+
+ // non-empty preamble
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY + TITLE_DESC_PHONE_BILL
+ + CATEGORY_DESC_UTILITIES + CATEGORY_DESC_WORK,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddBookmarkIncomeCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_multipleRepeatedFields_failure() {
+ // multiple titles
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + TITLE_DESC_PART_TIME
+ + AMOUNT_DESC_PHONE_BILL + CATEGORY_DESC_UTILITIES,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_TITLE_CONSTRAINTS));
+
+ // multiple amounts
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL
+ + AMOUNT_DESC_PART_TIME + CATEGORY_DESC_UTILITIES,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_AMOUNT_CONSTRAINTS));
+ }
+
+ @Test
+ public void parse_dateFieldPresent_failure() {
+ // date field present
+ assertParseFailure(parser, TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL
+ + DATE_DESC_SPOTIFY_SUBSCRIPTION + CATEGORY_DESC_UTILITIES,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_INVALID_PREFIX_PRESENT_HEADER + " " + PREFIX_DATE
+ + "\n" + AddBookmarkIncomeCommand.MESSAGE_USAGE));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/BookmarkTransactionBuilderTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/BookmarkTransactionBuilderTest.java
new file mode 100644
index 00000000000..ccfccd0a7b9
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/BookmarkTransactionBuilderTest.java
@@ -0,0 +1,36 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmark;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+
+public class BookmarkTransactionBuilderTest {
+ @Test
+ public void equals() {
+ BookmarkTransactionBuilder bookmarkTransactionBuilder = new BookmarkTransactionBuilder();
+
+ // Same values -> returns true
+ assertTrue(bookmarkTransactionBuilder.equals(new BookmarkTransactionBuilder()));
+
+ // Different titles -> returns false
+ assertFalse(bookmarkTransactionBuilder.equals(new BookmarkTransactionBuilder().withTitle("Internship")));
+
+ // Different amounts -> returns false
+ assertFalse(bookmarkTransactionBuilder.equals(new BookmarkTransactionBuilder().withAmount("5")));
+
+ // Different categories -> returns false
+ assertFalse(bookmarkTransactionBuilder.equals(new BookmarkTransactionBuilder().withCategories("Work")));
+
+ // Same object -> returns true
+ assertTrue(bookmarkTransactionBuilder.equals(bookmarkTransactionBuilder));
+
+ // null -> returns false
+ assertFalse(bookmarkTransactionBuilder.equals(null));
+
+ // Different types -> returns false
+ assertFalse(bookmarkTransactionBuilder.equals(5));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/ConvertBookmarkCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/ConvertBookmarkCommandParserTest.java
new file mode 100644
index 00000000000..82afe58a9ed
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/ConvertBookmarkCommandParserTest.java
@@ -0,0 +1,107 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_DATE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE_TO;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.ConvertBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.ConvertBookmarkCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+public class ConvertBookmarkCommandParserTest {
+ private static final String CURRENT_DATE = LocalDate.now().format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+ private static final String MESSAGE_INVALID_FORMAT =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, ConvertBookmarkCommand.MESSAGE_USAGE);
+
+ private ConvertBookmarkCommandParser parser = new ConvertBookmarkCommandParser();
+
+ @Test
+ public void parse_missingParts_failure() {
+ // no index specified
+ assertParseFailure(parser, DATE_DESC_SPOTIFY_SUBSCRIPTION, MESSAGE_INVALID_FORMAT);
+
+ // no index and no field specified
+ assertParseFailure(parser, "", MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_invalidPreamble_failure() {
+ // negative index
+ assertParseFailure(parser, "-5" + DATE_DESC_SPOTIFY_SUBSCRIPTION, MESSAGE_INVALID_FORMAT);
+
+ // zero index
+ assertParseFailure(parser, "0" + DATE_DESC_SPOTIFY_SUBSCRIPTION, MESSAGE_INVALID_FORMAT);
+
+ // invalid arguments being parsed as preamble
+ assertParseFailure(parser, "1 some random string", MESSAGE_INVALID_FORMAT);
+
+ // invalid prefix being parsed as preamble
+ assertParseFailure(parser, "1 i/ string", MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ // invalid date
+ assertParseFailure(parser, "1" + INVALID_DATE_DESC, Date.MESSAGE_CONSTRAINTS);
+
+ // multiple dates
+ assertParseFailure(parser, INDEX_SECOND + DATE_DESC_SPOTIFY_SUBSCRIPTION
+ + DATE_DESC_BUBBLE_TEA,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, ConvertBookmarkCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_allFieldsSpecified_success() {
+ Index targetIndex = INDEX_SECOND;
+ Date convertedDate = new Date(VALID_DATE_SPOTIFY_SUBSCRIPTION);
+
+ String userInput = targetIndex.getOneBased() + DATE_DESC_SPOTIFY_SUBSCRIPTION;
+
+ ConvertBookmarkCommand expectedConvertBookmarkCommand =
+ new ConvertBookmarkCommand(targetIndex, convertedDate);
+
+ assertParseSuccess(parser, userInput, expectedConvertBookmarkCommand);
+ }
+
+ @Test
+ public void parse_optionalDateFieldMissing_success() {
+ Index targetIndex = INDEX_SECOND;
+ Date convertedDate = new Date(CURRENT_DATE);
+
+ String userInput = String.valueOf(targetIndex.getOneBased());
+
+ ConvertBookmarkCommand expectedConvertBookmarkCommand =
+ new ConvertBookmarkCommand(targetIndex, convertedDate);
+
+ assertParseSuccess(parser, userInput, expectedConvertBookmarkCommand);
+ }
+
+ @Test
+ public void parse_moreThanOneDateFieldSpecified_throwParseException() {
+ Index targetIndex = INDEX_SECOND;
+ String userInput = targetIndex.getOneBased() + DATE_DESC_SPOTIFY_SUBSCRIPTION + DATE_DESC_SPOTIFY_SUBSCRIPTION;
+ assertParseFailure(parser, userInput, String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ Transaction.MESSAGE_DATE_CONSTRAINTS));
+ }
+
+ @Test
+ public void parse_invalidFieldSpecified_throwParseException() {
+ Index targetIndex = INDEX_SECOND;
+ String userInput = targetIndex.getOneBased() + PREFIX_DATE_TO.toString() + VALID_DATE_SPOTIFY_SUBSCRIPTION;
+ assertParseFailure(parser, userInput, String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ConvertBookmarkCommand.MESSAGE_USAGE));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/DeleteBookmarkCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/DeleteBookmarkCommandParserTest.java
new file mode 100644
index 00000000000..6040ca91bc0
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/DeleteBookmarkCommandParserTest.java
@@ -0,0 +1,33 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.DeleteBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.DeleteBookmarkCommandParser;
+
+/**
+ * As we are only doing white-box testing, our test cases do not cover path variations
+ * outside of the DeleteBookmarkCommand code. For example, inputs "1" and "1 abc" take the
+ * same path through the DeleteBookmarkCommand, and therefore we test only one of them.
+ * The path variation for those two cases occur inside the ParserUtil, and
+ * therefore should be covered by the ParserUtilTest.
+ */
+public class DeleteBookmarkCommandParserTest {
+ private DeleteBookmarkCommandParser parser = new DeleteBookmarkCommandParser();
+
+ @Test
+ public void parse_validArgs_returnsDeleteCommand() {
+ assertParseSuccess(parser, "1", new DeleteBookmarkCommand(INDEX_FIRST));
+ }
+
+ @Test
+ public void parse_invalidArgs_throwsParseException() {
+ assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ DeleteBookmarkCommand.MESSAGE_USAGE));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/EditBookmarkCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/EditBookmarkCommandParserTest.java
new file mode 100644
index 00000000000..3ba79be2899
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/bookmark/EditBookmarkCommandParserTest.java
@@ -0,0 +1,184 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_PREFIX_PRESENT_HEADER;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_MISCELLANEOUS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_UTILITIES;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.CATEGORY_DESC_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.DATE_DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_AMOUNT_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_CATEGORY_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.INVALID_TITLE_DESC;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.TITLE_DESC_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_MISCELLANEOUS;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_UTILITIES;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_FIRST;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_SECOND;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalIndexes.INDEX_THIRD;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.EditBookmarkCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.testutil.EditBookmarkTransactionDescriptorBuilder;
+
+
+public class EditBookmarkCommandParserTest {
+
+ private static final String CATEGORY_EMPTY = " " + PREFIX_CATEGORY;
+ private static final String MESSAGE_INVALID_FORMAT =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditBookmarkCommand.MESSAGE_USAGE);
+ private EditBookmarkCommandParser parser = new EditBookmarkCommandParser();
+
+ @Test
+ public void parse_missingParts_failure() {
+ // no index specified
+ assertParseFailure(parser, VALID_TITLE_PHONE_BILL, MESSAGE_INVALID_FORMAT);
+
+ // no field specified
+ assertParseFailure(parser, "1", EditBookmarkCommand.MESSAGE_NOT_EDITED);
+
+ // no index and no field specified
+ assertParseFailure(parser, "", MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_invalidPreamble_failure() {
+ // negative index
+ assertParseFailure(parser, "-5" + TITLE_DESC_PHONE_BILL, MESSAGE_INVALID_FORMAT);
+
+ // zero index
+ assertParseFailure(parser, "0" + TITLE_DESC_PHONE_BILL, MESSAGE_INVALID_FORMAT);
+
+ // invalid arguments being parsed as preamble
+ assertParseFailure(parser, "1 some random string", MESSAGE_INVALID_FORMAT);
+
+ // invalid prefix being parsed as preamble
+ assertParseFailure(parser, "1 i/ string", MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ assertParseFailure(parser, "1" + INVALID_TITLE_DESC, Title.MESSAGE_CONSTRAINTS); // invalid title
+ assertParseFailure(parser, "1" + INVALID_AMOUNT_DESC, Amount.MESSAGE_CONSTRAINTS); // invalid amount
+ assertParseFailure(parser, "1" + INVALID_CATEGORY_DESC, Category.MESSAGE_CONSTRAINTS); // invalid category
+
+ // invalid amount followed by valid category
+ assertParseFailure(parser, "1" + INVALID_AMOUNT_DESC + CATEGORY_DESC_UTILITIES,
+ Amount.MESSAGE_CONSTRAINTS);
+
+ // while parsing {@code PREFIX_CATEGORY} alone will reset the categories of the {@code BookmarkExpense} being
+ // edited, parsing it together with a valid category results in error
+ assertParseFailure(parser, "1" + CATEGORY_DESC_FOOD_BEVERAGE + CATEGORY_DESC_WORK + CATEGORY_EMPTY,
+ Category.MESSAGE_EMPTY_CATEGORY);
+ assertParseFailure(parser, "1" + CATEGORY_DESC_FOOD_BEVERAGE + CATEGORY_EMPTY + CATEGORY_DESC_WORK,
+ Category.MESSAGE_EMPTY_CATEGORY);
+ assertParseFailure(parser, "1" + CATEGORY_EMPTY + CATEGORY_DESC_FOOD_BEVERAGE + CATEGORY_DESC_WORK,
+ Category.MESSAGE_EMPTY_CATEGORY);
+
+ // multiple invalid values, but only the first invalid value is captured
+ assertParseFailure(parser, "1" + INVALID_TITLE_DESC + INVALID_AMOUNT_DESC
+ + CATEGORY_DESC_UTILITIES, Title.MESSAGE_CONSTRAINTS);
+ }
+
+ @Test
+ public void parse_invalidFieldPresent_failure() {
+ assertParseFailure(parser, "1" + TITLE_DESC_SPOTIFY_SUBSCRIPTION + AMOUNT_DESC_SPOTIFY_SUBSCRIPTION
+ + DATE_DESC_SPOTIFY_SUBSCRIPTION,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_INVALID_PREFIX_PRESENT_HEADER + " " + PREFIX_DATE
+ + "\n" + EditBookmarkCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_allFieldsSpecified_success() {
+ Index targetIndex = INDEX_SECOND;
+ String userInput = targetIndex.getOneBased() + AMOUNT_DESC_PHONE_BILL + CATEGORY_DESC_UTILITIES
+ + TITLE_DESC_SPOTIFY_SUBSCRIPTION + CATEGORY_DESC_MISCELLANEOUS;
+
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).withAmount(VALID_AMOUNT_PHONE_BILL)
+ .withCategories(VALID_CATEGORY_UTILITIES, VALID_CATEGORY_MISCELLANEOUS).build();
+ EditBookmarkCommand expectedCommand = new EditBookmarkCommand(targetIndex, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_someFieldsSpecified_success() {
+ Index targetIndex = INDEX_FIRST;
+ String userInput = targetIndex.getOneBased() + AMOUNT_DESC_PHONE_BILL;
+
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder()
+ .withAmount(VALID_AMOUNT_PHONE_BILL).build();
+ EditBookmarkCommand expectedCommand = new EditBookmarkCommand(targetIndex, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_oneFieldSpecified_success() {
+ // title
+ Index targetIndex = INDEX_THIRD;
+ String userInput = targetIndex.getOneBased() + TITLE_DESC_SPOTIFY_SUBSCRIPTION;
+ System.out.println(userInput);
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder()
+ .withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).build();
+ EditBookmarkCommand expectedCommand = new EditBookmarkCommand(targetIndex, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // amounts
+ userInput = targetIndex.getOneBased() + AMOUNT_DESC_PHONE_BILL;
+ descriptor = new EditBookmarkTransactionDescriptorBuilder().withAmount(VALID_AMOUNT_PHONE_BILL).build();
+ expectedCommand = new EditBookmarkCommand(targetIndex, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // categories
+ userInput = targetIndex.getOneBased() + CATEGORY_DESC_UTILITIES;
+ descriptor = new EditBookmarkTransactionDescriptorBuilder().withCategories(VALID_CATEGORY_UTILITIES).build();
+ expectedCommand = new EditBookmarkCommand(targetIndex, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_multipleRepeatedFields_failure() {
+ // multiple titles
+ assertParseFailure(parser, "1" + TITLE_DESC_PHONE_BILL + TITLE_DESC_SPOTIFY_SUBSCRIPTION
+ + AMOUNT_DESC_PHONE_BILL + CATEGORY_DESC_UTILITIES,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_TITLE_CONSTRAINTS));
+
+ // multiple amounts
+ assertParseFailure(parser, "1" + TITLE_DESC_PHONE_BILL + AMOUNT_DESC_PHONE_BILL
+ + AMOUNT_DESC_SPOTIFY_SUBSCRIPTION + CATEGORY_DESC_UTILITIES,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, BookmarkTransaction.MESSAGE_AMOUNT_CONSTRAINTS));
+ }
+
+ @Test
+ public void parse_resetCategories_success() {
+ Index targetIndex = INDEX_THIRD;
+ String userInput = targetIndex.getOneBased() + CATEGORY_EMPTY;
+
+ EditBookmarkTransactionDescriptor descriptor = new EditBookmarkTransactionDescriptorBuilder().withCategories()
+ .build();
+ EditBookmarkCommand expectedCommand = new EditBookmarkCommand(targetIndex, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budget/SetExpenseLimitCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budget/SetExpenseLimitCommandParserTest.java
new file mode 100644
index 00000000000..f378f5bcccb
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budget/SetExpenseLimitCommandParserTest.java
@@ -0,0 +1,51 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.budget;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.budget.SetExpenseLimitCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.budgetparsers.SetExpenseLimitCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+
+public class SetExpenseLimitCommandParserTest {
+
+ private SetExpenseLimitCommandParser parser = new SetExpenseLimitCommandParser();
+
+ @Test
+ public void parse_emptyArg_throwsParseException() {
+ assertParseFailure(parser, PREAMBLE_WHITESPACE, String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ SetExpenseLimitCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_invalidArgs_throwsParseException() {
+ // no whitespace in front
+ assertParseFailure(parser, PREFIX_AMOUNT + VALID_AMOUNT_INTERNSHIP,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetExpenseLimitCommand.MESSAGE_USAGE));
+ // preamble before amount prefix
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY + AMOUNT_DESC_INTERNSHIP,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetExpenseLimitCommand.MESSAGE_USAGE));
+ // multiple amounts
+ assertParseFailure(parser, PREAMBLE_WHITESPACE + AMOUNT_DESC_INTERNSHIP + AMOUNT_DESC_PART_TIME,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetExpenseLimitCommandParser.MESSAGE_CONSTRAINTS));
+ }
+
+ @Test
+ public void parse_validArgs_returnsSetExpenseLimitCommand() {
+ assertParseSuccess(parser, AMOUNT_DESC_INTERNSHIP,
+ new SetExpenseLimitCommand(new Amount(VALID_AMOUNT_INTERNSHIP)));
+ // whitespaces before/after keywords
+ assertParseSuccess(parser, PREAMBLE_WHITESPACE + AMOUNT_DESC_INTERNSHIP + PREAMBLE_WHITESPACE,
+ new SetExpenseLimitCommand(new Amount(VALID_AMOUNT_INTERNSHIP)));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budget/SetSavingsGoalCommandParserTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budget/SetSavingsGoalCommandParserTest.java
new file mode 100644
index 00000000000..d681c8cd44d
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/parser/budget/SetSavingsGoalCommandParserTest.java
@@ -0,0 +1,51 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.parser.budget;
+
+import static ay2021s1_cs2103_w16_3.finesse.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.AMOUNT_DESC_PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.budget.SetSavingsGoalCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.budgetparsers.SetSavingsGoalCommandParser;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+
+public class SetSavingsGoalCommandParserTest {
+
+ private SetSavingsGoalCommandParser parser = new SetSavingsGoalCommandParser();
+
+ @Test
+ public void parse_emptyArg_throwsParseException() {
+ assertParseFailure(parser, PREAMBLE_WHITESPACE, String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ SetSavingsGoalCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_invalidArgs_throwsParseException() {
+ // no whitespace in front
+ assertParseFailure(parser, PREFIX_AMOUNT + VALID_AMOUNT_INTERNSHIP,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetSavingsGoalCommand.MESSAGE_USAGE));
+ // preamble before amount prefix
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY + AMOUNT_DESC_INTERNSHIP,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetSavingsGoalCommand.MESSAGE_USAGE));
+ // multiple amounts
+ assertParseFailure(parser, PREAMBLE_WHITESPACE + AMOUNT_DESC_INTERNSHIP + AMOUNT_DESC_PART_TIME,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SetSavingsGoalCommandParser.MESSAGE_CONSTRAINTS));
+ }
+
+ @Test
+ public void parse_validArgs_returnsSetExpenseLimitCommand() {
+ assertParseSuccess(parser, AMOUNT_DESC_INTERNSHIP,
+ new SetSavingsGoalCommand(new Amount(VALID_AMOUNT_INTERNSHIP)));
+ // whitespaces before/after keywords
+ assertParseSuccess(parser, PREAMBLE_WHITESPACE + AMOUNT_DESC_INTERNSHIP + PREAMBLE_WHITESPACE,
+ new SetSavingsGoalCommand(new Amount(VALID_AMOUNT_INTERNSHIP)));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/SystemClockTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/SystemClockTest.java
new file mode 100644
index 00000000000..5236e0132e0
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/SystemClockTest.java
@@ -0,0 +1,17 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.time;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+public class SystemClockTest {
+ /** Time difference acceptance threshold (in milliseconds) for slower systems. */
+ private static final int TIME_DIFFERENCE_THRESHOLD = 100;
+
+ private final SystemClock systemClock = new SystemClock();
+
+ @Test
+ public void getCurrentTime_sameAsCurrentSystemTime() {
+ assertTrue(Math.abs(System.currentTimeMillis() - systemClock.getCurrentTime()) <= TIME_DIFFERENCE_THRESHOLD);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/TimekeeperTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/TimekeeperTest.java
new file mode 100644
index 00000000000..bf64b17d62a
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/TimekeeperTest.java
@@ -0,0 +1,91 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.time;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions.TemporalException;
+
+public class TimekeeperTest {
+ @Test
+ public void checkIn_laterTime_doesNotThrowTemporalException() throws TemporalException {
+ long currentSystemTime = System.currentTimeMillis();
+ ClockStub adjustableClock = new ClockStub(currentSystemTime);
+ Timekeeper timekeeper = new Timekeeper(adjustableClock);
+
+ long firstTime = adjustableClock.getCurrentTime();
+ timekeeper.checkIn();
+ adjustableClock.setCurrentTime(currentSystemTime + 1);
+ long secondTime = adjustableClock.getCurrentTime();
+ timekeeper.checkIn();
+
+ assertTrue(firstTime < secondTime);
+ }
+
+ @Test
+ public void checkIn_sameTime_doesNotThrowTemporalException() throws TemporalException {
+ long currentSystemTime = System.currentTimeMillis();
+ ClockStub adjustableClock = new ClockStub(currentSystemTime);
+ Timekeeper timekeeper = new Timekeeper(adjustableClock);
+
+ long firstTime = adjustableClock.getCurrentTime();
+ timekeeper.checkIn();
+ long secondTime = adjustableClock.getCurrentTime();
+ timekeeper.checkIn();
+
+ assertEquals(firstTime, secondTime);
+ }
+
+ @Test
+ public void checkIn_earlierTime_throwsTemporalException() throws TemporalException {
+ long currentSystemTime = System.currentTimeMillis();
+ ClockStub adjustableClock = new ClockStub(currentSystemTime);
+ Timekeeper timekeeper = new Timekeeper(adjustableClock);
+
+ long firstTime = adjustableClock.getCurrentTime();
+ timekeeper.checkIn();
+ adjustableClock.setCurrentTime(currentSystemTime - 1);
+ long secondTime = adjustableClock.getCurrentTime();
+ assertThrows(TemporalException.class, () -> timekeeper.checkIn());
+
+ assertTrue(firstTime > secondTime);
+ }
+
+ /**
+ * A class representing a clock with the ability to manipulate time for testing purposes.
+ */
+ private static class ClockStub implements Clock {
+ /** The current time. */
+ private long currentTime;
+
+ /**
+ * Constructs a new {@code ClockStub} with the specified current time.
+ *
+ * @param currentTime The specified current time.
+ */
+ public ClockStub(long currentTime) {
+ this.currentTime = currentTime;
+ }
+
+ /**
+ * Sets the current time of the clock.
+ *
+ * @param currentTime The specified current time.
+ */
+ public void setCurrentTime(long currentTime) {
+ this.currentTime = currentTime;
+ }
+
+ /**
+ * Returns the current time.
+ *
+ * @return The current time.
+ */
+ @Override
+ public long getCurrentTime() {
+ return currentTime;
+ }
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/exceptions/TemporalExceptionTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/exceptions/TemporalExceptionTest.java
new file mode 100644
index 00000000000..177761b4b31
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/logic/time/exceptions/TemporalExceptionTest.java
@@ -0,0 +1,19 @@
+package ay2021s1_cs2103_w16_3.finesse.logic.time.exceptions;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class TemporalExceptionTest {
+ private static final String TEMPORAL_EXCEPTION_MESSAGE = "This is a TemporalException.";
+
+ @Test
+ public void constructor_throwTemporalException_temporalExceptionThrown() {
+ assertThrows(TemporalException.class, () -> {
+ throw new TemporalException(TEMPORAL_EXCEPTION_MESSAGE);
+ });
+ assertThrows(TemporalException.class, () -> {
+ throw new TemporalException(TEMPORAL_EXCEPTION_MESSAGE, new Throwable());
+ });
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/FinanceTrackerTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/FinanceTrackerTest.java
new file mode 100644
index 00000000000..d12255fe20e
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/FinanceTrackerTest.java
@@ -0,0 +1,72 @@
+package ay2021s1_cs2103_w16_3.finesse.model;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalTransactions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
+public class FinanceTrackerTest {
+
+ private final FinanceTracker financeTracker = new FinanceTracker();
+
+ @Test
+ public void constructor() {
+ assertEquals(Collections.emptyList(), financeTracker.getTransactionList());
+ }
+
+ @Test
+ public void resetData_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> financeTracker.resetData(null));
+ }
+
+ @Test
+ public void resetData_withValidReadOnlyFinanceTracker_replacesData() {
+ FinanceTracker newData = getTypicalFinanceTracker();
+ financeTracker.resetData(newData);
+ assertEquals(newData, financeTracker);
+ }
+
+ @Test
+ public void getTransactionList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> financeTracker.getTransactionList().remove(0));
+ }
+
+ @Test
+ public void getExpenseList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> financeTracker.getExpenseList().remove(0));
+ }
+
+ @Test
+ public void getIncomeList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> financeTracker.getIncomeList().remove(0));
+ }
+
+ @Test
+ public void equals_distinctFinanceTrackersWithSameAttributes_returnsTrue() {
+ FinanceTracker firstFinanceTracker = new FinanceTracker();
+ FinanceTracker secondFinanceTracker = new FinanceTracker();
+
+ firstFinanceTracker.setTransactions(getTypicalTransactions());
+ secondFinanceTracker.setTransactions(getTypicalTransactions());
+
+ assertNotSame(firstFinanceTracker, secondFinanceTracker);
+ assertEquals(firstFinanceTracker, secondFinanceTracker);
+ }
+
+ @Test
+ public void hashCode_distinctFinanceTrackersWithSameAttributes_returnsTrue() {
+ FinanceTracker firstFinanceTracker = new FinanceTracker();
+ FinanceTracker secondFinanceTracker = new FinanceTracker();
+
+ firstFinanceTracker.setTransactions(getTypicalTransactions());
+ secondFinanceTracker.setTransactions(getTypicalTransactions());
+
+ assertNotSame(firstFinanceTracker, secondFinanceTracker);
+ assertEquals(firstFinanceTracker.hashCode(), secondFinanceTracker.hashCode());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/ModelManagerTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/ModelManagerTest.java
new file mode 100644
index 00000000000..fea298aa55c
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/ModelManagerTest.java
@@ -0,0 +1,203 @@
+package ay2021s1_cs2103_w16_3.finesse.model;
+
+import static ay2021s1_cs2103_w16_3.finesse.model.Model.PREDICATE_SHOW_ALL_TRANSACTIONS;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.TUITION_FEES;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates.TitleContainsKeyphrasesPredicate;
+import ay2021s1_cs2103_w16_3.finesse.testutil.FinanceTrackerBuilder;
+import javafx.collections.ObservableList;
+
+public class ModelManagerTest {
+
+ private ModelManager modelManager = new ModelManager();
+
+ @Test
+ public void constructor() {
+ assertEquals(new UserPrefs(), modelManager.getUserPrefs());
+ assertEquals(new GuiSettings(), modelManager.getGuiSettings());
+ assertEquals(new FinanceTracker(), new FinanceTracker(modelManager.getFinanceTracker()));
+ }
+
+ @Test
+ public void setUserPrefs_nullUserPrefs_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> modelManager.setUserPrefs(null));
+ }
+
+ @Test
+ public void setUserPrefs_validUserPrefs_copiesUserPrefs() {
+ UserPrefs userPrefs = new UserPrefs();
+ userPrefs.setFinanceTrackerFilePath(Paths.get("finance/tracker/file/path"));
+ userPrefs.setGuiSettings(new GuiSettings(1, 2, 3, 4, true));
+ modelManager.setUserPrefs(userPrefs);
+ assertEquals(userPrefs, modelManager.getUserPrefs());
+
+ // Modifying userPrefs should not modify modelManager's userPrefs
+ UserPrefs oldUserPrefs = new UserPrefs(userPrefs);
+ userPrefs.setFinanceTrackerFilePath(Paths.get("new/finance/tracker/file/path"));
+ assertEquals(oldUserPrefs, modelManager.getUserPrefs());
+ }
+
+ @Test
+ public void setGuiSettings_nullGuiSettings_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> modelManager.setGuiSettings(null));
+ }
+
+ @Test
+ public void setGuiSettings_validGuiSettings_setsGuiSettings() {
+ GuiSettings guiSettings = new GuiSettings(1, 2, 3, 4, true);
+ modelManager.setGuiSettings(guiSettings);
+ assertEquals(guiSettings, modelManager.getGuiSettings());
+ }
+
+ @Test
+ public void setFinanceTrackerFilePath_nullPath_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> modelManager.setFinanceTrackerFilePath(null));
+ }
+
+ @Test
+ public void setFinanceTrackerFilePath_validPath_setsFinanceTrackerFilePath() {
+ Path path = Paths.get("finance/tracker/file/path");
+ modelManager.setFinanceTrackerFilePath(path);
+ assertEquals(path, modelManager.getFinanceTrackerFilePath());
+ }
+
+ @Test
+ public void getFilteredTransactionList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> modelManager.getFilteredTransactionList().remove(0));
+ }
+
+ @Test
+ public void getFilteredExpenseList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> modelManager.getFilteredExpenseList().remove(0));
+ }
+
+ @Test
+ public void getFilteredIncomeList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> modelManager.getFilteredIncomeList().remove(0));
+ }
+
+ @Test
+ public void getFilteredBookmarkExpenseList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, ()
+ -> modelManager.getFilteredBookmarkExpenseList().remove(0));
+ }
+
+ @Test
+ public void getFilteredBookmarkIncomeList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, ()
+ -> modelManager.getFilteredBookmarkIncomeList().remove(0));
+ }
+
+ @Test
+ public void getFilteredTransactionLists_addTransactions_updatesList() {
+ ObservableList<Expense> expenseList = modelManager.getFilteredExpenseList();
+ ObservableList<Income> incomeList = modelManager.getFilteredIncomeList();
+ modelManager.addExpense(new TransactionBuilder().buildExpense());
+ assertEquals(1, expenseList.size());
+ assertEquals(0, incomeList.size());
+ modelManager.addIncome(new TransactionBuilder().buildIncome());
+ assertEquals(1, expenseList.size());
+ assertEquals(1, incomeList.size());
+ }
+
+ @Test
+ public void getFilteredTransactionLists_deleteTransaction_updatesList() {
+ Expense e = new TransactionBuilder().buildExpense();
+ modelManager.addExpense(e);
+ ObservableList<Expense> expenseList = modelManager.getFilteredExpenseList();
+ assertEquals(1, expenseList.size());
+ modelManager.deleteTransaction(e);
+ assertEquals(0, expenseList.size());
+ }
+
+ @Test
+ public void getFilteredTransactionLists_editTransaction_updatesList() {
+ Income i = new TransactionBuilder().buildIncome();
+ Income updated = new TransactionBuilder().withTitle("foo").buildIncome();
+ assertNotEquals(i.getTitle(), updated.getTitle()); // ensure no conflict
+ modelManager.addIncome(i);
+ ObservableList<Income> incomeList = modelManager.getFilteredIncomeList();
+ assertEquals(1, incomeList.size());
+ modelManager.setTransaction(i, updated);
+ assertFalse(incomeList.contains(i));
+ assertTrue(incomeList.contains(updated));
+ }
+
+ @Test
+ public void getFilteredTransactionLists_clear_updatesList() {
+ ObservableList<Expense> expenseList = modelManager.getFilteredExpenseList();
+ ObservableList<Income> incomeList = modelManager.getFilteredIncomeList();
+ modelManager.addExpense(new TransactionBuilder().buildExpense());
+ modelManager.addIncome(new TransactionBuilder().buildIncome());
+ modelManager.setFinanceTracker(new FinanceTracker());
+ assertTrue(expenseList.isEmpty());
+ assertTrue(incomeList.isEmpty());
+ }
+
+ @Test
+ public void equals() {
+ FinanceTracker financeTracker = new FinanceTrackerBuilder()
+ .withTransaction(BUBBLE_TEA).withTransaction(TUITION_FEES)
+ .withExpense(new TransactionBuilder(BUBBLE_TEA).buildExpense())
+ .withExpense(new TransactionBuilder(TUITION_FEES).buildExpense())
+ .withIncome(new TransactionBuilder(BUBBLE_TEA).buildIncome())
+ .withIncome(new TransactionBuilder(TUITION_FEES).buildIncome()).build();
+ FinanceTracker differentFinanceTracker = new FinanceTracker();
+ UserPrefs userPrefs = new UserPrefs();
+
+ // same values -> returns true
+ modelManager = new ModelManager(financeTracker, userPrefs);
+ ModelManager modelManagerCopy = new ModelManager(financeTracker, userPrefs);
+ assertTrue(modelManager.equals(modelManagerCopy));
+
+ // same object -> returns true
+ assertTrue(modelManager.equals(modelManager));
+
+ // null -> returns false
+ assertFalse(modelManager.equals(null));
+
+ // different types -> returns false
+ assertFalse(modelManager.equals(5));
+
+ // different financeTracker -> returns false
+ assertFalse(modelManager.equals(new ModelManager(differentFinanceTracker, userPrefs)));
+
+ String[] keyphrases = BUBBLE_TEA.getTitle().toString().split("\\s+");
+
+ // different filteredTransactionList -> returns false
+ modelManager.updateFilteredTransactionList(new TitleContainsKeyphrasesPredicate(Arrays.asList(keyphrases)));
+ assertFalse(modelManager.equals(new ModelManager(financeTracker, userPrefs)));
+
+ // different filteredExpenseList -> returns false
+ modelManager.updateFilteredExpenseList(new TitleContainsKeyphrasesPredicate(Arrays.asList(keyphrases)));
+ assertFalse(modelManager.equals(new ModelManager(financeTracker, userPrefs)));
+
+ // different filteredIncomeList -> returns false
+ modelManager.updateFilteredIncomeList(new TitleContainsKeyphrasesPredicate(Arrays.asList(keyphrases)));
+ assertFalse(modelManager.equals(new ModelManager(financeTracker, userPrefs)));
+
+ // resets modelManager to initial state for upcoming tests
+ modelManager.updateFilteredTransactionList(PREDICATE_SHOW_ALL_TRANSACTIONS);
+
+ // different userPrefs -> returns false
+ UserPrefs differentUserPrefs = new UserPrefs();
+ differentUserPrefs.setFinanceTrackerFilePath(Paths.get("differentFilePath"));
+ assertFalse(modelManager.equals(new ModelManager(financeTracker, differentUserPrefs)));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/UserPrefsTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/UserPrefsTest.java
new file mode 100644
index 00000000000..d7b65299a92
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/UserPrefsTest.java
@@ -0,0 +1,65 @@
+package ay2021s1_cs2103_w16_3.finesse.model;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+
+public class UserPrefsTest {
+ private final GuiSettings guiSettings = new GuiSettings(1200, 800, 100, 100, false);
+
+ @Test
+ public void setGuiSettings_nullGuiSettings_throwsNullPointerException() {
+ UserPrefs userPref = new UserPrefs();
+ assertThrows(NullPointerException.class, () -> userPref.setGuiSettings(null));
+ }
+
+ @Test
+ public void setFinanceTrackerFilePath_nullPath_throwsNullPointerException() {
+ UserPrefs userPrefs = new UserPrefs();
+ assertThrows(NullPointerException.class, () -> userPrefs.setFinanceTrackerFilePath(null));
+ }
+
+ @Test
+ public void equals_sameUserPrefs_returnsTrue() {
+ UserPrefs userPrefs = new UserPrefs();
+ GuiSettings guiSettings = new GuiSettings(1200, 800, 100, 100, false);
+ userPrefs.setGuiSettings(guiSettings);
+ assertEquals(userPrefs, userPrefs);
+ }
+
+ @Test
+ public void equals_compareUserPrefsWithNull_returnsFalse() {
+ UserPrefs userPrefs = new UserPrefs();
+ userPrefs.setGuiSettings(guiSettings);
+ assertNotEquals(userPrefs, null);
+ }
+
+ @Test
+ public void equals_distinctUserPrefsWithSameAttributes_returnsTrue() {
+ UserPrefs firstUserPrefs = new UserPrefs();
+ UserPrefs secondUserPrefs = new UserPrefs();
+
+ firstUserPrefs.setGuiSettings(guiSettings);
+ secondUserPrefs.setGuiSettings(guiSettings);
+
+ assertNotSame(firstUserPrefs, secondUserPrefs);
+ assertEquals(firstUserPrefs, secondUserPrefs);
+ }
+
+ @Test
+ public void hashCode_distinctUserPrefsWithSameAttributes_returnsTrue() {
+ UserPrefs firstUserPrefs = new UserPrefs();
+ UserPrefs secondUserPrefs = new UserPrefs();
+
+ firstUserPrefs.setGuiSettings(guiSettings);
+ secondUserPrefs.setGuiSettings(guiSettings);
+
+ assertNotSame(firstUserPrefs, secondUserPrefs);
+ assertEquals(firstUserPrefs.hashCode(), secondUserPrefs.hashCode());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseListTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseListTest.java
new file mode 100644
index 00000000000..4a49da90d21
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseListTest.java
@@ -0,0 +1,179 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_UTILITIES;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalBookmarkExpenses;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.BookmarkTransactionNotFoundException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+
+public class BookmarkExpenseListTest {
+
+ private final BookmarkExpenseList bookmarkExpenseList = new BookmarkExpenseList();
+
+ @Test
+ public void add_nullBookmarkExpense_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> bookmarkExpenseList.add(null));
+ }
+
+ @Test
+ public void add_duplicateBookmarkExpense_throwsDuplicateBookmarkTransactionException() {
+ BookmarkExpense bookmarkExpense = new BookmarkTransactionBuilder(PHONE_BILL)
+ .withCategories(VALID_CATEGORY_UTILITIES).buildBookmarkExpense();
+
+ bookmarkExpenseList.add(bookmarkExpense);
+
+ BookmarkExpense bookmarkExpenseCopy = new BookmarkTransactionBuilder(bookmarkExpense).buildBookmarkExpense();
+
+ assertThrows(DuplicateBookmarkTransactionException.class, () -> bookmarkExpenseList.add(bookmarkExpenseCopy));
+ }
+
+ @Test
+ public void setBookmarkExpense_nullTargetBookmarkExpense_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> bookmarkExpenseList.setBookmarkExpense(null, PHONE_BILL));
+ }
+
+ @Test
+ public void setBookmarkExpense_nullEditedBookmarkExpense_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> bookmarkExpenseList.setBookmarkExpense(PHONE_BILL, null));
+ }
+
+ @Test
+ public void setBookmarkExpense_targetBookmarkExpenseNotInList_throwsTransactionNotFoundException() {
+ assertThrows(BookmarkTransactionNotFoundException.class, ()
+ -> bookmarkExpenseList.setBookmarkExpense(PHONE_BILL, PHONE_BILL));
+ }
+
+ @Test
+ public void setBookmarkExpense_editedBookmarkExpenseIsSameBookmarkExpense_success() {
+ bookmarkExpenseList.add(PHONE_BILL);
+ bookmarkExpenseList.setBookmarkExpense(PHONE_BILL, PHONE_BILL);
+ BookmarkExpenseList expectedTransactionList = new BookmarkExpenseList();
+ expectedTransactionList.add(PHONE_BILL);
+ assertEquals(expectedTransactionList, bookmarkExpenseList);
+ }
+
+ @Test
+ public void setBookmarkExpense_editedBookmarkExpenseHasSameIdentity_success() {
+ bookmarkExpenseList.add(PHONE_BILL);
+ BookmarkExpense editedPhone = new BookmarkTransactionBuilder(PHONE_BILL)
+ .withCategories(VALID_CATEGORY_UTILITIES).buildBookmarkExpense();
+ bookmarkExpenseList.setBookmarkExpense(PHONE_BILL, editedPhone);
+ BookmarkExpenseList expectedTransactionList = new BookmarkExpenseList();
+ expectedTransactionList.add(editedPhone);
+ assertEquals(expectedTransactionList, bookmarkExpenseList);
+ }
+
+ @Test
+ public void setBookmarkExpense_editedBookmarkExpenseIsDuplicateOfAnotherBookmarkExpense() {
+ bookmarkExpenseList.add(PHONE_BILL);
+ bookmarkExpenseList.add(SPOTIFY_SUBSCRIPTION);
+ BookmarkExpense editedPhoneBill = new BookmarkTransactionBuilder(PHONE_BILL)
+ .withTitle(SPOTIFY_SUBSCRIPTION.getTitle().toString()).buildBookmarkExpense();
+ assertThrows(DuplicateBookmarkTransactionException.class, ()
+ -> bookmarkExpenseList.setBookmarkExpense(PHONE_BILL, editedPhoneBill));
+ }
+
+ @Test
+ public void setBookmarkExpense_editedBookmarkExpenseHasDifferentIdentity_success() {
+ bookmarkExpenseList.add(PHONE_BILL);
+ bookmarkExpenseList.setBookmarkExpense(PHONE_BILL, SPOTIFY_SUBSCRIPTION);
+ BookmarkExpenseList expectedTransactionList = new BookmarkExpenseList();
+ expectedTransactionList.add(SPOTIFY_SUBSCRIPTION);
+ assertEquals(expectedTransactionList, bookmarkExpenseList);
+ }
+
+ @Test
+ public void remove_nullBookmarkExpense_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> bookmarkExpenseList.remove(null));
+ }
+
+ @Test
+ public void remove_bookmarkExpenseDoesNotExist_throwsBookmarkTransactionNotFoundException() {
+ assertThrows(BookmarkTransactionNotFoundException.class, () -> bookmarkExpenseList.remove(PHONE_BILL));
+ }
+
+ @Test
+ public void remove_existingBookmarkExpense_removesBookmarkExpense() {
+ bookmarkExpenseList.add(PHONE_BILL);
+ bookmarkExpenseList.remove(PHONE_BILL);
+ BookmarkExpenseList expectedTransactionList = new BookmarkExpenseList();
+ assertEquals(expectedTransactionList, bookmarkExpenseList);
+ }
+
+ @Test
+ public void setBookmarkExpenses_nullBookmarkExpenseList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> bookmarkExpenseList.setBookmarkExpenses((BookmarkExpenseList) null));
+ }
+
+ @Test
+ public void setBookmarkExpenses_bookmarkExpenseList_replacesOwnListWithProvidedBookmarkExpenseList() {
+ bookmarkExpenseList.add(PHONE_BILL);
+ BookmarkExpenseList expectedTransactionList = new BookmarkExpenseList();
+ expectedTransactionList.add(SPOTIFY_SUBSCRIPTION);
+ bookmarkExpenseList.setBookmarkExpenses(expectedTransactionList);
+ assertEquals(expectedTransactionList, bookmarkExpenseList);
+ }
+
+ @Test
+ public void setBookmarkExpenses_nullList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> bookmarkExpenseList.setBookmarkExpenses((List<BookmarkExpense>) null));
+ }
+
+ @Test
+ public void setBookmarkExpenses_list_replacesOwnListWithProvidedList() {
+ bookmarkExpenseList.add(PHONE_BILL);
+ List<BookmarkExpense> transactionList = Collections.singletonList(SPOTIFY_SUBSCRIPTION);
+ this.bookmarkExpenseList.setBookmarkExpenses(transactionList);
+ BookmarkExpenseList expectedTransactionList = new BookmarkExpenseList();
+ expectedTransactionList.add(SPOTIFY_SUBSCRIPTION);
+ assertEquals(expectedTransactionList, this.bookmarkExpenseList);
+ }
+
+ @Test
+ public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, ()
+ -> bookmarkExpenseList.asUnmodifiableObservableList().remove(0));
+ }
+
+ @Test
+ public void equals_distinctBookmarkExpenseListsWithSameAttributes_returnsTrue() {
+ List<BookmarkExpense> bookmarkExpens = getTypicalBookmarkExpenses();
+ BookmarkExpenseList firstTransactionList = new BookmarkExpenseList();
+ BookmarkExpenseList secondTransactionList = new BookmarkExpenseList();
+
+ firstTransactionList.setBookmarkExpenses(bookmarkExpens);
+ secondTransactionList.setBookmarkExpenses(bookmarkExpens);
+
+ assertNotSame(firstTransactionList, secondTransactionList);
+ assertEquals(firstTransactionList, secondTransactionList);
+ }
+
+ @Test
+ public void hashCode_distinctBookmarkExpenseListsWithSameAttributes_returnsTrue() {
+ List<BookmarkExpense> bookmarkExpens = getTypicalBookmarkExpenses();
+ BookmarkExpenseList firstTransactionList = new BookmarkExpenseList();
+ BookmarkExpenseList secondTransactionList = new BookmarkExpenseList();
+
+ firstTransactionList.setBookmarkExpenses(bookmarkExpens);
+ secondTransactionList.setBookmarkExpenses(bookmarkExpens);
+
+ assertNotSame(firstTransactionList, secondTransactionList);
+ assertEquals(firstTransactionList.hashCode(), secondTransactionList.hashCode());
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseTest.java
new file mode 100644
index 00000000000..88a2b15c403
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkExpenseTest.java
@@ -0,0 +1,50 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.SPOTIFY_SUBSCRIPTION;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+
+public class BookmarkExpenseTest {
+ @Test
+ public void equals() {
+ // same values -> returns true
+ BookmarkExpense bookmarkExpense = new BookmarkTransactionBuilder(PHONE_BILL).buildBookmarkExpense();
+ assertTrue(PHONE_BILL.equals(bookmarkExpense));
+
+ // same object -> returns true
+ assertTrue(PHONE_BILL.equals(PHONE_BILL));
+
+ // null -> returns false
+ assertFalse(PHONE_BILL.equals(null));
+
+ // different type -> returns false
+ assertFalse(PHONE_BILL.equals(5));
+
+ // different bookmark expense -> returns false
+ assertFalse(PHONE_BILL.equals(SPOTIFY_SUBSCRIPTION));
+
+ // different title -> returns false
+ BookmarkExpense editedPhoneBill = new BookmarkTransactionBuilder(PHONE_BILL)
+ .withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).buildBookmarkExpense();
+ assertFalse(PHONE_BILL.equals(editedPhoneBill));
+
+ // different amounts -> returns false
+ editedPhoneBill = new BookmarkTransactionBuilder(PHONE_BILL).withAmount(VALID_AMOUNT_SPOTIFY_SUBSCRIPTION)
+ .buildBookmarkExpense();
+ assertFalse(PHONE_BILL.equals(editedPhoneBill));
+
+ // different categories -> returns false
+ editedPhoneBill = new BookmarkTransactionBuilder(PHONE_BILL).withCategories(VALID_CATEGORY_FOOD_BEVERAGE)
+ .buildBookmarkExpense();
+ assertFalse(PHONE_BILL.equals(editedPhoneBill));
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeListTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeListTest.java
new file mode 100644
index 00000000000..3244c1ba233
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeListTest.java
@@ -0,0 +1,179 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.INVESTING;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.PART_TIME;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalBookmarkIncome;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.BookmarkTransactionNotFoundException;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.exceptions.DuplicateBookmarkTransactionException;
+
+public class BookmarkIncomeListTest {
+
+ private final BookmarkIncomeList bookmarkIncomeList = new BookmarkIncomeList();
+
+ @Test
+ public void add_nullBookmarkIncome_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> bookmarkIncomeList.add(null));
+ }
+
+ @Test
+ public void add_duplicateBookmarkIncome_throwsDuplicateBookmarkTransactionException() {
+ BookmarkIncome bookmarkIncome = new BookmarkTransactionBuilder(PART_TIME)
+ .withCategories(VALID_CATEGORY_WORK).buildBookmarkIncome();
+
+ bookmarkIncomeList.add(bookmarkIncome);
+
+ BookmarkIncome bookmarkIncomeCopy = new BookmarkTransactionBuilder(bookmarkIncome).buildBookmarkIncome();
+
+ assertThrows(DuplicateBookmarkTransactionException.class, () -> bookmarkIncomeList.add(bookmarkIncomeCopy));
+ }
+
+ @Test
+ public void setBookmarkIncome_nullTargetBookmarkIncome_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> bookmarkIncomeList.setBookmarkIncome(null, PART_TIME));
+ }
+
+ @Test
+ public void setBookmarkIncome_nullEditedBookmarkIncome_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> bookmarkIncomeList.setBookmarkIncome(PART_TIME, null));
+ }
+
+ @Test
+ public void setBookmarkIncome_targetBookmarkIncomeNotInList_throwsTransactionNotFoundException() {
+ assertThrows(BookmarkTransactionNotFoundException.class, ()
+ -> bookmarkIncomeList.setBookmarkIncome(PART_TIME, PART_TIME));
+ }
+
+ @Test
+ public void setBookmarkIncome_editedBookmarkIncomeIsSameBookmarkIncome_success() {
+ bookmarkIncomeList.add(PART_TIME);
+ bookmarkIncomeList.setBookmarkIncome(PART_TIME, PART_TIME);
+ BookmarkIncomeList expectedBookmarkIncomeList = new BookmarkIncomeList();
+ expectedBookmarkIncomeList.add(PART_TIME);
+ assertEquals(expectedBookmarkIncomeList, bookmarkIncomeList);
+ }
+
+ @Test
+ public void setBookmarkIncome_editedBookmarkIncomeHasSameIdentity_success() {
+ bookmarkIncomeList.add(PART_TIME);
+ BookmarkIncome editedPartTime = new BookmarkTransactionBuilder(PART_TIME)
+ .withCategories(VALID_CATEGORY_WORK).buildBookmarkIncome();
+ bookmarkIncomeList.setBookmarkIncome(PART_TIME, editedPartTime);
+ BookmarkIncomeList expectedBookmarkIncomeList = new BookmarkIncomeList();
+ expectedBookmarkIncomeList.add(editedPartTime);
+ assertEquals(expectedBookmarkIncomeList, bookmarkIncomeList);
+ }
+
+ @Test
+ public void setBookmarkIncome_editedBookmarkIncomeIsDuplicateOfAnotherBookmarkIncome() {
+ bookmarkIncomeList.add(PART_TIME);
+ bookmarkIncomeList.add(INVESTING);
+ BookmarkIncome editedPartTime = new BookmarkTransactionBuilder(PART_TIME)
+ .withTitle(INVESTING.getTitle().toString()).buildBookmarkIncome();
+ assertThrows(DuplicateBookmarkTransactionException.class, ()
+ -> bookmarkIncomeList.setBookmarkIncome(PART_TIME, editedPartTime));
+ }
+
+ @Test
+ public void setBookmarkIncome_editedBookmarkIncomeHasDifferentIdentity_success() {
+ bookmarkIncomeList.add(PART_TIME);
+ bookmarkIncomeList.setBookmarkIncome(PART_TIME, INVESTING);
+ BookmarkIncomeList expectedBookmarkIncomeList = new BookmarkIncomeList();
+ expectedBookmarkIncomeList.add(INVESTING);
+ assertEquals(expectedBookmarkIncomeList, bookmarkIncomeList);
+ }
+
+ @Test
+ public void remove_nullBookmarkIncome_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> bookmarkIncomeList.remove(null));
+ }
+
+ @Test
+ public void remove_bookmarkBookmarkDoesNotExist_throwsTransactionNotFoundException() {
+ assertThrows(BookmarkTransactionNotFoundException.class, () -> bookmarkIncomeList.remove(PART_TIME));
+ }
+
+ @Test
+ public void remove_existingBookmarkIncome_removesBookmarkIncome() {
+ bookmarkIncomeList.add(PART_TIME);
+ bookmarkIncomeList.remove(PART_TIME);
+ BookmarkIncomeList expectedBookmarkIncomeList = new BookmarkIncomeList();
+ assertEquals(expectedBookmarkIncomeList, bookmarkIncomeList);
+ }
+
+ @Test
+ public void setBookmarkIncomes_nullBookmarkIncomeList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> bookmarkIncomeList.setBookmarkIncomes((BookmarkIncomeList) null));
+ }
+
+ @Test
+ public void setBookmarkIncomes_bookmarkIncomeList_replacesOwnListWithProvidedBookmarkIncomeList() {
+ bookmarkIncomeList.add(PART_TIME);
+ BookmarkIncomeList expectedBookmarkIncomeList = new BookmarkIncomeList();
+ expectedBookmarkIncomeList.add(INVESTING);
+ bookmarkIncomeList.setBookmarkIncomes(expectedBookmarkIncomeList);
+ assertEquals(expectedBookmarkIncomeList, bookmarkIncomeList);
+ }
+
+ @Test
+ public void setBookmarkIncomes_nullList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> bookmarkIncomeList.setBookmarkIncomes((List<BookmarkIncome>) null));
+ }
+
+ @Test
+ public void setBookmarkIncomes_list_replacesOwnListWithProvidedList() {
+ bookmarkIncomeList.add(PART_TIME);
+ List<BookmarkIncome> transactionList = Collections.singletonList(INVESTING);
+ this.bookmarkIncomeList.setBookmarkIncomes(transactionList);
+ BookmarkIncomeList expectedBookmarkIncomeList = new BookmarkIncomeList();
+ expectedBookmarkIncomeList.add(INVESTING);
+ assertEquals(expectedBookmarkIncomeList, this.bookmarkIncomeList);
+ }
+
+ @Test
+ public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, ()
+ -> bookmarkIncomeList.asUnmodifiableObservableList().remove(0));
+ }
+
+ @Test
+ public void equals_distinctBookmarkIncomeListsWithSameAttributes_returnsTrue() {
+ List<BookmarkIncome> bookmarkIncomes = getTypicalBookmarkIncome();
+ BookmarkIncomeList firstTransactionList = new BookmarkIncomeList();
+ BookmarkIncomeList secondTransactionList = new BookmarkIncomeList();
+
+ firstTransactionList.setBookmarkIncomes(bookmarkIncomes);
+ secondTransactionList.setBookmarkIncomes(bookmarkIncomes);
+
+ assertNotSame(firstTransactionList, secondTransactionList);
+ assertEquals(firstTransactionList, secondTransactionList);
+ }
+
+ @Test
+ public void hashCode_distinctBookmarkIncomeListsWithSameAttributes_returnsTrue() {
+ List<BookmarkIncome> bookmarkIncomes = getTypicalBookmarkIncome();
+ BookmarkIncomeList firstTransactionList = new BookmarkIncomeList();
+ BookmarkIncomeList secondTransactionList = new BookmarkIncomeList();
+
+ firstTransactionList.setBookmarkIncomes(bookmarkIncomes);
+ secondTransactionList.setBookmarkIncomes(bookmarkIncomes);
+
+ assertNotSame(firstTransactionList, secondTransactionList);
+ assertEquals(firstTransactionList.hashCode(), secondTransactionList.hashCode());
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeTest.java
new file mode 100644
index 00000000000..abea76350a5
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/bookmark/BookmarkIncomeTest.java
@@ -0,0 +1,50 @@
+package ay2021s1_cs2103_w16_3.finesse.model.bookmark;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_PHONE_BILL;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_SPOTIFY_SUBSCRIPTION;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.INVESTING;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.PART_TIME;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+
+public class BookmarkIncomeTest {
+
+ @Test
+ public void equals() {
+ // same values -> returns true
+ BookmarkIncome bookmarkIncome = new BookmarkTransactionBuilder(PART_TIME).buildBookmarkIncome();
+ assertTrue(PART_TIME.equals(bookmarkIncome));
+
+ // same object -> returns true
+ assertTrue(PART_TIME.equals(PART_TIME));
+
+ // null -> returns false
+ assertFalse(PART_TIME.equals(null));
+
+ // different type -> returns false
+ assertFalse(PART_TIME.equals(5));
+
+ // different bookmark expense -> returns false
+ assertFalse(PART_TIME.equals(INVESTING));
+
+ // different title -> returns false
+ BookmarkIncome editedPartTime = new BookmarkTransactionBuilder(PART_TIME)
+ .withTitle(VALID_TITLE_SPOTIFY_SUBSCRIPTION).buildBookmarkIncome();
+ assertFalse(PART_TIME.equals(editedPartTime));
+
+ // different amounts -> returns false
+ editedPartTime = new BookmarkTransactionBuilder(PART_TIME).withAmount(VALID_AMOUNT_PHONE_BILL)
+ .buildBookmarkIncome();
+ assertFalse(PART_TIME.equals(editedPartTime));
+
+ // different categories -> returns false
+ editedPartTime = new BookmarkTransactionBuilder(PART_TIME).withCategories(VALID_CATEGORY_FOOD_BEVERAGE)
+ .buildBookmarkIncome();
+ assertFalse(PART_TIME.equals(editedPartTime));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/budget/MonthlyBudgetTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/budget/MonthlyBudgetTest.java
new file mode 100644
index 00000000000..a0d1dd6db1a
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/budget/MonthlyBudgetTest.java
@@ -0,0 +1,134 @@
+package ay2021s1_cs2103_w16_3.finesse.model.budget;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalTransactions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount.CalculatedAmount;
+
+public class MonthlyBudgetTest {
+ private final MonthlyBudget monthlyBudget = new MonthlyBudget();
+ private final Amount amountToSet = new Amount("500");
+ private final CalculatedAmount calculatedAmountToSet = new CalculatedAmount(amountToSet);
+
+ @Test
+ public void constructor() {
+ CalculatedAmount initialCalculatedAmount = new CalculatedAmount();
+ assertEquals(Amount.ZERO_AMOUNT, monthlyBudget.getMonthlyExpenseLimit().getValue());
+ assertEquals(Amount.ZERO_AMOUNT, monthlyBudget.getMonthlySavingsGoal().getValue());
+ assertEquals(initialCalculatedAmount, monthlyBudget.getRemainingBudget().getValue());
+ assertEquals(initialCalculatedAmount, monthlyBudget.getCurrentSavings().getValue());
+ assertEquals(Collections.emptyList(), monthlyBudget.getMonthlyExpenses());
+ assertEquals(Collections.emptyList(), monthlyBudget.getMonthlyIncomes());
+ assertEquals(Collections.emptyList(), monthlyBudget.getMonthlySavings());
+ assertEquals(Collections.emptyList(), monthlyBudget.getMonths());
+ }
+
+ @Test
+ public void getMonthlyExpenses_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> monthlyBudget.getMonthlyExpenses().remove(0));
+ }
+
+ @Test
+ public void getMonthlyIncomes_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> monthlyBudget.getMonthlyIncomes().remove(0));
+ }
+
+ @Test
+ public void getMonthlySavings_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> monthlyBudget.getMonthlySavings().remove(0));
+ }
+
+ @Test
+ public void getMonths_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> monthlyBudget.getMonths().remove(0));
+ }
+
+ @Test
+ public void setMonthlyExpenseLimit_validAmount_successful() {
+ MonthlyBudget monthlyBudget = new MonthlyBudget();
+ monthlyBudget.setMonthlyExpenseLimit(amountToSet);
+ assertEquals(amountToSet, monthlyBudget.getMonthlyExpenseLimit().getValue());
+ }
+
+ @Test
+ public void setMonthlySavingsGoal_validAmount_successful() {
+ MonthlyBudget monthlyBudget = new MonthlyBudget();
+ monthlyBudget.setMonthlySavingsGoal(amountToSet);
+ assertEquals(amountToSet, monthlyBudget.getMonthlySavingsGoal().getValue());
+ }
+
+ @Test
+ public void setRemainingBudget_validCalculatedAmount_successful() {
+ MonthlyBudget monthlyBudget = new MonthlyBudget();
+ monthlyBudget.setRemainingBudget(calculatedAmountToSet);
+ assertEquals(calculatedAmountToSet, monthlyBudget.getRemainingBudget().getValue());
+ }
+
+ @Test
+ public void setCurrentSavings_validCalculatedAmount_successful() {
+ MonthlyBudget monthlyBudget = new MonthlyBudget();
+ monthlyBudget.setCurrentSavings(calculatedAmountToSet);
+ assertEquals(calculatedAmountToSet, monthlyBudget.getCurrentSavings().getValue());
+ }
+
+ @Test
+ public void calculateBudgetInfo_calculatesCorrectValues_returnsFalse() {
+ MonthlyBudget monthlyBudget = new MonthlyBudget();
+
+ monthlyBudget.setMonthlyExpenseLimit(amountToSet);
+ monthlyBudget.setMonthlySavingsGoal(amountToSet);
+
+ FinanceTracker financeTracker = new FinanceTracker();
+ financeTracker.setMonthlyBudget(monthlyBudget);
+
+ financeTracker.calculateBudgetInfo();
+
+ assertEquals(calculatedAmountToSet, financeTracker.getMonthlyBudget().getRemainingBudget().getValue());
+ assertEquals(new CalculatedAmount(), financeTracker.getMonthlyBudget().getCurrentSavings().getValue());
+
+ }
+
+ @Test
+ public void equals_distinctMonthlyBudgetsWithSameAttributes_returnsTrue() {
+ MonthlyBudget firstMonthlyBudget = new MonthlyBudget();
+ MonthlyBudget secondMonthlyBudget = new MonthlyBudget();
+
+ firstMonthlyBudget.setMonthlyExpenseLimit(amountToSet);
+ secondMonthlyBudget.setMonthlyExpenseLimit(amountToSet);
+ firstMonthlyBudget.setMonthlySavingsGoal(amountToSet);
+ secondMonthlyBudget.setMonthlySavingsGoal(amountToSet);
+
+ assertNotSame(firstMonthlyBudget, secondMonthlyBudget);
+ assertEquals(firstMonthlyBudget, secondMonthlyBudget);
+ }
+
+ @Test
+ public void equals_sameSetValuesDifferentCalculatedValues_returnsFalse() {
+ MonthlyBudget monthlyBudget = new MonthlyBudget();
+
+ monthlyBudget.setMonthlyExpenseLimit(amountToSet);
+ monthlyBudget.setMonthlySavingsGoal(amountToSet);
+
+ FinanceTracker financeTracker = new FinanceTracker();
+ financeTracker.setTransactions(getTypicalTransactions());
+ financeTracker.setMonthlyBudget(monthlyBudget);
+
+ // ensure monthly budgets were equal before calculating budget info
+ assertEquals(financeTracker.getMonthlyBudget(), monthlyBudget);
+
+ financeTracker.calculateBudgetInfo();
+
+ // monthly budgets are now not equal
+ assertNotEquals(financeTracker.getMonthlyBudget(), monthlyBudget);
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/category/CategoryTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/category/CategoryTest.java
new file mode 100644
index 00000000000..1299592b8de
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/category/CategoryTest.java
@@ -0,0 +1,77 @@
+package ay2021s1_cs2103_w16_3.finesse.model.category;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+
+public class CategoryTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Category(null));
+ }
+
+ @Test
+ public void constructor_invalidCategoryName_throwsIllegalArgumentException() {
+ String invalidCategoryName = "";
+ assertThrows(IllegalArgumentException.class, () -> new Category(invalidCategoryName));
+ }
+
+ @Test
+ public void isValidCategoryName() {
+ // null category name
+ assertThrows(NullPointerException.class, () -> Category.isValidCategoryName(null));
+
+ // invalid category name
+ assertFalse(Category.isValidCategoryName("")); // empty string
+ assertFalse(Category.isValidCategoryName(" ")); // spaces only
+ assertFalse(Category.isValidCategoryName("\u0000world")); // non-graphical character
+
+ // valid category name
+ assertTrue(Category.isValidCategoryName("peter jack")); // alphabets only
+ assertTrue(Category.isValidCategoryName("12345")); // numbers only
+ assertTrue(Category.isValidCategoryName("peter the 2nd")); // alphanumeric characters
+ assertTrue(Category.isValidCategoryName("Capital Tan")); // with capital letters
+ assertTrue(Category.isValidCategoryName("David Roger Jackson Ray Jr 2nd")); // long category name
+ assertTrue(Category.isValidCategoryName("^")); // only non-alphanumeric characters
+ assertTrue(Category.isValidCategoryName("peter*")); // contains non-alphanumeric characters
+ }
+
+ @Test
+ public void asciiTest() {
+ String categoryNamePrefix = "Test: ";
+
+ // Check that the category name prefix is valid. It will need to be used to get around the
+ // 'at least one non-whitespace printable ASCII character' restriction.
+ assertTrue(Category.isValidCategoryName(categoryNamePrefix));
+
+ // Each character is its own equivalence partition.
+
+ // Check that the ASCII control characters (char codes 0 to 31 inclusive) are invalid.
+ IntStream.range(0, 32).forEach(i ->
+ assertFalse(Category.isValidCategoryName(categoryNamePrefix + getCharFromCharCode(i))));
+
+ // Check that the ASCII printable characters (char codes 32 to 126 inclusive) are valid.
+ IntStream.range(32, 127).forEach(i ->
+ assertTrue(Category.isValidCategoryName(categoryNamePrefix + getCharFromCharCode(i))));
+
+ // Check that the ASCII delete character (char code 127) is invalid.
+ assertFalse(Category.isValidCategoryName(categoryNamePrefix + getCharFromCharCode(127)));
+
+ // Check that extended ASCII characters (char codes 128 to 255 inclusive) are invalid.
+ IntStream.range(128, 256).forEach(i ->
+ assertFalse(Category.isValidCategoryName(categoryNamePrefix + getCharFromCharCode(i))));
+
+ // Check that Unicode characters are invalid.
+ IntStream.iterate(300, i -> i <= 10000, i -> i + 100).forEach(i ->
+ assertFalse(Category.isValidCategoryName(categoryNamePrefix + getCharFromCharCode(i))));
+ }
+
+ private String getCharFromCharCode(int i) {
+ return Character.toString((char) i);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/CommandHistoryTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/CommandHistoryTest.java
new file mode 100644
index 00000000000..e3043647b38
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/CommandHistoryTest.java
@@ -0,0 +1,48 @@
+package ay2021s1_cs2103_w16_3.finesse.model.command.history;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+
+public class CommandHistoryTest {
+ @Test
+ public void constructor_invalidMaxCommands_throwsIllegalArgumentException() {
+ assertThrows(IllegalArgumentException.class, () -> new CommandHistory(0));
+ assertThrows(IllegalArgumentException.class, () -> new CommandHistory(-10));
+ }
+
+ @Test
+ public void addAndNavigateCommands() {
+ CommandHistory commandHistory = new CommandHistory(5);
+ IntStream.range(1, 9).mapToObj(i -> "Command " + i).forEach(commandHistory::addCommand);
+
+ // Check that the order of command history is maintained backwards.
+ assertEquals("Command 8", commandHistory.navigateUp());
+ assertEquals("Command 7", commandHistory.navigateUp());
+ assertEquals("Command 6", commandHistory.navigateUp());
+ assertEquals("Command 5", commandHistory.navigateUp());
+ assertEquals("Command 4", commandHistory.navigateUp());
+ // Check that the earliest commands are evicted.
+ assertEquals("Command 4", commandHistory.navigateUp());
+ // Check that the order of command history is maintained forwards.
+ assertEquals("Command 5", commandHistory.navigateDown());
+ assertEquals("Command 6", commandHistory.navigateDown());
+ assertEquals("Command 7", commandHistory.navigateDown());
+ assertEquals("Command 8", commandHistory.navigateDown());
+ // Check that navigating past the most recent command returns null.
+ assertNull(commandHistory.navigateDown());
+ }
+
+ @Test
+ public void navigate_emptyCommandHistory_returnsEmptyString() {
+ CommandHistory commandHistory = new CommandHistory(5);
+
+ // Check that the empty string is returned when the command history is empty.
+ assertEquals("", commandHistory.navigateUp());
+ assertEquals("", commandHistory.navigateDown());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/EvictingStackTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/EvictingStackTest.java
new file mode 100644
index 00000000000..b65056209aa
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/EvictingStackTest.java
@@ -0,0 +1,64 @@
+package ay2021s1_cs2103_w16_3.finesse.model.command.history;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.EmptyStackException;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+
+public class EvictingStackTest {
+ @Test
+ public void constructor_invalidMaxSize_throwsIllegalArgumentException() {
+ assertThrows(IllegalArgumentException.class, () -> new EvictingStack<Integer>(0));
+ assertThrows(IllegalArgumentException.class, () -> new EvictingStack<Integer>(-10));
+ }
+
+ @Test
+ public void push_moreElementsThanMaxSize_bottomElementEvicted() {
+ EvictingStack<Integer> evictingStack = new EvictingStack<>(1);
+ assertTrue(evictingStack.isEmpty());
+ evictingStack.push(1);
+ assertFalse(evictingStack.isEmpty());
+ evictingStack.push(2);
+ assertEquals(2, evictingStack.pop());
+ // Check that element 1 is no longer in the stack.
+ assertTrue(evictingStack.isEmpty());
+ }
+
+ @Test
+ public void peek_emptyEvictingStack_throwsEmptyStackException() {
+ EvictingStack<Integer> evictingStack = new EvictingStack<>(5);
+ assertThrows(EmptyStackException.class, evictingStack::peek);
+ }
+
+ @Test
+ public void pop_emptyEvictingStack_throwsEmptyStackException() {
+ EvictingStack<Integer> evictingStack = new EvictingStack<>(5);
+ assertThrows(EmptyStackException.class, evictingStack::pop);
+ }
+
+ @Test
+ public void getTopNode_iterateThroughStack_correctNumberOfNodes() {
+ EvictingStack<Integer> evictingStack = new EvictingStack<>(5);
+ IntStream.range(1, 9).forEach(evictingStack::push);
+
+ // Check that the top-most element is 8.
+ assertEquals(8, evictingStack.peek());
+
+ // Check that the stack only holds the maximum of 5 elements.
+ Node<Integer> node = evictingStack.getTopNode();
+ int numOfNodes = 1;
+ while (node.hasPreviousNode()) {
+ node = node.getPreviousNode();
+ numOfNodes++;
+ }
+ assertEquals(5, numOfNodes);
+
+ // Check that the bottom-most element is 4.
+ assertEquals(4, node.getValue());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/NodeTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/NodeTest.java
new file mode 100644
index 00000000000..f50baeb5767
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/command/history/NodeTest.java
@@ -0,0 +1,94 @@
+package ay2021s1_cs2103_w16_3.finesse.model.command.history;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+public class NodeTest {
+ @Test
+ public void contructor() {
+ String value = "Hello World";
+ Node<String> node = new Node<>(value);
+
+ assertEquals(value, node.getValue());
+ }
+
+ @Test
+ public void linkNodes_noLinkConflicts_returnsTrue() {
+ Node<Integer> firstNode = new Node<>(1);
+ Node<Integer> secondNode = new Node<>(2);
+
+ assertTrue(Node.linkNodes(firstNode, secondNode));
+
+ // Check that the link was successfully created.
+ assertFalse(firstNode.hasPreviousNode());
+ assertTrue(firstNode.hasNextNode());
+ assertTrue(secondNode.hasPreviousNode());
+ assertFalse(secondNode.hasNextNode());
+
+ assertEquals(secondNode, firstNode.getNextNode());
+ assertEquals(firstNode, secondNode.getPreviousNode());
+ }
+
+ @Test
+ public void linkNodes_hasLinkConflicts_returnsFalse() {
+ Node<Integer> firstNode = new Node<>(1);
+ Node<Integer> secondNode = new Node<>(2);
+ Node<Integer> thirdNode = new Node<>(3);
+
+ assertTrue(Node.linkNodes(firstNode, secondNode));
+ assertFalse(Node.linkNodes(firstNode, thirdNode));
+
+ // Check that the link between firstNode and secondNode was not created.
+ assertFalse(firstNode.hasPreviousNode());
+ assertTrue(firstNode.hasNextNode());
+ assertFalse(thirdNode.hasPreviousNode());
+ assertFalse(thirdNode.hasNextNode());
+
+ assertEquals(secondNode, firstNode.getNextNode());
+ assertNull(thirdNode.getPreviousNode());
+ }
+
+ @Test
+ public void linkNodes_nullNode_throwsNullPointerException() {
+ Node<Integer> node = new Node<>(1);
+
+ assertThrows(NullPointerException.class, () -> Node.linkNodes(node, null));
+ assertThrows(NullPointerException.class, () -> Node.linkNodes(null, node));
+ assertThrows(NullPointerException.class, () -> Node.linkNodes(null, null));
+ }
+
+ @Test
+ public void removeLinks() {
+ Node<Integer> firstNode = new Node<>(1);
+ Node<Integer> secondNode = new Node<>(2);
+ Node<Integer> thirdNode = new Node<>(3);
+
+ // Create a circular chain of nodes.
+ assertTrue(Node.linkNodes(firstNode, secondNode));
+ assertTrue(Node.linkNodes(secondNode, thirdNode));
+ assertTrue(Node.linkNodes(thirdNode, firstNode));
+
+ // Check that all nodes have previous and next links.
+ assertTrue(firstNode.hasPreviousNode());
+ assertTrue(firstNode.hasNextNode());
+ assertTrue(secondNode.hasPreviousNode());
+ assertTrue(secondNode.hasNextNode());
+ assertTrue(thirdNode.hasPreviousNode());
+ assertTrue(thirdNode.hasNextNode());
+
+ secondNode.removeLinks();
+
+ // Check that all links with secondNode are be removed.
+ assertTrue(firstNode.hasPreviousNode());
+ assertFalse(firstNode.hasNextNode());
+ assertFalse(secondNode.hasPreviousNode());
+ assertFalse(secondNode.hasNextNode());
+ assertFalse(thirdNode.hasPreviousNode());
+ assertTrue(thirdNode.hasNextNode());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/AmountTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/AmountTest.java
new file mode 100644
index 00000000000..d541433719e
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/AmountTest.java
@@ -0,0 +1,69 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+public class AmountTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Amount(null));
+ }
+
+ @Test
+ public void constructor_invalidAmount_throwsIllegalArgumentException() {
+ String invalidAmount = "";
+ assertThrows(IllegalArgumentException.class, () -> new Amount(invalidAmount));
+ assertThrows(IllegalArgumentException.class, () -> new Amount("40.404"));
+ }
+
+ @Test
+ public void isValidAmount() {
+ // null amount
+ assertThrows(NullPointerException.class, () -> Amount.isValidAmount(null));
+
+ // invalid amounts
+ assertFalse(Amount.isValidAmount("")); // empty string
+ assertFalse(Amount.isValidAmount(" ")); // spaces only
+ assertFalse(Amount.isValidAmount("phone")); // non-numeric
+ assertFalse(Amount.isValidAmount("9011p041")); // alphabets within digits
+ assertFalse(Amount.isValidAmount("9312 1534")); // spaces within digits
+ assertFalse(Amount.isValidAmount("40.")); // no numbers after decimal
+ assertFalse(Amount.isValidAmount("40.4")); // 1 decimal place
+ assertFalse(Amount.isValidAmount("40.404")); // 3 decimal places
+ assertFalse(Amount.isValidAmount("€3")); // wrong currency prefix
+
+ // valid amounts
+ assertTrue(Amount.isValidAmount("$1")); // $ prefix
+ assertTrue(Amount.isValidAmount("4.20")); // 2 decimal places
+ assertTrue(Amount.isValidAmount("$3.50")); // $ prefix, 2 decimal places
+ assertTrue(Amount.isValidAmount("91")); // numbers
+ assertTrue(Amount.isValidAmount("911")); // numbers
+
+ // length tests
+ assertTrue(Amount.isValidAmount("93121534")); // 8 digits, valid
+ assertFalse(Amount.isValidAmount("931215344")); // 9 digits, invalid
+ assertFalse(Amount.isValidAmount("124293842033123")); // 15 digits, invalid
+ }
+
+ @Test
+ public void equals_distinctAmountsWithSameAttributes_returnsTrue() {
+ Amount firstAmount = new Amount("3.78");
+ Amount secondAmount = new Amount("3.78");
+ assertNotSame(firstAmount, secondAmount);
+ assertEquals(firstAmount, secondAmount);
+ }
+
+ @Test
+ public void hashCode_distinctAmountsWithSameAttributes_returnsTrue() {
+ Amount firstAmount = new Amount("3.78");
+ Amount secondAmount = new Amount("3.78");
+ assertNotSame(firstAmount, secondAmount);
+ assertEquals(firstAmount.hashCode(), secondAmount.hashCode());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/CalculatedAmountTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/CalculatedAmountTest.java
new file mode 100644
index 00000000000..7483f885b99
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/CalculatedAmountTest.java
@@ -0,0 +1,66 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.math.BigDecimal;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount.CalculatedAmount;
+
+public class CalculatedAmountTest {
+
+ private CalculatedAmount zero = new CalculatedAmount();
+ private CalculatedAmount positive = new CalculatedAmount(new Amount("1"));
+ private CalculatedAmount negative = zero.subtract(positive);
+
+ @Test
+ public void zeroValue() {
+ assertEquals(BigDecimal.ZERO, zero.getValue());
+ }
+
+ @Test
+ public void isNonNegative() {
+ assertTrue(zero.isNonNegative());
+ assertTrue(positive.isNonNegative());
+ assertFalse(negative.isNonNegative());
+ }
+
+ @Test
+ public void arithmeticIdentity() {
+ // zero is an additive identity
+ assertEquals(zero, zero.add(zero));
+ assertEquals(zero, zero.subtract(zero));
+ assertEquals(positive, positive.add(zero));
+ assertEquals(negative, negative.add(zero));
+ assertEquals(positive, positive.subtract(zero));
+ assertEquals(negative, negative.subtract(zero));
+ }
+
+ @Test
+ public void commutativeLaw() {
+ // addition is commutative
+ assertEquals(positive.add(zero), zero.add(positive));
+ // subtraction is not commutative
+ assertNotEquals(positive.subtract(zero), zero.subtract(positive));
+ }
+
+ @Test
+ public void associativeLaw() {
+ // addition is associative
+ assertEquals(zero.add(positive).add(positive), zero.add(positive.add(positive)));
+ // subtraction is not associative
+ assertNotEquals(zero.subtract(positive).subtract(positive), zero.subtract(positive.subtract(positive)));
+ }
+
+ @Test
+ public void stringFormat() {
+ assertEquals("$0.00", zero.toString());
+ assertEquals("$1.00", positive.toString());
+ assertEquals("$1.00", negative.toString());
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/DateTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/DateTest.java
new file mode 100644
index 00000000000..24074b2f660
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/DateTest.java
@@ -0,0 +1,80 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.Clock;
+import java.time.LocalDate;
+import java.time.ZoneId;
+
+import org.junit.jupiter.api.Test;
+
+public class DateTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Date(null));
+ }
+
+ @Test
+ public void constructor_invalidDate_throwsIllegalArgumentException() {
+ String invalidDate = "";
+ assertThrows(IllegalArgumentException.class, () -> new Date(invalidDate));
+ }
+
+ @Test
+ public void isValidDate() {
+ // null date
+ assertThrows(NullPointerException.class, () -> Date.isValidDate(null));
+
+ // blank date
+ assertFalse(Date.isValidDate("")); // empty string
+ assertFalse(Date.isValidDate(" ")); // spaces only
+
+ // missing parts
+ assertFalse(Date.isValidDate("04/11")); // missing year
+ assertFalse(Date.isValidDate("06102020")); // missing separators
+
+ // invalid parts
+ assertFalse(Date.isValidDate("01/02/03/04")); // more than 3 parts
+ assertFalse(Date.isValidDate("ab/cd/efgh")); // not numeric
+ assertFalse(Date.isValidDate("01/Jan/1970")); // not numeric
+ assertFalse(Date.isValidDate("6/10/2020")); // leading zeroes are required
+ assertFalse(Date.isValidDate("06/10/20")); // year must be 4 digits
+ assertFalse(Date.isValidDate("32/09/2020")); // day is not valid
+ assertFalse(Date.isValidDate("30/02/2019")); // day is not valid
+ assertFalse(Date.isValidDate("03/13/2020")); // month is not valid
+ assertFalse(Date.isValidDate("01/01/0000")); // year is not valid
+
+ // last invalid date
+ assertFalse(Date.isValidDate("31/12/1969"));
+
+ // date from the future is not allowed
+ LocalDate pastDate = LocalDate.of(2020, 10, 16);
+ assertFalse(Date.isValidDate("17/10/2020", Clock.fixed(
+ pastDate.atStartOfDay(ZoneId.systemDefault()).toInstant(), ZoneId.systemDefault())));
+
+ // valid date
+ assertTrue(Date.isValidDate("01/01/1970")); // earliest allowed date
+ assertTrue(Date.isValidDate("06/10/2020")); // 6 October 2020
+ }
+
+ @Test
+ public void equals_distinctDatesWithSameAttributes_returnsTrue() {
+ Date firstDate = new Date("22/09/2000");
+ Date secondDate = new Date("22/09/2000");
+ assertNotSame(firstDate, secondDate);
+ assertEquals(firstDate, secondDate);
+ }
+
+ @Test
+ public void hashCode_distinctDatesWithSameAttributes_returnsTrue() {
+ Date firstDate = new Date("22/09/2000");
+ Date secondDate = new Date("22/09/2000");
+ assertNotSame(firstDate, secondDate);
+ assertEquals(firstDate.hashCode(), secondDate.hashCode());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TitleTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TitleTest.java
new file mode 100644
index 00000000000..2a58eeff15e
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TitleTest.java
@@ -0,0 +1,77 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+
+public class TitleTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Title(null));
+ }
+
+ @Test
+ public void constructor_invalidTitle_throwsIllegalArgumentException() {
+ String invalidTitle = "";
+ assertThrows(IllegalArgumentException.class, () -> new Title(invalidTitle));
+ }
+
+ @Test
+ public void isValidTitle() {
+ // null title
+ assertThrows(NullPointerException.class, () -> Title.isValidTitle(null));
+
+ // invalid title
+ assertFalse(Title.isValidTitle("")); // empty string
+ assertFalse(Title.isValidTitle(" ")); // spaces only
+ assertFalse(Title.isValidTitle("\u0000world")); // non-graphical character
+
+ // valid title
+ assertTrue(Title.isValidTitle("peter jack")); // alphabets only
+ assertTrue(Title.isValidTitle("12345")); // numbers only
+ assertTrue(Title.isValidTitle("peter the 2nd")); // alphanumeric characters
+ assertTrue(Title.isValidTitle("Capital Tan")); // with capital letters
+ assertTrue(Title.isValidTitle("David Roger Jackson Ray Jr 2nd")); // long title
+ assertTrue(Title.isValidTitle("^")); // only non-alphanumeric characters
+ assertTrue(Title.isValidTitle("peter*")); // contains non-alphanumeric characters
+ }
+
+ @Test
+ public void asciiTest() {
+ String titlePrefix = "Test: ";
+
+ // Check that the title prefix is valid. It will need to be used to get around the
+ // 'at least one non-whitespace printable ASCII character' restriction.
+ assertTrue(Title.isValidTitle(titlePrefix));
+
+ // Each character is its own equivalence partition.
+
+ // Check that the ASCII control characters (char codes 0 to 31 inclusive) are invalid.
+ IntStream.range(0, 32).forEach(i ->
+ assertFalse(Title.isValidTitle(titlePrefix + getCharFromCharCode(i))));
+
+ // Check that the ASCII printable characters (char codes 32 to 126 inclusive) are valid.
+ IntStream.range(32, 127).forEach(i ->
+ assertTrue(Title.isValidTitle(titlePrefix + getCharFromCharCode(i))));
+
+ // Check that the ASCII delete character (char code 127) is invalid.
+ assertFalse(Title.isValidTitle(titlePrefix + getCharFromCharCode(127)));
+
+ // Check that extended ASCII characters (char codes 128 to 255 inclusive) are invalid.
+ IntStream.range(128, 256).forEach(i ->
+ assertFalse(Title.isValidTitle(titlePrefix + getCharFromCharCode(i))));
+
+ // Check that Unicode characters are invalid.
+ IntStream.iterate(300, i -> i <= 10000, i -> i + 100).forEach(i ->
+ assertFalse(Title.isValidTitle(titlePrefix + getCharFromCharCode(i))));
+ }
+
+ private String getCharFromCharCode(int i) {
+ return Character.toString((char) i);
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TransactionListTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TransactionListTest.java
new file mode 100644
index 00000000000..b44718f545c
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/TransactionListTest.java
@@ -0,0 +1,162 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction.TRANSACTION_COMPARATOR;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.INTERNSHIP_2;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalTransactions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.exceptions.TransactionNotFoundException;
+
+public class TransactionListTest {
+
+ private final TransactionList transactionList = new TransactionList();
+
+ @Test
+ public void add_nullTransaction_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> transactionList.add(null));
+ }
+
+ @Test
+ public void setTransaction_nullTargetTransaction_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> transactionList.setTransaction(null, BUBBLE_TEA));
+ }
+
+ @Test
+ public void setTransaction_nullEditedTransaction_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> transactionList.setTransaction(BUBBLE_TEA, null));
+ }
+
+ @Test
+ public void setTransaction_targetTransactionNotInList_throwsTransactionNotFoundException() {
+ assertThrows(TransactionNotFoundException.class, () -> transactionList.setTransaction(BUBBLE_TEA, BUBBLE_TEA));
+ }
+
+ @Test
+ public void setTransaction_editedTransactionIsSameTransaction_success() {
+ transactionList.add(BUBBLE_TEA);
+ transactionList.setTransaction(BUBBLE_TEA, BUBBLE_TEA);
+ TransactionList expectedTransactionList = new TransactionList();
+ expectedTransactionList.add(BUBBLE_TEA);
+ assertEquals(expectedTransactionList, transactionList);
+ }
+
+ @Test
+ public void setTransaction_editedTransactionHasSameIdentity_success() {
+ transactionList.add(BUBBLE_TEA);
+ Expense editedBubbleTea = new TransactionBuilder(BUBBLE_TEA)
+ .withCategories(VALID_CATEGORY_WORK).buildExpense();
+ transactionList.setTransaction(BUBBLE_TEA, editedBubbleTea);
+ TransactionList expectedTransactionList = new TransactionList();
+ expectedTransactionList.add(editedBubbleTea);
+ assertEquals(expectedTransactionList, transactionList);
+ }
+
+ @Test
+ public void setTransaction_editedTransactionHasDifferentIdentity_success() {
+ transactionList.add(BUBBLE_TEA);
+ transactionList.setTransaction(BUBBLE_TEA, INTERNSHIP_2);
+ TransactionList expectedTransactionList = new TransactionList();
+ expectedTransactionList.add(INTERNSHIP_2);
+ assertEquals(expectedTransactionList, transactionList);
+ }
+
+ @Test
+ public void remove_nullTransaction_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> transactionList.remove(null));
+ }
+
+ @Test
+ public void remove_transactionDoesNotExist_throwsTransactionNotFoundException() {
+ assertThrows(TransactionNotFoundException.class, () -> transactionList.remove(BUBBLE_TEA));
+ }
+
+ @Test
+ public void remove_existingTransaction_removesTransaction() {
+ transactionList.add(BUBBLE_TEA);
+ transactionList.remove(BUBBLE_TEA);
+ TransactionList expectedTransactionList = new TransactionList();
+ assertEquals(expectedTransactionList, transactionList);
+ }
+
+ @Test
+ public void setTransactions_nullTransactionList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, ()
+ -> transactionList.setTransactions((TransactionList) null));
+ }
+
+ @Test
+ public void setTransactions_transactionList_replacesOwnListWithProvidedTransactionList() {
+ transactionList.add(BUBBLE_TEA);
+ TransactionList expectedTransactionList = new TransactionList();
+ expectedTransactionList.add(INTERNSHIP_2);
+ transactionList.setTransactions(expectedTransactionList);
+ assertEquals(expectedTransactionList, transactionList);
+ }
+
+ @Test
+ public void setTransactions_nullList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> transactionList.setTransactions((List<Transaction>) null));
+ }
+
+ @Test
+ public void setTransactions_list_replacesOwnListWithProvidedList() {
+ transactionList.add(BUBBLE_TEA);
+ List<Transaction> transactionList = Collections.singletonList(INTERNSHIP_2);
+ this.transactionList.setTransactions(transactionList);
+ TransactionList expectedTransactionList = new TransactionList();
+ expectedTransactionList.add(INTERNSHIP_2);
+ assertEquals(expectedTransactionList, this.transactionList);
+ }
+
+ @Test
+ public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, ()
+ -> transactionList.asUnmodifiableObservableList().remove(0));
+ }
+
+ @Test
+ public void iterator_iteratesTransactionsInOrder_success() {
+ List<Transaction> transactions = getTypicalTransactions();
+ transactions.sort(TRANSACTION_COMPARATOR);
+ transactionList.setTransactions(transactions);
+ Iterator<Transaction> iterator = transactionList.iterator();
+ transactions.stream().forEach(transaction -> assertEquals(transaction, iterator.next()));
+ }
+
+ @Test
+ public void equals_distinctTransactionListsWithSameAttributes_returnsTrue() {
+ List<Transaction> transactions = getTypicalTransactions();
+ TransactionList firstTransactionList = new TransactionList();
+ TransactionList secondTransactionList = new TransactionList();
+
+ firstTransactionList.setTransactions(transactions);
+ secondTransactionList.setTransactions(transactions);
+
+ assertNotSame(firstTransactionList, secondTransactionList);
+ assertEquals(firstTransactionList, secondTransactionList);
+ }
+
+ @Test
+ public void hashCode_distinctTransactionListsWithSameAttributes_returnsTrue() {
+ List<Transaction> transactions = getTypicalTransactions();
+ TransactionList firstTransactionList = new TransactionList();
+ TransactionList secondTransactionList = new TransactionList();
+
+ firstTransactionList.setTransactions(transactions);
+ secondTransactionList.setTransactions(transactions);
+
+ assertNotSame(firstTransactionList, secondTransactionList);
+ assertEquals(firstTransactionList.hashCode(), secondTransactionList.hashCode());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasCategoriesPredicateTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasCategoriesPredicateTest.java
new file mode 100644
index 00000000000..a5b962ecd92
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasCategoriesPredicateTest.java
@@ -0,0 +1,75 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+
+public class HasCategoriesPredicateTest {
+
+ @Test
+ public void equals() {
+ List<String> firstPredicateCategoryList = Collections.singletonList("first");
+ List<String> secondPredicateCategoryList = Arrays.asList("first", "second");
+
+ HasCategoriesPredicate firstPredicate = new HasCategoriesPredicate(firstPredicateCategoryList);
+ HasCategoriesPredicate secondPredicate = new HasCategoriesPredicate(secondPredicateCategoryList);
+
+ // same object -> returns true
+ assertTrue(firstPredicate.equals(firstPredicate));
+
+ // same values -> returns true
+ HasCategoriesPredicate firstPredicateCopy = new HasCategoriesPredicate(firstPredicateCategoryList);
+ assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+ // different types -> returns false
+ assertFalse(firstPredicate.equals(1));
+
+ // null -> returns false
+ assertFalse(firstPredicate.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(firstPredicate.equals(secondPredicate));
+ }
+
+ @Test
+ public void test_categoriesContainMatch_returnsTrue() {
+ // One category
+ HasCategoriesPredicate predicate = new HasCategoriesPredicate(Collections.singletonList("Food"));
+ assertTrue(predicate.test(new TransactionBuilder().withCategories("Food", "Drink").buildExpense()));
+
+ // Multiple categories
+ predicate = new HasCategoriesPredicate(Arrays.asList("Food", "Drink"));
+ assertTrue(predicate.test(new TransactionBuilder().withCategories("Food", "Drink").buildExpense()));
+
+ // Only one matching category
+ predicate = new HasCategoriesPredicate(Arrays.asList("Food", "Dronk"));
+ assertTrue(predicate.test(new TransactionBuilder().withCategories("Food", "Drink").buildExpense()));
+
+ // Mixed-case keywords
+ predicate = new HasCategoriesPredicate(Arrays.asList("fOoD", "dRiNk"));
+ assertTrue(predicate.test(new TransactionBuilder().withCategories("Food", "Drink").buildExpense()));
+ }
+
+ @Test
+ public void test_categoriesDoNotMatch_returnsFalse() {
+ // Zero categories
+ HasCategoriesPredicate predicate = new HasCategoriesPredicate(Collections.emptyList());
+ assertFalse(predicate.test(new TransactionBuilder().withCategories("Food", "Drink").buildExpense()));
+
+ // Non-matching category
+ predicate = new HasCategoriesPredicate(Arrays.asList("Dronk"));
+ assertFalse(predicate.test(new TransactionBuilder().withCategories("Food", "Drink").buildExpense()));
+
+ // Category matches title, but does not match category
+ predicate = new HasCategoriesPredicate(
+ Arrays.asList("Bubble Tea"));
+ assertFalse(predicate.test(new TransactionBuilder().withTitle("Bubble Tea").buildExpense()));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasExactAmountPredicateTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasExactAmountPredicateTest.java
new file mode 100644
index 00000000000..36a71d078b4
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/HasExactAmountPredicateTest.java
@@ -0,0 +1,49 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+
+public class HasExactAmountPredicateTest {
+
+ @Test
+ public void equals() {
+ Amount firstPredicateAmount = new Amount("1");
+ Amount secondPredicateAmount = new Amount("2");
+
+ HasExactAmountPredicate firstPredicate = new HasExactAmountPredicate(firstPredicateAmount);
+ HasExactAmountPredicate secondPredicate = new HasExactAmountPredicate(secondPredicateAmount);
+
+ // same object -> returns true
+ assertTrue(firstPredicate.equals(firstPredicate));
+
+ // same values -> returns true
+ HasExactAmountPredicate firstPredicateCopy = new HasExactAmountPredicate(firstPredicateAmount);
+ assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+ // different types -> returns false
+ assertFalse(firstPredicate.equals(1));
+
+ // null -> returns false
+ assertFalse(firstPredicate.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(firstPredicate.equals(secondPredicate));
+ }
+
+ @Test
+ public void test_amountMatches_returnsTrue() {
+ HasExactAmountPredicate predicate = new HasExactAmountPredicate(new Amount("50"));
+ assertTrue(predicate.test(new TransactionBuilder().withAmount("50.00").buildExpense()));
+ }
+
+ @Test
+ public void test_amountDoesNotMatch_returnsFalse() {
+ HasExactAmountPredicate predicate = new HasExactAmountPredicate(new Amount("51"));
+ assertFalse(predicate.test(new TransactionBuilder().withAmount("50.00").buildExpense()));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InAmountRangePredicateTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InAmountRangePredicateTest.java
new file mode 100644
index 00000000000..183fa2ddc7a
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InAmountRangePredicateTest.java
@@ -0,0 +1,82 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+
+public class InAmountRangePredicateTest {
+
+ @Test
+ public void equals() {
+ Amount firstPredicateAmount = new Amount("1");
+ Amount secondPredicateAmount = new Amount("2");
+
+ InAmountRangePredicate firstPredicate =
+ new InAmountRangePredicate(Optional.of(firstPredicateAmount), Optional.ofNullable(null));
+ InAmountRangePredicate secondPredicate =
+ new InAmountRangePredicate(Optional.ofNullable(null), Optional.of(secondPredicateAmount));
+
+ // same object -> returns true
+ assertTrue(firstPredicate.equals(firstPredicate));
+
+ // same values -> returns true
+ InAmountRangePredicate firstPredicateCopy =
+ new InAmountRangePredicate(Optional.of(firstPredicateAmount), Optional.ofNullable(null));
+ assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+ // different types -> returns false
+ assertFalse(firstPredicate.equals(1));
+
+ // null -> returns false
+ assertFalse(firstPredicate.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(firstPredicate.equals(secondPredicate));
+ }
+
+ @Test
+ public void test_lowerBoundOnly() {
+ InAmountRangePredicate predicate = new InAmountRangePredicate(
+ Optional.of(new Amount("50")), Optional.ofNullable((null)));
+ // same as lower bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withAmount("50.00").buildExpense()));
+ // more than lower bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withAmount("55.00").buildExpense()));
+ // less than lower bound -> returns false
+ assertFalse(predicate.test(new TransactionBuilder().withAmount("45.00").buildExpense()));
+ }
+
+ @Test
+ public void test_upperBoundOnly() {
+ InAmountRangePredicate predicate = new InAmountRangePredicate(
+ Optional.ofNullable((null)), Optional.of(new Amount("50")));
+ // same as upper bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withAmount("50.00").buildExpense()));
+ // less than upper bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withAmount("45.00").buildExpense()));
+ // more than upper bound -> returns false
+ assertFalse(predicate.test(new TransactionBuilder().withAmount("55.00").buildExpense()));
+ }
+
+ @Test
+ public void test_upperAndLowerBound() {
+ InAmountRangePredicate predicate = new InAmountRangePredicate(
+ Optional.of(new Amount("10")), Optional.of(new Amount("50")));
+ // same as lower bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withAmount("10.00").buildExpense()));
+ // same as upper bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withAmount("50.00").buildExpense()));
+ // between lower and upper bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withAmount("45.00").buildExpense()));
+ // less than lower bound -> returns false
+ assertFalse(predicate.test(new TransactionBuilder().withAmount("5.00").buildExpense()));
+ // more than upper bound -> returns false
+ assertFalse(predicate.test(new TransactionBuilder().withAmount("55.00").buildExpense()));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InDateRangePredicateTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InDateRangePredicateTest.java
new file mode 100644
index 00000000000..8c274b009a8
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/InDateRangePredicateTest.java
@@ -0,0 +1,82 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+
+public class InDateRangePredicateTest {
+
+ @Test
+ public void equals() {
+ Date firstPredicateDate = new Date("01/10/2020");
+ Date secondPredicateDate = new Date("02/10/2020");
+
+ InDateRangePredicate firstPredicate =
+ new InDateRangePredicate(Optional.of(firstPredicateDate), Optional.ofNullable(null));
+ InDateRangePredicate secondPredicate =
+ new InDateRangePredicate(Optional.ofNullable(null), Optional.of(secondPredicateDate));
+
+ // same object -> returns true
+ assertTrue(firstPredicate.equals(firstPredicate));
+
+ // same values -> returns true
+ InDateRangePredicate firstPredicateCopy =
+ new InDateRangePredicate(Optional.of(firstPredicateDate), Optional.ofNullable(null));
+ assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+ // different types -> returns false
+ assertFalse(firstPredicate.equals(1));
+
+ // null -> returns false
+ assertFalse(firstPredicate.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(firstPredicate.equals(secondPredicate));
+ }
+
+ @Test
+ public void test_lowerBoundOnly() {
+ InDateRangePredicate predicate = new InDateRangePredicate(
+ Optional.of(new Date("01/10/2020")), Optional.ofNullable((null)));
+ // same as lower bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withDate("01/10/2020").buildExpense()));
+ // more than lower bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withDate("15/10/2020").buildExpense()));
+ // less than lower bound -> returns false
+ assertFalse(predicate.test(new TransactionBuilder().withDate("22/09/2020").buildExpense()));
+ }
+
+ @Test
+ public void test_upperBoundOnly() {
+ InDateRangePredicate predicate = new InDateRangePredicate(
+ Optional.ofNullable((null)), Optional.of(new Date("15/10/2020")));
+ // same as upper bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withDate("15/10/2020").buildExpense()));
+ // less than upper bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withDate("01/10/2020").buildExpense()));
+ // more than upper bound -> returns false
+ assertFalse(predicate.test(new TransactionBuilder().withDate("20/10/2020").buildExpense()));
+ }
+
+ @Test
+ public void test_upperAndLowerBound() {
+ InDateRangePredicate predicate = new InDateRangePredicate(
+ Optional.of(new Date("01/10/2020")), Optional.of(new Date("15/10/2020")));
+ // same as lower bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withDate("01/10/2020").buildExpense()));
+ // same as upper bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withDate("15/10/2020").buildExpense()));
+ // between lower and upper bound -> returns true
+ assertTrue(predicate.test(new TransactionBuilder().withDate("15/10/2020").buildExpense()));
+ // less than lower bound -> returns false
+ assertFalse(predicate.test(new TransactionBuilder().withDate("22/09/2020").buildExpense()));
+ // more than upper bound -> returns false
+ assertFalse(predicate.test(new TransactionBuilder().withDate("20/10/2020").buildExpense()));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/OnExactDatePredicateTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/OnExactDatePredicateTest.java
new file mode 100644
index 00000000000..e2a5d44aa40
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/OnExactDatePredicateTest.java
@@ -0,0 +1,49 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+
+public class OnExactDatePredicateTest {
+
+ @Test
+ public void equals() {
+ Date firstPredicateDate = new Date("01/10/2020");
+ Date secondPredicateDate = new Date("02/10/2020");
+
+ OnExactDatePredicate firstPredicate = new OnExactDatePredicate(firstPredicateDate);
+ OnExactDatePredicate secondPredicate = new OnExactDatePredicate(secondPredicateDate);
+
+ // same object -> returns true
+ assertTrue(firstPredicate.equals(firstPredicate));
+
+ // same values -> returns true
+ OnExactDatePredicate firstPredicateCopy = new OnExactDatePredicate(firstPredicateDate);
+ assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+ // different types -> returns false
+ assertFalse(firstPredicate.equals(1));
+
+ // null -> returns false
+ assertFalse(firstPredicate.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(firstPredicate.equals(secondPredicate));
+ }
+
+ @Test
+ public void test_dateMatches_returnsTrue() {
+ OnExactDatePredicate predicate = new OnExactDatePredicate(new Date("01/10/2020"));
+ assertTrue(predicate.test(new TransactionBuilder().withDate("01/10/2020").buildExpense()));
+ }
+
+ @Test
+ public void test_dateDoesNotMatch_returnsFalse() {
+ OnExactDatePredicate predicate = new OnExactDatePredicate(new Date("01/10/2020"));
+ assertFalse(predicate.test(new TransactionBuilder().withDate("10/01/2020").buildExpense()));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/TitleContainsKeyphrasesPredicateTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/TitleContainsKeyphrasesPredicateTest.java
new file mode 100644
index 00000000000..e697654cfee
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/transaction/predicates/TitleContainsKeyphrasesPredicateTest.java
@@ -0,0 +1,79 @@
+package ay2021s1_cs2103_w16_3.finesse.model.transaction.predicates;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+
+public class TitleContainsKeyphrasesPredicateTest {
+
+ @Test
+ public void equals() {
+ List<String> firstPredicateKeyphraseList = Collections.singletonList("first");
+ List<String> secondPredicateKeyphraseList = Arrays.asList("first", "second");
+
+ TitleContainsKeyphrasesPredicate firstPredicate =
+ new TitleContainsKeyphrasesPredicate(firstPredicateKeyphraseList);
+ TitleContainsKeyphrasesPredicate secondPredicate =
+ new TitleContainsKeyphrasesPredicate(secondPredicateKeyphraseList);
+
+ // same object -> returns true
+ assertTrue(firstPredicate.equals(firstPredicate));
+
+ // same values -> returns true
+ TitleContainsKeyphrasesPredicate firstPredicateCopy =
+ new TitleContainsKeyphrasesPredicate(firstPredicateKeyphraseList);
+ assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+ // different types -> returns false
+ assertFalse(firstPredicate.equals(1));
+
+ // null -> returns false
+ assertFalse(firstPredicate.equals(null));
+
+ // different transaction -> returns false
+ assertFalse(firstPredicate.equals(secondPredicate));
+ }
+
+ @Test
+ public void test_titleContainsKeyphrases_returnsTrue() {
+ // One keyphrase
+ TitleContainsKeyphrasesPredicate predicate =
+ new TitleContainsKeyphrasesPredicate(Collections.singletonList("Damith Seth"));
+ assertTrue(predicate.test(new TransactionBuilder().withTitle("Damith Seth").buildExpense()));
+
+ // Partial keyphrase
+ predicate = new TitleContainsKeyphrasesPredicate(Arrays.asList("Dam"));
+ assertTrue(predicate.test(new TransactionBuilder().withTitle("Damith Seth").buildExpense()));
+
+ // Multiple keyphrases
+ predicate = new TitleContainsKeyphrasesPredicate(Arrays.asList("Damith", "Seth"));
+ assertTrue(predicate.test(new TransactionBuilder().withTitle("Damith Seth").buildExpense()));
+
+ // Only one matching keyphrase
+ predicate = new TitleContainsKeyphrasesPredicate(Arrays.asList("Seth", "Aaron"));
+ assertTrue(predicate.test(new TransactionBuilder().withTitle("Damith Aaron").buildExpense()));
+
+ // Mixed-case keyphrases
+ predicate = new TitleContainsKeyphrasesPredicate(Arrays.asList("dAMiTh", "SEtH"));
+ assertTrue(predicate.test(new TransactionBuilder().withTitle("Damith Seth").buildExpense()));
+ }
+
+ @Test
+ public void test_titleDoesNotContainKeyphrases_returnsFalse() {
+ // Zero keyphrases
+ TitleContainsKeyphrasesPredicate predicate = new TitleContainsKeyphrasesPredicate(Collections.emptyList());
+ assertFalse(predicate.test(new TransactionBuilder().withTitle("Damith").buildExpense()));
+
+ // Non-matching keyphrase
+ predicate = new TitleContainsKeyphrasesPredicate(Arrays.asList("Aaron"));
+ assertFalse(predicate.test(new TransactionBuilder().withTitle("Damith Seth").buildExpense()));
+
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/util/SampleDataUtilTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/util/SampleDataUtilTest.java
new file mode 100644
index 00000000000..d877ad75a75
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/model/util/SampleDataUtilTest.java
@@ -0,0 +1,17 @@
+package ay2021s1_cs2103_w16_3.finesse.model.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+
+public class SampleDataUtilTest {
+ @Test
+ public void getSampleFinanceTracker_countTransactions_correctNumberOfTransactions() {
+ ReadOnlyFinanceTracker financeTracker = SampleDataUtil.getSampleFinanceTracker();
+ assertEquals(6, financeTracker.getTransactionList().size());
+ assertEquals(3, financeTracker.getExpenseList().size());
+ assertEquals(3, financeTracker.getIncomeList().size());
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedExpenseTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedExpenseTest.java
new file mode 100644
index 00000000000..e116ae995b8
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedExpenseTest.java
@@ -0,0 +1,98 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import static ay2021s1_cs2103_w16_3.finesse.storage.JsonAdaptedExpense.MISSING_FIELD_MESSAGE_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.TUITION_FEES;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+public class JsonAdaptedExpenseTest {
+ private static final String INVALID_TITLE = "R\u2416chel";
+ private static final String INVALID_AMOUNT = "+651234";
+ private static final String INVALID_DATE = "example.com";
+ private static final String INVALID_CATEGORY = "\u2416friend";
+
+ private static final String VALID_TITLE = TUITION_FEES.getTitle().toString();
+ private static final String VALID_AMOUNT = TUITION_FEES.getAmount().toString();
+ private static final String VALID_DATE = TUITION_FEES.getDate().toString();
+ private static final List<JsonAdaptedCategory> VALID_CATEGORIES = TUITION_FEES.getCategories().stream()
+ .map(JsonAdaptedCategory::new)
+ .collect(Collectors.toList());
+
+ @Test
+ public void toModelType_validExpenseDetails_returnsExpense() throws Exception {
+ Expense expenseBenson = new TransactionBuilder(TUITION_FEES).buildExpense();
+ JsonAdaptedExpense expense = new JsonAdaptedExpense(expenseBenson);
+ assertEquals(expenseBenson, expense.toModelType());
+ }
+
+ @Test
+ public void toModelType_invalidTitle_throwsIllegalValueException() {
+ JsonAdaptedExpense expense =
+ new JsonAdaptedExpense(INVALID_TITLE, VALID_AMOUNT, VALID_DATE, VALID_CATEGORIES);
+ String expectedMessage = Title.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, expense::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullTitle_throwsIllegalValueException() {
+ JsonAdaptedExpense expense = new JsonAdaptedExpense(null, VALID_AMOUNT, VALID_DATE,
+ VALID_CATEGORIES);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Title.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, expense::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidAmount_throwsIllegalValueException() {
+ JsonAdaptedExpense expense =
+ new JsonAdaptedExpense(VALID_TITLE, INVALID_AMOUNT, VALID_DATE, VALID_CATEGORIES);
+ String expectedMessage = Amount.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, expense::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullAmount_throwsIllegalValueException() {
+ JsonAdaptedExpense expense = new JsonAdaptedExpense(VALID_TITLE, null, VALID_DATE,
+ VALID_CATEGORIES);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Amount.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, expense::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidDate_throwsIllegalValueException() {
+ JsonAdaptedExpense expense =
+ new JsonAdaptedExpense(VALID_TITLE, VALID_AMOUNT, INVALID_DATE, VALID_CATEGORIES);
+ String expectedMessage = Date.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, expense::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullDate_throwsIllegalValueException() {
+ JsonAdaptedExpense expense = new JsonAdaptedExpense(VALID_TITLE, VALID_AMOUNT, null,
+ VALID_CATEGORIES);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Date.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, expense::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidCategories_throwsIllegalValueException() {
+ List<JsonAdaptedCategory> invalidCategories = new ArrayList<>(VALID_CATEGORIES);
+ invalidCategories.add(new JsonAdaptedCategory(INVALID_CATEGORY));
+ JsonAdaptedExpense expense =
+ new JsonAdaptedExpense(VALID_TITLE, VALID_AMOUNT, VALID_DATE, invalidCategories);
+ assertThrows(IllegalValueException.class, expense::toModelType);
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedIncomeTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedIncomeTest.java
new file mode 100644
index 00000000000..20bd6486d4b
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedIncomeTest.java
@@ -0,0 +1,98 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import static ay2021s1_cs2103_w16_3.finesse.storage.JsonAdaptedIncome.MISSING_FIELD_MESSAGE_FORMAT;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.TUITION_FEES;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+
+public class JsonAdaptedIncomeTest {
+ private static final String INVALID_TITLE = "R\u2416chel";
+ private static final String INVALID_AMOUNT = "+651234";
+ private static final String INVALID_DATE = "example.com";
+ private static final String INVALID_CATEGORY = "\u2416friend";
+
+ private static final String VALID_TITLE = TUITION_FEES.getTitle().toString();
+ private static final String VALID_AMOUNT = TUITION_FEES.getAmount().toString();
+ private static final String VALID_DATE = TUITION_FEES.getDate().toString();
+ private static final List<JsonAdaptedCategory> VALID_CATEGORIES = TUITION_FEES.getCategories().stream()
+ .map(JsonAdaptedCategory::new)
+ .collect(Collectors.toList());
+
+ @Test
+ public void toModelType_validIncomeDetails_returnsIncome() throws Exception {
+ Income bensonIncome = new TransactionBuilder(TUITION_FEES).buildIncome();
+ JsonAdaptedIncome income = new JsonAdaptedIncome(bensonIncome);
+ assertEquals(bensonIncome, income.toModelType());
+ }
+
+ @Test
+ public void toModelType_invalidTitle_throwsIllegalValueException() {
+ JsonAdaptedIncome income =
+ new JsonAdaptedIncome(INVALID_TITLE, VALID_AMOUNT, VALID_DATE, VALID_CATEGORIES);
+ String expectedMessage = Title.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, income::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullTitle_throwsIllegalValueException() {
+ JsonAdaptedIncome income = new JsonAdaptedIncome(null, VALID_AMOUNT, VALID_DATE,
+ VALID_CATEGORIES);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Title.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, income::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidAmount_throwsIllegalValueException() {
+ JsonAdaptedIncome income =
+ new JsonAdaptedIncome(VALID_TITLE, INVALID_AMOUNT, VALID_DATE, VALID_CATEGORIES);
+ String expectedMessage = Amount.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, income::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullAmount_throwsIllegalValueException() {
+ JsonAdaptedIncome income = new JsonAdaptedIncome(VALID_TITLE, null, VALID_DATE,
+ VALID_CATEGORIES);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Amount.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, income::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidDate_throwsIllegalValueException() {
+ JsonAdaptedIncome income =
+ new JsonAdaptedIncome(VALID_TITLE, VALID_AMOUNT, INVALID_DATE, VALID_CATEGORIES);
+ String expectedMessage = Date.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, income::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullDate_throwsIllegalValueException() {
+ JsonAdaptedIncome income = new JsonAdaptedIncome(VALID_TITLE, VALID_AMOUNT, null,
+ VALID_CATEGORIES);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Date.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, income::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidCategories_throwsIllegalValueException() {
+ List<JsonAdaptedCategory> invalidCategories = new ArrayList<>(VALID_CATEGORIES);
+ invalidCategories.add(new JsonAdaptedCategory(INVALID_CATEGORY));
+ JsonAdaptedIncome income =
+ new JsonAdaptedIncome(VALID_TITLE, VALID_AMOUNT, VALID_DATE, invalidCategories);
+ assertThrows(IllegalValueException.class, income::toModelType);
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedMonthlyBudgetTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedMonthlyBudgetTest.java
new file mode 100644
index 00000000000..be6421f0258
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonAdaptedMonthlyBudgetTest.java
@@ -0,0 +1,28 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+
+public class JsonAdaptedMonthlyBudgetTest {
+ private static final String INVALID_AMOUNT = "+651234";
+ private static final String VALID_AMOUNT = "500";
+
+ @Test
+ public void toModelType_invalidMonthlyExpenseLimit_throwsIllegalValueException() {
+ JsonAdaptedMonthlyBudget monthlyBudget = new JsonAdaptedMonthlyBudget(INVALID_AMOUNT, VALID_AMOUNT);
+ String expectedMessage = Amount.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, monthlyBudget::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidMonthlySavingsGoal_throwsIllegalValueException() {
+ JsonAdaptedMonthlyBudget monthlyBudget = new JsonAdaptedMonthlyBudget(VALID_AMOUNT, INVALID_AMOUNT);
+ String expectedMessage = Amount.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, monthlyBudget::toModelType);
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonFinanceTrackerStorageTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonFinanceTrackerStorageTest.java
new file mode 100644
index 00000000000..0c8e7e478f0
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonFinanceTrackerStorageTest.java
@@ -0,0 +1,113 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.TEACHING_ASSISTANT_2;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.TUITION_FEES_2;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+
+public class JsonFinanceTrackerStorageTest {
+ private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonFinanceTrackerStorageTest");
+
+ @TempDir
+ public Path testFolder;
+
+ @Test
+ public void readFinanceTracker_nullFilePath_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> readFinanceTracker(null));
+ }
+
+ private java.util.Optional<ReadOnlyFinanceTracker> readFinanceTracker(String filePath) throws Exception {
+ return new JsonFinanceTrackerStorage(Paths.get(filePath))
+ .readFinanceTracker(addToTestDataPathIfNotNull(filePath));
+ }
+
+ private Path addToTestDataPathIfNotNull(String prefsFileInTestDataFolder) {
+ return prefsFileInTestDataFolder != null
+ ? TEST_DATA_FOLDER.resolve(prefsFileInTestDataFolder)
+ : null;
+ }
+
+ @Test
+ public void read_missingFile_emptyResult() throws Exception {
+ assertFalse(readFinanceTracker("NonExistentFile.json").isPresent());
+ }
+
+ @Test
+ public void read_notJsonFormat_exceptionThrown() {
+ assertThrows(DataConversionException.class, () -> readFinanceTracker("notJsonFormatFinanceTracker.json"));
+ }
+
+ @Test
+ public void readFinanceTracker_invalidTransactionFinanceTracker_throwDataConversionException() {
+ assertThrows(DataConversionException.class, () -> readFinanceTracker("invalidTransactionsFinanceTracker.json"));
+ }
+
+ @Test
+ public void readFinanceTracker_invalidAndValidTransactionFinanceTracker_throwDataConversionException() {
+ assertThrows(DataConversionException.class, () -> readFinanceTracker(
+ "invalidAndValidTransactionsFinanceTracker.json"));
+ }
+
+ @Test
+ public void readAndSaveFinanceTracker_allInOrder_success() throws Exception {
+ Path filePath = testFolder.resolve("TempFinanceTracker.json");
+ FinanceTracker original = getTypicalFinanceTracker();
+ JsonFinanceTrackerStorage jsonFinanceTrackerStorage = new JsonFinanceTrackerStorage(filePath);
+
+ // Save in new file and read back
+ jsonFinanceTrackerStorage.saveFinanceTracker(original, filePath);
+ ReadOnlyFinanceTracker readBack = jsonFinanceTrackerStorage.readFinanceTracker(filePath).get();
+ assertEquals(original, new FinanceTracker(readBack));
+
+ // Modify data, overwrite exiting file, and read back
+ original.addTransaction(new TransactionBuilder(TUITION_FEES_2).buildExpense());
+ original.removeTransaction(new TransactionBuilder(BUBBLE_TEA).buildExpense());
+ jsonFinanceTrackerStorage.saveFinanceTracker(original, filePath);
+ readBack = jsonFinanceTrackerStorage.readFinanceTracker(filePath).get();
+ assertEquals(original, new FinanceTracker(readBack));
+
+ // Save and read without specifying file path
+ original.addTransaction(new TransactionBuilder(TEACHING_ASSISTANT_2).buildIncome());
+ jsonFinanceTrackerStorage.saveFinanceTracker(original); // file path not specified
+ readBack = jsonFinanceTrackerStorage.readFinanceTracker().get(); // file path not specified
+ assertEquals(original, new FinanceTracker(readBack));
+
+ }
+
+ @Test
+ public void saveFinanceTracker_nullFinanceTracker_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> saveFinanceTracker(null, "SomeFile.json"));
+ }
+
+ /**
+ * Saves {@code financeTracker} at the specified {@code filePath}.
+ */
+ private void saveFinanceTracker(ReadOnlyFinanceTracker financeTracker, String filePath) {
+ try {
+ new JsonFinanceTrackerStorage(Paths.get(filePath))
+ .saveFinanceTracker(financeTracker, addToTestDataPathIfNotNull(filePath));
+ } catch (IOException ioe) {
+ throw new AssertionError("There should not be an error writing to the file.", ioe);
+ }
+ }
+
+ @Test
+ public void saveFinanceTracker_nullFilePath_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> saveFinanceTracker(new FinanceTracker(), null));
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonSerializableFinanceTrackerTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonSerializableFinanceTrackerTest.java
new file mode 100644
index 00000000000..99ccb4820d7
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonSerializableFinanceTrackerTest.java
@@ -0,0 +1,40 @@
+package ay2021s1_cs2103_w16_3.finesse.storage;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.IllegalValueException;
+import ay2021s1_cs2103_w16_3.finesse.commons.util.JsonUtil;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions;
+
+public class JsonSerializableFinanceTrackerTest {
+
+ private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonSerializableFinanceTrackerTest");
+ private static final Path TYPICAL_TRANSACTIONS_FILE =
+ TEST_DATA_FOLDER.resolve("typicalTransactionsFinanceTracker.json");
+ private static final Path INVALID_TRANSACTION_FILE =
+ TEST_DATA_FOLDER.resolve("invalidTransactionsFinanceTracker.json");
+
+ @Test
+ public void toModelType_typicalTransactionsFile_success() throws Exception {
+ JsonSerializableFinanceTracker dataFromFile = JsonUtil.readJsonFile(TYPICAL_TRANSACTIONS_FILE,
+ JsonSerializableFinanceTracker.class).get();
+ FinanceTracker financeTrackerFromFile = dataFromFile.toModelType();
+ FinanceTracker typicalTransactionsFinanceTracker = TypicalTransactions.getTypicalFinanceTracker();
+ assertEquals(financeTrackerFromFile, typicalTransactionsFinanceTracker);
+ }
+
+ @Test
+ public void toModelType_invalidTransactionFile_throwsIllegalValueException() throws Exception {
+ JsonSerializableFinanceTracker dataFromFile = JsonUtil.readJsonFile(INVALID_TRANSACTION_FILE,
+ JsonSerializableFinanceTracker.class).get();
+ assertThrows(IllegalValueException.class, dataFromFile::toModelType);
+ }
+
+}
diff --git a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonUserPrefsStorageTest.java
similarity index 88%
rename from src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonUserPrefsStorageTest.java
index 16f33f4a6bb..903a73c9b2c 100644
--- a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/JsonUserPrefsStorageTest.java
@@ -1,8 +1,8 @@
-package seedu.address.storage;
+package ay2021s1_cs2103_w16_3.finesse.storage;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static seedu.address.testutil.Assert.assertThrows;
import java.io.IOException;
import java.nio.file.Path;
@@ -12,9 +12,9 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.commons.exceptions.DataConversionException;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
public class JsonUserPrefsStorageTest {
@@ -72,8 +72,8 @@ public void readUserPrefs_extraValuesInFile_extraValuesIgnored() throws DataConv
private UserPrefs getTypicalUserPrefs() {
UserPrefs userPrefs = new UserPrefs();
- userPrefs.setGuiSettings(new GuiSettings(1000, 500, 300, 100));
- userPrefs.setAddressBookFilePath(Paths.get("addressbook.json"));
+ userPrefs.setGuiSettings(new GuiSettings(1000, 500, 300, 100, false));
+ userPrefs.setFinanceTrackerFilePath(Paths.get("fine$$e.json"));
return userPrefs;
}
@@ -103,7 +103,7 @@ private void saveUserPrefs(UserPrefs userPrefs, String prefsFileInTestDataFolder
public void saveUserPrefs_allInOrder_success() throws DataConversionException, IOException {
UserPrefs original = new UserPrefs();
- original.setGuiSettings(new GuiSettings(1200, 200, 0, 2));
+ original.setGuiSettings(new GuiSettings(1200, 200, 0, 2, false));
Path pefsFilePath = testFolder.resolve("TempPrefs.json");
JsonUserPrefsStorage jsonUserPrefsStorage = new JsonUserPrefsStorage(pefsFilePath);
@@ -114,7 +114,7 @@ public void saveUserPrefs_allInOrder_success() throws DataConversionException, I
assertEquals(original, readBack);
//Try saving when the file exists
- original.setGuiSettings(new GuiSettings(5, 5, 5, 5));
+ original.setGuiSettings(new GuiSettings(5, 5, 5, 5, false));
jsonUserPrefsStorage.saveUserPrefs(original);
readBack = jsonUserPrefsStorage.readUserPrefs().get();
assertEquals(original, readBack);
diff --git a/src/test/java/seedu/address/storage/StorageManagerTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/StorageManagerTest.java
similarity index 54%
rename from src/test/java/seedu/address/storage/StorageManagerTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/StorageManagerTest.java
index 99a16548970..5190c031eef 100644
--- a/src/test/java/seedu/address/storage/StorageManagerTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/storage/StorageManagerTest.java
@@ -1,8 +1,8 @@
-package seedu.address.storage;
+package ay2021s1_cs2103_w16_3.finesse.storage;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.TypicalTransactions.getTypicalFinanceTracker;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
import java.nio.file.Path;
@@ -10,10 +10,10 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.UserPrefs;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.GuiSettings;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.ReadOnlyFinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.UserPrefs;
public class StorageManagerTest {
@@ -24,9 +24,9 @@ public class StorageManagerTest {
@BeforeEach
public void setUp() {
- JsonAddressBookStorage addressBookStorage = new JsonAddressBookStorage(getTempFilePath("ab"));
+ JsonFinanceTrackerStorage financeTrackerStorage = new JsonFinanceTrackerStorage(getTempFilePath("ab"));
JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(getTempFilePath("prefs"));
- storageManager = new StorageManager(addressBookStorage, userPrefsStorage);
+ storageManager = new StorageManager(financeTrackerStorage, userPrefsStorage);
}
private Path getTempFilePath(String fileName) {
@@ -41,28 +41,28 @@ public void prefsReadSave() throws Exception {
* More extensive testing of UserPref saving/reading is done in {@link JsonUserPrefsStorageTest} class.
*/
UserPrefs original = new UserPrefs();
- original.setGuiSettings(new GuiSettings(300, 600, 4, 6));
+ original.setGuiSettings(new GuiSettings(300, 600, 4, 6, false));
storageManager.saveUserPrefs(original);
UserPrefs retrieved = storageManager.readUserPrefs().get();
assertEquals(original, retrieved);
}
@Test
- public void addressBookReadSave() throws Exception {
+ public void financeTrackerReadSave() throws Exception {
/*
* Note: This is an integration test that verifies the StorageManager is properly wired to the
- * {@link JsonAddressBookStorage} class.
- * More extensive testing of UserPref saving/reading is done in {@link JsonAddressBookStorageTest} class.
+ * {@link JsonFinanceTrackerStorage} class.
+ * More extensive testing of UserPref saving/reading is done in {@link JsonFinanceTrackerStorageTest} class.
*/
- AddressBook original = getTypicalAddressBook();
- storageManager.saveAddressBook(original);
- ReadOnlyAddressBook retrieved = storageManager.readAddressBook().get();
- assertEquals(original, new AddressBook(retrieved));
+ FinanceTracker original = getTypicalFinanceTracker();
+ storageManager.saveFinanceTracker(original);
+ ReadOnlyFinanceTracker retrieved = storageManager.readFinanceTracker().get();
+ assertEquals(original, new FinanceTracker(retrieved));
}
@Test
- public void getAddressBookFilePath() {
- assertNotNull(storageManager.getAddressBookFilePath());
+ public void getFinanceTrackerFilePath() {
+ assertNotNull(storageManager.getFinanceTrackerFilePath());
}
}
diff --git a/src/test/java/seedu/address/testutil/Assert.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/Assert.java
similarity index 96%
rename from src/test/java/seedu/address/testutil/Assert.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/Assert.java
index 9863093bd6e..93cb4e216ef 100644
--- a/src/test/java/seedu/address/testutil/Assert.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/Assert.java
@@ -1,4 +1,4 @@
-package seedu.address.testutil;
+package ay2021s1_cs2103_w16_3.finesse.testutil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.function.Executable;
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/BookmarkTransactionUtil.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/BookmarkTransactionUtil.java
new file mode 100644
index 00000000000..6705d9c9c70
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/BookmarkTransactionUtil.java
@@ -0,0 +1,58 @@
+package ay2021s1_cs2103_w16_3.finesse.testutil;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.AddBookmarkIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * Utility class for Bookmark Transaction.
+ */
+public class BookmarkTransactionUtil {
+
+ public static String getAddBookmarkIncomeCommand(BookmarkIncome bookmarkIncome) {
+ return AddBookmarkIncomeCommand.COMMAND_WORD + " " + getTransactionDetails(bookmarkIncome);
+ }
+
+ public static String getAddBookmarkExpenseCommand(BookmarkExpense bookmarkExpense) {
+ return AddBookmarkExpenseCommand.COMMAND_WORD + " " + getTransactionDetails(bookmarkExpense);
+ }
+
+ /**
+ * Returns the part of command string for the given {@code BookmarkTransaction}'s details.
+ */
+ public static <T extends Transaction> String getTransactionDetails(BookmarkTransaction<T> bookmarkTransaction) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(PREFIX_TITLE + bookmarkTransaction.getTitle().toString() + " ");
+ sb.append(PREFIX_AMOUNT + bookmarkTransaction.getAmount().toString() + " ");
+ bookmarkTransaction.getCategories().stream().forEach(
+ s -> sb.append(PREFIX_CATEGORY + s.getCategoryName() + " ")
+ );
+ return sb.toString();
+ }
+
+ public static String getEditBookmarkTransactionDescriptorDetails(EditBookmarkTransactionDescriptor descriptor) {
+ StringBuilder sb = new StringBuilder();
+ descriptor.getTitle().ifPresent(title -> sb.append(PREFIX_TITLE).append(title.toString()).append(" "));
+ descriptor.getAmount().ifPresent(amount -> sb.append(PREFIX_AMOUNT).append(amount.toString()).append(" "));
+ if (descriptor.getCategories().isPresent()) {
+ Set<Category> categories = descriptor.getCategories().get();
+ if (categories.isEmpty()) {
+ sb.append(PREFIX_CATEGORY);
+ } else {
+ categories.forEach(s -> sb.append(PREFIX_CATEGORY).append(s.getCategoryName()).append(" "));
+ }
+ }
+ return sb.toString();
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/EditBookmarkTransactionDescriptorBuilder.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/EditBookmarkTransactionDescriptorBuilder.java
new file mode 100644
index 00000000000..949e04d46c9
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/EditBookmarkTransactionDescriptorBuilder.java
@@ -0,0 +1,71 @@
+package ay2021s1_cs2103_w16_3.finesse.testutil;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.bookmark.EditBookmarkTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkTransaction;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * A utility class to help with building EditBookmarkTransactionDescriptor objects.
+ */
+public class EditBookmarkTransactionDescriptorBuilder {
+
+ private EditBookmarkTransactionDescriptor descriptor;
+
+ public EditBookmarkTransactionDescriptorBuilder() {
+ descriptor = new EditBookmarkTransactionDescriptor();
+ }
+
+ public EditBookmarkTransactionDescriptorBuilder(EditBookmarkTransactionDescriptor descriptor) {
+ this.descriptor = new EditBookmarkTransactionDescriptor(descriptor);
+ }
+
+ /**
+ * Returns an {@code EditBookmarkTransactionDescriptorBuilder} with fields containing
+ * {@code bookmarkTransaction}'s details
+ */
+ public <T extends Transaction> EditBookmarkTransactionDescriptorBuilder(BookmarkTransaction<T>
+ bookmarkTransaction) {
+ descriptor = new EditBookmarkTransactionDescriptor();
+ descriptor.setTitle(bookmarkTransaction.getTitle());
+ descriptor.setAmount(bookmarkTransaction.getAmount());
+ descriptor.setCategories(bookmarkTransaction.getCategories());
+ }
+
+ /**
+ * Sets the {@code Title} of the {@code EditBookmarkTransactionDescriptorBuilder} that we are building.
+ */
+ public EditBookmarkTransactionDescriptorBuilder withTitle(String title) {
+ descriptor.setTitle(new Title(title));
+ return this;
+ }
+
+ /**
+ * Sets the {@code Amount} of the {@code EditBookmarkTransactionDescriptorBuilder} that we are building.
+ */
+ public EditBookmarkTransactionDescriptorBuilder withAmount(String amount) {
+ descriptor.setAmount(new Amount(amount));
+ return this;
+ }
+
+ /**
+ * Parses the {@code categories} into a {@code Set<Category>} and set it to the
+ * {@code EditBookmarkTransactionDescriptorBuilder} that we are building.
+ */
+ public EditBookmarkTransactionDescriptorBuilder withCategories(String... categories) {
+ Set<Category> categorySet = Stream.of(categories).map(Category::new).collect(Collectors.toSet());
+ descriptor.setCategories(categorySet);
+ return this;
+ }
+
+ public EditBookmarkTransactionDescriptor build() {
+ return descriptor;
+ }
+
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/EditTransactionDescriptorBuilder.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/EditTransactionDescriptorBuilder.java
new file mode 100644
index 00000000000..7bab65317f0
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/EditTransactionDescriptorBuilder.java
@@ -0,0 +1,78 @@
+package ay2021s1_cs2103_w16_3.finesse.testutil;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand.EditTransactionDescriptor;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Date;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Title;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * A utility class to help with building EditTransactionDescriptor objects.
+ */
+public class EditTransactionDescriptorBuilder {
+
+ private EditCommand.EditTransactionDescriptor descriptor;
+
+ public EditTransactionDescriptorBuilder() {
+ descriptor = new EditCommand.EditTransactionDescriptor();
+ }
+
+ public EditTransactionDescriptorBuilder(EditCommand.EditTransactionDescriptor descriptor) {
+ this.descriptor = new EditTransactionDescriptor(descriptor);
+ }
+
+ /**
+ * Returns an {@code EditTransactionDescriptor} with fields containing {@code transaction}'s details
+ */
+ public EditTransactionDescriptorBuilder(Transaction transaction) {
+ descriptor = new EditTransactionDescriptor();
+ descriptor.setTitle(transaction.getTitle());
+ descriptor.setAmount(transaction.getAmount());
+ descriptor.setDate(transaction.getDate());
+ descriptor.setCategories(transaction.getCategories());
+ }
+
+ /**
+ * Sets the {@code Title} of the {@code EditTransactionDescriptor} that we are building.
+ */
+ public EditTransactionDescriptorBuilder withTitle(String title) {
+ descriptor.setTitle(new Title(title));
+ return this;
+ }
+
+ /**
+ * Sets the {@code Amount} of the {@code EditTransactionDescriptor} that we are building.
+ */
+ public EditTransactionDescriptorBuilder withAmount(String amount) {
+ descriptor.setAmount(new Amount(amount));
+ return this;
+ }
+
+ /**
+ * Sets the {@code Date} of the {@code EditTransactionDescriptor} that we are building.
+ */
+ public EditTransactionDescriptorBuilder withDate(String date) {
+ descriptor.setDate(new Date(date));
+ return this;
+ }
+
+ /**
+ * Parses the {@code categories} into a {@code Set<Category>} and set it to the {@code EditTransactionDescriptor}
+ * that we are building.
+ */
+ public EditTransactionDescriptorBuilder withCategories(String... categories) {
+ Set<Category> categorySet = Stream.of(categories).map(Category::new).collect(Collectors.toSet());
+ descriptor.setCategories(categorySet);
+ return this;
+ }
+
+ public EditCommand.EditTransactionDescriptor build() {
+ return descriptor;
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/FinanceTrackerBuilder.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/FinanceTrackerBuilder.java
new file mode 100644
index 00000000000..3be54466ab2
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/FinanceTrackerBuilder.java
@@ -0,0 +1,50 @@
+package ay2021s1_cs2103_w16_3.finesse.testutil;
+
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * A utility class to help with building FinanceTracker objects.
+ */
+public class FinanceTrackerBuilder {
+
+ private FinanceTracker financeTracker;
+
+ public FinanceTrackerBuilder() {
+ financeTracker = new FinanceTracker();
+ }
+
+ public FinanceTrackerBuilder(FinanceTracker financeTracker) {
+ this.financeTracker = financeTracker;
+ }
+
+ /**
+ * Adds a new {@code Transaction} to the {@code FinanceTracker} that we are building.
+ */
+ public FinanceTrackerBuilder withTransaction(Transaction transaction) {
+ financeTracker.addTransaction(transaction);
+ return this;
+ }
+
+ /**
+ * Adds a new {@code Transaction} to the {@code FinanceTracker} that we are building.
+ */
+ public FinanceTrackerBuilder withExpense(Expense expense) {
+ financeTracker.addTransaction(expense);
+ return this;
+ }
+
+ /**
+ * Adds a new {@code Transaction} to the {@code FinanceTracker} that we are building.
+ */
+ public FinanceTrackerBuilder withIncome(Income income) {
+ financeTracker.addTransaction(income);
+ return this;
+ }
+
+ public FinanceTracker build() {
+ return financeTracker;
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/MonthlyBudgetBuilder.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/MonthlyBudgetBuilder.java
new file mode 100644
index 00000000000..be7e50e0f2c
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/MonthlyBudgetBuilder.java
@@ -0,0 +1,39 @@
+package ay2021s1_cs2103_w16_3.finesse.testutil;
+
+import ay2021s1_cs2103_w16_3.finesse.model.budget.MonthlyBudget;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Amount;
+
+/**
+ * A utility class to help with building MonthlyBudget objects.
+ */
+public class MonthlyBudgetBuilder {
+
+ public static final String DEFAULT_AMOUNT = "$500.00";
+
+ private Amount monthlyExpenseLimit;
+
+ /**
+ * Creates a {@code MonthlyBudgetBuilder} with the default details.
+ */
+ public MonthlyBudgetBuilder() {
+ monthlyExpenseLimit = new Amount(DEFAULT_AMOUNT);
+ }
+
+ /**
+ * Initializes the MonthlyExpenseBuilder with the data of {@code transactionToCopy}.
+ */
+ public MonthlyBudgetBuilder(Amount limit) {
+ monthlyExpenseLimit = limit;
+ }
+
+ /**
+ * Builds a {@code MonthlyExpense} object.
+ */
+ public MonthlyBudget buildMonthlyBudget() {
+ MonthlyBudget monthlyBudget = new MonthlyBudget();
+ monthlyBudget.setMonthlyExpenseLimit(monthlyExpenseLimit);
+ return monthlyBudget;
+ }
+
+
+}
diff --git a/src/test/java/seedu/address/testutil/SerializableTestClass.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/SerializableTestClass.java
similarity index 97%
rename from src/test/java/seedu/address/testutil/SerializableTestClass.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/SerializableTestClass.java
index f5a66340489..e48be2c0463 100644
--- a/src/test/java/seedu/address/testutil/SerializableTestClass.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/SerializableTestClass.java
@@ -1,4 +1,4 @@
-package seedu.address.testutil;
+package ay2021s1_cs2103_w16_3.finesse.testutil;
import java.time.LocalDateTime;
import java.util.ArrayList;
diff --git a/src/test/java/seedu/address/testutil/TestUtil.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TestUtil.java
similarity index 54%
rename from src/test/java/seedu/address/testutil/TestUtil.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TestUtil.java
index 896d103eb0b..3554d81deb2 100644
--- a/src/test/java/seedu/address/testutil/TestUtil.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TestUtil.java
@@ -1,13 +1,13 @@
-package seedu.address.testutil;
+package ay2021s1_cs2103_w16_3.finesse.testutil;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import seedu.address.commons.core.index.Index;
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+import ay2021s1_cs2103_w16_3.finesse.model.Model;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
/**
* A utility class for test cases.
@@ -33,23 +33,23 @@ public static Path getFilePathInSandboxFolder(String fileName) {
}
/**
- * Returns the middle index of the person in the {@code model}'s person list.
+ * Returns the middle index of the transaction in the {@code model}'s transaction list.
*/
public static Index getMidIndex(Model model) {
- return Index.fromOneBased(model.getFilteredPersonList().size() / 2);
+ return Index.fromOneBased(model.getFilteredTransactionList().size() / 2);
}
/**
- * Returns the last index of the person in the {@code model}'s person list.
+ * Returns the last index of the transaction in the {@code model}'s transaction list.
*/
public static Index getLastIndex(Model model) {
- return Index.fromOneBased(model.getFilteredPersonList().size());
+ return Index.fromOneBased(model.getFilteredTransactionList().size());
}
/**
- * Returns the person in the {@code model}'s person list at {@code index}.
+ * Returns the transaction in the {@code model}'s transaction list at {@code index}.
*/
- public static Person getPerson(Model model, Index index) {
- return model.getFilteredPersonList().get(index.getZeroBased());
+ public static Transaction getTransaction(Model model, Index index) {
+ return model.getFilteredTransactionList().get(index.getZeroBased());
}
}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TransactionUtil.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TransactionUtil.java
new file mode 100644
index 00000000000..186304db0b4
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TransactionUtil.java
@@ -0,0 +1,77 @@
+package ay2021s1_cs2103_w16_3.finesse.testutil;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_AMOUNT;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_CATEGORY;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_DATE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.CliSyntax.PREFIX_TITLE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.parser.FinanceTrackerParser.ADD_COMMAND_COMMAND_WORD;
+
+import java.util.Set;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddExpenseCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.AddIncomeCommand;
+import ay2021s1_cs2103_w16_3.finesse.logic.commands.EditCommand;
+import ay2021s1_cs2103_w16_3.finesse.model.category.Category;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * A utility class for Transaction.
+ */
+public class TransactionUtil {
+
+ /**
+ * Returns an add command string for adding the {@code Transaction}.
+ */
+ public static String getAddCommand(Transaction transaction) {
+ return ADD_COMMAND_COMMAND_WORD + " " + getTransactionDetails(transaction);
+ }
+
+ /**
+ * Returns an add expense command string for adding the {@code Expense}.
+ */
+ public static String getAddExpenseCommand(Expense expense) {
+ return AddExpenseCommand.COMMAND_WORD + " " + getTransactionDetails(expense);
+ }
+
+ /**
+ * Returns an add income command string for adding the {@code Income}.
+ */
+ public static String getAddIncomeCommand(Income income) {
+ return AddIncomeCommand.COMMAND_WORD + " " + getTransactionDetails(income);
+ }
+
+ /**
+ * Returns the part of command string for the given {@code Transaction}'s details.
+ */
+ public static String getTransactionDetails(Transaction transaction) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(PREFIX_TITLE + transaction.getTitle().toString() + " ");
+ sb.append(PREFIX_AMOUNT + transaction.getAmount().toString() + " ");
+ sb.append(PREFIX_DATE + transaction.getDate().toString() + " ");
+ transaction.getCategories().stream().forEach(
+ s -> sb.append(PREFIX_CATEGORY + s.getCategoryName() + " ")
+ );
+ return sb.toString();
+ }
+
+ /**
+ * Returns the part of command string for the given {@code EditTransactionDescriptor}'s details.
+ */
+ public static String getEditTransactionDescriptorDetails(EditCommand.EditTransactionDescriptor descriptor) {
+ StringBuilder sb = new StringBuilder();
+ descriptor.getTitle().ifPresent(title -> sb.append(PREFIX_TITLE).append(title.toString()).append(" "));
+ descriptor.getAmount().ifPresent(amount -> sb.append(PREFIX_AMOUNT).append(amount.toString()).append(" "));
+ descriptor.getDate().ifPresent(date -> sb.append(PREFIX_DATE).append(date.toString()).append(" "));
+ if (descriptor.getCategories().isPresent()) {
+ Set<Category> categories = descriptor.getCategories().get();
+ if (categories.isEmpty()) {
+ sb.append(PREFIX_CATEGORY);
+ } else {
+ categories.forEach(s -> sb.append(PREFIX_CATEGORY).append(s.getCategoryName()).append(" "));
+ }
+ }
+ return sb.toString();
+ }
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TypicalIndexes.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TypicalIndexes.java
new file mode 100644
index 00000000000..9bf5908b310
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TypicalIndexes.java
@@ -0,0 +1,12 @@
+package ay2021s1_cs2103_w16_3.finesse.testutil;
+
+import ay2021s1_cs2103_w16_3.finesse.commons.core.index.Index;
+
+/**
+ * A utility class containing a list of {@code Index} objects to be used in tests.
+ */
+public class TypicalIndexes {
+ public static final Index INDEX_FIRST = Index.fromOneBased(1);
+ public static final Index INDEX_SECOND = Index.fromOneBased(2);
+ public static final Index INDEX_THIRD = Index.fromOneBased(3);
+}
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TypicalTransactions.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TypicalTransactions.java
new file mode 100644
index 00000000000..26c48b75a8c
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/testutil/TypicalTransactions.java
@@ -0,0 +1,132 @@
+package ay2021s1_cs2103_w16_3.finesse.testutil;
+
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_AMOUNT_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_FOOD_BEVERAGE;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_CATEGORY_WORK;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_DATE_INTERNSHIP;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_BUBBLE_TEA;
+import static ay2021s1_cs2103_w16_3.finesse.logic.commands.CommandTestUtil.VALID_TITLE_INTERNSHIP;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.TransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.logic.parser.bookmarkparsers.BookmarkTransactionBuilder;
+import ay2021s1_cs2103_w16_3.finesse.model.FinanceTracker;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkExpense;
+import ay2021s1_cs2103_w16_3.finesse.model.bookmark.BookmarkIncome;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Expense;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Income;
+import ay2021s1_cs2103_w16_3.finesse.model.transaction.Transaction;
+
+/**
+ * A utility class containing a list of {@code Transaction} objects to be used in tests.
+ */
+public class TypicalTransactions {
+
+ // Expenses
+ public static final Expense BUBBLE_TEA = new TransactionBuilder().withTitle("Bubble Tea")
+ .withDate("14/10/2020").withAmount("$4.80").withCategories("Food & Beverage").buildExpense();
+ public static final Expense TUITION_FEES = new TransactionBuilder().withTitle("Tuition Fees")
+ .withDate("05/10/2020").withAmount("4221").withCategories("NUS", "GIRO").buildExpense();
+ public static final Expense CARLS_JR = new TransactionBuilder().withTitle("Carl's Jr.").withAmount("11.60")
+ .withDate("06/10/2020").withCategories("Food & Beverage").buildExpense();
+ public static final Expense EZLINK_TOPUP = new TransactionBuilder().withTitle("EZ-Link Top-up").withAmount("20")
+ .withDate("06/10/2020").withCategories("Transport").buildExpense();
+ public static final Expense AIMA = new TransactionBuilder().withTitle("Artificial Intelligence: A Modern Approach")
+ .withAmount("139.00").withDate("06/10/2020").buildExpense();
+ public static final Expense PEN_REFILLS = new TransactionBuilder().withTitle("Pen Refills").withAmount("6")
+ .withDate("06/10/2020").buildExpense();
+ public static final Expense MOVIE = new TransactionBuilder().withTitle("Movie").withAmount("9")
+ .withDate("06/10/2020").buildExpense();
+
+ // Incomes
+ public static final Income INTERNSHIP = new TransactionBuilder().withTitle("Internship")
+ .withDate("06/10/2020").withAmount("$560").withCategories("Work").buildIncome();
+ public static final Income TEACHING_ASSISTANT = new TransactionBuilder().withTitle("Teaching Assistant")
+ .withDate("05/10/2020").withAmount("1920").withCategories("NUS", "GIRO").buildIncome();
+ public static final Income STARTUP_FUNDING = new TransactionBuilder().withTitle("Start-up Funding")
+ .withDate("20/09/2020").withAmount("10000.00").withCategories("NUS Enterprise").buildIncome();
+ public static final Income ALLOWANCE = new TransactionBuilder().withTitle("Allowance")
+ .withDate("06/10/2020").withAmount("$100.00").buildIncome();
+ public static final Income ANG_PAO = new TransactionBuilder().withTitle("Ang Pao")
+ .withDate("06/10/2020").withAmount("88").buildIncome();
+ public static final Income GST_VOUCHER = new TransactionBuilder().withTitle("GST Voucher")
+ .withDate("06/10/2020").withAmount("300").buildIncome();
+ public static final Income HACKATHON_WINNINGS = new TransactionBuilder().withTitle("Hackathon Winnings")
+ .withDate("22/09/2020").withAmount("1000").buildIncome();
+
+ // Bookmark Expenses
+ public static final BookmarkExpense PHONE_BILL = new BookmarkTransactionBuilder().withTitle("Phone Bill")
+ .withAmount("60").buildBookmarkExpense();
+ public static final BookmarkExpense SPOTIFY_SUBSCRIPTION = new BookmarkTransactionBuilder()
+ .withTitle("Spotify Subscription").withAmount("9.90").buildBookmarkExpense();
+ public static final BookmarkExpense NETFLIX_SUBSCRIPTION = new BookmarkTransactionBuilder()
+ .withTitle("Netflix Subscription").withAmount("20").buildBookmarkExpense();
+ public static final BookmarkExpense TIMES_MAGAZINE_SUBSCRIPTION = new BookmarkTransactionBuilder()
+ .withTitle("Times Magazine Subscription").withAmount("12").buildBookmarkExpense();
+
+ // Bookmark Incomes
+ public static final BookmarkIncome PART_TIME = new BookmarkTransactionBuilder().withTitle("Part Time")
+ .withAmount("450").withCategories("Work").buildBookmarkIncome();
+ public static final BookmarkIncome INVESTING = new BookmarkTransactionBuilder().withTitle("Investing")
+ .withAmount("50").buildBookmarkIncome();
+
+ // Manually added
+ public static final Expense TUITION_FEES_2 = new TransactionBuilder().withTitle("Tuition Fees")
+ .withDate("05/10/2020").withAmount("4221").withCategories("NUS", "GIRO").buildExpense();
+ public static final Income TEACHING_ASSISTANT_2 = new TransactionBuilder().withTitle("Teaching Assistant")
+ .withDate("05/10/2020").withAmount("1920").withCategories("NUS", "GIRO").buildIncome();
+
+ // Manually added - Transaction's details found in {@code CommandTestUtil}
+ public static final Expense BUBBLE_TEA_2 = new TransactionBuilder().withTitle(VALID_TITLE_BUBBLE_TEA)
+ .withAmount(VALID_AMOUNT_BUBBLE_TEA).withDate(VALID_DATE_BUBBLE_TEA)
+ .withCategories(VALID_CATEGORY_FOOD_BEVERAGE).buildExpense();
+ public static final Income INTERNSHIP_2 = new TransactionBuilder().withTitle(VALID_TITLE_INTERNSHIP)
+ .withAmount(VALID_AMOUNT_INTERNSHIP).withDate(VALID_DATE_INTERNSHIP)
+ .withCategories(VALID_CATEGORY_WORK, VALID_CATEGORY_FOOD_BEVERAGE).buildIncome();
+
+ private TypicalTransactions() {} // prevents instantiation
+
+ /**
+ * Returns an {@code FinanceTracker} with all the typical transactions.
+ */
+ public static FinanceTracker getTypicalFinanceTracker() {
+ FinanceTracker ft = new FinanceTracker();
+ getTypicalExpenses().forEach(ft::addTransaction);
+ getTypicalIncomes().forEach(ft::addTransaction);
+ getTypicalBookmarkExpenses().forEach(ft::addBookmarkExpense);
+ getTypicalBookmarkIncome().forEach(ft::addBookmarkIncome);
+ return ft;
+ }
+
+ public static List<Transaction> getTypicalTransactions() {
+ return Stream.concat(getTypicalExpenses().stream(), getTypicalIncomes().stream())
+ .collect(Collectors.toList());
+ }
+
+ public static List<Expense> getTypicalExpenses() {
+ return new ArrayList<>(Arrays.asList(BUBBLE_TEA, TUITION_FEES, CARLS_JR,
+ EZLINK_TOPUP, AIMA, PEN_REFILLS, MOVIE));
+ }
+
+ public static List<Income> getTypicalIncomes() {
+ return new ArrayList<>(Arrays.asList(INTERNSHIP, TEACHING_ASSISTANT, STARTUP_FUNDING,
+ ALLOWANCE, ANG_PAO, GST_VOUCHER, HACKATHON_WINNINGS));
+ }
+
+ public static List<BookmarkExpense> getTypicalBookmarkExpenses() {
+ return new ArrayList<>(Arrays.asList(PHONE_BILL, SPOTIFY_SUBSCRIPTION, NETFLIX_SUBSCRIPTION,
+ TIMES_MAGAZINE_SUBSCRIPTION));
+ }
+
+ public static List<BookmarkIncome> getTypicalBookmarkIncome() {
+ return new ArrayList<>(Arrays.asList(PART_TIME, INVESTING));
+ }
+
+}
diff --git a/src/test/java/seedu/address/ui/TestFxmlObject.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/TestFxmlObject.java
similarity index 95%
rename from src/test/java/seedu/address/ui/TestFxmlObject.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/TestFxmlObject.java
index 5ecd82656f2..0d2d91c80bf 100644
--- a/src/test/java/seedu/address/ui/TestFxmlObject.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/TestFxmlObject.java
@@ -1,4 +1,4 @@
-package seedu.address.ui;
+package ay2021s1_cs2103_w16_3.finesse.ui;
import javafx.beans.DefaultProperty;
diff --git a/src/test/java/seedu/address/ui/UiPartTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/UiPartTest.java
similarity index 96%
rename from src/test/java/seedu/address/ui/UiPartTest.java
rename to src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/UiPartTest.java
index 33d82d911b8..9b8141d95fb 100644
--- a/src/test/java/seedu/address/ui/UiPartTest.java
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/UiPartTest.java
@@ -1,8 +1,8 @@
-package seedu.address.ui;
+package ay2021s1_cs2103_w16_3.finesse.ui;
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static seedu.address.testutil.Assert.assertThrows;
import java.net.URL;
import java.nio.file.Path;
@@ -10,8 +10,8 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
+import ay2021s1_cs2103_w16_3.finesse.MainApp;
import javafx.fxml.FXML;
-import seedu.address.MainApp;
public class UiPartTest {
diff --git a/src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/UiStateTest.java b/src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/UiStateTest.java
new file mode 100644
index 00000000000..78408eef6a7
--- /dev/null
+++ b/src/test/java/ay2021s1_cs2103_w16_3/finesse/ui/UiStateTest.java
@@ -0,0 +1,36 @@
+package ay2021s1_cs2103_w16_3.finesse.ui;
+
+import static ay2021s1_cs2103_w16_3.finesse.testutil.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import ay2021s1_cs2103_w16_3.finesse.ui.UiState.Tab;
+
+public class UiStateTest {
+ @Test
+ public void getTabEnumIndex_returnsCorrectIndex() {
+ assertEquals(1, Tab.OVERVIEW.getTabIndex().getOneBased());
+ assertEquals(2, Tab.INCOME.getTabIndex().getOneBased());
+ assertEquals(3, Tab.EXPENSES.getTabIndex().getOneBased());
+ assertEquals(4, Tab.ANALYTICS.getTabIndex().getOneBased());
+ }
+
+ @Test
+ public void constructor_nullCurrentTab_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new UiState((Tab) null));
+ }
+
+ @Test
+ public void setCurrentTab_nullCurrentTab_throwsNullPointerException() {
+ UiState uiState = new UiState();
+ assertThrows(NullPointerException.class, () -> uiState.setCurrentTab((Tab) null));
+ }
+
+ @Test
+ public void setCurrentTab_validTab_setsCurrentTab() {
+ UiState uiState = new UiState();
+ uiState.setCurrentTab(Tab.EXPENSES);
+ assertEquals(Tab.EXPENSES, uiState.getCurrentTab());
+ }
+}
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/seedu/address/logic/LogicManagerTest.java
deleted file mode 100644
index ad923ac249a..00000000000
--- a/src/test/java/seedu/address/logic/LogicManagerTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package seedu.address.logic;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.AMY;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.CommandResult;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.storage.JsonAddressBookStorage;
-import seedu.address.storage.JsonUserPrefsStorage;
-import seedu.address.storage.StorageManager;
-import seedu.address.testutil.PersonBuilder;
-
-public class LogicManagerTest {
- private static final IOException DUMMY_IO_EXCEPTION = new IOException("dummy exception");
-
- @TempDir
- public Path temporaryFolder;
-
- private Model model = new ModelManager();
- private Logic logic;
-
- @BeforeEach
- public void setUp() {
- JsonAddressBookStorage addressBookStorage =
- new JsonAddressBookStorage(temporaryFolder.resolve("addressBook.json"));
- JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.resolve("userPrefs.json"));
- StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
- logic = new LogicManager(model, storage);
- }
-
- @Test
- public void execute_invalidCommandFormat_throwsParseException() {
- String invalidCommand = "uicfhmowqewca";
- assertParseException(invalidCommand, MESSAGE_UNKNOWN_COMMAND);
- }
-
- @Test
- public void execute_commandExecutionError_throwsCommandException() {
- String deleteCommand = "delete 9";
- assertCommandException(deleteCommand, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- @Test
- public void execute_validCommand_success() throws Exception {
- String listCommand = ListCommand.COMMAND_WORD;
- assertCommandSuccess(listCommand, ListCommand.MESSAGE_SUCCESS, model);
- }
-
- @Test
- public void execute_storageThrowsIoException_throwsCommandException() {
- // Setup LogicManager with JsonAddressBookIoExceptionThrowingStub
- JsonAddressBookStorage addressBookStorage =
- new JsonAddressBookIoExceptionThrowingStub(temporaryFolder.resolve("ioExceptionAddressBook.json"));
- JsonUserPrefsStorage userPrefsStorage =
- new JsonUserPrefsStorage(temporaryFolder.resolve("ioExceptionUserPrefs.json"));
- StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
- logic = new LogicManager(model, storage);
-
- // Execute add command
- String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY
- + ADDRESS_DESC_AMY;
- Person expectedPerson = new PersonBuilder(AMY).withTags().build();
- ModelManager expectedModel = new ModelManager();
- expectedModel.addPerson(expectedPerson);
- String expectedMessage = LogicManager.FILE_OPS_ERROR_MESSAGE + DUMMY_IO_EXCEPTION;
- assertCommandFailure(addCommand, CommandException.class, expectedMessage, expectedModel);
- }
-
- @Test
- public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException() {
- assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredPersonList().remove(0));
- }
-
- /**
- * Executes the command and confirms that
- * - no exceptions are thrown <br>
- * - the feedback message is equal to {@code expectedMessage} <br>
- * - the internal model manager state is the same as that in {@code expectedModel} <br>
- * @see #assertCommandFailure(String, Class, String, Model)
- */
- private void assertCommandSuccess(String inputCommand, String expectedMessage,
- Model expectedModel) throws CommandException, ParseException {
- CommandResult result = logic.execute(inputCommand);
- assertEquals(expectedMessage, result.getFeedbackToUser());
- assertEquals(expectedModel, model);
- }
-
- /**
- * Executes the command, confirms that a ParseException is thrown and that the result message is correct.
- * @see #assertCommandFailure(String, Class, String, Model)
- */
- private void assertParseException(String inputCommand, String expectedMessage) {
- assertCommandFailure(inputCommand, ParseException.class, expectedMessage);
- }
-
- /**
- * Executes the command, confirms that a CommandException is thrown and that the result message is correct.
- * @see #assertCommandFailure(String, Class, String, Model)
- */
- private void assertCommandException(String inputCommand, String expectedMessage) {
- assertCommandFailure(inputCommand, CommandException.class, expectedMessage);
- }
-
- /**
- * Executes the command, confirms that the exception is thrown and that the result message is correct.
- * @see #assertCommandFailure(String, Class, String, Model)
- */
- private void assertCommandFailure(String inputCommand, Class<? extends Throwable> expectedException,
- String expectedMessage) {
- Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- assertCommandFailure(inputCommand, expectedException, expectedMessage, expectedModel);
- }
-
- /**
- * Executes the command and confirms that
- * - the {@code expectedException} is thrown <br>
- * - the resulting error message is equal to {@code expectedMessage} <br>
- * - the internal model manager state is the same as that in {@code expectedModel} <br>
- * @see #assertCommandSuccess(String, String, Model)
- */
- private void assertCommandFailure(String inputCommand, Class<? extends Throwable> expectedException,
- String expectedMessage, Model expectedModel) {
- assertThrows(expectedException, expectedMessage, () -> logic.execute(inputCommand));
- assertEquals(expectedModel, model);
- }
-
- /**
- * A stub class to throw an {@code IOException} when the save method is called.
- */
- private static class JsonAddressBookIoExceptionThrowingStub extends JsonAddressBookStorage {
- private JsonAddressBookIoExceptionThrowingStub(Path filePath) {
- super(filePath);
- }
-
- @Override
- public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
- throw DUMMY_IO_EXCEPTION;
- }
- }
-}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java b/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
deleted file mode 100644
index cb8714bb055..00000000000
--- a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.PersonBuilder;
-
-/**
- * Contains integration tests (interaction with the Model) for {@code AddCommand}.
- */
-public class AddCommandIntegrationTest {
-
- private Model model;
-
- @BeforeEach
- public void setUp() {
- model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- }
-
- @Test
- public void execute_newPerson_success() {
- Person validPerson = new PersonBuilder().build();
-
- Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- expectedModel.addPerson(validPerson);
-
- assertCommandSuccess(new AddCommand(validPerson), model,
- String.format(AddCommand.MESSAGE_SUCCESS, validPerson), expectedModel);
- }
-
- @Test
- public void execute_duplicatePerson_throwsCommandException() {
- Person personInList = model.getAddressBook().getPersonList().get(0);
- assertCommandFailure(new AddCommand(personInList), model, AddCommand.MESSAGE_DUPLICATE_PERSON);
- }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
deleted file mode 100644
index 5865713d5dd..00000000000
--- a/src/test/java/seedu/address/logic/commands/AddCommandTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.function.Predicate;
-
-import org.junit.jupiter.api.Test;
-
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.PersonBuilder;
-
-public class AddCommandTest {
-
- @Test
- public void constructor_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new AddCommand(null));
- }
-
- @Test
- public void execute_personAcceptedByModel_addSuccessful() throws Exception {
- ModelStubAcceptingPersonAdded modelStub = new ModelStubAcceptingPersonAdded();
- Person validPerson = new PersonBuilder().build();
-
- CommandResult commandResult = new AddCommand(validPerson).execute(modelStub);
-
- assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, validPerson), commandResult.getFeedbackToUser());
- assertEquals(Arrays.asList(validPerson), modelStub.personsAdded);
- }
-
- @Test
- public void execute_duplicatePerson_throwsCommandException() {
- Person validPerson = new PersonBuilder().build();
- AddCommand addCommand = new AddCommand(validPerson);
- ModelStub modelStub = new ModelStubWithPerson(validPerson);
-
- assertThrows(CommandException.class, AddCommand.MESSAGE_DUPLICATE_PERSON, () -> addCommand.execute(modelStub));
- }
-
- @Test
- public void equals() {
- Person alice = new PersonBuilder().withName("Alice").build();
- Person bob = new PersonBuilder().withName("Bob").build();
- AddCommand addAliceCommand = new AddCommand(alice);
- AddCommand addBobCommand = new AddCommand(bob);
-
- // same object -> returns true
- assertTrue(addAliceCommand.equals(addAliceCommand));
-
- // same values -> returns true
- AddCommand addAliceCommandCopy = new AddCommand(alice);
- assertTrue(addAliceCommand.equals(addAliceCommandCopy));
-
- // different types -> returns false
- assertFalse(addAliceCommand.equals(1));
-
- // null -> returns false
- assertFalse(addAliceCommand.equals(null));
-
- // different person -> returns false
- assertFalse(addAliceCommand.equals(addBobCommand));
- }
-
- /**
- * A default model stub that have all of the methods failing.
- */
- private class ModelStub implements Model {
- @Override
- public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public ReadOnlyUserPrefs getUserPrefs() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public GuiSettings getGuiSettings() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void setGuiSettings(GuiSettings guiSettings) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public Path getAddressBookFilePath() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void setAddressBookFilePath(Path addressBookFilePath) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void addPerson(Person person) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void setAddressBook(ReadOnlyAddressBook newData) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public ReadOnlyAddressBook getAddressBook() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public boolean hasPerson(Person person) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void deletePerson(Person target) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void setPerson(Person target, Person editedPerson) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public ObservableList<Person> getFilteredPersonList() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void updateFilteredPersonList(Predicate<Person> predicate) {
- throw new AssertionError("This method should not be called.");
- }
- }
-
- /**
- * A Model stub that contains a single person.
- */
- private class ModelStubWithPerson extends ModelStub {
- private final Person person;
-
- ModelStubWithPerson(Person person) {
- requireNonNull(person);
- this.person = person;
- }
-
- @Override
- public boolean hasPerson(Person person) {
- requireNonNull(person);
- return this.person.isSamePerson(person);
- }
- }
-
- /**
- * A Model stub that always accept the person being added.
- */
- private class ModelStubAcceptingPersonAdded extends ModelStub {
- final ArrayList<Person> personsAdded = new ArrayList<>();
-
- @Override
- public boolean hasPerson(Person person) {
- requireNonNull(person);
- return personsAdded.stream().anyMatch(person::isSamePerson);
- }
-
- @Override
- public void addPerson(Person person) {
- requireNonNull(person);
- personsAdded.add(person);
- }
-
- @Override
- public ReadOnlyAddressBook getAddressBook() {
- return new AddressBook();
- }
- }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
deleted file mode 100644
index 80d9110c03a..00000000000
--- a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-
-public class ClearCommandTest {
-
- @Test
- public void execute_emptyAddressBook_success() {
- Model model = new ModelManager();
- Model expectedModel = new ModelManager();
-
- assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
- }
-
- @Test
- public void execute_nonEmptyAddressBook_success() {
- Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- expectedModel.setAddressBook(new AddressBook());
-
- assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
- }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
deleted file mode 100644
index 643a1d08069..00000000000
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-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 static seedu.address.testutil.Assert.assertThrows;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-
-/**
- * Contains helper methods for testing commands.
- */
-public class CommandTestUtil {
-
- public static final String VALID_NAME_AMY = "Amy Bee";
- public static final String VALID_NAME_BOB = "Bob Choo";
- public static final String VALID_PHONE_AMY = "11111111";
- public static final String VALID_PHONE_BOB = "22222222";
- public static final String VALID_EMAIL_AMY = "amy@example.com";
- public static final String VALID_EMAIL_BOB = "bob@example.com";
- public static final String VALID_ADDRESS_AMY = "Block 312, Amy Street 1";
- public static final String VALID_ADDRESS_BOB = "Block 123, Bobby Street 3";
- public static final String VALID_TAG_HUSBAND = "husband";
- public static final String VALID_TAG_FRIEND = "friend";
-
- public static final String NAME_DESC_AMY = " " + PREFIX_NAME + VALID_NAME_AMY;
- public static final String NAME_DESC_BOB = " " + PREFIX_NAME + VALID_NAME_BOB;
- public static final String PHONE_DESC_AMY = " " + PREFIX_PHONE + VALID_PHONE_AMY;
- public static final String PHONE_DESC_BOB = " " + PREFIX_PHONE + VALID_PHONE_BOB;
- public static final String EMAIL_DESC_AMY = " " + PREFIX_EMAIL + VALID_EMAIL_AMY;
- public static final String EMAIL_DESC_BOB = " " + PREFIX_EMAIL + VALID_EMAIL_BOB;
- public static final String ADDRESS_DESC_AMY = " " + PREFIX_ADDRESS + VALID_ADDRESS_AMY;
- public static final String ADDRESS_DESC_BOB = " " + PREFIX_ADDRESS + VALID_ADDRESS_BOB;
- public static final String TAG_DESC_FRIEND = " " + PREFIX_TAG + VALID_TAG_FRIEND;
- public static final String TAG_DESC_HUSBAND = " " + PREFIX_TAG + VALID_TAG_HUSBAND;
-
- public static final String INVALID_NAME_DESC = " " + PREFIX_NAME + "James&"; // '&' not allowed in names
- public static final String INVALID_PHONE_DESC = " " + PREFIX_PHONE + "911a"; // 'a' not allowed in phones
- public static final String INVALID_EMAIL_DESC = " " + PREFIX_EMAIL + "bob!yahoo"; // missing '@' symbol
- public static final String INVALID_ADDRESS_DESC = " " + PREFIX_ADDRESS; // empty string not allowed for addresses
- public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags
-
- public static final String PREAMBLE_WHITESPACE = "\t \r \n";
- public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble";
-
- public static final EditCommand.EditPersonDescriptor DESC_AMY;
- public static final EditCommand.EditPersonDescriptor DESC_BOB;
-
- static {
- DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
- .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
- .withTags(VALID_TAG_FRIEND).build();
- DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
- .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
- .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
- }
-
- /**
- * Executes the given {@code command}, confirms that <br>
- * - the returned {@link CommandResult} matches {@code expectedCommandResult} <br>
- * - the {@code actualModel} matches {@code expectedModel}
- */
- public static void assertCommandSuccess(Command command, Model actualModel, CommandResult expectedCommandResult,
- Model expectedModel) {
- try {
- CommandResult result = command.execute(actualModel);
- assertEquals(expectedCommandResult, result);
- assertEquals(expectedModel, actualModel);
- } catch (CommandException ce) {
- throw new AssertionError("Execution of command should not fail.", ce);
- }
- }
-
- /**
- * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)}
- * that takes a string {@code expectedMessage}.
- */
- public static void assertCommandSuccess(Command command, Model actualModel, String expectedMessage,
- Model expectedModel) {
- CommandResult expectedCommandResult = new CommandResult(expectedMessage);
- assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel);
- }
-
- /**
- * Executes the given {@code command}, confirms that <br>
- * - a {@code CommandException} is thrown <br>
- * - the CommandException message matches {@code expectedMessage} <br>
- * - the address book, filtered person list and selected person in {@code actualModel} remain unchanged
- */
- public static void assertCommandFailure(Command command, Model actualModel, String expectedMessage) {
- // we are unable to defensively copy the model for comparison later, so we can
- // only do so by copying its components.
- AddressBook expectedAddressBook = new AddressBook(actualModel.getAddressBook());
- List<Person> expectedFilteredList = new ArrayList<>(actualModel.getFilteredPersonList());
-
- assertThrows(CommandException.class, expectedMessage, () -> command.execute(actualModel));
- assertEquals(expectedAddressBook, actualModel.getAddressBook());
- assertEquals(expectedFilteredList, actualModel.getFilteredPersonList());
- }
- /**
- * Updates {@code model}'s filtered list to show only the person at the given {@code targetIndex} in the
- * {@code model}'s address book.
- */
- public static void showPersonAtIndex(Model model, Index targetIndex) {
- assertTrue(targetIndex.getZeroBased() < model.getFilteredPersonList().size());
-
- Person person = model.getFilteredPersonList().get(targetIndex.getZeroBased());
- final String[] splitName = person.getName().fullName.split("\\s+");
- model.updateFilteredPersonList(new NameContainsKeywordsPredicate(Arrays.asList(splitName[0])));
-
- assertEquals(1, model.getFilteredPersonList().size());
- }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
deleted file mode 100644
index 0f77d8295f6..00000000000
--- a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-
-/**
- * Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for
- * {@code DeleteCommand}.
- */
-public class DeleteCommandTest {
-
- private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-
- @Test
- public void execute_validIndexUnfilteredList_success() {
- Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
-
- String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
-
- ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- expectedModel.deletePerson(personToDelete);
-
- assertCommandSuccess(deleteCommand, model, expectedMessage, expectedModel);
- }
-
- @Test
- public void execute_invalidIndexUnfilteredList_throwsCommandException() {
- Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
- DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
-
- assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- @Test
- public void execute_validIndexFilteredList_success() {
- showPersonAtIndex(model, INDEX_FIRST_PERSON);
-
- Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
-
- String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
-
- Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- expectedModel.deletePerson(personToDelete);
- showNoPerson(expectedModel);
-
- assertCommandSuccess(deleteCommand, model, expectedMessage, expectedModel);
- }
-
- @Test
- public void execute_invalidIndexFilteredList_throwsCommandException() {
- showPersonAtIndex(model, INDEX_FIRST_PERSON);
-
- Index outOfBoundIndex = INDEX_SECOND_PERSON;
- // ensures that outOfBoundIndex is still in bounds of address book list
- assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
-
- DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
-
- assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- @Test
- public void equals() {
- DeleteCommand deleteFirstCommand = new DeleteCommand(INDEX_FIRST_PERSON);
- DeleteCommand deleteSecondCommand = new DeleteCommand(INDEX_SECOND_PERSON);
-
- // same object -> returns true
- assertTrue(deleteFirstCommand.equals(deleteFirstCommand));
-
- // same values -> returns true
- DeleteCommand deleteFirstCommandCopy = new DeleteCommand(INDEX_FIRST_PERSON);
- assertTrue(deleteFirstCommand.equals(deleteFirstCommandCopy));
-
- // different types -> returns false
- assertFalse(deleteFirstCommand.equals(1));
-
- // null -> returns false
- assertFalse(deleteFirstCommand.equals(null));
-
- // different person -> returns false
- assertFalse(deleteFirstCommand.equals(deleteSecondCommand));
- }
-
- /**
- * Updates {@code model}'s filtered list to show no one.
- */
- private void showNoPerson(Model model) {
- model.updateFilteredPersonList(p -> false);
-
- assertTrue(model.getFilteredPersonList().isEmpty());
- }
-}
diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
deleted file mode 100644
index 1c27530fa99..00000000000
--- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.AddressBook;
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-import seedu.address.testutil.PersonBuilder;
-
-/**
- * Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for EditCommand.
- */
-public class EditCommandTest {
-
- private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-
- @Test
- public void execute_allFieldsSpecifiedUnfilteredList_success() {
- Person editedPerson = new PersonBuilder().build();
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(editedPerson).build();
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, descriptor);
-
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
- Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
- expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
-
- assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
- }
-
- @Test
- public void execute_someFieldsSpecifiedUnfilteredList_success() {
- Index indexLastPerson = Index.fromOneBased(model.getFilteredPersonList().size());
- Person lastPerson = model.getFilteredPersonList().get(indexLastPerson.getZeroBased());
-
- PersonBuilder personInList = new PersonBuilder(lastPerson);
- Person editedPerson = personInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
- .withTags(VALID_TAG_HUSBAND).build();
-
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
- .withPhone(VALID_PHONE_BOB).withTags(VALID_TAG_HUSBAND).build();
- EditCommand editCommand = new EditCommand(indexLastPerson, descriptor);
-
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
- Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
- expectedModel.setPerson(lastPerson, editedPerson);
-
- assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
- }
-
- @Test
- public void execute_noFieldSpecifiedUnfilteredList_success() {
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, new EditPersonDescriptor());
- Person editedPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
-
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
- Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
-
- assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
- }
-
- @Test
- public void execute_filteredList_success() {
- showPersonAtIndex(model, INDEX_FIRST_PERSON);
-
- Person personInFilteredList = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- Person editedPerson = new PersonBuilder(personInFilteredList).withName(VALID_NAME_BOB).build();
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON,
- new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
-
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
-
- Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
- expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
-
- assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
- }
-
- @Test
- public void execute_duplicatePersonUnfilteredList_failure() {
- Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(firstPerson).build();
- EditCommand editCommand = new EditCommand(INDEX_SECOND_PERSON, descriptor);
-
- assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_PERSON);
- }
-
- @Test
- public void execute_duplicatePersonFilteredList_failure() {
- showPersonAtIndex(model, INDEX_FIRST_PERSON);
-
- // edit person in filtered list into a duplicate in address book
- Person personInList = model.getAddressBook().getPersonList().get(INDEX_SECOND_PERSON.getZeroBased());
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON,
- new EditPersonDescriptorBuilder(personInList).build());
-
- assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_PERSON);
- }
-
- @Test
- public void execute_invalidPersonIndexUnfilteredList_failure() {
- Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build();
- EditCommand editCommand = new EditCommand(outOfBoundIndex, descriptor);
-
- assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- /**
- * Edit filtered list where index is larger than size of filtered list,
- * but smaller than size of address book
- */
- @Test
- public void execute_invalidPersonIndexFilteredList_failure() {
- showPersonAtIndex(model, INDEX_FIRST_PERSON);
- Index outOfBoundIndex = INDEX_SECOND_PERSON;
- // ensures that outOfBoundIndex is still in bounds of address book list
- assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
-
- EditCommand editCommand = new EditCommand(outOfBoundIndex,
- new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
-
- assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- @Test
- public void equals() {
- final EditCommand standardCommand = new EditCommand(INDEX_FIRST_PERSON, DESC_AMY);
-
- // same values -> returns true
- EditPersonDescriptor copyDescriptor = new EditPersonDescriptor(DESC_AMY);
- EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST_PERSON, copyDescriptor);
- assertTrue(standardCommand.equals(commandWithSameValues));
-
- // same object -> returns true
- assertTrue(standardCommand.equals(standardCommand));
-
- // null -> returns false
- assertFalse(standardCommand.equals(null));
-
- // different types -> returns false
- assertFalse(standardCommand.equals(new ClearCommand()));
-
- // different index -> returns false
- assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_PERSON, DESC_AMY)));
-
- // different descriptor -> returns false
- assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_PERSON, DESC_BOB)));
- }
-
-}
diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
deleted file mode 100644
index e0288792e72..00000000000
--- a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-
-public class EditPersonDescriptorTest {
-
- @Test
- public void equals() {
- // same values -> returns true
- EditPersonDescriptor descriptorWithSameValues = new EditPersonDescriptor(DESC_AMY);
- assertTrue(DESC_AMY.equals(descriptorWithSameValues));
-
- // same object -> returns true
- assertTrue(DESC_AMY.equals(DESC_AMY));
-
- // null -> returns false
- assertFalse(DESC_AMY.equals(null));
-
- // different types -> returns false
- assertFalse(DESC_AMY.equals(5));
-
- // different values -> returns false
- assertFalse(DESC_AMY.equals(DESC_BOB));
-
- // different name -> returns false
- EditPersonDescriptor editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withName(VALID_NAME_BOB).build();
- assertFalse(DESC_AMY.equals(editedAmy));
-
- // different phone -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withPhone(VALID_PHONE_BOB).build();
- assertFalse(DESC_AMY.equals(editedAmy));
-
- // different email -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withEmail(VALID_EMAIL_BOB).build();
- assertFalse(DESC_AMY.equals(editedAmy));
-
- // different address -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withAddress(VALID_ADDRESS_BOB).build();
- assertFalse(DESC_AMY.equals(editedAmy));
-
- // different tags -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withTags(VALID_TAG_HUSBAND).build();
- assertFalse(DESC_AMY.equals(editedAmy));
- }
-}
diff --git a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java b/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
deleted file mode 100644
index 9533c473875..00000000000
--- a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.ExitCommand.MESSAGE_EXIT_ACKNOWLEDGEMENT;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-
-public class ExitCommandTest {
- private Model model = new ModelManager();
- private Model expectedModel = new ModelManager();
-
- @Test
- public void execute_exit_success() {
- CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
- assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
- }
-}
diff --git a/src/test/java/seedu/address/logic/commands/FindCommandTest.java b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
deleted file mode 100644
index 9b15db28bbb..00000000000
--- a/src/test/java/seedu/address/logic/commands/FindCommandTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package seedu.address.logic.commands;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.commons.core.Messages.MESSAGE_PERSONS_LISTED_OVERVIEW;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.CARL;
-import static seedu.address.testutil.TypicalPersons.ELLE;
-import static seedu.address.testutil.TypicalPersons.FIONA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-
-/**
- * Contains integration tests (interaction with the Model) for {@code FindCommand}.
- */
-public class FindCommandTest {
- private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- private Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-
- @Test
- public void equals() {
- NameContainsKeywordsPredicate firstPredicate =
- new NameContainsKeywordsPredicate(Collections.singletonList("first"));
- NameContainsKeywordsPredicate secondPredicate =
- new NameContainsKeywordsPredicate(Collections.singletonList("second"));
-
- FindCommand findFirstCommand = new FindCommand(firstPredicate);
- FindCommand findSecondCommand = new FindCommand(secondPredicate);
-
- // same object -> returns true
- assertTrue(findFirstCommand.equals(findFirstCommand));
-
- // same values -> returns true
- FindCommand findFirstCommandCopy = new FindCommand(firstPredicate);
- assertTrue(findFirstCommand.equals(findFirstCommandCopy));
-
- // different types -> returns false
- assertFalse(findFirstCommand.equals(1));
-
- // null -> returns false
- assertFalse(findFirstCommand.equals(null));
-
- // different person -> returns false
- assertFalse(findFirstCommand.equals(findSecondCommand));
- }
-
- @Test
- public void execute_zeroKeywords_noPersonFound() {
- String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 0);
- NameContainsKeywordsPredicate predicate = preparePredicate(" ");
- FindCommand command = new FindCommand(predicate);
- expectedModel.updateFilteredPersonList(predicate);
- assertCommandSuccess(command, model, expectedMessage, expectedModel);
- assertEquals(Collections.emptyList(), model.getFilteredPersonList());
- }
-
- @Test
- public void execute_multipleKeywords_multiplePersonsFound() {
- String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 3);
- NameContainsKeywordsPredicate predicate = preparePredicate("Kurz Elle Kunz");
- FindCommand command = new FindCommand(predicate);
- expectedModel.updateFilteredPersonList(predicate);
- assertCommandSuccess(command, model, expectedMessage, expectedModel);
- assertEquals(Arrays.asList(CARL, ELLE, FIONA), model.getFilteredPersonList());
- }
-
- /**
- * Parses {@code userInput} into a {@code NameContainsKeywordsPredicate}.
- */
- private NameContainsKeywordsPredicate preparePredicate(String userInput) {
- return new NameContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+")));
- }
-}
diff --git a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java b/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
deleted file mode 100644
index 4904fc4352e..00000000000
--- a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.HelpCommand.SHOWING_HELP_MESSAGE;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-
-public class HelpCommandTest {
- private Model model = new ModelManager();
- private Model expectedModel = new ModelManager();
-
- @Test
- public void execute_help_success() {
- CommandResult expectedCommandResult = new CommandResult(SHOWING_HELP_MESSAGE, true, false);
- assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
- }
-}
diff --git a/src/test/java/seedu/address/logic/commands/ListCommandTest.java b/src/test/java/seedu/address/logic/commands/ListCommandTest.java
deleted file mode 100644
index 435ff1f7275..00000000000
--- a/src/test/java/seedu/address/logic/commands/ListCommandTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import seedu.address.model.Model;
-import seedu.address.model.ModelManager;
-import seedu.address.model.UserPrefs;
-
-/**
- * Contains integration tests (interaction with the Model) and unit tests for ListCommand.
- */
-public class ListCommandTest {
-
- private Model model;
- private Model expectedModel;
-
- @BeforeEach
- public void setUp() {
- model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- }
-
- @Test
- public void execute_listIsNotFiltered_showsSameList() {
- assertCommandSuccess(new ListCommand(), model, ListCommand.MESSAGE_SUCCESS, expectedModel);
- }
-
- @Test
- public void execute_listIsFiltered_showsEverything() {
- showPersonAtIndex(model, INDEX_FIRST_PERSON);
- assertCommandSuccess(new ListCommand(), model, ListCommand.MESSAGE_SUCCESS, expectedModel);
- }
-}
diff --git a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
deleted file mode 100644
index 5cf487d7ebb..00000000000
--- a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
-import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-import static seedu.address.testutil.TypicalPersons.AMY;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.PersonBuilder;
-
-public class AddCommandParserTest {
- private AddCommandParser parser = new AddCommandParser();
-
- @Test
- public void parse_allFieldsPresent_success() {
- Person expectedPerson = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND).build();
-
- // whitespace only preamble
- assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
- // multiple names - last name accepted
- assertParseSuccess(parser, NAME_DESC_AMY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
- // multiple phones - last phone accepted
- assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_AMY + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
- // multiple emails - last email accepted
- assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_AMY + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
- // multiple addresses - last address accepted
- assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_AMY
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
- // multiple tags - all accepted
- Person expectedPersonMultipleTags = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
- .build();
- assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, new AddCommand(expectedPersonMultipleTags));
- }
-
- @Test
- public void parse_optionalFieldsMissing_success() {
- // zero tags
- Person expectedPerson = new PersonBuilder(AMY).withTags().build();
- assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY,
- new AddCommand(expectedPerson));
- }
-
- @Test
- public void parse_compulsoryFieldMissing_failure() {
- String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE);
-
- // missing name prefix
- assertParseFailure(parser, VALID_NAME_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB,
- expectedMessage);
-
- // missing phone prefix
- assertParseFailure(parser, NAME_DESC_BOB + VALID_PHONE_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB,
- expectedMessage);
-
- // missing email prefix
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + VALID_EMAIL_BOB + ADDRESS_DESC_BOB,
- expectedMessage);
-
- // missing address prefix
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + VALID_ADDRESS_BOB,
- expectedMessage);
-
- // all prefixes missing
- assertParseFailure(parser, VALID_NAME_BOB + VALID_PHONE_BOB + VALID_EMAIL_BOB + VALID_ADDRESS_BOB,
- expectedMessage);
- }
-
- @Test
- public void parse_invalidValue_failure() {
- // invalid name
- assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Name.MESSAGE_CONSTRAINTS);
-
- // invalid phone
- assertParseFailure(parser, NAME_DESC_BOB + INVALID_PHONE_DESC + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Phone.MESSAGE_CONSTRAINTS);
-
- // invalid email
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + INVALID_EMAIL_DESC + ADDRESS_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Email.MESSAGE_CONSTRAINTS);
-
- // invalid address
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Address.MESSAGE_CONSTRAINTS);
-
- // invalid tag
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
- + INVALID_TAG_DESC + VALID_TAG_FRIEND, Tag.MESSAGE_CONSTRAINTS);
-
- // two invalid values, only first invalid value reported
- assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC,
- Name.MESSAGE_CONSTRAINTS);
-
- // non-empty preamble
- assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
- String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
- }
-}
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
deleted file mode 100644
index d9659205b57..00000000000
--- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package seedu.address.logic.parser;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.logic.commands.ExitCommand;
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.commands.HelpCommand;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-import seedu.address.testutil.PersonBuilder;
-import seedu.address.testutil.PersonUtil;
-
-public class AddressBookParserTest {
-
- private final AddressBookParser parser = new AddressBookParser();
-
- @Test
- public void parseCommand_add() throws Exception {
- Person person = new PersonBuilder().build();
- AddCommand command = (AddCommand) parser.parseCommand(PersonUtil.getAddCommand(person));
- assertEquals(new AddCommand(person), command);
- }
-
- @Test
- public void parseCommand_clear() throws Exception {
- assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD) instanceof ClearCommand);
- assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD + " 3") instanceof ClearCommand);
- }
-
- @Test
- public void parseCommand_delete() throws Exception {
- DeleteCommand command = (DeleteCommand) parser.parseCommand(
- DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
- assertEquals(new DeleteCommand(INDEX_FIRST_PERSON), command);
- }
-
- @Test
- public void parseCommand_edit() throws Exception {
- Person person = new PersonBuilder().build();
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(person).build();
- EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
- + INDEX_FIRST_PERSON.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor));
- assertEquals(new EditCommand(INDEX_FIRST_PERSON, descriptor), command);
- }
-
- @Test
- public void parseCommand_exit() throws Exception {
- assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD) instanceof ExitCommand);
- assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD + " 3") instanceof ExitCommand);
- }
-
- @Test
- public void parseCommand_find() throws Exception {
- List<String> keywords = Arrays.asList("foo", "bar", "baz");
- FindCommand command = (FindCommand) parser.parseCommand(
- FindCommand.COMMAND_WORD + " " + keywords.stream().collect(Collectors.joining(" ")));
- assertEquals(new FindCommand(new NameContainsKeywordsPredicate(keywords)), command);
- }
-
- @Test
- public void parseCommand_help() throws Exception {
- assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
- assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand);
- }
-
- @Test
- public void parseCommand_list() throws Exception {
- assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD) instanceof ListCommand);
- assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
- }
-
- @Test
- public void parseCommand_unrecognisedInput_throwsParseException() {
- assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), ()
- -> parser.parseCommand(""));
- }
-
- @Test
- public void parseCommand_unknownCommand_throwsParseException() {
- assertThrows(ParseException.class, MESSAGE_UNKNOWN_COMMAND, () -> parser.parseCommand("unknownCommand"));
- }
-}
diff --git a/src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java b/src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java
deleted file mode 100644
index c97308935f5..00000000000
--- a/src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package seedu.address.logic.parser;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.Test;
-
-public class ArgumentTokenizerTest {
-
- private final Prefix unknownPrefix = new Prefix("--u");
- private final Prefix pSlash = new Prefix("p/");
- private final Prefix dashT = new Prefix("-t");
- private final Prefix hatQ = new Prefix("^Q");
-
- @Test
- public void tokenize_emptyArgsString_noValues() {
- String argsString = " ";
- ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash);
-
- assertPreambleEmpty(argMultimap);
- assertArgumentAbsent(argMultimap, pSlash);
- }
-
- private void assertPreamblePresent(ArgumentMultimap argMultimap, String expectedPreamble) {
- assertEquals(expectedPreamble, argMultimap.getPreamble());
- }
-
- private void assertPreambleEmpty(ArgumentMultimap argMultimap) {
- assertTrue(argMultimap.getPreamble().isEmpty());
- }
-
- /**
- * Asserts all the arguments in {@code argMultimap} with {@code prefix} match the {@code expectedValues}
- * and only the last value is returned upon calling {@code ArgumentMultimap#getValue(Prefix)}.
- */
- private void assertArgumentPresent(ArgumentMultimap argMultimap, Prefix prefix, String... expectedValues) {
-
- // Verify the last value is returned
- assertEquals(expectedValues[expectedValues.length - 1], argMultimap.getValue(prefix).get());
-
- // Verify the number of values returned is as expected
- assertEquals(expectedValues.length, argMultimap.getAllValues(prefix).size());
-
- // Verify all values returned are as expected and in order
- for (int i = 0; i < expectedValues.length; i++) {
- assertEquals(expectedValues[i], argMultimap.getAllValues(prefix).get(i));
- }
- }
-
- private void assertArgumentAbsent(ArgumentMultimap argMultimap, Prefix prefix) {
- assertFalse(argMultimap.getValue(prefix).isPresent());
- }
-
- @Test
- public void tokenize_noPrefixes_allTakenAsPreamble() {
- String argsString = " some random string /t tag with leading and trailing spaces ";
- ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(argsString);
-
- // Same string expected as preamble, but leading/trailing spaces should be trimmed
- assertPreamblePresent(argMultimap, argsString.trim());
-
- }
-
- @Test
- public void tokenize_oneArgument() {
- // Preamble present
- String argsString = " Some preamble string p/ Argument value ";
- ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash);
- assertPreamblePresent(argMultimap, "Some preamble string");
- assertArgumentPresent(argMultimap, pSlash, "Argument value");
-
- // No preamble
- argsString = " p/ Argument value ";
- argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash);
- assertPreambleEmpty(argMultimap);
- assertArgumentPresent(argMultimap, pSlash, "Argument value");
-
- }
-
- @Test
- public void tokenize_multipleArguments() {
- // Only two arguments are present
- String argsString = "SomePreambleString -t dashT-Value p/pSlash value";
- ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash, dashT, hatQ);
- assertPreamblePresent(argMultimap, "SomePreambleString");
- assertArgumentPresent(argMultimap, pSlash, "pSlash value");
- assertArgumentPresent(argMultimap, dashT, "dashT-Value");
- assertArgumentAbsent(argMultimap, hatQ);
-
- // All three arguments are present
- argsString = "Different Preamble String ^Q111 -t dashT-Value p/pSlash value";
- argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash, dashT, hatQ);
- assertPreamblePresent(argMultimap, "Different Preamble String");
- assertArgumentPresent(argMultimap, pSlash, "pSlash value");
- assertArgumentPresent(argMultimap, dashT, "dashT-Value");
- assertArgumentPresent(argMultimap, hatQ, "111");
-
- /* Also covers: Reusing of the tokenizer multiple times */
-
- // Reuse tokenizer on an empty string to ensure ArgumentMultimap is correctly reset
- // (i.e. no stale values from the previous tokenizing remain)
- argsString = "";
- argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash, dashT, hatQ);
- assertPreambleEmpty(argMultimap);
- assertArgumentAbsent(argMultimap, pSlash);
-
- /* Also covers: testing for prefixes not specified as a prefix */
-
- // Prefixes not previously given to the tokenizer should not return any values
- argsString = unknownPrefix + "some value";
- argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash, dashT, hatQ);
- assertArgumentAbsent(argMultimap, unknownPrefix);
- assertPreamblePresent(argMultimap, argsString); // Unknown prefix is taken as part of preamble
- }
-
- @Test
- public void tokenize_multipleArgumentsWithRepeats() {
- // Two arguments repeated, some have empty values
- String argsString = "SomePreambleString -t dashT-Value ^Q ^Q -t another dashT value p/ pSlash value -t";
- ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash, dashT, hatQ);
- assertPreamblePresent(argMultimap, "SomePreambleString");
- assertArgumentPresent(argMultimap, pSlash, "pSlash value");
- assertArgumentPresent(argMultimap, dashT, "dashT-Value", "another dashT value", "");
- assertArgumentPresent(argMultimap, hatQ, "", "");
- }
-
- @Test
- public void tokenize_multipleArgumentsJoined() {
- String argsString = "SomePreambleStringp/ pSlash joined-tjoined -t not joined^Qjoined";
- ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(argsString, pSlash, dashT, hatQ);
- assertPreamblePresent(argMultimap, "SomePreambleStringp/ pSlash joined-tjoined");
- assertArgumentAbsent(argMultimap, pSlash);
- assertArgumentPresent(argMultimap, dashT, "not joined^Qjoined");
- assertArgumentAbsent(argMultimap, hatQ);
- }
-
- @Test
- public void equalsMethod() {
- Prefix aaa = new Prefix("aaa");
-
- assertEquals(aaa, aaa);
- assertEquals(aaa, new Prefix("aaa"));
-
- assertNotEquals(aaa, "aaa");
- assertNotEquals(aaa, new Prefix("aab"));
- }
-
-}
diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
deleted file mode 100644
index 2ff31522486..00000000000
--- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalIndexes.INDEX_THIRD_PERSON;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-
-public class EditCommandParserTest {
-
- private static final String TAG_EMPTY = " " + PREFIX_TAG;
-
- private static final String MESSAGE_INVALID_FORMAT =
- String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE);
-
- private EditCommandParser parser = new EditCommandParser();
-
- @Test
- public void parse_missingParts_failure() {
- // no index specified
- assertParseFailure(parser, VALID_NAME_AMY, MESSAGE_INVALID_FORMAT);
-
- // no field specified
- assertParseFailure(parser, "1", EditCommand.MESSAGE_NOT_EDITED);
-
- // no index and no field specified
- assertParseFailure(parser, "", MESSAGE_INVALID_FORMAT);
- }
-
- @Test
- public void parse_invalidPreamble_failure() {
- // negative index
- assertParseFailure(parser, "-5" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT);
-
- // zero index
- assertParseFailure(parser, "0" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT);
-
- // invalid arguments being parsed as preamble
- assertParseFailure(parser, "1 some random string", MESSAGE_INVALID_FORMAT);
-
- // invalid prefix being parsed as preamble
- assertParseFailure(parser, "1 i/ string", MESSAGE_INVALID_FORMAT);
- }
-
- @Test
- public void parse_invalidValue_failure() {
- assertParseFailure(parser, "1" + INVALID_NAME_DESC, Name.MESSAGE_CONSTRAINTS); // invalid name
- assertParseFailure(parser, "1" + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS); // invalid phone
- assertParseFailure(parser, "1" + INVALID_EMAIL_DESC, Email.MESSAGE_CONSTRAINTS); // invalid email
- assertParseFailure(parser, "1" + INVALID_ADDRESS_DESC, Address.MESSAGE_CONSTRAINTS); // invalid address
- assertParseFailure(parser, "1" + INVALID_TAG_DESC, Tag.MESSAGE_CONSTRAINTS); // invalid tag
-
- // invalid phone followed by valid email
- assertParseFailure(parser, "1" + INVALID_PHONE_DESC + EMAIL_DESC_AMY, Phone.MESSAGE_CONSTRAINTS);
-
- // valid phone followed by invalid phone. The test case for invalid phone followed by valid phone
- // is tested at {@code parse_invalidValueFollowedByValidValue_success()}
- assertParseFailure(parser, "1" + PHONE_DESC_BOB + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS);
-
- // while parsing {@code PREFIX_TAG} alone will reset the tags of the {@code Person} being edited,
- // parsing it together with a valid tag results in error
- assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_DESC_HUSBAND + TAG_EMPTY, Tag.MESSAGE_CONSTRAINTS);
- assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_EMPTY + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
- assertParseFailure(parser, "1" + TAG_EMPTY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
-
- // multiple invalid values, but only the first invalid value is captured
- assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC + VALID_ADDRESS_AMY + VALID_PHONE_AMY,
- Name.MESSAGE_CONSTRAINTS);
- }
-
- @Test
- public void parse_allFieldsSpecified_success() {
- Index targetIndex = INDEX_SECOND_PERSON;
- String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND
- + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND;
-
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
- .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
- .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
- assertParseSuccess(parser, userInput, expectedCommand);
- }
-
- @Test
- public void parse_someFieldsSpecified_success() {
- Index targetIndex = INDEX_FIRST_PERSON;
- String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + EMAIL_DESC_AMY;
-
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
- .withEmail(VALID_EMAIL_AMY).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
- assertParseSuccess(parser, userInput, expectedCommand);
- }
-
- @Test
- public void parse_oneFieldSpecified_success() {
- // name
- Index targetIndex = INDEX_THIRD_PERSON;
- String userInput = targetIndex.getOneBased() + NAME_DESC_AMY;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
- assertParseSuccess(parser, userInput, expectedCommand);
-
- // phone
- userInput = targetIndex.getOneBased() + PHONE_DESC_AMY;
- descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_AMY).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
- assertParseSuccess(parser, userInput, expectedCommand);
-
- // email
- userInput = targetIndex.getOneBased() + EMAIL_DESC_AMY;
- descriptor = new EditPersonDescriptorBuilder().withEmail(VALID_EMAIL_AMY).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
- assertParseSuccess(parser, userInput, expectedCommand);
-
- // address
- userInput = targetIndex.getOneBased() + ADDRESS_DESC_AMY;
- descriptor = new EditPersonDescriptorBuilder().withAddress(VALID_ADDRESS_AMY).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
- assertParseSuccess(parser, userInput, expectedCommand);
-
- // tags
- userInput = targetIndex.getOneBased() + TAG_DESC_FRIEND;
- descriptor = new EditPersonDescriptorBuilder().withTags(VALID_TAG_FRIEND).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
- assertParseSuccess(parser, userInput, expectedCommand);
- }
-
- @Test
- public void parse_multipleRepeatedFields_acceptsLast() {
- Index targetIndex = INDEX_FIRST_PERSON;
- String userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + ADDRESS_DESC_AMY + EMAIL_DESC_AMY
- + TAG_DESC_FRIEND + PHONE_DESC_AMY + ADDRESS_DESC_AMY + EMAIL_DESC_AMY + TAG_DESC_FRIEND
- + PHONE_DESC_BOB + ADDRESS_DESC_BOB + EMAIL_DESC_BOB + TAG_DESC_HUSBAND;
-
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
- .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
- .build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
- assertParseSuccess(parser, userInput, expectedCommand);
- }
-
- @Test
- public void parse_invalidValueFollowedByValidValue_success() {
- // no other valid values specified
- Index targetIndex = INDEX_FIRST_PERSON;
- String userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + PHONE_DESC_BOB;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
- assertParseSuccess(parser, userInput, expectedCommand);
-
- // other valid values specified
- userInput = targetIndex.getOneBased() + EMAIL_DESC_BOB + INVALID_PHONE_DESC + ADDRESS_DESC_BOB
- + PHONE_DESC_BOB;
- descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
- .withAddress(VALID_ADDRESS_BOB).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
- assertParseSuccess(parser, userInput, expectedCommand);
- }
-
- @Test
- public void parse_resetTags_success() {
- Index targetIndex = INDEX_THIRD_PERSON;
- String userInput = targetIndex.getOneBased() + TAG_EMPTY;
-
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withTags().build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
- assertParseSuccess(parser, userInput, expectedCommand);
- }
-}
diff --git a/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java b/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java
deleted file mode 100644
index 70f4f0e79c4..00000000000
--- a/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package seedu.address.logic.parser;
-
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
-import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-
-import java.util.Arrays;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-
-public class FindCommandParserTest {
-
- private FindCommandParser parser = new FindCommandParser();
-
- @Test
- public void parse_emptyArg_throwsParseException() {
- assertParseFailure(parser, " ", String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
- }
-
- @Test
- public void parse_validArgs_returnsFindCommand() {
- // no leading and trailing whitespaces
- FindCommand expectedFindCommand =
- new FindCommand(new NameContainsKeywordsPredicate(Arrays.asList("Alice", "Bob")));
- assertParseSuccess(parser, "Alice Bob", expectedFindCommand);
-
- // multiple whitespaces between keywords
- assertParseSuccess(parser, " \n Alice \n \t Bob \t", expectedFindCommand);
- }
-
-}
diff --git a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
deleted file mode 100644
index 4256788b1a7..00000000000
--- a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package seedu.address.logic.parser;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.parser.ParserUtil.MESSAGE_INVALID_INDEX;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-public class ParserUtilTest {
- private static final String INVALID_NAME = "R@chel";
- private static final String INVALID_PHONE = "+651234";
- private static final String INVALID_ADDRESS = " ";
- private static final String INVALID_EMAIL = "example.com";
- private static final String INVALID_TAG = "#friend";
-
- private static final String VALID_NAME = "Rachel Walker";
- private static final String VALID_PHONE = "123456";
- private static final String VALID_ADDRESS = "123 Main Street #0505";
- private static final String VALID_EMAIL = "rachel@example.com";
- private static final String VALID_TAG_1 = "friend";
- private static final String VALID_TAG_2 = "neighbour";
-
- private static final String WHITESPACE = " \t\r\n";
-
- @Test
- public void parseIndex_invalidInput_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseIndex("10 a"));
- }
-
- @Test
- public void parseIndex_outOfRangeInput_throwsParseException() {
- assertThrows(ParseException.class, MESSAGE_INVALID_INDEX, ()
- -> ParserUtil.parseIndex(Long.toString(Integer.MAX_VALUE + 1)));
- }
-
- @Test
- public void parseIndex_validInput_success() throws Exception {
- // No whitespaces
- assertEquals(INDEX_FIRST_PERSON, ParserUtil.parseIndex("1"));
-
- // Leading and trailing whitespaces
- assertEquals(INDEX_FIRST_PERSON, ParserUtil.parseIndex(" 1 "));
- }
-
- @Test
- public void parseName_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseName((String) null));
- }
-
- @Test
- public void parseName_invalidValue_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseName(INVALID_NAME));
- }
-
- @Test
- public void parseName_validValueWithoutWhitespace_returnsName() throws Exception {
- Name expectedName = new Name(VALID_NAME);
- assertEquals(expectedName, ParserUtil.parseName(VALID_NAME));
- }
-
- @Test
- public void parseName_validValueWithWhitespace_returnsTrimmedName() throws Exception {
- String nameWithWhitespace = WHITESPACE + VALID_NAME + WHITESPACE;
- Name expectedName = new Name(VALID_NAME);
- assertEquals(expectedName, ParserUtil.parseName(nameWithWhitespace));
- }
-
- @Test
- public void parsePhone_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parsePhone((String) null));
- }
-
- @Test
- public void parsePhone_invalidValue_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parsePhone(INVALID_PHONE));
- }
-
- @Test
- public void parsePhone_validValueWithoutWhitespace_returnsPhone() throws Exception {
- Phone expectedPhone = new Phone(VALID_PHONE);
- assertEquals(expectedPhone, ParserUtil.parsePhone(VALID_PHONE));
- }
-
- @Test
- public void parsePhone_validValueWithWhitespace_returnsTrimmedPhone() throws Exception {
- String phoneWithWhitespace = WHITESPACE + VALID_PHONE + WHITESPACE;
- Phone expectedPhone = new Phone(VALID_PHONE);
- assertEquals(expectedPhone, ParserUtil.parsePhone(phoneWithWhitespace));
- }
-
- @Test
- public void parseAddress_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseAddress((String) null));
- }
-
- @Test
- public void parseAddress_invalidValue_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseAddress(INVALID_ADDRESS));
- }
-
- @Test
- public void parseAddress_validValueWithoutWhitespace_returnsAddress() throws Exception {
- Address expectedAddress = new Address(VALID_ADDRESS);
- assertEquals(expectedAddress, ParserUtil.parseAddress(VALID_ADDRESS));
- }
-
- @Test
- public void parseAddress_validValueWithWhitespace_returnsTrimmedAddress() throws Exception {
- String addressWithWhitespace = WHITESPACE + VALID_ADDRESS + WHITESPACE;
- Address expectedAddress = new Address(VALID_ADDRESS);
- assertEquals(expectedAddress, ParserUtil.parseAddress(addressWithWhitespace));
- }
-
- @Test
- public void parseEmail_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseEmail((String) null));
- }
-
- @Test
- public void parseEmail_invalidValue_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseEmail(INVALID_EMAIL));
- }
-
- @Test
- public void parseEmail_validValueWithoutWhitespace_returnsEmail() throws Exception {
- Email expectedEmail = new Email(VALID_EMAIL);
- assertEquals(expectedEmail, ParserUtil.parseEmail(VALID_EMAIL));
- }
-
- @Test
- public void parseEmail_validValueWithWhitespace_returnsTrimmedEmail() throws Exception {
- String emailWithWhitespace = WHITESPACE + VALID_EMAIL + WHITESPACE;
- Email expectedEmail = new Email(VALID_EMAIL);
- assertEquals(expectedEmail, ParserUtil.parseEmail(emailWithWhitespace));
- }
-
- @Test
- public void parseTag_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseTag(null));
- }
-
- @Test
- public void parseTag_invalidValue_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseTag(INVALID_TAG));
- }
-
- @Test
- public void parseTag_validValueWithoutWhitespace_returnsTag() throws Exception {
- Tag expectedTag = new Tag(VALID_TAG_1);
- assertEquals(expectedTag, ParserUtil.parseTag(VALID_TAG_1));
- }
-
- @Test
- public void parseTag_validValueWithWhitespace_returnsTrimmedTag() throws Exception {
- String tagWithWhitespace = WHITESPACE + VALID_TAG_1 + WHITESPACE;
- Tag expectedTag = new Tag(VALID_TAG_1);
- assertEquals(expectedTag, ParserUtil.parseTag(tagWithWhitespace));
- }
-
- @Test
- public void parseTags_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseTags(null));
- }
-
- @Test
- public void parseTags_collectionWithInvalidTags_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseTags(Arrays.asList(VALID_TAG_1, INVALID_TAG)));
- }
-
- @Test
- public void parseTags_emptyCollection_returnsEmptySet() throws Exception {
- assertTrue(ParserUtil.parseTags(Collections.emptyList()).isEmpty());
- }
-
- @Test
- public void parseTags_collectionWithValidTags_returnsTagSet() throws Exception {
- Set<Tag> actualTagSet = ParserUtil.parseTags(Arrays.asList(VALID_TAG_1, VALID_TAG_2));
- Set<Tag> expectedTagSet = new HashSet<Tag>(Arrays.asList(new Tag(VALID_TAG_1), new Tag(VALID_TAG_2)));
-
- assertEquals(expectedTagSet, actualTagSet);
- }
-}
diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
deleted file mode 100644
index 87782528ecd..00000000000
--- a/src/test/java/seedu/address/model/AddressBookTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package seedu.address.model;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.testutil.PersonBuilder;
-
-public class AddressBookTest {
-
- private final AddressBook addressBook = new AddressBook();
-
- @Test
- public void constructor() {
- assertEquals(Collections.emptyList(), addressBook.getPersonList());
- }
-
- @Test
- public void resetData_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> addressBook.resetData(null));
- }
-
- @Test
- public void resetData_withValidReadOnlyAddressBook_replacesData() {
- AddressBook newData = getTypicalAddressBook();
- addressBook.resetData(newData);
- assertEquals(newData, addressBook);
- }
-
- @Test
- public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
- // Two persons with the same identity fields
- Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
- .build();
- List<Person> newPersons = Arrays.asList(ALICE, editedAlice);
- AddressBookStub newData = new AddressBookStub(newPersons);
-
- assertThrows(DuplicatePersonException.class, () -> addressBook.resetData(newData));
- }
-
- @Test
- public void hasPerson_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> addressBook.hasPerson(null));
- }
-
- @Test
- public void hasPerson_personNotInAddressBook_returnsFalse() {
- assertFalse(addressBook.hasPerson(ALICE));
- }
-
- @Test
- public void hasPerson_personInAddressBook_returnsTrue() {
- addressBook.addPerson(ALICE);
- assertTrue(addressBook.hasPerson(ALICE));
- }
-
- @Test
- public void hasPerson_personWithSameIdentityFieldsInAddressBook_returnsTrue() {
- addressBook.addPerson(ALICE);
- Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
- .build();
- assertTrue(addressBook.hasPerson(editedAlice));
- }
-
- @Test
- public void getPersonList_modifyList_throwsUnsupportedOperationException() {
- assertThrows(UnsupportedOperationException.class, () -> addressBook.getPersonList().remove(0));
- }
-
- /**
- * A stub ReadOnlyAddressBook whose persons list can violate interface constraints.
- */
- private static class AddressBookStub implements ReadOnlyAddressBook {
- private final ObservableList<Person> persons = FXCollections.observableArrayList();
-
- AddressBookStub(Collection<Person> persons) {
- this.persons.setAll(persons);
- }
-
- @Override
- public ObservableList<Person> getPersonList() {
- return persons;
- }
- }
-
-}
diff --git a/src/test/java/seedu/address/model/ModelManagerTest.java b/src/test/java/seedu/address/model/ModelManagerTest.java
deleted file mode 100644
index 2cf1418d116..00000000000
--- a/src/test/java/seedu/address/model/ModelManagerTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package seedu.address.model;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BENSON;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.testutil.AddressBookBuilder;
-
-public class ModelManagerTest {
-
- private ModelManager modelManager = new ModelManager();
-
- @Test
- public void constructor() {
- assertEquals(new UserPrefs(), modelManager.getUserPrefs());
- assertEquals(new GuiSettings(), modelManager.getGuiSettings());
- assertEquals(new AddressBook(), new AddressBook(modelManager.getAddressBook()));
- }
-
- @Test
- public void setUserPrefs_nullUserPrefs_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> modelManager.setUserPrefs(null));
- }
-
- @Test
- public void setUserPrefs_validUserPrefs_copiesUserPrefs() {
- UserPrefs userPrefs = new UserPrefs();
- userPrefs.setAddressBookFilePath(Paths.get("address/book/file/path"));
- userPrefs.setGuiSettings(new GuiSettings(1, 2, 3, 4));
- modelManager.setUserPrefs(userPrefs);
- assertEquals(userPrefs, modelManager.getUserPrefs());
-
- // Modifying userPrefs should not modify modelManager's userPrefs
- UserPrefs oldUserPrefs = new UserPrefs(userPrefs);
- userPrefs.setAddressBookFilePath(Paths.get("new/address/book/file/path"));
- assertEquals(oldUserPrefs, modelManager.getUserPrefs());
- }
-
- @Test
- public void setGuiSettings_nullGuiSettings_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> modelManager.setGuiSettings(null));
- }
-
- @Test
- public void setGuiSettings_validGuiSettings_setsGuiSettings() {
- GuiSettings guiSettings = new GuiSettings(1, 2, 3, 4);
- modelManager.setGuiSettings(guiSettings);
- assertEquals(guiSettings, modelManager.getGuiSettings());
- }
-
- @Test
- public void setAddressBookFilePath_nullPath_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> modelManager.setAddressBookFilePath(null));
- }
-
- @Test
- public void setAddressBookFilePath_validPath_setsAddressBookFilePath() {
- Path path = Paths.get("address/book/file/path");
- modelManager.setAddressBookFilePath(path);
- assertEquals(path, modelManager.getAddressBookFilePath());
- }
-
- @Test
- public void hasPerson_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> modelManager.hasPerson(null));
- }
-
- @Test
- public void hasPerson_personNotInAddressBook_returnsFalse() {
- assertFalse(modelManager.hasPerson(ALICE));
- }
-
- @Test
- public void hasPerson_personInAddressBook_returnsTrue() {
- modelManager.addPerson(ALICE);
- assertTrue(modelManager.hasPerson(ALICE));
- }
-
- @Test
- public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException() {
- assertThrows(UnsupportedOperationException.class, () -> modelManager.getFilteredPersonList().remove(0));
- }
-
- @Test
- public void equals() {
- AddressBook addressBook = new AddressBookBuilder().withPerson(ALICE).withPerson(BENSON).build();
- AddressBook differentAddressBook = new AddressBook();
- UserPrefs userPrefs = new UserPrefs();
-
- // same values -> returns true
- modelManager = new ModelManager(addressBook, userPrefs);
- ModelManager modelManagerCopy = new ModelManager(addressBook, userPrefs);
- assertTrue(modelManager.equals(modelManagerCopy));
-
- // same object -> returns true
- assertTrue(modelManager.equals(modelManager));
-
- // null -> returns false
- assertFalse(modelManager.equals(null));
-
- // different types -> returns false
- assertFalse(modelManager.equals(5));
-
- // different addressBook -> returns false
- assertFalse(modelManager.equals(new ModelManager(differentAddressBook, userPrefs)));
-
- // different filteredList -> returns false
- String[] keywords = ALICE.getName().fullName.split("\\s+");
- modelManager.updateFilteredPersonList(new NameContainsKeywordsPredicate(Arrays.asList(keywords)));
- assertFalse(modelManager.equals(new ModelManager(addressBook, userPrefs)));
-
- // resets modelManager to initial state for upcoming tests
- modelManager.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-
- // different userPrefs -> returns false
- UserPrefs differentUserPrefs = new UserPrefs();
- differentUserPrefs.setAddressBookFilePath(Paths.get("differentFilePath"));
- assertFalse(modelManager.equals(new ModelManager(addressBook, differentUserPrefs)));
- }
-}
diff --git a/src/test/java/seedu/address/model/UserPrefsTest.java b/src/test/java/seedu/address/model/UserPrefsTest.java
deleted file mode 100644
index b1307a70d52..00000000000
--- a/src/test/java/seedu/address/model/UserPrefsTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package seedu.address.model;
-
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class UserPrefsTest {
-
- @Test
- public void setGuiSettings_nullGuiSettings_throwsNullPointerException() {
- UserPrefs userPref = new UserPrefs();
- assertThrows(NullPointerException.class, () -> userPref.setGuiSettings(null));
- }
-
- @Test
- public void setAddressBookFilePath_nullPath_throwsNullPointerException() {
- UserPrefs userPrefs = new UserPrefs();
- assertThrows(NullPointerException.class, () -> userPrefs.setAddressBookFilePath(null));
- }
-
-}
diff --git a/src/test/java/seedu/address/model/person/AddressTest.java b/src/test/java/seedu/address/model/person/AddressTest.java
deleted file mode 100644
index dcd3be87b3a..00000000000
--- a/src/test/java/seedu/address/model/person/AddressTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class AddressTest {
-
- @Test
- public void constructor_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new Address(null));
- }
-
- @Test
- public void constructor_invalidAddress_throwsIllegalArgumentException() {
- String invalidAddress = "";
- assertThrows(IllegalArgumentException.class, () -> new Address(invalidAddress));
- }
-
- @Test
- public void isValidAddress() {
- // null address
- assertThrows(NullPointerException.class, () -> Address.isValidAddress(null));
-
- // invalid addresses
- assertFalse(Address.isValidAddress("")); // empty string
- assertFalse(Address.isValidAddress(" ")); // spaces only
-
- // valid addresses
- assertTrue(Address.isValidAddress("Blk 456, Den Road, #01-355"));
- assertTrue(Address.isValidAddress("-")); // one character
- assertTrue(Address.isValidAddress("Leng Inc; 1234 Market St; San Francisco CA 2349879; USA")); // long address
- }
-}
diff --git a/src/test/java/seedu/address/model/person/EmailTest.java b/src/test/java/seedu/address/model/person/EmailTest.java
deleted file mode 100644
index 7fa726ceb18..00000000000
--- a/src/test/java/seedu/address/model/person/EmailTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class EmailTest {
-
- @Test
- public void constructor_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new Email(null));
- }
-
- @Test
- public void constructor_invalidEmail_throwsIllegalArgumentException() {
- String invalidEmail = "";
- assertThrows(IllegalArgumentException.class, () -> new Email(invalidEmail));
- }
-
- @Test
- public void isValidEmail() {
- // null email
- assertThrows(NullPointerException.class, () -> Email.isValidEmail(null));
-
- // blank email
- assertFalse(Email.isValidEmail("")); // empty string
- assertFalse(Email.isValidEmail(" ")); // spaces only
-
- // missing parts
- assertFalse(Email.isValidEmail("@example.com")); // missing local part
- assertFalse(Email.isValidEmail("peterjackexample.com")); // missing '@' symbol
- assertFalse(Email.isValidEmail("peterjack@")); // missing domain name
-
- // invalid parts
- assertFalse(Email.isValidEmail("peterjack@-")); // invalid domain name
- assertFalse(Email.isValidEmail("peterjack@exam_ple.com")); // underscore in domain name
- assertFalse(Email.isValidEmail("peter jack@example.com")); // spaces in local part
- assertFalse(Email.isValidEmail("peterjack@exam ple.com")); // spaces in domain name
- assertFalse(Email.isValidEmail(" peterjack@example.com")); // leading space
- assertFalse(Email.isValidEmail("peterjack@example.com ")); // trailing space
- assertFalse(Email.isValidEmail("peterjack@@example.com")); // double '@' symbol
- assertFalse(Email.isValidEmail("peter@jack@example.com")); // '@' symbol in local part
- assertFalse(Email.isValidEmail("peterjack@example@com")); // '@' symbol in domain name
- assertFalse(Email.isValidEmail("peterjack@.example.com")); // domain name starts with a period
- assertFalse(Email.isValidEmail("peterjack@example.com.")); // domain name ends with a period
- assertFalse(Email.isValidEmail("peterjack@-example.com")); // domain name starts with a hyphen
- assertFalse(Email.isValidEmail("peterjack@example.com-")); // domain name ends with a hyphen
-
- // valid email
- assertTrue(Email.isValidEmail("PeterJack_1190@example.com"));
- assertTrue(Email.isValidEmail("a@bc")); // minimal
- assertTrue(Email.isValidEmail("test@localhost")); // alphabets only
- assertTrue(Email.isValidEmail("!#$%&'*+/=?`{|}~^.-@example.org")); // special characters local part
- assertTrue(Email.isValidEmail("123@145")); // numeric local part and domain name
- assertTrue(Email.isValidEmail("a1+be!@example1.com")); // mixture of alphanumeric and special characters
- assertTrue(Email.isValidEmail("peter_jack@very-very-very-long-example.com")); // long domain name
- assertTrue(Email.isValidEmail("if.you.dream.it_you.can.do.it@example.com")); // long local part
- }
-}
diff --git a/src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java b/src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java
deleted file mode 100644
index f136664e017..00000000000
--- a/src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.testutil.PersonBuilder;
-
-public class NameContainsKeywordsPredicateTest {
-
- @Test
- public void equals() {
- List<String> firstPredicateKeywordList = Collections.singletonList("first");
- List<String> secondPredicateKeywordList = Arrays.asList("first", "second");
-
- NameContainsKeywordsPredicate firstPredicate = new NameContainsKeywordsPredicate(firstPredicateKeywordList);
- NameContainsKeywordsPredicate secondPredicate = new NameContainsKeywordsPredicate(secondPredicateKeywordList);
-
- // same object -> returns true
- assertTrue(firstPredicate.equals(firstPredicate));
-
- // same values -> returns true
- NameContainsKeywordsPredicate firstPredicateCopy = new NameContainsKeywordsPredicate(firstPredicateKeywordList);
- assertTrue(firstPredicate.equals(firstPredicateCopy));
-
- // different types -> returns false
- assertFalse(firstPredicate.equals(1));
-
- // null -> returns false
- assertFalse(firstPredicate.equals(null));
-
- // different person -> returns false
- assertFalse(firstPredicate.equals(secondPredicate));
- }
-
- @Test
- public void test_nameContainsKeywords_returnsTrue() {
- // One keyword
- NameContainsKeywordsPredicate predicate = new NameContainsKeywordsPredicate(Collections.singletonList("Alice"));
- assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
-
- // Multiple keywords
- predicate = new NameContainsKeywordsPredicate(Arrays.asList("Alice", "Bob"));
- assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
-
- // Only one matching keyword
- predicate = new NameContainsKeywordsPredicate(Arrays.asList("Bob", "Carol"));
- assertTrue(predicate.test(new PersonBuilder().withName("Alice Carol").build()));
-
- // Mixed-case keywords
- predicate = new NameContainsKeywordsPredicate(Arrays.asList("aLIce", "bOB"));
- assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
- }
-
- @Test
- public void test_nameDoesNotContainKeywords_returnsFalse() {
- // Zero keywords
- NameContainsKeywordsPredicate predicate = new NameContainsKeywordsPredicate(Collections.emptyList());
- assertFalse(predicate.test(new PersonBuilder().withName("Alice").build()));
-
- // Non-matching keyword
- predicate = new NameContainsKeywordsPredicate(Arrays.asList("Carol"));
- assertFalse(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
-
- // Keywords match phone, email and address, but does not match name
- predicate = new NameContainsKeywordsPredicate(Arrays.asList("12345", "alice@email.com", "Main", "Street"));
- assertFalse(predicate.test(new PersonBuilder().withName("Alice").withPhone("12345")
- .withEmail("alice@email.com").withAddress("Main Street").build()));
- }
-}
diff --git a/src/test/java/seedu/address/model/person/NameTest.java b/src/test/java/seedu/address/model/person/NameTest.java
deleted file mode 100644
index c9801392874..00000000000
--- a/src/test/java/seedu/address/model/person/NameTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class NameTest {
-
- @Test
- public void constructor_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new Name(null));
- }
-
- @Test
- public void constructor_invalidName_throwsIllegalArgumentException() {
- String invalidName = "";
- assertThrows(IllegalArgumentException.class, () -> new Name(invalidName));
- }
-
- @Test
- public void isValidName() {
- // null name
- assertThrows(NullPointerException.class, () -> Name.isValidName(null));
-
- // invalid name
- assertFalse(Name.isValidName("")); // empty string
- assertFalse(Name.isValidName(" ")); // spaces only
- assertFalse(Name.isValidName("^")); // only non-alphanumeric characters
- assertFalse(Name.isValidName("peter*")); // contains non-alphanumeric characters
-
- // valid name
- assertTrue(Name.isValidName("peter jack")); // alphabets only
- assertTrue(Name.isValidName("12345")); // numbers only
- assertTrue(Name.isValidName("peter the 2nd")); // alphanumeric characters
- assertTrue(Name.isValidName("Capital Tan")); // with capital letters
- assertTrue(Name.isValidName("David Roger Jackson Ray Jr 2nd")); // long names
- }
-}
diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
deleted file mode 100644
index 7c1058d8635..00000000000
--- a/src/test/java/seedu/address/model/person/PersonTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.testutil.PersonBuilder;
-
-public class PersonTest {
-
- @Test
- public void asObservableList_modifyList_throwsUnsupportedOperationException() {
- Person person = new PersonBuilder().build();
- assertThrows(UnsupportedOperationException.class, () -> person.getTags().remove(0));
- }
-
- @Test
- public void isSamePerson() {
- // same object -> returns true
- assertTrue(ALICE.isSamePerson(ALICE));
-
- // null -> returns false
- assertFalse(ALICE.isSamePerson(null));
-
- // different phone and email -> returns false
- Person editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).build();
- assertFalse(ALICE.isSamePerson(editedAlice));
-
- // different name -> returns false
- editedAlice = new PersonBuilder(ALICE).withName(VALID_NAME_BOB).build();
- assertFalse(ALICE.isSamePerson(editedAlice));
-
- // same name, same phone, different attributes -> returns true
- editedAlice = new PersonBuilder(ALICE).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
- .withTags(VALID_TAG_HUSBAND).build();
- assertTrue(ALICE.isSamePerson(editedAlice));
-
- // same name, same email, different attributes -> returns true
- editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withAddress(VALID_ADDRESS_BOB)
- .withTags(VALID_TAG_HUSBAND).build();
- assertTrue(ALICE.isSamePerson(editedAlice));
-
- // same name, same phone, same email, different attributes -> returns true
- editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND).build();
- assertTrue(ALICE.isSamePerson(editedAlice));
- }
-
- @Test
- public void equals() {
- // same values -> returns true
- Person aliceCopy = new PersonBuilder(ALICE).build();
- assertTrue(ALICE.equals(aliceCopy));
-
- // same object -> returns true
- assertTrue(ALICE.equals(ALICE));
-
- // null -> returns false
- assertFalse(ALICE.equals(null));
-
- // different type -> returns false
- assertFalse(ALICE.equals(5));
-
- // different person -> returns false
- assertFalse(ALICE.equals(BOB));
-
- // different name -> returns false
- Person editedAlice = new PersonBuilder(ALICE).withName(VALID_NAME_BOB).build();
- assertFalse(ALICE.equals(editedAlice));
-
- // different phone -> returns false
- editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).build();
- assertFalse(ALICE.equals(editedAlice));
-
- // different email -> returns false
- editedAlice = new PersonBuilder(ALICE).withEmail(VALID_EMAIL_BOB).build();
- assertFalse(ALICE.equals(editedAlice));
-
- // different address -> returns false
- editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).build();
- assertFalse(ALICE.equals(editedAlice));
-
- // different tags -> returns false
- editedAlice = new PersonBuilder(ALICE).withTags(VALID_TAG_HUSBAND).build();
- assertFalse(ALICE.equals(editedAlice));
- }
-}
diff --git a/src/test/java/seedu/address/model/person/PhoneTest.java b/src/test/java/seedu/address/model/person/PhoneTest.java
deleted file mode 100644
index 8dd52766a5f..00000000000
--- a/src/test/java/seedu/address/model/person/PhoneTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class PhoneTest {
-
- @Test
- public void constructor_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new Phone(null));
- }
-
- @Test
- public void constructor_invalidPhone_throwsIllegalArgumentException() {
- String invalidPhone = "";
- assertThrows(IllegalArgumentException.class, () -> new Phone(invalidPhone));
- }
-
- @Test
- public void isValidPhone() {
- // null phone number
- assertThrows(NullPointerException.class, () -> Phone.isValidPhone(null));
-
- // invalid phone numbers
- assertFalse(Phone.isValidPhone("")); // empty string
- assertFalse(Phone.isValidPhone(" ")); // spaces only
- assertFalse(Phone.isValidPhone("91")); // less than 3 numbers
- assertFalse(Phone.isValidPhone("phone")); // non-numeric
- assertFalse(Phone.isValidPhone("9011p041")); // alphabets within digits
- assertFalse(Phone.isValidPhone("9312 1534")); // spaces within digits
-
- // valid phone numbers
- assertTrue(Phone.isValidPhone("911")); // exactly 3 numbers
- assertTrue(Phone.isValidPhone("93121534"));
- assertTrue(Phone.isValidPhone("124293842033123")); // long phone numbers
- }
-}
diff --git a/src/test/java/seedu/address/model/person/UniquePersonListTest.java b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
deleted file mode 100644
index 1cc5fe9e0fe..00000000000
--- a/src/test/java/seedu/address/model/person/UniquePersonListTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
-import seedu.address.testutil.PersonBuilder;
-
-public class UniquePersonListTest {
-
- private final UniquePersonList uniquePersonList = new UniquePersonList();
-
- @Test
- public void contains_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.contains(null));
- }
-
- @Test
- public void contains_personNotInList_returnsFalse() {
- assertFalse(uniquePersonList.contains(ALICE));
- }
-
- @Test
- public void contains_personInList_returnsTrue() {
- uniquePersonList.add(ALICE);
- assertTrue(uniquePersonList.contains(ALICE));
- }
-
- @Test
- public void contains_personWithSameIdentityFieldsInList_returnsTrue() {
- uniquePersonList.add(ALICE);
- Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
- .build();
- assertTrue(uniquePersonList.contains(editedAlice));
- }
-
- @Test
- public void add_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.add(null));
- }
-
- @Test
- public void add_duplicatePerson_throwsDuplicatePersonException() {
- uniquePersonList.add(ALICE);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.add(ALICE));
- }
-
- @Test
- public void setPerson_nullTargetPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPerson(null, ALICE));
- }
-
- @Test
- public void setPerson_nullEditedPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPerson(ALICE, null));
- }
-
- @Test
- public void setPerson_targetPersonNotInList_throwsPersonNotFoundException() {
- assertThrows(PersonNotFoundException.class, () -> uniquePersonList.setPerson(ALICE, ALICE));
- }
-
- @Test
- public void setPerson_editedPersonIsSamePerson_success() {
- uniquePersonList.add(ALICE);
- uniquePersonList.setPerson(ALICE, ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(ALICE);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPerson_editedPersonHasSameIdentity_success() {
- uniquePersonList.add(ALICE);
- Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
- .build();
- uniquePersonList.setPerson(ALICE, editedAlice);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(editedAlice);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPerson_editedPersonHasDifferentIdentity_success() {
- uniquePersonList.add(ALICE);
- uniquePersonList.setPerson(ALICE, BOB);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(BOB);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPerson_editedPersonHasNonUniqueIdentity_throwsDuplicatePersonException() {
- uniquePersonList.add(ALICE);
- uniquePersonList.add(BOB);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.setPerson(ALICE, BOB));
- }
-
- @Test
- public void remove_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.remove(null));
- }
-
- @Test
- public void remove_personDoesNotExist_throwsPersonNotFoundException() {
- assertThrows(PersonNotFoundException.class, () -> uniquePersonList.remove(ALICE));
- }
-
- @Test
- public void remove_existingPerson_removesPerson() {
- uniquePersonList.add(ALICE);
- uniquePersonList.remove(ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPersons_nullUniquePersonList_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPersons((UniquePersonList) null));
- }
-
- @Test
- public void setPersons_uniquePersonList_replacesOwnListWithProvidedUniquePersonList() {
- uniquePersonList.add(ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(BOB);
- uniquePersonList.setPersons(expectedUniquePersonList);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPersons_nullList_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPersons((List<Person>) null));
- }
-
- @Test
- public void setPersons_list_replacesOwnListWithProvidedList() {
- uniquePersonList.add(ALICE);
- List<Person> personList = Collections.singletonList(BOB);
- uniquePersonList.setPersons(personList);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(BOB);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPersons_listWithDuplicatePersons_throwsDuplicatePersonException() {
- List<Person> listWithDuplicatePersons = Arrays.asList(ALICE, ALICE);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.setPersons(listWithDuplicatePersons));
- }
-
- @Test
- public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
- assertThrows(UnsupportedOperationException.class, ()
- -> uniquePersonList.asUnmodifiableObservableList().remove(0));
- }
-}
diff --git a/src/test/java/seedu/address/model/tag/TagTest.java b/src/test/java/seedu/address/model/tag/TagTest.java
deleted file mode 100644
index 64d07d79ee2..00000000000
--- a/src/test/java/seedu/address/model/tag/TagTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package seedu.address.model.tag;
-
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class TagTest {
-
- @Test
- public void constructor_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new Tag(null));
- }
-
- @Test
- public void constructor_invalidTagName_throwsIllegalArgumentException() {
- String invalidTagName = "";
- assertThrows(IllegalArgumentException.class, () -> new Tag(invalidTagName));
- }
-
- @Test
- public void isValidTagName() {
- // null tag name
- assertThrows(NullPointerException.class, () -> Tag.isValidTagName(null));
- }
-
-}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
deleted file mode 100644
index 83b11331cdb..00000000000
--- a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package seedu.address.storage;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static seedu.address.storage.JsonAdaptedPerson.MISSING_FIELD_MESSAGE_FORMAT;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.BENSON;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-
-public class JsonAdaptedPersonTest {
- private static final String INVALID_NAME = "R@chel";
- private static final String INVALID_PHONE = "+651234";
- private static final String INVALID_ADDRESS = " ";
- private static final String INVALID_EMAIL = "example.com";
- private static final String INVALID_TAG = "#friend";
-
- private static final String VALID_NAME = BENSON.getName().toString();
- private static final String VALID_PHONE = BENSON.getPhone().toString();
- private static final String VALID_EMAIL = BENSON.getEmail().toString();
- private static final String VALID_ADDRESS = BENSON.getAddress().toString();
- private static final List<JsonAdaptedTag> VALID_TAGS = BENSON.getTags().stream()
- .map(JsonAdaptedTag::new)
- .collect(Collectors.toList());
-
- @Test
- public void toModelType_validPersonDetails_returnsPerson() throws Exception {
- JsonAdaptedPerson person = new JsonAdaptedPerson(BENSON);
- assertEquals(BENSON, person.toModelType());
- }
-
- @Test
- public void toModelType_invalidName_throwsIllegalValueException() {
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = Name.MESSAGE_CONSTRAINTS;
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_nullName_throwsIllegalValueException() {
- JsonAdaptedPerson person = new JsonAdaptedPerson(null, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_invalidPhone_throwsIllegalValueException() {
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_nullPhone_throwsIllegalValueException() {
- JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, null, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_invalidEmail_throwsIllegalValueException() {
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = Email.MESSAGE_CONSTRAINTS;
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_nullEmail_throwsIllegalValueException() {
- JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, null, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_invalidAddress_throwsIllegalValueException() {
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_ADDRESS, VALID_TAGS);
- String expectedMessage = Address.MESSAGE_CONSTRAINTS;
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_nullAddress_throwsIllegalValueException() {
- JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, null, VALID_TAGS);
- String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName());
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_invalidTags_throwsIllegalValueException() {
- List<JsonAdaptedTag> invalidTags = new ArrayList<>(VALID_TAGS);
- invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, invalidTags);
- assertThrows(IllegalValueException.class, person::toModelType);
- }
-
-}
diff --git a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java b/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
deleted file mode 100644
index ac3c3af9566..00000000000
--- a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package seedu.address.storage;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.HOON;
-import static seedu.address.testutil.TypicalPersons.IDA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-
-public class JsonAddressBookStorageTest {
- private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonAddressBookStorageTest");
-
- @TempDir
- public Path testFolder;
-
- @Test
- public void readAddressBook_nullFilePath_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> readAddressBook(null));
- }
-
- private java.util.Optional<ReadOnlyAddressBook> readAddressBook(String filePath) throws Exception {
- return new JsonAddressBookStorage(Paths.get(filePath)).readAddressBook(addToTestDataPathIfNotNull(filePath));
- }
-
- private Path addToTestDataPathIfNotNull(String prefsFileInTestDataFolder) {
- return prefsFileInTestDataFolder != null
- ? TEST_DATA_FOLDER.resolve(prefsFileInTestDataFolder)
- : null;
- }
-
- @Test
- public void read_missingFile_emptyResult() throws Exception {
- assertFalse(readAddressBook("NonExistentFile.json").isPresent());
- }
-
- @Test
- public void read_notJsonFormat_exceptionThrown() {
- assertThrows(DataConversionException.class, () -> readAddressBook("notJsonFormatAddressBook.json"));
- }
-
- @Test
- public void readAddressBook_invalidPersonAddressBook_throwDataConversionException() {
- assertThrows(DataConversionException.class, () -> readAddressBook("invalidPersonAddressBook.json"));
- }
-
- @Test
- public void readAddressBook_invalidAndValidPersonAddressBook_throwDataConversionException() {
- assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidPersonAddressBook.json"));
- }
-
- @Test
- public void readAndSaveAddressBook_allInOrder_success() throws Exception {
- Path filePath = testFolder.resolve("TempAddressBook.json");
- AddressBook original = getTypicalAddressBook();
- JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(filePath);
-
- // Save in new file and read back
- jsonAddressBookStorage.saveAddressBook(original, filePath);
- ReadOnlyAddressBook readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
- assertEquals(original, new AddressBook(readBack));
-
- // Modify data, overwrite exiting file, and read back
- original.addPerson(HOON);
- original.removePerson(ALICE);
- jsonAddressBookStorage.saveAddressBook(original, filePath);
- readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
- assertEquals(original, new AddressBook(readBack));
-
- // Save and read without specifying file path
- original.addPerson(IDA);
- jsonAddressBookStorage.saveAddressBook(original); // file path not specified
- readBack = jsonAddressBookStorage.readAddressBook().get(); // file path not specified
- assertEquals(original, new AddressBook(readBack));
-
- }
-
- @Test
- public void saveAddressBook_nullAddressBook_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> saveAddressBook(null, "SomeFile.json"));
- }
-
- /**
- * Saves {@code addressBook} at the specified {@code filePath}.
- */
- private void saveAddressBook(ReadOnlyAddressBook addressBook, String filePath) {
- try {
- new JsonAddressBookStorage(Paths.get(filePath))
- .saveAddressBook(addressBook, addToTestDataPathIfNotNull(filePath));
- } catch (IOException ioe) {
- throw new AssertionError("There should not be an error writing to the file.", ioe);
- }
- }
-
- @Test
- public void saveAddressBook_nullFilePath_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> saveAddressBook(new AddressBook(), null));
- }
-}
diff --git a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java b/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
deleted file mode 100644
index 188c9058d20..00000000000
--- a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package seedu.address.storage;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static seedu.address.testutil.Assert.assertThrows;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.commons.util.JsonUtil;
-import seedu.address.model.AddressBook;
-import seedu.address.testutil.TypicalPersons;
-
-public class JsonSerializableAddressBookTest {
-
- private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonSerializableAddressBookTest");
- private static final Path TYPICAL_PERSONS_FILE = TEST_DATA_FOLDER.resolve("typicalPersonsAddressBook.json");
- private static final Path INVALID_PERSON_FILE = TEST_DATA_FOLDER.resolve("invalidPersonAddressBook.json");
- private static final Path DUPLICATE_PERSON_FILE = TEST_DATA_FOLDER.resolve("duplicatePersonAddressBook.json");
-
- @Test
- public void toModelType_typicalPersonsFile_success() throws Exception {
- JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(TYPICAL_PERSONS_FILE,
- JsonSerializableAddressBook.class).get();
- AddressBook addressBookFromFile = dataFromFile.toModelType();
- AddressBook typicalPersonsAddressBook = TypicalPersons.getTypicalAddressBook();
- assertEquals(addressBookFromFile, typicalPersonsAddressBook);
- }
-
- @Test
- public void toModelType_invalidPersonFile_throwsIllegalValueException() throws Exception {
- JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(INVALID_PERSON_FILE,
- JsonSerializableAddressBook.class).get();
- assertThrows(IllegalValueException.class, dataFromFile::toModelType);
- }
-
- @Test
- public void toModelType_duplicatePersons_throwsIllegalValueException() throws Exception {
- JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(DUPLICATE_PERSON_FILE,
- JsonSerializableAddressBook.class).get();
- assertThrows(IllegalValueException.class, JsonSerializableAddressBook.MESSAGE_DUPLICATE_PERSON,
- dataFromFile::toModelType);
- }
-
-}
diff --git a/src/test/java/seedu/address/testutil/AddressBookBuilder.java b/src/test/java/seedu/address/testutil/AddressBookBuilder.java
deleted file mode 100644
index d53799fd110..00000000000
--- a/src/test/java/seedu/address/testutil/AddressBookBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package seedu.address.testutil;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * A utility class to help with building Addressbook objects.
- * Example usage: <br>
- * {@code AddressBook ab = new AddressBookBuilder().withPerson("John", "Doe").build();}
- */
-public class AddressBookBuilder {
-
- private AddressBook addressBook;
-
- public AddressBookBuilder() {
- addressBook = new AddressBook();
- }
-
- public AddressBookBuilder(AddressBook addressBook) {
- this.addressBook = addressBook;
- }
-
- /**
- * Adds a new {@code Person} to the {@code AddressBook} that we are building.
- */
- public AddressBookBuilder withPerson(Person person) {
- addressBook.addPerson(person);
- return this;
- }
-
- public AddressBook build() {
- return addressBook;
- }
-}
diff --git a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
deleted file mode 100644
index 4584bd5044e..00000000000
--- a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package seedu.address.testutil;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * A utility class to help with building EditPersonDescriptor objects.
- */
-public class EditPersonDescriptorBuilder {
-
- private EditPersonDescriptor descriptor;
-
- public EditPersonDescriptorBuilder() {
- descriptor = new EditPersonDescriptor();
- }
-
- public EditPersonDescriptorBuilder(EditPersonDescriptor descriptor) {
- this.descriptor = new EditPersonDescriptor(descriptor);
- }
-
- /**
- * Returns an {@code EditPersonDescriptor} with fields containing {@code person}'s details
- */
- public EditPersonDescriptorBuilder(Person person) {
- descriptor = new EditPersonDescriptor();
- descriptor.setName(person.getName());
- descriptor.setPhone(person.getPhone());
- descriptor.setEmail(person.getEmail());
- descriptor.setAddress(person.getAddress());
- descriptor.setTags(person.getTags());
- }
-
- /**
- * Sets the {@code Name} of the {@code EditPersonDescriptor} that we are building.
- */
- public EditPersonDescriptorBuilder withName(String name) {
- descriptor.setName(new Name(name));
- return this;
- }
-
- /**
- * Sets the {@code Phone} of the {@code EditPersonDescriptor} that we are building.
- */
- public EditPersonDescriptorBuilder withPhone(String phone) {
- descriptor.setPhone(new Phone(phone));
- return this;
- }
-
- /**
- * Sets the {@code Email} of the {@code EditPersonDescriptor} that we are building.
- */
- public EditPersonDescriptorBuilder withEmail(String email) {
- descriptor.setEmail(new Email(email));
- return this;
- }
-
- /**
- * Sets the {@code Address} of the {@code EditPersonDescriptor} that we are building.
- */
- public EditPersonDescriptorBuilder withAddress(String address) {
- descriptor.setAddress(new Address(address));
- return this;
- }
-
- /**
- * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code EditPersonDescriptor}
- * that we are building.
- */
- public EditPersonDescriptorBuilder withTags(String... tags) {
- Set<Tag> tagSet = Stream.of(tags).map(Tag::new).collect(Collectors.toSet());
- descriptor.setTags(tagSet);
- return this;
- }
-
- public EditPersonDescriptor build() {
- return descriptor;
- }
-}
diff --git a/src/test/java/seedu/address/testutil/PersonBuilder.java b/src/test/java/seedu/address/testutil/PersonBuilder.java
deleted file mode 100644
index efe744cd12c..00000000000
--- a/src/test/java/seedu/address/testutil/PersonBuilder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package seedu.address.testutil;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.model.util.SampleDataUtil;
-
-/**
- * A utility class to help with building Person objects.
- */
-public class PersonBuilder {
-
- public static final String DEFAULT_NAME = "Alice Pauline";
- public static final String DEFAULT_PHONE = "85355255";
- public static final String DEFAULT_EMAIL = "alice@gmail.com";
- public static final String DEFAULT_ADDRESS = "123, Jurong West Ave 6, #08-111";
-
- private Name name;
- private Phone phone;
- private Email email;
- private Address address;
- private Set<Tag> tags;
-
- /**
- * Creates a {@code PersonBuilder} with the default details.
- */
- public PersonBuilder() {
- name = new Name(DEFAULT_NAME);
- phone = new Phone(DEFAULT_PHONE);
- email = new Email(DEFAULT_EMAIL);
- address = new Address(DEFAULT_ADDRESS);
- tags = new HashSet<>();
- }
-
- /**
- * Initializes the PersonBuilder with the data of {@code personToCopy}.
- */
- public PersonBuilder(Person personToCopy) {
- name = personToCopy.getName();
- phone = personToCopy.getPhone();
- email = personToCopy.getEmail();
- address = personToCopy.getAddress();
- tags = new HashSet<>(personToCopy.getTags());
- }
-
- /**
- * Sets the {@code Name} of the {@code Person} that we are building.
- */
- public PersonBuilder withName(String name) {
- this.name = new Name(name);
- return this;
- }
-
- /**
- * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code Person} that we are building.
- */
- public PersonBuilder withTags(String ... tags) {
- this.tags = SampleDataUtil.getTagSet(tags);
- return this;
- }
-
- /**
- * Sets the {@code Address} of the {@code Person} that we are building.
- */
- public PersonBuilder withAddress(String address) {
- this.address = new Address(address);
- return this;
- }
-
- /**
- * Sets the {@code Phone} of the {@code Person} that we are building.
- */
- public PersonBuilder withPhone(String phone) {
- this.phone = new Phone(phone);
- return this;
- }
-
- /**
- * Sets the {@code Email} of the {@code Person} that we are building.
- */
- public PersonBuilder withEmail(String email) {
- this.email = new Email(email);
- return this;
- }
-
- public Person build() {
- return new Person(name, phone, email, address, tags);
- }
-
-}
diff --git a/src/test/java/seedu/address/testutil/PersonUtil.java b/src/test/java/seedu/address/testutil/PersonUtil.java
deleted file mode 100644
index 90849945183..00000000000
--- a/src/test/java/seedu/address/testutil/PersonUtil.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package seedu.address.testutil;
-
-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 java.util.Set;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Person;
-import seedu.address.model.tag.Tag;
-
-/**
- * A utility class for Person.
- */
-public class PersonUtil {
-
- /**
- * Returns an add command string for adding the {@code person}.
- */
- public static String getAddCommand(Person person) {
- return AddCommand.COMMAND_WORD + " " + getPersonDetails(person);
- }
-
- /**
- * Returns the part of command string for the given {@code person}'s details.
- */
- public static String getPersonDetails(Person person) {
- StringBuilder sb = new StringBuilder();
- sb.append(PREFIX_NAME + person.getName().fullName + " ");
- sb.append(PREFIX_PHONE + person.getPhone().value + " ");
- sb.append(PREFIX_EMAIL + person.getEmail().value + " ");
- sb.append(PREFIX_ADDRESS + person.getAddress().value + " ");
- person.getTags().stream().forEach(
- s -> sb.append(PREFIX_TAG + s.tagName + " ")
- );
- return sb.toString();
- }
-
- /**
- * Returns the part of command string for the given {@code EditPersonDescriptor}'s details.
- */
- public static String getEditPersonDescriptorDetails(EditPersonDescriptor descriptor) {
- StringBuilder sb = new StringBuilder();
- descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(" "));
- descriptor.getPhone().ifPresent(phone -> sb.append(PREFIX_PHONE).append(phone.value).append(" "));
- descriptor.getEmail().ifPresent(email -> sb.append(PREFIX_EMAIL).append(email.value).append(" "));
- descriptor.getAddress().ifPresent(address -> sb.append(PREFIX_ADDRESS).append(address.value).append(" "));
- if (descriptor.getTags().isPresent()) {
- Set<Tag> tags = descriptor.getTags().get();
- if (tags.isEmpty()) {
- sb.append(PREFIX_TAG);
- } else {
- tags.forEach(s -> sb.append(PREFIX_TAG).append(s.tagName).append(" "));
- }
- }
- return sb.toString();
- }
-}
diff --git a/src/test/java/seedu/address/testutil/TypicalIndexes.java b/src/test/java/seedu/address/testutil/TypicalIndexes.java
deleted file mode 100644
index 1e613937657..00000000000
--- a/src/test/java/seedu/address/testutil/TypicalIndexes.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package seedu.address.testutil;
-
-import seedu.address.commons.core.index.Index;
-
-/**
- * A utility class containing a list of {@code Index} objects to be used in tests.
- */
-public class TypicalIndexes {
- public static final Index INDEX_FIRST_PERSON = Index.fromOneBased(1);
- public static final Index INDEX_SECOND_PERSON = Index.fromOneBased(2);
- public static final Index INDEX_THIRD_PERSON = Index.fromOneBased(3);
-}
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
deleted file mode 100644
index fec76fb7129..00000000000
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package seedu.address.testutil;
-
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * A utility class containing a list of {@code Person} objects to be used in tests.
- */
-public class TypicalPersons {
-
- public static final Person ALICE = new PersonBuilder().withName("Alice Pauline")
- .withAddress("123, Jurong West Ave 6, #08-111").withEmail("alice@example.com")
- .withPhone("94351253")
- .withTags("friends").build();
- public static final Person BENSON = new PersonBuilder().withName("Benson Meier")
- .withAddress("311, Clementi Ave 2, #02-25")
- .withEmail("johnd@example.com").withPhone("98765432")
- .withTags("owesMoney", "friends").build();
- public static final Person CARL = new PersonBuilder().withName("Carl Kurz").withPhone("95352563")
- .withEmail("heinz@example.com").withAddress("wall street").build();
- public static final Person DANIEL = new PersonBuilder().withName("Daniel Meier").withPhone("87652533")
- .withEmail("cornelia@example.com").withAddress("10th street").withTags("friends").build();
- public static final Person ELLE = new PersonBuilder().withName("Elle Meyer").withPhone("9482224")
- .withEmail("werner@example.com").withAddress("michegan ave").build();
- public static final Person FIONA = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427")
- .withEmail("lydia@example.com").withAddress("little tokyo").build();
- public static final Person GEORGE = new PersonBuilder().withName("George Best").withPhone("9482442")
- .withEmail("anna@example.com").withAddress("4th street").build();
-
- // Manually added
- public static final Person HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
- .withEmail("stefan@example.com").withAddress("little india").build();
- public static final Person IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
- .withEmail("hans@example.com").withAddress("chicago ave").build();
-
- // Manually added - Person's details found in {@code CommandTestUtil}
- public static final Person AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
- .withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build();
- public static final Person BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
- .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
- .build();
-
- public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER
-
- private TypicalPersons() {} // prevents instantiation
-
- /**
- * Returns an {@code AddressBook} with all the typical persons.
- */
- public static AddressBook getTypicalAddressBook() {
- AddressBook ab = new AddressBook();
- for (Person person : getTypicalPersons()) {
- ab.addPerson(person);
- }
- return ab;
- }
-
- public static List<Person> getTypicalPersons() {
- return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE));
- }
-}
diff --git a/src/test/resources/view/UiPartTest/validFile.fxml b/src/test/resources/view/UiPartTest/validFile.fxml
index bab836af0db..872539b8f3f 100644
--- a/src/test/resources/view/UiPartTest/validFile.fxml
+++ b/src/test/resources/view/UiPartTest/validFile.fxml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import seedu.address.ui.TestFxmlObject?>
+<?import ay2021s1_cs2103_w16_3.finesse.ui.TestFxmlObject?>
<TestFxmlObject xmlns:fx="http://javafx.com/fxml/1" fx:id="validFileRoot">Hello World!</TestFxmlObject>
diff --git a/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml b/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
index 151e09ce926..7ec9e8579ba 100644
--- a/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
+++ b/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<fx:root type="seedu.address.ui.TestFxmlObject" xmlns="http://javafx.com/javafx"
+<fx:root type="ay2021s1_cs2103_w16_3.finesse.ui.TestFxmlObject" xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml">
<text>Hello World!</text>
</fx:root>
+
-[[homepage](http://www.comp.nus.edu.sg/~damithch)]
-[[github](https://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](https://github.com/ianyong)]
+[[portfolio](team/ianyong.md)]
-* Role: Project Advisor
+* Role: Team Co-Lead
+* Responsibilities: Testing
-### Jane Doe
+### Tan Wei Liang
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/wltan)]
+[[portfolio](team/wltan.md)]
-* Role: Team Lead
-* Responsibilities: UI
+* Role: Team Co-Lead
+* Responsibilities: Git/CI Expert, Integration
-### Johnny Doe
+### Siddarth Nandanahosur Suresh
-
-[[github](http://github.com/johndoe)] [[portfolio](team/johndoe.md)]
+[[github](http://github.com/siddarth2824)] [[portfolio](team/siddarth2824.md)]
* Role: Developer
-* Responsibilities: Data
+* Responsibilities: Scheduling and Tracking, User Interface
-### Jean Doe
+### Zhao Jingjing
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/zhaojj2209)]
+[[portfolio](team/zhaojj2209.md)]
* Role: Developer
-* Responsibilities: Dev Ops + Threading
+* Responsibilities: Documentation, Model, Logic
-### James Doe
+### Yong Ping
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/yongping827)]
+[[portfolio](team/yongping827.md)]
* Role: Developer
-* Responsibilities: UI
+* Responsibilities: Code Quality, Storage
diff --git a/docs/Configuration.md b/docs/Configuration.md
deleted file mode 100644
index 13cf0faea16..00000000000
--- a/docs/Configuration.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: page
-title: Configuration guide
----
-
-Certain properties of the application can be controlled (e.g user preferences file location, logging level) through the configuration file (default: `config.json`).
diff --git a/docs/DevOps.md b/docs/DevOps.md
deleted file mode 100644
index 4414eea3344..00000000000
--- a/docs/DevOps.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-layout: page
-title: DevOps guide
----
-
-* Table of Contents
-{:toc}
-
---------------------------------------------------------------------------------------------------------------------
-
-## Build automation
-
-This project uses Gradle for **build automation and dependency management**. **You are recommended to read [this Gradle Tutorial from the se-edu/guides](https://se-education.org/guides/tutorials/gradle.html)**.
-
-
-Given below are how to use Gradle for some important project tasks.
-
-
-* **`clean`**: Deletes the files created during the previous build tasks (e.g. files in the `build` folder).
@@ -62,31 +50,43 @@ The sections below give more details of each component.
**API** :
-[`Ui.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/ui/Ui.java)
+[`Ui.java`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/Ui.java)
-The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `PersonListPanel`, `StatusBarFooter` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class.
+The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `TransactionListPanel`, `OverviewTabPane` etc.
+All of these, including `MainWindow`, inherit from the abstract `UiPart` class.
-The `UI` component uses JavaFx UI framework. The layout of these UI parts are defined in matching `.fxml` files that are in the `src/main/resources/view` folder. For example, the layout of the [`MainWindow`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/ui/MainWindow.java) is specified in [`MainWindow.fxml`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/resources/view/MainWindow.fxml)
+There are 5 tab panes which are contained within `MainWindow`:
+* `OverviewTabPane` - Displays an overview of the most recent transactions (both incomes and expenses) along with the savings goals.
+ * Contains `TransactionListPanel` and `SavingsGoalPanel`.
+* `IncomeTabPane` - Displays a list of incomes along with bookmark incomes.
+ * Contains `IncomePanel` and `BookmarkIncomePanel`.
+* `ExpenseTabPane` - Displays a list of expenses along with bookmark expenses.
+ * Contains `ExpensePanel` and `BookmarkExpensePanel`.
+* `AnalyticsTabPane` - Displays statistics.
+* `UserGuideTabPane` - Displays the user guide.
-The `UI` component,
+The `UI` component uses the JavaFx UI framework. The layout of these UI parts is defined in matching `.fxml` files that are in the `src/main/resources/view` folder.
+For example, the layout of [`MainWindow`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/ui/MainWindow.java) is specified in [`MainWindow.fxml`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/resources/view/MainWindow.fxml).
-* Executes user commands using the `Logic` component.
-* Listens for changes to `Model` data so that the UI can be updated with the modified data.
+The `UI` component:
+
+* executes user commands using the `Logic` component.
+* listens for changes to `Model` data so that the UI can be updated with the modified data.
### Logic component
**API** :
-[`Logic.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/logic/Logic.java)
+[`Logic.java`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/logic/Logic.java)
-1. `Logic` uses the `AddressBookParser` class to parse the user command.
-1. This results in a `Command` object which is executed by the `LogicManager`.
-1. The command execution can affect the `Model` (e.g. adding a person).
-1. The result of the command execution is encapsulated as a `CommandResult` object which is passed back to the `Ui`.
-1. In addition, the `CommandResult` object can also instruct the `Ui` to perform certain actions, such as displaying help to the user.
+1. `Logic` uses the `FinanceTrackerParser` class to parse the user command.
+1. This results in a `Command` object which is executed by `LogicManager`.
+1. The command execution can affect `Model` (e.g. adding a transaction).
+1. The result of the command execution is encapsulated as a `CommandResult` object which is passed back to `Ui`.
+1. In addition, the `CommandResult` object can also instruct `Ui` to perform certain actions, such as displaying the help message to the user.
-Given below is the Sequence Diagram for interactions within the `Logic` component for the `execute("delete 1")` API call.
+Below is the sequence diagram for interactions within the `Logic` component for the `execute("delete 1")` API call.
@@ -97,35 +97,91 @@ Given below is the Sequence Diagram for interactions within the `Logic` componen
-**API** : [`Model.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/model/Model.java)
+**API** : [`Model.java`](https://github.com/AY2021S1-CS2103T-W16-3/tp/blob/master/src/main/java/ay2021s1_cs2103_w16_3/finesse/model/Model.java)
-The `Model`,
+The `Model`:
* stores a `UserPref` object that represents the user’s preferences.
-* stores the address book data.
-* exposes an unmodifiable `ObservableList