diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 00000000000..0cd51c5fb97
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,25 @@
+name: MarkBind Action
+
+on:
+ push:
+ branches:
+ - master
+
+jobs:
+ build_and_deploy:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Install Graphviz
+ run: sudo apt-get install graphviz
+ - name: Install Java
+ uses: actions/setup-java@v3
+ with:
+ java-version: '11'
+ distribution: 'temurin'
+ - name: Build & Deploy MarkBind site
+ uses: MarkBind/markbind-action@v2
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ rootDirectory: './docs'
+ baseUrl: '/tp' # assuming your repo name is tp
+ version: '^5.2.0'
diff --git a/.gitignore b/.gitignore
index 284c4ca7cd9..eab4c7db6a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ src/test/data/sandbox/
# MacOS custom attributes files created by Finder
.DS_Store
docs/_site/
+docs/_markbind/logs/
diff --git a/README.md b/README.md
index 13f5c77403f..e36b4423d9a 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,12 @@
-[](https://github.com/se-edu/addressbook-level3/actions)
+[](https://github.com/se-edu/addressbook-level3/actions) [](https://codecov.io/gh/AY2324S2-CS2103T-T11-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.
+# EventBook
+As a student leader overseeing various events, it can be challenging to stay organized with numerous contacts across different events. EventBook is designed to simplify the management of contacts across various events. With EventBook, you can effortlessly organize and access contact details of individuals in different events, streamlining the process of communication and coordination.
+
+## Documentation
+For the detailed documentation of this project, see the **[EventBook Product Website](https://ay2324s2-cs2103t-t11-3.github.io/tp/index.html)**.
+
+### Acknowledgement
+This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).
diff --git a/build.gradle b/build.gradle
index a2951cc709e..0a2e0ec772a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,8 +65,12 @@ dependencies {
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
}
+run {
+ enableAssertions = true
+}
+
shadowJar {
- archiveFileName = 'addressbook.jar'
+ archiveFileName = 'EventBook.jar'
}
defaultTasks 'clean', 'test'
diff --git a/data/addressbook.json b/data/addressbook.json
new file mode 100644
index 00000000000..dc6d54344d5
--- /dev/null
+++ b/data/addressbook.json
@@ -0,0 +1,183 @@
+{
+ "persons" : [ {
+ "name" : "Alex Yeoh",
+ "phone" : "99999999",
+ "email" : "alexyeoh@example.com",
+ "address" : "Blk 30 Geylang Street 29, #06-40",
+ "tags" : [ "operations" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "Bernice Yu",
+ "phone" : "99272758",
+ "email" : "berniceyu@example.com",
+ "address" : "Blk 30 Lorong 3 Serangoon Gardens, #07-18",
+ "tags" : [ "marketing" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "Charlotte Oliveiro",
+ "phone" : "93210283",
+ "email" : "charlotte@example.com",
+ "address" : "Blk 11 Ang Mo Kio Street 74, #11-04",
+ "tags" : [ "logistics" ],
+ "eventTags" : [ {
+ "tagName" : "Rag",
+ "description" : "Rag event",
+ "startDate" : "2024-04-05T14:00:00",
+ "endDate" : "2024-04-05T16:00:00"
+ } ]
+ }, {
+ "name" : "David Li",
+ "phone" : "91031282",
+ "email" : "lidavid@example.com",
+ "address" : "Blk 436 Serangoon Gardens Street 26, #16-43",
+ "tags" : [ "publicity" ],
+ "eventTags" : [ {
+ "tagName" : "Rag",
+ "description" : "Rag event",
+ "startDate" : "2024-04-05T14:00:00",
+ "endDate" : "2024-04-05T16:00:00"
+ } ]
+ }, {
+ "name" : "Irfan Ibrahim",
+ "phone" : "92492021",
+ "email" : "irfan@example.com",
+ "address" : "Blk 47 Tampines Street 20, #17-35",
+ "tags" : [ "publicity" ],
+ "eventTags" : [ {
+ "tagName" : "Rag",
+ "description" : "Rag event",
+ "startDate" : "2024-04-05T14:00:00",
+ "endDate" : "2024-04-05T16:00:00"
+ } ]
+ }, {
+ "name" : "Roy Balakrishnan",
+ "phone" : "92624417",
+ "email" : "royb@example.com",
+ "address" : "Blk 45 Aljunied Street 85, #11-31",
+ "tags" : [ "VPD" ],
+ "eventTags" : [ {
+ "tagName" : "Rag",
+ "description" : "Rag event",
+ "startDate" : "2024-04-05T14:00:00",
+ "endDate" : "2024-04-05T16:00:00"
+ } ]
+ }, {
+ "name" : "Tom Goh",
+ "phone" : "91234812",
+ "email" : "hi@mail.com",
+ "address" : "Blk 98 Telok Blangah Street 85, #11-09",
+ "tags" : [ "secretary" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "John Tan",
+ "phone" : "91232345",
+ "email" : "john@john.com",
+ "address" : "Blk 1 Hougang Street 3, #07-18",
+ "tags" : [ "operations" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "Ben Tan",
+ "phone" : "83478596",
+ "email" : "ben@mail.com",
+ "address" : "NA",
+ "tags" : [ "operations" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "Ann Lee",
+ "phone" : "82882919",
+ "email" : "Ann@mail.com",
+ "address" : "NA",
+ "tags" : [ "head", "publicity" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "Amy Lim",
+ "phone" : "82882919",
+ "email" : "Amy@mail.com",
+ "address" : "AMK Blk 91",
+ "tags" : [ "head", "operations" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "Betty Ho",
+ "phone" : "93882919",
+ "email" : "Betty@mail.com",
+ "address" : "AMK Blk 10",
+ "tags" : [ "logistics" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "Zack Goh",
+ "phone" : "82820119",
+ "email" : "zack@mail.com",
+ "address" : "AMK Blk 10",
+ "tags" : [ "logistics" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ }, {
+ "name" : "Xan",
+ "phone" : "82882919",
+ "email" : "xan@mail.com",
+ "address" : "Bishan Blk 10",
+ "tags" : [ "logistics" ],
+ "eventTags" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ } ]
+ } ],
+ "tagList" : [ "head", "marketing", "secretary", "operations", "logistics", "neighbours", "VPD", "publicity" ],
+ "eventTagList" : [ {
+ "tagName" : "Flag",
+ "description" : "Flag event",
+ "startDate" : "2024-04-10T18:00:00",
+ "endDate" : "2024-04-10T22:00:00"
+ }, {
+ "tagName" : "Rag",
+ "description" : "Rag event",
+ "startDate" : "2024-04-05T14:00:00",
+ "endDate" : "2024-04-05T16:00:00"
+ } ]
+}
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000000..1748e487fbd
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,23 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+_markbind/logs/
+
+# Dependency directories
+node_modules/
+
+# Production build files (change if you output the build to a different directory)
+_site/
+
+# Env
+.env
+.env.local
+
+# IDE configs
+.vscode/
+.idea/*
+*.iml
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
index 1c9514e966a..6282c185450 100644
--- a/docs/AboutUs.md
+++ b/docs/AboutUs.md
@@ -1,59 +1,45 @@
---
-layout: page
-title: About Us
+ layout: default.md
+ title: "About Us"
---
-We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).
+# About Us
-You can reach us at the email `seer[at]comp.nus.edu.sg`
+We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).
## Project team
-### John Doe
-
-
-
-[[homepage](http://www.comp.nus.edu.sg/~damithch)]
-[[github](https://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
-
-* Role: Project Advisor
+### Owen
-### Jane Doe
+
-
+[[github](https://github.com/owenong1)]
+* Role: Developer
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+### Yifei
-* Role: Team Lead
-* Responsibilities: UI
+
-### Johnny Doe
+[[github](http://github.com/peterXGD)]
+* Role: Developer
-
+### Cleo
-[[github](http://github.com/johndoe)] [[portfolio](team/johndoe.md)]
+
+[[github](http://github.com/cleowenxuan)]
* Role: Developer
-* Responsibilities: Data
-### Jean Doe
+### Jonathan
-
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+
+[[github](http://github.com/jonpwk)]
* Role: Developer
-* Responsibilities: Dev Ops + Threading
-
-### James Doe
-
+### Pei En
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+
+[[github](http://github.com/peienlim)]
* Role: Developer
-* Responsibilities: UI
diff --git a/docs/Configuration.md b/docs/Configuration.md
index 13cf0faea16..32f6255f3b9 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -1,6 +1,8 @@
---
-layout: page
-title: Configuration guide
+ layout: default.md
+ title: "Configuration guide"
---
+# 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
index d2fd91a6001..8228c845e86 100644
--- a/docs/DevOps.md
+++ b/docs/DevOps.md
@@ -1,12 +1,15 @@
---
-layout: page
-title: DevOps guide
+ layout: default.md
+ title: "DevOps guide"
+ pageNav: 3
---
-* Table of Contents
-{:toc}
+# DevOps guide
---------------------------------------------------------------------------------------------------------------------
+
+
+
+
## Build automation
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
index 1b56bb5d31b..9142cb3e405 100644
--- a/docs/DeveloperGuide.md
+++ b/docs/DeveloperGuide.md
@@ -1,15 +1,18 @@
---
-layout: page
-title: Developer Guide
+ layout: default.md
+ title: "Developer Guide :)"
+ pageNav: 3
---
-* Table of Contents
-{:toc}
+
+# EventBook Developer Guide
+
+
+
--------------------------------------------------------------------------------------------------------------------
## **Acknowledgements**
-
-* {list here sources of all reused/adapted ideas, code, documentation, and third-party libraries -- include links to the original source as well}
+This project is based on [AddressBook Level 3](https://se-education.org/docs/templates.html#addressbook-level-3-ab3).
--------------------------------------------------------------------------------------------------------------------
@@ -21,14 +24,9 @@ Refer to the guide [_Setting up and getting started_](SettingUp.md).
## **Design**
-
-
-:bulb: **Tip:** The `.puml` files used to create diagrams in this document `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.
-
-
### Architecture
-
+
The ***Architecture Diagram*** given above explains the high-level design of the App.
@@ -36,7 +34,7 @@ Given below is a quick overview of main components and how they interact with ea
**Main components of the architecture**
-**`Main`** (consisting of classes [`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)) is in charge of the app launch and shut down.
+**`Main`** (consisting of classes [`Main`](https://github.com/AY2324S2-CS2103T-T11-3/tp/blob/master/src/main/java/seedu/address/Main.java) and [`MainApp`](https://github.com/AY2324S2-CS2103T-T11-3/tp/blob/master/src/main/java/seedu/address/MainApp.java)) is in charge of the app launch and shut down.
* At app launch, it initializes the other components in the correct sequence, and connects them up with each other.
* At shut down, it shuts down the other components and invokes cleanup methods where necessary.
@@ -53,7 +51,7 @@ The bulk of the app's work is done by the following four components:
The *Sequence Diagram* below shows how the components interact with each other for the scenario where the user issues the command `delete 1`.
-
+
Each of the four main components (also shown in the diagram above),
@@ -62,19 +60,21 @@ Each of the four main components (also shown in the diagram above),
For example, the `Logic` component defines its API in the `Logic.java` interface and implements its functionality using the `LogicManager.java` class which follows the `Logic` interface. Other components interact with a given component through its interface rather than the concrete class (reason: to prevent outside component's being coupled to the implementation of a component), as illustrated in the (partial) class diagram below.
-
+
The sections below give more details of each component.
+
+
### UI component
-The **API** of this component is specified in [`Ui.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/ui/Ui.java)
+The **API** of this component is specified in [`Ui.java`](https://github.com/AY2324S2-CS2103T-T11-3/tp/blob/master/src/main/java/seedu/address/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 which captures the commonalities between classes that represent parts of the visible GUI.
-The `UI` component uses the 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)
+The `UI` component uses the 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/AY2324S2-CS2103T-T11-3/tp/blob/master/src/main/java/seedu/address/ui/MainWindow.java) is specified in [`MainWindow.fxml`](https://github.com/AY2324S2-CS2103T-T11-3/tp/blob/master/src/main/resources/view/MainWindow.fxml)
The `UI` component,
@@ -83,20 +83,24 @@ The `UI` component,
* keeps a reference to the `Logic` component, because the `UI` relies on the `Logic` to execute commands.
* depends on some classes in the `Model` component, as it displays `Person` object residing in the `Model`.
+
+
### Logic component
-**API** : [`Logic.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/logic/Logic.java)
+**API** : [`Logic.java`](https://github.com/AY2324S2-CS2103T-T11-3/tp/blob/master/src/main/java/seedu/address/logic/Logic.java)
Here's a (partial) class diagram of the `Logic` component:
-
+
+
+The sequence diagram below illustrates the interactions within the `Logic` component, taking `execute("delete John Doe")` API call as an example.
-The sequence diagram below illustrates the interactions within the `Logic` component, taking `execute("delete 1")` API call as an example.
+
-
+
-
:information_source: **Note:** The lifeline for `DeleteCommandParser` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline continues till the end of diagram.
-
+**Note:** The lifeline for `DeleteCommandParser` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline continues till the end of diagram.
+
How the `Logic` component works:
@@ -108,37 +112,37 @@ How the `Logic` component works:
Here are the other classes in `Logic` (omitted from the class diagram above) that are used for parsing a user command:
-
+
How the parsing works:
* When called upon to parse a user command, the `AddressBookParser` class creates an `XYZCommandParser` (`XYZ` is a placeholder for the specific command name e.g., `AddCommandParser`) which uses the other classes shown above to parse the user command and create a `XYZCommand` object (e.g., `AddCommand`) which the `AddressBookParser` returns back as a `Command` object.
* All `XYZCommandParser` classes (e.g., `AddCommandParser`, `DeleteCommandParser`, ...) inherit from the `Parser` interface so that they can be treated similarly where possible e.g, during testing.
+
+
### Model component
-**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/AY2324S2-CS2103T-T11-3/tp/blob/master/src/main/java/seedu/address/model/Model.java)
-
+
The `Model` component,
-* stores the address book data i.e., all `Person` objects (which are contained in a `UniquePersonList` object).
-* stores the currently 'selected' `Person` objects (e.g., results of a search query) as a separate _filtered_ list which is exposed to outsiders as 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.
-* stores a `UserPref` object that represents the user’s preferences. This is exposed to the outside as a `ReadOnlyUserPref` objects.
-* does not depend on any of the other three components (as the `Model` represents data entities of the domain, they should make sense on their own without depending on other components)
-
-
: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` objects.
-
-
-
-
+* Stores the EventBook data i.e., all `Person` objects (which are contained in a `UniquePersonList` object) and all `Tag` objects (which are contained in a `UniqueTagList` object).
+* Not modelled in diagram due to limitations of PlantUML: `UniqueTagList` object storing EventTags.
+ * The `UniqueTagList` class involves the use of generics to allow it to store both `Tag` and `EventTag` objects.
+ * Each EventBook stores a list of tags of type `UniqueTagList` and a list of event tags of type `UniqueTagList`. However PlantUML is unable to capture the and portion, hence we were unable to include the EventTag list in the diagram.
+* Stores the currently 'selected' `Person` objects (e.g., results of a search query) as a separate _filtered_ list which is exposed to outsiders as 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.
+* Stores a `UserPref` object that represents the user’s preferences. This is exposed to the outside as a `ReadOnlyUserPref` objects.
+* Does not depend on any of the other three components (as the `Model` represents data entities of the domain, they should make sense on their own without depending on other components)
+
### 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/AY2324S2-CS2103T-T11-3/tp/blob/master/src/main/java/seedu/address/storage/Storage.java)
-
+
The `Storage` component,
* can save both address book data and user preference data in JSON format, and read them back into corresponding objects.
@@ -150,99 +154,264 @@ The `Storage` component,
Classes used by multiple components are in the `seedu.addressbook.commons` package.
--------------------------------------------------------------------------------------------------------------------
+
## **Implementation**
This section describes some noteworthy details on how certain features are implemented.
-### \[Proposed\] Undo/redo feature
+### Deleting Contacts by Index/Name
-#### Proposed Implementation
+As student leaders will be in charge of multiple events, they encounter a large number of contacts to be saved. By incorporating a delete feature in EventBook to allow student leaders to swiftly delete contacts either by name or index, it streamlines their workflow, sparing them the effort of manually sifting through extensive contact lists before deletion.
-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:
+This proposed delete feature introduces the concept of deleting the contacts by either name or index.
-* `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.
+Given below is an example usage scenario and how delete mechanism behaves at each step.
-These operations are exposed in the `Model` interface as `Model#commitAddressBook()`, `Model#undoAddressBook()` and `Model#redoAddressBook()` respectively.
+Step 1: The user launches the application. The application will be in its initial state showing the full list of contacts in the EventBook.
-Given below is an example usage scenario and how the undo/redo mechanism behaves at each step.
+Step 2: The user executes `delete John Doe` command to delete the person named John Doe in the EventBook.
-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.
+
-
+**Note:** If the command fails the execution, it means that the person does not exist and an error indicating that the person is not found will be shown.
-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 a delete operation goes through the `Logic` component:
-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`.
+
-
+
-
: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`.
+**Note:** The lifeline for `DeleteCommandParser` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline continues till the end of diagram.
-
+
-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.
+The following activity diagram summarizes what happens when a user executes a delete command:
-
+
-
: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.
+#### Design considerations:
-
+**Aspect: How delete executes:**
-The following sequence diagram shows how an undo operation goes through the `Logic` component:
+* **Alternative 1 (Proposed Choice):** Delete the name from the address book.
+ * Pros: Easy to search for the person by typing their full exact name.
+ * Cons: May have some issues with typing the full exact name if the person's full name that you want to delete is unknown to you.
-
+* **Alternative 2:** Search for the name of the person and delete the index from the address book.
+ * Pros: Able to see which name you want to delete by searching for their name.
+ * Cons: Having to search and delete is slower than simply deleting the person by name.
-
: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.
+### Editing Contacts by Index/Name
+As student leaders manage multiple events, they often need to update contact information swiftly within EventBook. By introducing an edit feature, student leaders can efficiently modify contact details either by name or index, enhancing their productivity and streamlining their workflow.
-
+This proposed edit feature introduces the capability to edit contacts by either their name or index.
-Similarly, how an undo operation goes through the `Model` component is shown below:
+Given below is an example usage scenario and how edit mechanism behaves at each step.
-
+Step 1: The user launches the application. The application will be in its initial state showing the full list of contacts in the EventBook.
-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.
+Step 2: The user executes `edit John Doe p/97979797` command to edit the person named John Doe with the updated phone number in the EventBook.
-
: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.
+
-
+**Note:** If the command fails the execution, it means that the person does not exist and an error indication that the person is not found will be shown.
-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.
+
-
+The following sequence diagram shows how an edit operation goes through the `Logic` component:
-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 when a user executes a new command:
+**Note:** The lifeline for `EditCommandParser` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline continues till the end of diagram.
-
+
-#### Design considerations:
+The following activity diagram summarizes what happens when a user executes an edit command:
+
+
-**Aspect: How undo & redo executes:**
+### Creating and Deleting Tag and EventTag Objects
-* **Alternative 1 (current choice):** Saves the entire address book.
- * Pros: Easy to implement.
- * Cons: May have performance issues in terms of memory usage.
+The `ctag`, `dtag` and `devent` functions allow users to create and delete `Tag` and `EventTag` objects that are critical for EventBook to work.
-* **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.
+#### Implementation
-_{more aspects and alternatives to be added}_
+##### `ctag` Command
+* The `ctag` command is facilitated by the following set of classes:
+ * CtagCommand
+ * CtagCommandParser
+* CtagCommand extends the Command class to allow it to interact with other predefined logic.
+* CtagCommandParser extends the Parser class, and returns a CtagCommand object.
+* In `CtagCommandParser::parse`, the user input is parsed to determine if a `Tag` object or an `EventTag` object is to
+be created. This is done via specifying `t/E-` as the prefix for an `EventTag`
+ * The appropriate CtagCommand object is then returned with either a `Tag` or `EventTag` object as a parameter.
+* In `CtagCommand::execute`, the given object is then added to the model.
-### \[Proposed\] Data archiving
+##### `dtag` Command
+* The `dtag` command is facilitated by the following set of classes:
+ * DtagCommand
+ * DtagCommandParser
+* In `DtagCommandParser::parse`, the user input is parsed to determine which `Tag` is to be deleted.
+* In `DtagCommand:execute`, the provided Tag is then deleted if it exists.
-_{Explain here how the data archiving feature will be implemented}_
+##### `devent` Command
+* The `devent` command is facilitated by the following set of classes:
+ * DeventCommand
+ * DeventCommandParser
+* In `DeventCommandParser::parse`, the user input is parsed to determine which `EventTag` is to be deleted.
+* In `DeventCommand:execute`, the provided EventTag is then deleted if it exists.
+#### Storage of Tags
+
+Every Tag and EventTag object that exists in the program must exist within a global Tag array. Existing functions such as
+`add` will support the creation of Tag objects to be added to this global Tag array.
+
+An example usage scenario illustrates how the `ctag` feature operates:
+1. The user launches the application. The application will be in its initial state showing the full list
+of contacts in the EventBook.
+2. The user executes `ctag Friend`, creating a new Tag object named `Friend`.
+3. The user can then tag people in the program with the new `Friend` tag.
+
+An example usage scenario illustrates how the `dtag` feature operates:
+1. The user launches the application. The application will be in its initial state showing the full list of
+contacts in the EventBook.
+2. The user executes `dtag Friend`, deleting the Tag object named `Friend`.
+3. All instances of `Friend` will be deleted from the EventBook.
+
+
+### Assign Tag command
+The `assign` command allows users to assign Tags and Events to contacts within EventBook to be displayed as a label in
+the main interface.
+
+#### Implementation
+* The `assign` command is facilitated by the following classes:
+ * `AssignCommand` which extends Command
+ * `AssignCommandParser` which extends Parser
+* In `AssignCommandParser::parse`, the user input is parsed to determine the contact and the Tag / EventTag that is to
+be assigned, and an `AssignCommand` object is returned.
+* In `AssignCommand::execute`, the Person that is specified will have the respective tags assigned to them.
+
+The `assign` command only takes in the index of the person to be assigned (as specified in the GUI), as well as a list of
+`TAGNAME` or `t/E-EVENTTAGNAME` separated by spaces.
+
+The following are the details of `AssignCommand::execute`:
+1. LogicManager calls `AssignCommand::execute`
+2. Within execute, `ModelManager::hasTag` and `ModelManager::hasEventTag` is called for each Tag and EventTag that is provided
+to see whether the provided tags are valid.
+3. If the tags / events do **not** exist, then an error is thrown.
+4. Using `ModelManager::getFilteredPersonList` and the provided index, the Person object is retrieved.
+5. Then, `ModelManager::assign` is called to assign the respective tags to the Person.
+
+#### Changes to Person
+
+In order to allow for assignment of `Tags` and `EventTags` to `Person` objects, `Person` was modified to be mutable.
+
+Previously, `Person` was defined to be immutable such that no changes could be made to their tags or fields. With the
+implementation of `assign`, changes had ot be made to allow mutability of each `Person` object's TagList and EventTagList.
+
+### Search by Tags command
+The search by tag feature allows for easy searching of contact by `tag` to view people easily. This is achieved by filtering people in the contact list with the tags
+to see if they have the tag you are searching assigned to them.
+
+#### Implementation
+* The Search feature is facilitated by the SearchCommand class which extends the Command class.
+* In `SearchTagCommand::execute`, the input tag name provided by the user is checked to see it is an existing tag.
+* If the tag already exists, the actual is used to update the filteredPersons list of Model class using the method
+`ModelManager::updateTagPersonList`. This allows the `filteredPersons` list to be updated to **show the correct contacts**.
+
+The initial parsing of the search command follows the standard parsing process for all commands. Refer to the [Logic component](#logic-component) for the sequence diagram and details.
+
+The following are the details of the execute method of SwitchCommand:
+1. LogicManager calls `SearchTagCommand::execute`
+2. Within execute, `ModelManager::hasTag` is called to check whether a tag with the given name already exists.
+3. If the tag exists, `ModelManager::updateTagPersonList` is called to update the contacts displayed with the given `tag`.
+This will update the `filteredPersons` field of ModelManager class to only contain contacts with the particular Tag.
+4. A new `CommandResult` object is created and this is returned by `SwitchCommand::execute` which displays a success message
+that a tag was created. The message is stored in the `SearchTagCommand` class itself.
+
+
+
+### Switch Event command
+The event switching feature allows for easy switching between event tabs to view event members. This is achieved by the introducing event-specific filtering to EventBook.
+
+#### Implementation
+* The Switch feature is facilitated by the SwitchCommand class which extends the Command class.
+* In `SwitchCommand::execute`, the input tag name provided by the user is checked to see whether it is an existing event tag.
+* If the tag already exists, the actual `EventTag` is retrieved and used to update the filteredPersons list of Model class. This allows the `filteredPersons` list to be updated to **show the correct contacts**.
+* The `currentEventTag` field in Model class is also updated to the corresponding `EventTag`. This ensures that the highlighted tab in the EventPanelList switches to **highlight the correct Event**.
+
+The initial parsing of the switch command follows the standard parsing process for all commands. Refer to the [Logic component](#logic-component) for the sequence diagram and details.
+
+The following are the details of the execute method of SwitchCommand:
+1. LogicManager calls `SwitchCommand::execute`
+2. Within execute, `ModelManager::hasEventTag` is called to check whether an event tag with the given name already exists.
+3. If the event tag exists, `ModelManager::getEventTag` is called to retrieve the event tag required.
+4. Next, `ModelManager::updateEventTagPersonList` is called with the event tag retrieved. This will update the `filteredPersons` field of ModelManager class to only contain contacts with the particular EventTag.
+5. A new `CommandResult` object is created and this is returned by `SwitchCommand::execute`. The CommandResult object is called with the retrieved EventTag.
+
+
+
+#### Changes made to `CommandResult`:
+In implementing this feature, `CommandResult` was updated to take in an additional field `EventTag` to facilitate the update of highlighted tabs for the `EventListPanel`. The following are the varying inputs for this addtional field by different Commands:
+* SwitchCommand creates a `CommandResult` with the **corresponding** `EventTag` to switch to.
+* ListCommand creates a `CommandResult` with the **default** `EventTag`.
+* All other Commands creates a `CommandResult` with **null** for the `EventTag` field, since there is no need to change the highlighted tab when executing other commands.
+
+
+When `executeCommand::MainWindow` is called to update the UI after the execution of a command, it checks whether the `CommandResult` contains an `EventTag`:
+* If the `EventTag` **does not exist**, the highlighted tab in EventListPanel does not change.
+* If the `EventTag` **exists**, the eventListPanel is updated to highlight the correct tab:
+ 1. DEFAULT_TAG: `list` command was executed, call `EventListPanel::clearEventSelection` to switch highlighted tab back to `All` tab.
+ 2. **Not** DEFAULT_TAG: `switch` command was executed, call `EventListPanel::selectEvent` with the EventTag to switch highlighted tab to corresponding Event tab.
+
+
+### Importing and Exporting as .csv file
+
+The import/export commands allow one to easily share contact data.
+As student leaders, a common and easily accessible file format type for event contacts would be .csv.
+Eventbook supports the ability to import and export contacts using .csv files to facilitate fast and effective contact upload and sharing.
+
+#### Implementation (Export)
+* The Export feature is facilitated by the ExportCommand class which extends the Command class.
+* In `ExportCommand::execute`, a reference to the current model is passed to the `ExportCommand::exportFile` call
+* `ExportCommand::exportFile` accesses the model's Person data through `model.getFilteredPersonList()`
+* For each Person, `ExportCommand::exportFile` accesses their details through the respective getters (e.g.`Person::getName()`)
+ and writes their details to a .csv file through a FileWriter object
+
+An example usage scenario illustrates how the export feature operates:
+1. The user launches the application. The application will be in its initial state showing the full list of contacts
+ in the EventBook.
+2. The user executes `export` to export all contacts
+3. All contacts in the address book will be exported to ./export/export.csv according to the format given above
+
+#### Implementation (Import)
+* The Import feature is facilitated by the following classes:
+ * `ImportCommand` which extends Command
+ * `ImportCommandParser` which extends Parser
+* In `ImportCommandParser::parse`, the user input is parsed to determine the path of the file to be imported,
+ and an `ImportCommand` object is returned with the parsed path (a default path is given if none is specified)
+* In `ImportCommand::execute`, a reference to the current model is passed and the following are called:
+ * `ImportCommand::parse` parses the given file and stores the data in an `ArrayList` object. The data
+ * `ImportCommand::checkFields` is called on the parsed data to check the fields. The field data is subsequently removed
+ * `ImportCommand::addPersons` uses the parsed Person data and simulates adding them to the model through the Add command
+ * `ImportCommand::loadEventTags` adds and assigns EventTags to the model separately, since the Add command does not support this functionality
+
+An example usage scenario illustrates how the import feature operates:
+1. The user launches the application. The application will be in its initial state showing the full list of contacts
+ in the EventBook.
+2. The user executes `import f/./import/import.csv` , with import.csv having 2 rows:
+ 1. `NAME,NUMBER,EMAIL,ADDRESS,EVENTS,TAGS`
+ 2. `John,94756383,john@mail.com,NUS,Orientation,BestFriend|Cool`
+3. The contact `John` is imported into the address book, with parameters as above (He is assigned the existing EventTag Orientation as well)
+
+#### Format of the .csv files
+* The format of the first line of the csv should contain the fields:
+ `NAME,NUMBER,EMAIL,ADDRESS,EVENTS,TAGS` (.csv is comma delimited, so that means each field should be in their own cell)
--------------------------------------------------------------------------------------------------------------------
@@ -255,6 +424,7 @@ _{Explain here how the data archiving feature will be implemented}_
* [DevOps guide](DevOps.md)
--------------------------------------------------------------------------------------------------------------------
+
## **Appendix: Requirements**
@@ -267,37 +437,43 @@ _{Explain here how the data archiving feature will be implemented}_
* can type fast
* prefers typing to mouse interactions
* is reasonably comfortable using CLI apps
+* student leaders planning school events
-**Value proposition**: manage contacts faster than a typical mouse/GUI driven app
+**Value proposition**: Easy way to share _project hierarchy_ / Manage project details and personnel / Quick onboarding of new team members
### 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 |
-
-*{More to be added}*
+| Priority | As a(n) … | I want to … | So that I can… |
+|----------|------------------------|------------------------------------------------------|-------------------------------------------------------------|
+| `* * *` | user | include tags when adding people | tag people based on their roles |
+| `* * *` | user | search by tags | find groups of people |
+| `* * *` | user | have different tagging options | keep my contacts organised and search effectively |
+| `* *` | user | delete by name OR index | manage my contacts easier |
+| `* *` | user | add contacts with partial information | keep my contacts as up to date as possible |
+| `* * *` | user | have knowledge on what event a person is involved in | keep my contacts easily |
+| `* *` | user | know details about an event, such as its time, etc | keep a clear mind on who is doing what and not get confused |
+| `*` | user | sort my tags based on event (and subsequently role) | visualise my contacts in a neat way |
+| `* *` | user | have a space to write notes for each contact | note my thoughts in an organised way |
+| `* *` | user proficient in CLI | have short form commands | use the programme faster |
+| `* *` | user | import details from different file types | quickly and efficiently input data |
+| `* *` | user | assign people different tags at any time | have a dynamic user experience in managing my contacts |
+| `* *` | user | save my event details in different formats | move my data to another place if needed |
-### Use cases
+### Use cases (UC)
-(For all use cases below, the **System** is the `AddressBook` and the **Actor** is the `user`, unless specified otherwise)
+(For all use cases below, the **System** is the `EventBook` and the **Actor** is the `user`, unless specified otherwise)
-**Use case: Delete a person**
+**Use case 1: Delete a person**
**MSS**
1. User requests to list persons
-2. AddressBook shows a list of persons
+2. EventBook shows a list of persons
3. User requests to delete a specific person in the list
-4. AddressBook deletes the person
+4. EventBook deletes the person
Use case ends.
@@ -309,74 +485,406 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
* 3a. The given index is invalid.
- * 3a1. AddressBook shows an error message.
+ * 3a1. EventBook shows an error message.
Use case resumes at step 2.
-*{More to be added}*
+**Use case 2: Add a person**
+
+**MSS**
+
+1. User adds person to EventBook
+2. EventBook shows a list of persons with added person
+
+ Use case ends.
+
+**Extensions**
+
+* 1a. The given parameters for the person is invalid.
+ * 1a1. EventBook shows an error message.
+
+ Use case ends.
+
+**Use case 3: Search by tag**
+
+**MSS**
+
+1. User requests a search based on tag options
+2. EventBook shows a list of persons with given tag options
+
+ Use case ends.
+
+**Extensions**
+* 1a. The given tag options are invalid.
+ * 1a1. EventBook shows an error message.
+
+ Use case ends.
+* 2a. The list is empty.
+
+ Use case ends.
### 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 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.
-
-*{More to be added}*
+4. The system should work on both 32-bit and 64-bit systems.
+5. The system should respond within 2 seconds.
### Glossary
* **Mainstream OS**: Windows, Linux, Unix, MacOS
* **Private contact detail**: A contact detail that is not meant to be shared with others
-
+* **Project hierarchy**: The structure of a project team, including team members and organisational structure
--------------------------------------------------------------------------------------------------------------------
+
+
## **Appendix: 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;
+
+
+**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. Download the latest `EventBook.jar` file from [here](https://github.com/AY2324S2-CS2103T-T11-3/tp/releases) and copy into an empty folder
- 1. Double-click the jar file Expected: Shows the GUI with a set of sample contacts. The window size may not be optimum.
+ 2. Open a command terminal and `cd` into the folder with `EventBook.jar`. Execute the following command to run `Eventbook`:
+ ```
+ java -jar EventBook.jar
+ ```
+ 3. The app will start up and you will see a GUI similar to the following:
+ 
-1. Saving window preferences
+2. 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.
+ 2. Re-launch the app by double-clicking the jar file.
Expected: The most recent window size and location is retained.
-1. _{ more test cases … }_
+3. Shut Down
+ 1. Click on the cross at the top of the window:
+ - MacOS: Red dot at the top left hand corner of the window.
+ - Windows and Linux: Cross at the top right hand corner of the window.
+ 2. Click on File button in the Menu Bar, then click on the `Exit` option.
+ 3. Type `exit` into the Command Box and click enter.
+
+### Adding a person
+Test Cases:
+1. Add person with **all necessary parameters**
+```
+add n/Alice Smith p/98765432 e/alice@gmail.com a/123 Main Street
+```
+- Expected: Alice Smith with the provided details should be successfully added to the EventBook.
+2. Add person with all necessary parameters and **optional parameters**
+```
+add n/Bob Johnson p/98675423 e/bob@gmail.com a/456 Elm Street t/logistics t/head
+```
+- Expected: Bob Johnson with the provided details and tags should be successfully added to the EventBook.
+3. Add person with **necessary parameters missing**
+```
+add n/Carol Lee p/8765432109
+```
+- Expected: No person added. Error stating invalid command format displayed.
+4. Add person that **already exists** in the EventBook
+```
+add n/Alice Smith p/98765432 e/alice@gmail.com a/123 Main Street
+```
+- Expected: Error stating that person already exists in the EventBook.
+
+### Editing a person
+Prerequisites:
+- Ensure that there is at least one person in the EventBook.
+- Execute the `list` command to display all contacts in your EventBook.
+1. Edit person with **valid index**
+```
+edit 1 n/John Doe p/91234567 e/johndoe@example.com
+```
+- Expected: The phone number and email address of the 1st person should be successfully updated.
+2. Edit person with **valid full name**
+```
+edit John Doe t/publicity
+```
+- Expected: The person named John Doe should have their tags updated to "publicity".
+3. Edit person with **invalid index**
+```
+edit 0 n/John Smith
+```
+- Expected: No person is edited. Error stating invalid command format displayed.
+4. Edit person with **invalid name** (not full name)
+```
+edit John t/logistics
+```
+- Expected: Error stating that person name provided is invalid.
+
+### Finding a person
+Prerequisites:
+- Ensure that there is at least one person in the EventBook.
+- Execute the `list` command to display all contacts in your EventBook.
+ Test Cases:
+1. Find a **valid person**
+```
+find John
+```
+- Expected: Indicates number of persons whose names contain "John" and shows the displays the corresponding contacts.
+2. Find a valid person with **name in lowercase**
+```
+find john
+```
+- Expected: Same as 1, returns all persons whose names contain "john" regardless of case sensitivity.
+3. Find **two valid persons**
+```
+find Alice Bob
+```
+- Expected: Indicates number of persons whose name contain "Alice" **or** "Bob" and displays the corresponding contacts.
+4. Find with **incomplete name** (missing one letter)
+```
+find Bo
+```
+- Expected: Indicates that 0 persons were found, contact list is empty.
### Deleting a person
+Prerequisites:
+- Ensure that there are multiple persons in the EventBook.
+- Execute the `list` command to display all contacts in your EventBook.
+1. Delete with **valid index**
+```
+delete 1
+```
+- Expected: First contact is deleted from the list. Details of the deleted contact shown in the status message.
+2. Delete by **valid name**
+```
+delete Alice
+```
+- Expected: Alice is deleted from the list. Details of the deleted contact shown in the status message.
+3. Delete with **invalid index**
+```
+delete 0
+```
+- Expected: No person is deleted. Error stating invalid command format displayed.
+4. Delete by **invalid name**
+```
+delete Bo
+```
+- Expected: No person is deleted. Error stating person name invalid displayed.
+
+
+### Importing contacts
+1. Import contacts from **valid .csv file**
+- Prerequisites: Ensure there is a valid .csv file containing contacts in the specified format.
+```
+import f/./import/import.csv
+```
+- Expected: Contacts from the specified .csv file should be successfully imported into the EventBook.
+2. Import contacts from **default .csv file**
+- Prerequisites: Ensure there is a default .csv file named "import.csv" in the default directory.
+```
+import f/
+```
+- Expected: Contacts from the default .csv file should be successfully imported into the EventBook.
+3. Attempt to import contacts from **invalid file path**
+```
+import f/./import/import.csv
+```
+- Expected: Error message indicating that import was unsuccessful, no such file was found at the given path.
+
+### Exporting contacts
+1. Export contacts to **default .csv file**
+```
+export
+```
+- Expected: Contacts from the EventBook should be successfully exported to the default .csv file named "export.csv" in the default directory.
+
+### Creating a Tag
+1. Create a tag with **valid name**
+```
+ctag Friend
+```
+- Expected: Message showing that a tag with name "Friend" has been successfully created
+2. Create a tag with **invalid characters** in name
+```
+ctag Good Friends
+```
+- Expected: No new tag created successfully. Error message indicating that tag has not been added successfully displayed.
+3. Create a tag with **existing tag name**
+```
+ctag Friend
+```
+- Expected: No new tag created successfully. Error message indicating that tag already exists displayed.
+4. Create an event tag with valid parameters
+```
+ctag t/E-Orientation dc/ORIENTATION! sd/2024-04-15 10:00:00 ed/2024-04-15 12:00:00
+```
+- Expected: An event tag named "Orientation" should be successfully created with the specified start and end dates.
+5. Create an event tag with **invalid format**
+```
+ctag t/E-Team Meeting sd/2024-04-15 10:00:00 ed/2024-04-15 12:00:00
+```
+- Expected: No new tag created successfully. Error message indicating that format is invalid displayed.
+6. Create an event tag with **existing event name**
+```
+ctag t/E-Orientation dc/ORIENTATION! sd/2024-04-15 14:00:00 ed/2024-04-15 16:00:00
+```
+- Expected: No new tag created successfully. Error message indicating that tag already exists displayed.
+
+### Deleting a Tag
+Prerequisites:
+- Ensure that the tag `Friend` exists in EventBook.
+- Execute the `list` command to display all contacts in your EventBook.
+1. Delete **existing tag**
+```
+dtag Friend
+```
+- Expected: Message indicating the tag with name "Friend" has been successfully deleted. "Friend" tag will also disappear from contacts who were previously tagged with it.
+2. Delete **non-existing tag**
+```
+dtag test
+```
+- Expected: Error message indicating that such a tag does not exist.
+3. Delete tag **without providing name**
+```
+dtag
+```
+- Expected: Error message indicating that command format is invalid.
+
+### Deleting an EventTag
+Prerequisites:
+- Ensure that the tag `Orientation` exists in EventBook.
+- Execute the `list` command to display all contacts in your EventBook.
+1. Delete **existing event tag**
+```
+devent Orientation
+```
+- Expected: Message to indicate that event with name "Orientation" has successfully been deleted. The Orientation tab in the list of events and Orientation tag for contacts will also disappear.
+2. Delete **non-existing event tag**
+```
+devent test
+```
+- Expected: Error message indicating that no such event exists displayed. No event tag deleted successfully.
+3. Delete event tag with **whitespace** in name
+```
+devent ori ntation
+```
+- Expected: Error message indicating incorrect format of command entered. No event tag deleted successfully.
+
+### Assigning a Tag
+Prerequisites:
+- Ensure that the tag `logistics` exists in EventBook.
+- Execute the `list` command to display all contacts in your EventBook.
+1. Assign **tag** to person with **valid index**
+```
+assign 1 t/logistics
+```
+- Expected: Message indicating that person at index 1 has been successfully assigned the tag `logistics`.
+2. Assign **event tag** to person with **valid name**
+```
+assign John t/E-Rag
+```
+- Expected: Message indicating that person at index 1 has been successfully assigned the event tag `Rag`.
+3. Assign a tag which does not currently exist
+```
+assign 1 t/hello
+```
+- Expected: Error message indicating to user to check if the tag entered exists displayed.
+4. Assign an event tag which does not currently exist
+```
+assign 1 t/E-hello
+```
+- Expected: Error message indicating to user to check if the event tag entered exists displayed.
+
+### Search by Tag
+Prerequisites:
+- run the following commands:
+```
+ctag test
+assign 1 test
+assign 2 test
+```
+- Execute the `list` command to display all contacts in your EventBook.
+1. Search **valid tag name**
+```
+search test
+```
+- Expected: Message indicates that all people with tag `test` have been found. Contacts displayed all contain the blue `test` tag.
+2. Search **invalid tag name**
+```
+search hello
+```
+- Expected: Error message indicating that no persons with tag `test` found.
+
+### Switching between Events
+Prerequisites:
+- Ensure that the event tag `Rag` exists in EventBook.
+- Execute the `list` command to display all contacts in your EventBook.
+1. Switch to **existing event**
+```
+switch Rag
+```
+- Expected: highlighted tab switches from `All` to `Rag` and all contacts displayed contain the `Rag` tag. The details of `Rag` event are also displayed in the command result box.
+2. Switch back to **display all contacts** (list)
+```
+list
+```
+- Expected: highlighted tab switches back to the `All` tab and all contacts in EventBook displayed.
+3. Switch to **non-existent event**
+```
+switch hello
+```
+- Expected: Error message indicating that no such event found displayed.
+
+
+
+
+**Note:** The switch command only takes in alphanumeric characters for the name!
+
-1. Deleting a person while all persons are being shown
-
- 1. Prerequisites: List all persons using the `list` command. Multiple persons in the list.
-
- 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.
-
- 1. Test case: `delete 0`
- Expected: No person is deleted. Error details shown in the status message. Status bar remains the same.
-
- 1. Other incorrect delete commands to try: `delete`, `delete x`, `...` (where x is larger than the list size)
- Expected: Similar to previous.
-
-1. _{ more test cases … }_
-
-### Saving data
-
-1. Dealing with missing/corrupted data files
-
- 1. _{explain how to simulate a missing/corrupted file, and the expected behavior}_
+--------------------------------------------------------------------------------------------------------------------
+
+
+## **Appendix: Enhancement**
+
+Team Size: 5
+
+1. **To show custom error for wrong time in `ctag` command**: When creating event tags with the `ctag` command,
+you will not get notified correctly on why you failed when you input the incorrect time(like 25:73:74 in the 24-hour
+format). We plan to make the error message also mention why failed and the reason for the failure: `Incorrect time input:
+please check that your time is correct!`
+2. **Help message in the `delete` command updates with spacing**: When displaying an error message prompting you to
+input with the correct format for the `delete` command, the example given displays: `Example: delete 1ordelete JohnDoe`.
+We plan to fix it to `Example: delete 1 or delete JohnDoe`.
+3. **Allow only correct phone numbers to recognized as phone numbers**: For contacts' phone number, we currently allow
+it to be any number value with size of `int` which can create some issues. We plan to make the phone number we add to
+contact only valid phone numbers types like **+65 8888 8888** in singapore or **+1 (123) 123-1234** in the United States.
+4. **New error message when creating tag or event tags that is not single-word or contains illegal characters with the `ctag` command**:
+All tags and event tags in this app are strictly **one word only with and alphanumeric only(a-z, A-Z, 0-9)**.
+When a person attempts to create tag or event tag with more than one word or contains illegal alphabet,
+he/she currently will only get an error message that is not related what caused the command to fail. We plan to create an
+custom error that will inform the user to that tag/event tag need to be one word with **legal characters(a-z, A-Z, 0-9) only**
+when this mistake by the user occurs.
+5. **Display all existing tags with a `taglist` command**: The current implementation **does not allow you to see all the existing tags
+within the EventBook** and this will cause some trouble for the user. For example, according to the user guide, when assigning a tag in the address book to a specified person,
+the provided tag(s) must already exist in the EventBook. However, there is no accessible list of tags (not event tags) that have been added.
+The absence of tag visibility aside from the ones you see beside contact panels in the app makes it challenging for users
+to remember if a tag was added when there are too many tags in the contact. We plan to create a new command that will
+display all the tags that are in the address book with a command called `taglist`. For example, if I input `taglist`,
+the app will display all the existing tags in the EventBook, with an output like `Tags: Tag1, Tag2, Tag3, Tag4`.
+6. **Make the app window adjust to the correct size without whitespace when you try to change its size`**:
+The current app's default display works fine but when trying to adjust the window, whitespace will appear at the bottom
+of the app instead of adjusting the size of the whole window as shown below. 
+We plane to make the window readjust properly for the future app instead of displaying this whitespace.
+7. **Length inputs to be displayed in full in the EventBook**: In the current implementation,
+lengthy inputs for the fields appear to not be displayed in full by the UI as shown in the image below. 
+We plan to make the display in full for up to 3 lines' length of information in the contact panel.
+8. **Import to support ignoring contacts that already exist**: The current implementation will throw an error
+when importing a file contacts that have the same name as an existing contact. We plan to make it so the import
+command will still import non-conflicting contacts when this happens.
-1. _{ more test cases … }_
diff --git a/docs/Documentation.md b/docs/Documentation.md
index 3e68ea364e7..082e652d947 100644
--- a/docs/Documentation.md
+++ b/docs/Documentation.md
@@ -1,29 +1,21 @@
---
-layout: page
-title: Documentation guide
+ layout: default.md
+ title: "Documentation guide"
+ pageNav: 3
---
-**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).
-* Note these points when adapting the documentation to a different project/product:
- * The 'Site-wide settings' section of the page linked above has information on how to update site-wide elements such as the top navigation bar.
- * :bulb: In addition to updating content files, you might have to update the config files `docs\_config.yml` and `docs\_sass\minima\_base.scss` (which contains a reference to `AB-3` that comes into play when converting documentation pages to PDF format).
-* If you are using Intellij for editing documentation files, you can consider enabling 'soft wrapping' for `*.md` files, as explained in [_[se-edu/guides] **Intellij IDEA: Useful settings**_](https://se-education.org/guides/tutorials/intellijUsefulSettings.html#enabling-soft-wrapping)
+# Documentation Guide
+* We use [**MarkBind**](https://markbind.org/) to manage documentation.
+* The `docs/` folder contains the source files for the documentation website.
+* To learn how set it up and maintain the project website, follow the guide [[se-edu/guides] Working with Forked MarkBind sites](https://se-education.org/guides/tutorials/markbind-forked-sites.html) for project documentation.
**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).
-* 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:**
+**Converting to PDF**
-* See the guide [_[se-edu/guides] **Saving web documents as PDF files**_](https://se-education.org/guides/tutorials/savingPdf.html)
+* See the guide [_se-edu/guides **Saving web documents as PDF files**_](https://se-education.org/guides/tutorials/savingPdf.html).
diff --git a/docs/Gemfile b/docs/Gemfile
deleted file mode 100644
index c8385d85874..00000000000
--- a/docs/Gemfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-gem 'jekyll'
-gem 'github-pages', group: :jekyll_plugins
-gem 'wdm', '~> 0.1.0' if Gem.win_platform?
-gem 'webrick'
diff --git a/docs/Logging.md b/docs/Logging.md
index 5e4fb9bc217..589644ad5c6 100644
--- a/docs/Logging.md
+++ b/docs/Logging.md
@@ -1,8 +1,10 @@
---
-layout: page
-title: Logging guide
+ layout: default.md
+ title: "Logging guide"
---
+# 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.
diff --git a/docs/SettingUp.md b/docs/SettingUp.md
index 275445bd551..03df0295bd2 100644
--- a/docs/SettingUp.md
+++ b/docs/SettingUp.md
@@ -1,27 +1,32 @@
---
-layout: page
-title: Setting up and getting started
+ layout: default.md
+ title: "Setting up and getting started"
+ pageNav: 3
---
-* Table of Contents
-{:toc}
+# Setting up and getting started
+
+
--------------------------------------------------------------------------------------------------------------------
## Setting up the project in your computer
-
:exclamation: **Caution:**
+
+**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. **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.
+
+ 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.
@@ -34,10 +39,11 @@ If you plan to use Intellij IDEA (highly recommended):
If using IDEA, follow the guide [_[se-edu/guides] IDEA: Configuring the code style_](https://se-education.org/guides/tutorials/intellijCodeStyle.html) to set up IDEA's coding style to match ours.
-
:bulb: **Tip:**
+
+ **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**
diff --git a/docs/Testing.md b/docs/Testing.md
index 8a99e82438a..78ddc57e670 100644
--- a/docs/Testing.md
+++ b/docs/Testing.md
@@ -1,12 +1,15 @@
---
-layout: page
-title: Testing guide
+ layout: default.md
+ title: "Testing guide"
+ pageNav: 3
---
-* Table of Contents
-{:toc}
+# Testing guide
---------------------------------------------------------------------------------------------------------------------
+
+
+
+
## Running tests
@@ -19,8 +22,10 @@ There are two ways to run tests.
* **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.
-
+
+
+**Link**: Read [this Gradle Tutorial from the se-edu/guides](https://se-education.org/guides/tutorials/gradle.html) to learn more about using Gradle.
+
--------------------------------------------------------------------------------------------------------------------
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 7abd1984218..5b7ff62216e 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -1,121 +1,255 @@
---
-layout: page
-title: User Guide
+layout: default.md
+title: "User Guide"
+pageNav: 3
---
-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.
+# EventBook User Guide
-* Table of Contents
-{:toc}
+## Welcome to EventBook!
+
+Thank you for downloading EventBook as your project management software of choice!
+
+Choose a topic from the table of contents below / or in the sidebar to find answers, or step-by-step
+guides on how to use EventBook.
+
+
--------------------------------------------------------------------------------------------------------------------
-## Quick start
+## Product Overview
-1. Ensure you have Java `11` or above installed in your Computer.
+EventBook is a **desktop application for Student Leaders to manage the contacts from different events, 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, EventBook can get your contact management tasks done faster than traditional GUI apps.
+
+--------------------------------------------------------------------------------------------------------------------
+
+## Using This User Guide
-1. Download the latest `addressbook.jar` from [here](https://github.com/se-edu/addressbook-level3/releases).
+This user guide provides in-depth summaries of all the commands available to you. To make it easier to find the
+information you need, you can either:
-1. Copy the file to the folder you want to use as the _home folder_ for your AddressBook.
+1. Refer to the Table of Contents above
+2. Search within the guide with the following steps:
+ 1. Press Ctrl + F (Windows OS) or Cmd + F (MacOS)
+ 2. A search box or dialogue should appear on your screen
+ 3. Type the keyword or phrase that you want to find into the search box and press enter
-1. Open a command terminal, `cd` into the folder you put the jar file in, and use the `java -jar addressbook.jar` command to run the application.
- A GUI similar to the below should appear in a few seconds. Note how the app contains some sample data.
+--------------------------------------------------------------------------------------------------------------------
+
+
+## Quick Start
+
+Before we can begin to use EventBook, we advise you to follow the simple steps below to ensure that EventBook is set up
+correctly.
+
+1. Ensure you have Java `11` or above installed in your Computer.
+ * MacOS: [link](https://www.oracle.com/sg/java/technologies/javase/jdk11-archive-downloads.html)
+ * Windows
+ OS: [link](https://www.azul.com/downloads/?version=java-11-lts&os=macos&architecture=arm-64-bit&package=jdk-fx#zulu)
+
+2. Download the latest `EventBook.jar` from [here](https://github.com/AY2324S2-CS2103T-T11-3/tp/releases).
+
+3. Copy the file to the folder you want to use as the _home folder_ for your EventBook.
+
+4. Open a command terminal (`Terminal` for MacOS, `Windows Terminal` for Windows OS)
+ * MacOS
+ 1. Right-click your _home folder_
+ 2. Left click on `Services`
+ 3. Select `New Terminal at Folder`
+ * Windows OS
+ 1. Using `Windows Explorer`, navigate to your _home folder_
+ 2. Right click anywhere in the folder
+ 3. Left click on `Open in Windows Terminal`
+
+5. Use the `java -jar EventBook.jar` command to run the application.
+ A 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.
+6. Type a command in the command box and press Enter to execute it. e.g. typing **`help`** and pressing Enter will open
+ the help window.
Some example commands you can try:
* `list` : Lists all contacts.
+ * `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 EventBook.
+ * `assign 1 t/E-event1` : Assigns the 1st contact shown in the current list with the event tag named `event1`.
+ * `assign John t/tag1` : Assigns the contact named John in the current list with the tag named `tag1`.
+ * `clear` : Deletes all contacts.
+ * `ctag Friend` : Creates a tag name `Friend`.
+ * `ctag t/E-orientation dc/Orientation! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02` : Creates an event tag.
+ * `dtag Friend` : Deletes a tag named `Friend`.
+ * `delete 3` : Deletes the 3rd contact shown in the current list.
+ * `devent orientation` : Deletes an event tag called orientation.
+ * `delete John Doe` : Deletes the contact named John Doe shown in the current list.
+ * `exit` : Exits the app.
+ * `import` : Imports contacts from `.\import\import.csv`.
+ * `search Friend` : Displays all contacts with the tag `Friend`.
+ * `switch Flag` : Switches to `Flag` event tab to show contacts.
- * `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.
+7. Refer to the [Features](#features) below for details of each command or to [Command Summary](#command-summary)
+for a quick summary.
- * `delete 3` : Deletes the 3rd contact shown in the current list.
+
- * `clear` : Deletes all contacts.
+## Graphical User Interface (GUI)
- * `exit` : Exits the app.
+
-1. Refer to the [Features](#features) below for details of each command.
+EventBook's GUI consists of 5 main components:
---------------------------------------------------------------------------------------------------------------------
+1. Menu Bar
+2. Command Box - enter the command you would like to execute here.
+3. Command Result Box - displays command success/error messages after commands are executed.
+4. Event Tabs Panel - displays all existing Events.
+5. Result Panel - displays contact details of members in the particular Event.
+
+### Person
+
+The following details are displayed for each contact in EventBook:
+
+This detailed overview enables users to quickly access essential contact information of their event members.
+
+> [**Note**]
+> The default tab on entering the app is the `All` tab, with all contacts in EventBook displayed in the Result
+> Panel.
-## Features
+
-
+## Try Out Your First Commands!
-**:information_source: Notes about the command format:**
+Ready to dive in? Let's try out a few commands to get you started with EventBook:
+
+1. Open EventBook if you haven't already done so by following the steps outlined in the [Quick Start](#quick-start)
+ section.
+2. First, let's start with **adding a new contact**. In the command box, type the following command:
+
+```
+add n/Xavier Tan p/98765432 e/xavt@example.com a/Ang Mo Kio street 2, Block 123, #01-01
+```
+
+* This command will add a new contact named "Xavier Tan" with the provided phone number, email address, and address
+ details.
+* Scroll to the bottom of the list of contacts, you will find that Xavier Tan has been successfully added to your
+ contacts!
+
+3. Now, let's **tag** Xavier as the vice-project director `VPD` of the `Flag` event. Enter the following command in the
+ command box:
+
+```
+assign Xavier Tan t/VPD t/E-Flag
+```
+
+* You will see Xavier has been assigned two new tags: a blue `VPD` tag and a purple `Flag` event tag.
+
+4. Next, let's try **switching to the Flag event tab** to view its members. In the command box, type the following
+ command:
+
+```
+switch Flag
+```
+
+* Notice that the highlighted tab on the left switches from the `All` tab to the `Flag` tab, and all listed contacts
+ have the `Flag` event tag.
+**Note:**
+ The default tab on entering the app is the `All` tab, with all contacts in EventBook displayed in the Result Panel.
+
+
+5. To **switch back to the `All` tab** to view all your contacts, enter the following command:
+
+```
+list
+```
+
+6. Experiment with other basic commands that we have listed in the [Quick Start](#quick-start) section to get a feel
+ for how EventBook works!
+
+Now that you are all warmed up, let's delve deeper into the details of each command and how you can use them to
+supercharge your event management in the next section!
+
+--------------------------------------------------------------------------------------------------------------------
+
+
+## Command Format
+
+**Things to take note of before about the format of commands:**
* 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`.
* 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`.
+ e.g. `n/NAME [t/TAG]` can be used as `n/John Doe t/friend` or as `n/John Doe`.
+
+* Items in round brackets specify two possible parameter types
+ e.g. `(NAME or INDEX)` means that either `NAME` or `INDEX` should fill that parameter
* 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.
+ e.g. `[t/TAG]…` can be used as ` ` (i.e. 0 times), `t/friend` (i.e. 1 time), `t/friend t/family` (i.e. multiple
+ times) etc.
* 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.
-* Extraneous parameters for commands that do not take in parameters (such as `help`, `list`, `exit` and `clear`) will be ignored.
+* Extraneous parameters for commands that do not take in parameters (such as `help`, `list`, `exit` and `clear`) will be
+ ignored.
e.g. if the command specifies `help 123`, it will be interpreted as `help`.
-* If you are using a PDF version of this document, be careful when copying and pasting commands that span multiple lines as space characters surrounding line-breaks may be omitted when copied over to the application.
-
-
-### Viewing help : `help`
-
-Shows a message explaning how to access the help page.
+> [**Note**]
+> If you are using a PDF version of this document, be careful when copying and pasting commands that span multiple
+> lines
+> as space characters surrounding line-breaks may be omitted when copied over to the application.
-
+--------------------------------------------------------------------------------------------------------------------
+
-Format: `help`
+# Features
+EventBook is divided into 3 categories - managing contacts, managing events with tags and general functions, which are all listed below.
+## Managing Contacts
### Adding a person: `add`
-Adds a person to the address book.
+This command allows you to add a person to the EventBook.
Format: `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…`
-
:bulb: **Tip:**
-A person can have any number of tags (including 0)
-
+> [**❗WARNING❗**]
+> Names must consist **solely** of alphabetic characters; any inclusion of numbers or symbols is not permitted.
+> This is to ensure that `delete 2` does not create an ambiguity on whether to delete the person with the name `2` or the person at index `2`.
+
+> [**💡TIP💡**]
+> A person can have any number of tags (including 0)
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`
-### Listing all persons : `list`
-
-Shows a list of all persons in the address book.
-
-Format: `list`
-
### Editing a person : `edit`
-Edits an existing person in the address book.
+This command allows you to edit an existing person in the EventBook.
-Format: `edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…`
+Format: `edit (NAME or INDEX) [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…`
-* 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, …
+* Edits the person at the specified `INDEX` or `NAME`.
+* The index refers to the index number shown in the displayed person list. The index **must be a positive integer** 1, 2, 3, …
+* The name refers to the name shown in the displayed person list. The name must be **exactly** what is shown in the displayed person list.
+* For example, `edit John Doe t/friends` instead of `edit John t/friends`.
* 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.
+* 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.
+ specifying any tags after it.
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 Ben n/Betsy Crower t/` Edits the person named Ben to be `Betsy Crower` and clears all existing tags.
* `edit 2 n/Betsy Crower t/` Edits the name of the 2nd person to be `Betsy Crower` and clears all existing tags.
-### Locating persons by name: `find`
+### Finding a person with keywords : `find`
-Finds persons whose names contain any of the given keywords.
+This command allows you to find all contacts whose names contain any of the given keywords.
Format: `find KEYWORD [MORE_KEYWORDS]`
-* The search is case-insensitive. e.g `hans` will match `Hans`
+* 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`
@@ -129,70 +263,405 @@ Examples:
### Deleting a person : `delete`
-Deletes the specified person from the address book.
+This command allows you to delete the specified person from the EventBook.
-Format: `delete INDEX`
+Format: `delete (NAME or INDEX)`
-* 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, …
+* Deletes the person at the specified `INDEX` or `NAME`.
+* The index refers to the index number shown in the displayed person list. The index **must be a positive integer** 1, 2, 3, …
+* The name refers to the name shown in the displayed person list. The name must be **exactly** what is shown in the displayed person list.
+* For example, `delete John Doe` instead of `delete John`.
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.
+* `list` followed by `delete 2` deletes the 2nd person in the EventBook.
+* `list` followed by `delete John Doe` deletes the person named 'John Doe' in the EventBook.
+
+### Importing contacts from .csv : `import`
+
+This command allows you to imports all contacts from given file path (default ./import/import.csv)
+
+Format: `import f/PATH`
+
+* Requires a valid file to be given in the `PATH` parameter
+* If PATH is left empty (i.e. `import f/`) the default file referenced is `./import/import.csv`
+* A sample is provided below. Note the fields in the first row and the data in subsequent rows.
+ 
+
+* Fields:
+ * The format of the first line of the csv should contain the fields:
+ `NAME,NUMBER,EMAIL,ADDRESS,EVENTS,TAGS` as above (.csv is comma delimited, so that means
+ each field should be in their own cell)
+ * The fields are non-caps sensitive (`Name` pr `NaME` would also be valid)
+* Parameters:
+ * The format of each parameter should follow the same format as in the add command format.
+ * There should be no blank lines, and no conflicts with contacts in the existing EventBook (e.g. You cannot
+ import a contact if EventBook already contains a contact with the exact same name)
+ * There should be no trailing empty characters (' ') in any cell.
+* The `EVENTS` parameter must satisfy one of the following format requirements:
+ 1. `N/A` if the contact is not in any events, else a field error will occur
+ 2. `t/E-eventName dc/Description sd/yyyy-MM-dd HH:mm:ss ed/yyyy-MM-dd HH:mm:ss` for the first instance of each
+ unique event, unless said tag already exists in the EventBook, in which case iii. can be used
+ 3. `t/E-eventName` for existing events or previously declared events
+ * e.g. If the first contact has `t/E-orientation dc/Orientation! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02`,
+ then further contacts may simply have `t/E-orientation` under the `EVENTS` fields
+* The `TAGS` and `EVENTS` portion accept multiple arguments delimited by the `|` character (e.g. Friend|Colleague). A
+ consequence of this is that tags containing `|` in their name cannot be imported
+* Ensure that the file provided is saved before used as an import file
+* The default download contains a sample .csv file that one can refer to
+
+Examples:
+* `import f/./import/import.csv` imports the contacts from the specified file
+* `import f/` is identical to running the above command
+
+### Exporting contacts from EventBook : `export`
+
+This command allows you to export all contacts to ./export/export.csv
+
+Format: `export`
+
+* Note that moving files around may cause export to fail. If one relocates the source files, one must
+ ensure that the ./export directory exists for the export.csv to generate at
+* If a file export.csv is already present at ./export, it will be overwritten with the
+ current EventBook data
+* The export file format is the same as the output format given in `import`
+
+> [**❗WARNING❗**]
+> There should be an empty folder named `export` inside the folder with `EventBook.jar` to ensure that export function works.
+>
+
+
+
+## Managing Events and Tags
+
+### Creating a tag : `ctag`
+
+This command allows you to create a tag or an event tag in the EventBook. You are able to manage or search for people with the specified tags after creation.
+
+The `ctag` function allows you to create tags and events tags separately based on different input formats listed below.
+
+Format 1: `ctag TAG_NAME`
+
+This format allows you to create tags that you can tag your contacts with!
+
+* The provided name has to be a **_unique_** `tag` name that does not already exist in the EventBook.
+* The field "TAG_NAME" allows only alphanumerical inputs, eg. `0-9`,`a-z,A-Z`.
+* The tag must be a single word. (e.g. `Friends` is allowed but `Good Friends` is forbidden)
+* No trailing or extra whitespaces are allowed.
+
+Example: `ctag Friend` creates a tag named `Friend`.
+
+> [**❗WARNING❗**]
+> 1. All input fields are necessary.
+> 2. If you miss out any of the mandatory fields, or has input the wrong format, your input will get rejected or you will get an incorrect result.
+> 3. Make sure your TAG_NAME is alphanumerical(`0-9`,`a-z,A-Z`) with no whitespaces in between them.
+
+> [**💡TIP💡**]
+> 1. If you want to create a tag with 2 words, consider grouping them together into a single word. For example: "
+ SchoolFriends"
+
+Format 2: `ctag t/E-EVENT_NAME dc/Description sd/yyyy-MM-dd HH:mm:ss ed/yyyy-MM-dd HH:mm:ss`
+
+This format allows you to create event tags that you can tag your contacts with! How cool!
+
+* The provided name has to be a **_unique_** `EVENT_NAME` name that does not already exist in the EventBook.
+* The field "EVENT_NAME" allows only alphanumerical inputs, eg. `0-9`,`a-z,A-Z`. For instance, `ctag t/E-E-event1 sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02` is not allowed.
+* The tag must be a single word.(e.g. `Meeting` is allowed but `Friends Meeting` is forbidden)
+* No trailing or extra whitespaces are allowed.
+
+Examples:
+
+* `ctag t/E-orientation dc/Orientation! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02`
+* Creates an EventTag named orientation that starts from 2024-04-04 02:02:02 to 2024-04-05 02:02:02.
+
+> [**💡TIP💡**]
+> 1. If you want to create an event with 2 words, consider grouping them together into a single word. For example: "
+ SchoolEvent"
+
+> [**❗WARNING❗**]
+> 1. All input fields are necessary.
+> 2. If you miss out any of the mandatory fields, or has input the wrong format, your input will get rejected, or you
+ will get an incorrect result.
+> 3. Make sure your EVENT_NAME is alphanumerical(`0-9`,`a-z,A-Z`) with no whitespaces in between them.
+
+### Deleting a tag : `dtag`
+
+This command allows you to delete an existing tag in the EventBook. This is done to allow you to free up memory space by
+deleting tags that you will no longer use, how thoughtful of us :).
+Take note that this command also deletes the tag from all the contacts in your list.
+
+Format: `dtag TAG_NAME`
+
+* The provided name has to be a `TAG_NAME` name that already exists in the EventBook.
+* The field "TAG_NAME" allows only alphanumerical inputs, eg. `0-9`,`a-z,A-Z`.
+* The tag must be a single word.(In fact, you can only create tags with single word inputs.)
+* No trailing or extra whitespaces are allowed.
+* The provided tag has to exist in the EventBook.
+
+Examples:
+
+* `dtag Friend` Deletes a tag named `Friend`.
+
+> [**💡TIP💡**]
+> 1. You can check who is associated with the tag you are deleting by using the [Search](#searching-by-tag--search) command.
+
+> [**NOTE**]
+> If you delete a tag that does not exist, you will get notified by a warning that it does not exist. You will get a
+> success message when you delete an existing tag too.
+
+> [**❗WARNING❗**]
+> All input fields are necessary.
+> This tag will be removed from **every** contact tagged with it. This action is also **not** reversible.
+> Make sure your `TAG_NAME` is alphanumerical(`0-9`,`a-z,A-Z`) with no whitespaces in between them.
+
+### Deleting an EventTag : `devent`
+
+This command allows you to delete an event tag in the EventBook. Convenient to do so when an event is over, right?
+Take note that this command also deletes the event tag from all the contacts that are associated with it.
+
+Format: `devent EVENT_TAG`
+
+* The provided name has to be an `EVENT_TAG` name that already exists in the EventBook.
+* The field "EVENT_TAG" allows only alphanumerical inputs, eg. `0-9`,`a-z,A-Z`.
+* The event tag must be a single word.(In fact, you can only create event tags with single word inputs.)
+* No trailing or extra whitespaces are allowed.
+* The provided event tag has to exist in the EventBook.
+
+Examples:
+* `devent orientation` Deletes an EventTag named `orientation`.
+
+> [**💡TIP💡**]
+> You can do a quick check of who is in the event by using the [Switch](#switching-between-events--switch), do take note that the event panel at the left of the GUI is not clickable.
+
+> [**❗WARNING❗**]
+> Make sure your `EVENT_NAME` is alphanumerical(`0-9`,`a-z,A-Z`) with no whitespaces in between them.
+
+> [**NOTE**]
+> If you delete an event tag that does not exist, you will get notified by a warning that says it does not exist. You
+> will get a success message after deleting an existing tag.
+> The event GUI on the left of the screen will update when you delete an existing event.
+> This event tag will be removed from **every** contact tagged with it. This action is also **not** reversible.
+
+### Assigning a tag : `assign`
+
+This command allows you to assign someone to a tag and group them conveniently! For example, you can assign a person with a tag named `Logistics` or assign a person with an event tag named `Rag`.
+
+Format: `assign (NAME or INDEX) t/TAG…` or `assign (NAME or INDEX) t/E-EVENT_TAG…`
+
+* Assign the person at the specified `INDEX` or `NAME` with the tag `TAG` or with the event tag `EVENT_TAG`.
+* The index refers to the index number shown in the displayed person list. The index **must be a positive integer** 1,
+ 2, 3, …
+* The provided tag(s) and event tag(s) have to exist in the EventBook.
+* No trailing or extra whitespaces are allowed.
+
+Examples:
+* `assign 1 t/Logistics` Assigns the first person in the list to a tag named `Logistics`.
+* `assign John Doe t/E-event1` Assigns the person named John Doe in the list to an Event Tag named `event1`.
+
+> [**💡TIP💡**]
+> If you do not have the tag or event tag you are assigning a person with, you can create them with
+> the [ctag](#creating-a-tag--ctag) command.
+
+> [**❗WARNING❗**]
+> The name refers to the name shown in the displayed person list. The name must be **exactly** what is shown in the
+> displayed person list.
+> For example, `assign John Doe t/friends` instead of `assign John t/friends`.
+
+### Searching by tag : `search`
+
+This command allows you to displays all the people that are tagged with `TAG_NAME`. We know that to search for a list people who are tagged as **Friend**,
+you are tempted to do `search Friends`, plural. However, this is not supported :(.
+
+Format: `search TAG_NAME`
+
+* The search is case-sensitive.
+* The provided tag has to exist in the EventBook.
+
+Examples:
+
+* `search Friend` Displays all people tagged as `Friend`.
+
+> [**💡TIP💡**]
+> After searching, you can reset the app to display all the contacts with the [list](#listing-all-persons--list)
+> command.
+
+### Switching between events : `switch`
+
+This command allows you to switch to the event with the `EVENT_TAG_NAME`.
+
+Format: `switch EVENT_TAG_NAME`
+
+* The search is case-sensitive.
+* The default tab is the `All` tab with full list of contacts displayed.
+
+Examples:
+* `switch Flag` Switches to `Flag` event tab and shows all members tagged with `Flag` event tag.
+
+> [**💡TIP💡**]
+> After searching, you can reset the app to display all the contacts with the [list](#listing-all-persons--list)
+command.
+
+
+
+## General Functions
+
+### Getting help : `help`
+
+To access the EventBook User Guide within the application, simply enter `help` into the command box and a link to the User Guide will be provided.
+
+
+
+Format: `help`
+
+### Listing all contacts : `list`
+
+This command shows a list of all contacts in the EventBook.
+
+Format: `list`
### Clearing all entries : `clear`
-Clears all entries from the address book.
+This command clears all the contacts from the EventBook.
Format: `clear`
### Exiting the program : `exit`
-Exits the program.
+This command exits the program.
Format: `exit`
### Saving the data
-AddressBook data are saved in the hard disk automatically after any command that changes the data. There is no need to save manually.
+EventBook data are saved in the hard disk automatically after any command that changes the data. There is no need to
+save manually.
### Editing the data file
-AddressBook data are saved automatically as a JSON file `[JAR file location]/data/addressbook.json`. Advanced users are welcome to update data directly by editing that data file.
+EventBook data are saved automatically as a JSON file `[JAR file location]/data/addressbook.json`. Advanced users are
+welcome to update data directly by editing that data file.
+
+> [**❗WARNING❗**]
+> If your changes to the data file makes its format invalid, EventBook will discard all data and start with an empty
+> data file at the next run. Hence, it is recommended to take a backup of the file before editing it.
+> Furthermore, certain edits can cause the EventBook to behave in unexpected ways (e.g., if a value entered is outside
+> the acceptable range). Therefore, edit the data file only if you are confident that you can update it correctly.
+
+--------------------------------------------------------------------------------------------------------------------
+
+
+
+## Setting Up Your First Event!
+
+This section would guide you through some basic commands of EventBook, and how to use them to set up your first event
+with contacts and tags.
+
+### Clear sample data
+
+To start, if you want to remove the sample contacts in the EventBook, you can use the `clear` command to clear
+everything!
+Simply type `clear` in the text box at the top of the app! (Do take note that throughout this tutorial, we will not
+clear the
+sample contacts for the convenience doing demo.)
+
+1. Input `clear`.
+2. Success! 
+
+### Create a tag with `ctag`
+
+To tag a person as a friend or any tag you want, you need to first create the tag.
+To start, create a tag called `dummytag`. Do take not tags are alphanumerical, so you cannot do `pen-pal` unfortunately.
+
+1. Input `ctag dummytag`.
+2. Success! 
+
+### Using `assign` to tag people
+
+To tag the person to the tag, we can use the assign command.
-
:exclamation: **Caution:**
-If your changes to the data file makes its format invalid, AddressBook will discard all data and start with an empty data file at the next run. Hence, it is recommended to take a backup of the file before editing it.
-Furthermore, certain edits can cause the AddressBook to behave in unexpected ways (e.g., if a value entered is outside of the acceptable range). Therefore, edit the data file only if you are confident that you can update it correctly.
-
+1. Assign the person of interest with your tag! For this example,
+we assign Alex Yeoh as part of the `logistics` by typing `assign Alex Yeoh t/logistics`.
+2. Success! 
-### Archiving data files `[coming in v2.0]`
+### Using `switch` to change to the event that you want
-_Details coming soon ..._
+Ok, I want to check who is in an event or the event details, how can I do it?
+No worries pal, we got you covered. To figure out who is in any event, use the `switch` command.
+
+1. Switch to the event named `Flag` with `switch Flag`.
+2. Success! 
+
+### Using `search` to find the people with the tag
+
+You may want to say, what if I don't remember who are part of the logistics team?
+No worries, you can use the search command to find out!
+
+1. Search for the logistic team in the event `Flag` with `search logistics`.
+2. Success! 
+3. To see all the existing contacts again, type `list` in the input box to reset everything!
+
+### Delete a tag with `dtag`
+
+Oh no, what if I want to delete a tag that I no longer use? No worries, you can use the `dtag` command!
+This command removes the tag you delete for all your contacts so be careful!
+
+1. Delete the existing `dummytag` tag using the dtag command `dtag dummytag`.
+2. Success! 
+
+### Create an event with `ctag`
+
+Ok, what if you have an event that you need to group people to, like a Orientation for 9 Feb 2024 8pm? No worries, you can assign people to events
+and manage them as well. But first, you should create an event first with `ctag`.
+
+1. Create an event called **Orientation** for 9 Feb 8pm with
+the command `ctag t/E-Orientation dc/SoC Orientation 2024 sd/2024-02-09 20:00:00 ed/2024-02-09 20:00:00`.
+2. Success! 
+
+### Assign a person to the event with `assign`
+
+Now you want to assign a person to the Rag. You can do it with the
+`assign` command.
+
+1. Assign Alex to the event `Rag` using `assign Alex Yeoh t/Rag`.
+2. Success! 
--------------------------------------------------------------------------------------------------------------------
+
+
+## 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` |
+| **Assign** | `assign (NAME or INDEX) [t/TAG]…` or `assign (NAME or INDEX) [t/E-TAG]…` e.g.,`assign 2 t/tag1` or `assign John Doe t/E-event1` |
+| **Clear** | `clear` |
+| **Delete** | `delete (NAME or INDEX)` e.g., `delete 3` or `delete John Doe` |
+| **Edit** | `edit (NAME or INDEX) [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [t/TAG]…` e.g., `edit 2 n/James Lee e/jameslee@example.com` or`edit John Doe n/James Lee e/jameslee@example.com` |
+| **Find** | `find KEYWORD [MORE_KEYWORDS]` e.g., `find James Jake` |
+| **List** | `list` |
+| **Help** | `help` |
+| **Create Tag** | `ctag TAG_NAME` e.g., `ctag Friend` |
+| **Create EventTag** | `ctag t/E-eventName dc/Description sd/yyyy-MM-dd HH:mm:ss ed/yyyy-MM-dd HH:mm:ss` e.g., `ctag t/E-orientation dc/Orientation! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02` |
+| **Delete Tag** | `dtag TAG_NAME` e.g., `dtag Friend` |
+| **Delete Event** | `devent EVENT_TAG_NAME` e.g., `devent orientation` |
+| **Import** | `import f/PATH` e.g., `import f/./import/import.csv` |
+| **Export** | `export` |
+| **Search Tag** | `search TAG_NAME` e.g., `search Friend` |
+| **Switch** | `switch EVENT_TAG_NAME` e.g. `switch Flag` |
+
+
+
## FAQ
**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.
+**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 EventBook home folder.
--------------------------------------------------------------------------------------------------------------------
## Known issues
1. **When using multiple screens**, if you move the application to a secondary screen, and later switch to using only the primary screen, the GUI will open off-screen. The remedy is to delete the `preferences.json` file created by the application before running the application again.
+2. When giving enormously long inputs such as long tag/event tag names, the tag will not get fully displayed by the app.
+3. **Date Handling.** It has been identified in the Java Format library when user input an invalid date, eg: 31 Feb 2024, the system incorrectly accepts and converts it to a valid date such as 29 Feb 2024. This can result in incorrect date to be saved. Hence, it is recommended for users to manually verify that the date that they have written is accurate.
--------------------------------------------------------------------------------------------------------------------
-
-## 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`
diff --git a/docs/_config.yml b/docs/_config.yml
deleted file mode 100644
index 6bd245d8f4e..00000000000
--- a/docs/_config.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-title: "AB-3"
-theme: minima
-
-header_pages:
- - UserGuide.md
- - DeveloperGuide.md
- - AboutUs.md
-
-markdown: kramdown
-
-repository: "se-edu/addressbook-level3"
-github_icon: "images/github-icon.png"
-
-plugins:
- - jemoji
diff --git a/docs/_data/projects.yml b/docs/_data/projects.yml
deleted file mode 100644
index 8f3e50cb601..00000000000
--- a/docs/_data/projects.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- name: "AB-1"
- url: https://se-edu.github.io/addressbook-level1
-
-- name: "AB-2"
- url: https://se-edu.github.io/addressbook-level2
-
-- name: "AB-3"
- url: https://se-edu.github.io/addressbook-level3
-
-- name: "AB-4"
- url: https://se-edu.github.io/addressbook-level4
-
-- name: "Duke"
- url: https://se-edu.github.io/duke
-
-- name: "Collate"
- url: https://se-edu.github.io/collate
-
-- name: "Book"
- url: https://se-edu.github.io/se-book
-
-- name: "Resources"
- url: https://se-edu.github.io/resources
diff --git a/docs/_includes/custom-head.html b/docs/_includes/custom-head.html
deleted file mode 100644
index 8559a67ffad..00000000000
--- a/docs/_includes/custom-head.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% comment %}
- Placeholder to allow defining custom head, in principle, you can add anything here, e.g. favicons:
-
- 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
deleted file mode 100644
index 83ac5326933..00000000000
--- a/docs/_includes/head.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
- {%- include custom-head.html -%}
-
- {{page.title}}
-
-
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
deleted file mode 100644
index 33badcd4f99..00000000000
--- a/docs/_includes/header.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
+
-:information_source: Don’t forget to update `AddressBookParser` to use our new `RemarkCommandParser`!
+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-8bf239e8e9529369b577701303ddd96af93178b4ed6735f91c2d8488b20c6b4a).
@@ -244,7 +247,7 @@ Simply add the following to [`seedu.address.ui.PersonCard`](https://github.com/s
**`PersonCard.java`:**
-``` java
+```java
@FXML
private Label remark;
```
@@ -276,11 +279,11 @@ We change the constructor of `Person` to take a `Remark`. We will also need to d
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.
+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!
@@ -291,11 +294,11 @@ AddressBook stores data by serializing `JsonAdaptedPerson` into `json` with the
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!
+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.
@@ -308,7 +311,7 @@ Just add [this one line of code!](https://github.com/se-edu/addressbook-level3/c
**`PersonCard.java`:**
-``` java
+```java
public PersonCard(Person person, int displayedIndex) {
//...
remark.setText(person.getRemark().value);
@@ -328,7 +331,7 @@ save it with `Model#setPerson()`.
**`RemarkCommand.java`:**
-``` 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";
diff --git a/docs/tutorials/RemovingFields.md b/docs/tutorials/RemovingFields.md
index f29169bc924..c73bd379e5e 100644
--- a/docs/tutorials/RemovingFields.md
+++ b/docs/tutorials/RemovingFields.md
@@ -1,8 +1,11 @@
---
-layout: page
-title: "Tutorial: Removing Fields"
+ layout: default.md
+ title: "Tutorial: Removing Fields"
+ pageNav: 3
---
+# 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
@@ -10,17 +13,17 @@ title: "Tutorial: Removing Fields"
When working on an existing code base, you will most likely find that some features that are no longer necessary.
This tutorial aims to give you some practice on such a code 'removal' activity by removing the `address` field from `Person` class.
-
+
**If you have done the [Add `remark` command tutorial](AddRemark.html) already**, you should know where the code had to be updated to add the field `remark`. From that experience, you can deduce where the code needs to be changed to _remove_ that field too. The removing of the `address` field can be done similarly.
However, if you have no such prior knowledge, removing a field can take a quite a bit of detective work. This tutorial takes you through that process. **At least have a read even if you don't actually do the steps yourself.**
-
+
-* Table of Contents
-{:toc}
+
+
## Safely deleting `Address`
@@ -50,10 +53,10 @@ Let’s try removing references to `Address` in `EditPersonDescriptor`.
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.
-
+ **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`
@@ -71,7 +74,7 @@ A quick look at the `PersonCard` class and its `fxml` file quickly reveals why i
**`PersonCard.java`**
-``` java
+```java
...
@FXML
private Label address;
diff --git a/docs/tutorials/TracingCode.md b/docs/tutorials/TracingCode.md
index 4fb62a83ef6..2b1b0f2d6b7 100644
--- a/docs/tutorials/TracingCode.md
+++ b/docs/tutorials/TracingCode.md
@@ -1,26 +1,30 @@
---
-layout: page
-title: "Tutorial: Tracing code"
+ layout: default.md
+ title: "Tutorial: Tracing code"
+ pageNav: 3
---
+# 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 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 aims to inform 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 how the code works.
@@ -37,16 +41,16 @@ As you know, the first step of debugging is to put in a breakpoint where you wan
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 you saw earlier (and repeated above for reference), the `UI` component yields control to the `Logic` component through a method named `execute`. Searching through the code base for an `execute()` method that belongs to the `Logic` component yields a promising candidate in `seedu.address.logic.Logic`.
-
+
-:bulb: **Intellij Tip:** The ['**Search Everywhere**' feature](https://www.jetbrains.com/help/idea/searching-everywhere.html) can be used here. In particular, the '**Find Symbol**' ('Symbol' here refers to methods, variables, classes etc.) variant of that feature is quite useful here as we are looking for a _method_ named `execute`, not simply the text `execute`.
-
+**Intellij Tip:** The ['**Search Everywhere**' feature](https://www.jetbrains.com/help/idea/searching-everywhere.html) can be used here. In particular, the '**Find Symbol**' ('Symbol' here refers to methods, variables, classes etc.) variant of that feature is quite useful here as we are looking for a _method_ named `execute`, not simply the text `execute`.
+
A quick look at the `seedu.address.logic.Logic` (an extract given below) confirms that this indeed might be what we’re looking for.
@@ -67,14 +71,14 @@ public interface Logic {
But apparently, this is an interface, not a concrete implementation.
That should be fine because the [Architecture section of the Developer Guide](../DeveloperGuide.html#architecture) tells us that components interact through interfaces. Here's the relevant diagram:
-
+
Next, let's find out which statement(s) in the `UI` code is calling this method, thus transferring control from the `UI` to the `Logic`.
-
+
-:bulb: **Intellij Tip:** The ['**Find Usages**' feature](https://www.jetbrains.com/help/idea/find-highlight-usages.html#find-usages) can find from which parts of the code a class/method/variable is being used.
-
+**Intellij Tip:** The ['**Find Usages**' feature](https://www.jetbrains.com/help/idea/find-highlight-usages.html#find-usages) can find from which parts of the code a class/method/variable is being used.
+
@@ -87,10 +91,10 @@ Now let’s set the breakpoint. First, double-click the item to reach the corres
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 keep track of what happens inside the component and where the execution transfers to another component.
-
+**Tip:** Over the course of the debugging session, you will encounter every major component in the application. Try to keep track of what happens inside the component and where the execution transfers to another component.
+
1. To start the debugging session, simply `Run` \> `Debug Main`
@@ -110,7 +114,7 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
**LogicManager\#execute().**
- ``` java
+ ```java
@Override
public CommandResult execute(String commandText)
throws CommandException, ParseException {
@@ -142,7 +146,7 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
1. _Step into_ the line where user input in parsed from a String to a Command, which should bring you to the `AddressBookParser#parseCommand()` method (partial code given below):
- ``` java
+ ```java
public Command parseCommand(String userInput) throws ParseException {
...
final String commandWord = matcher.group("commandWord");
@@ -157,7 +161,7 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
1. Stepping through the `switch` block, we end up at a call to `EditCommandParser().parse()` as expected (because the command we typed is an edit command).
- ``` java
+ ```java
...
case EditCommand.COMMAND_WORD:
return new EditCommandParser().parse(arguments);
@@ -166,8 +170,10 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
1. Let’s see what `EditCommandParser#parse()` does by stepping into it. You might have to click the 'step into' button multiple times here because there are two method calls in that statement: `EditCommandParser()` and `parse()`.
-
:bulb: **Intellij Tip:** Sometimes, you might end up stepping into functions that are not of interest. Simply use the `step out` button to get out of them!
-
+
+
+ **Intellij Tip:** Sometimes, you might end up stepping into functions that are not of interest. Simply use the `step out` button to get out of them!
+
1. Stepping through the method shows that it calls `ArgumentTokenizer#tokenize()` and `ParserUtil#parseIndex()` to obtain the arguments and index required.
@@ -175,17 +181,17 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
1. As you just traced through some code involved in parsing a command, you can take a look at this class diagram to see where the various parsing-related classes you encountered fit into the design of the `Logic` component.
-
+
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 match the diagram?
- 
+
1. Now, step over until you read the statement that calls the `execute()` method of the `EditCommand` object received, and step into that `execute()` method (partial code given below):
**`EditCommand#execute()`:**
- ``` java
+ ```java
@Override
public CommandResult execute(Model model) throws CommandException {
...
@@ -205,25 +211,28 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
* it uses the `updateFilteredPersonList` method to ask the `Model` to populate the 'filtered list' with _all_ persons.
FYI, The 'filtered list' is the list of persons resulting from the most recent operation that will be shown to the user immediately after. For the `edit` command, we populate it with all the persons so that the user can see the edited person along with all other persons. If this was a `find` command, we would be setting that list to contain the search results instead.
To provide some context, given below is the class diagram of the `Model` component. See if you can figure out where the 'filtered list' of persons is being tracked.
-
+
* :bulb: This may be a good time to read through the [`Model` component section of the DG](../DeveloperGuide.html#model-component)
1. As you step through the rest of the statements in the `EditCommand#execute()` method, you'll see that it creates a `CommandResult` object (containing information about the result of the execution) and returns it.
Advancing the debugger by one more step should take you back to the middle of the `LogicManager#execute()` method.
1. Given that you have already seen quite a few classes in the `Logic` component in action, see if you can identify in this partial class diagram some of the classes you've encountered so far, and see how they fit into the class structure of the `Logic` component:
-
+
+
* :bulb: This may be a good time to read through the [`Logic` component section of the DG](../DeveloperGuide.html#logic-component)
1. Similar to before, you can step over/into statements in the `LogicManager#execute()` method to examine how the control is transferred to the `Storage` component and what happens inside that component.
-
:bulb: **Intellij Tip:** When trying to step into a statement such as `storage.saveAddressBook(model.getAddressBook())` which contains multiple method calls, Intellij will let you choose (by clicking) which one you want to step into.
-
+
+
+ **Intellij Tip:** When trying to step into a statement such as `storage.saveAddressBook(model.getAddressBook())` which contains multiple method calls, Intellij will let you choose (by clicking) which one you want to step into.
+
-1. As you step through the code inside the `Storage` component, you will eventually arrive at the `JsonAddressBook#saveAddressBook()` method which calls the `JsonSerializableAddressBook` constructor, to create an object that can be _serialized_ (i.e., stored in storage medium) in JSON format. That constructor is given below (with added line breaks for easier readability):
+1. As you step through the code inside the `Storage` component, you will eventually arrive at the `JsonAddressBook#saveAddressBook()` method which calls the `JsonSerializableAddressBook` constructor, to create an object that can be _serialized_ (i.e., stored in storage medium) in JSON format. That constructor is given below (with added line breaks for easier readability):
**`JsonSerializableAddressBook` constructor:**
- ``` java
+ ```java
/**
* Converts a given {@code ReadOnlyAddressBook} into this class for Jackson use.
*
@@ -243,7 +252,8 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
This is because regular Java objects need to go through an _adaptation_ for them to be suitable to be saved in JSON format.
1. While you are stepping through the classes in the `Storage` component, here is the component's class diagram to help you understand how those classes fit into the structure of the component.
-
+
+
* :bulb: This may be a good time to read through the [`Storage` component section of the DG](../DeveloperGuide.html#storage-component)
1. We can continue to step through until you reach the end of the `LogicManager#execute()` method and return to the `MainWindow#executeCommand()` method (the place where we put the original breakpoint).
@@ -251,7 +261,7 @@ Recall from the User Guide that the `edit` command has the format: `edit INDEX [
1. Stepping into `resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());`, we end up in:
**`ResultDisplay#setFeedbackToUser()`**
- ``` java
+ ```java
public void setFeedbackToUser(String feedbackToUser) {
requireNonNull(feedbackToUser);
resultDisplay.setText(feedbackToUser);
diff --git a/export/export.csv b/export/export.csv
new file mode 100644
index 00000000000..e7cf1b4b98f
--- /dev/null
+++ b/export/export.csv
@@ -0,0 +1,4 @@
+NAME,NUMBER,EMAIL,ADDRESS,EVENTS,TAGS
+Tom,91234812,hi@mail.com,NUS,t/E-orientation dc/Orientation! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02|t/E-camping dc/CAMP!! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02,notcool|fine|interesting
+John,91232345,john@john.com,NTU,orientation,notcool
+Ben,83478596,ben@mail.com,NA,camping,friendly
diff --git a/import/import.csv b/import/import.csv
new file mode 100644
index 00000000000..adf25250cbc
--- /dev/null
+++ b/import/import.csv
@@ -0,0 +1,4 @@
+Name,Number,Email,Address,Events,Tags
+Tom,91234812,hi@mail.com,NUS,t/E-orientation dc/Orientation! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02|t/E-camping dc/CAMP!! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02,notcool|fine|interesting
+John,91232345,john@john.com,NTU,orientation,notcool
+Ben,83478596,ben@mail.com,NA,camping,friendly
diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java
index 3d6bd06d5af..6576b2dad9f 100644
--- a/src/main/java/seedu/address/MainApp.java
+++ b/src/main/java/seedu/address/MainApp.java
@@ -36,7 +36,7 @@
*/
public class MainApp extends Application {
- public static final Version VERSION = new Version(0, 2, 2, true);
+ public static final Version VERSION = new Version(1, 3, 1, true);
private static final Logger logger = LogsCenter.getLogger(MainApp.class);
diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/seedu/address/logic/Logic.java
index 92cd8fa605a..8c5fd9e99bb 100644
--- a/src/main/java/seedu/address/logic/Logic.java
+++ b/src/main/java/seedu/address/logic/Logic.java
@@ -3,12 +3,14 @@
import java.nio.file.Path;
import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
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;
+import seedu.address.model.tag.EventTag;
/**
* API of the Logic component
@@ -33,6 +35,8 @@ public interface Logic {
/** Returns an unmodifiable view of the filtered list of persons */
ObservableList getFilteredPersonList();
+ ObservableSet getEventTagList();
+
/**
* Returns the user prefs' address book file path.
*/
diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
index 5aa3b91c7d0..b8c8de08940 100644
--- a/src/main/java/seedu/address/logic/LogicManager.java
+++ b/src/main/java/seedu/address/logic/LogicManager.java
@@ -6,6 +6,7 @@
import java.util.logging.Logger;
import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
import seedu.address.commons.core.GuiSettings;
import seedu.address.commons.core.LogsCenter;
import seedu.address.logic.commands.Command;
@@ -16,6 +17,7 @@
import seedu.address.model.Model;
import seedu.address.model.ReadOnlyAddressBook;
import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
import seedu.address.storage.Storage;
/**
@@ -71,6 +73,11 @@ public ObservableList getFilteredPersonList() {
return model.getFilteredPersonList();
}
+ @Override
+ public ObservableSet getEventTagList() {
+ return model.getEventTagList();
+ }
+
@Override
public Path getAddressBookFilePath() {
return model.getAddressBookFilePath();
diff --git a/src/main/java/seedu/address/logic/Messages.java b/src/main/java/seedu/address/logic/Messages.java
index ecd32c31b53..44135d0f2f4 100644
--- a/src/main/java/seedu/address/logic/Messages.java
+++ b/src/main/java/seedu/address/logic/Messages.java
@@ -15,6 +15,8 @@ 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_INVALID_TAG = "The tag provided does not exist";
+ public static final String MESSAGE_INVALID_PERSON_DISPLAYED_NAME = "The person name provided is invalid";
public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
public static final String MESSAGE_DUPLICATE_FIELDS =
"Multiple values specified for the following single-valued field(s): ";
@@ -45,6 +47,17 @@ public static String format(Person person) {
.append(person.getAddress())
.append("; Tags: ");
person.getTags().forEach(builder::append);
+
+ builder.append("; EventTags: ");
+ if (!person.getEventTags().isEmpty()) {
+ builder.append("[");
+ person.getEventTags().forEach(eventTag -> builder.append(eventTag.tagName).append(", "));
+ builder.delete(builder.length() - 2, builder.length());
+ builder.append("]");
+ } else {
+ builder.append("[]");
+ }
+
return builder.toString();
}
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
index 5d7185a9680..dc9f430c154 100644
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddCommand.java
@@ -51,11 +51,9 @@ public AddCommand(Person 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, Messages.format(toAdd)));
}
diff --git a/src/main/java/seedu/address/logic/commands/AssignCommand.java b/src/main/java/seedu/address/logic/commands/AssignCommand.java
new file mode 100644
index 00000000000..9b68983e4a7
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/AssignCommand.java
@@ -0,0 +1,122 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.Messages;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.Person;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Assigns a person from the address book with the given tags.
+ */
+public class AssignCommand extends Command {
+
+ public static final String COMMAND_WORD = "assign";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + ": Assigns the person identified by the index number or full name used in the displayed person list with"
+ + " the given tags.\n"
+ + "Parameters: INDEX (must be a positive integer) or NAME (must be the exact full name), TAGS (t/TAGNAME)\n"
+ + "Examples: " + COMMAND_WORD + " 1" + " t/friends"
+ + " or " + COMMAND_WORD + " John Doe" + " t/friends"
+ + " or " + COMMAND_WORD + " 1 " + "t/E-eventName";
+
+ public static final String MESSAGE_ASSIGN_PERSON_MISSING = "Please provide either a name or index to delete.";
+ public static final String MESSAGE_ASSIGN_TAG_MISSING = "Please ensure that all tag(s) provided exist.";
+ public static final String MESSAGE_ASSIGN_PERSON_SUCCESS = "Assigned Person: %1$s";
+ private final Index targetIndex;
+ private final String targetName;
+ private final Set targetTagList;
+ private final Set targetEventTagList;
+
+ /**
+ * Constructs an AssignCommand with the specified target index, target name and target tag list.
+ *
+ * @param targetIndex The index of the person to be deleted.
+ * @param targetName The name of the person to be deleted.
+ * @param targetTagList The set of tags to be added to the person.
+ */
+ public AssignCommand(Index targetIndex, String targetName, Set targetTagList, Set targetEventTagList) {
+ this.targetIndex = targetIndex;
+ this.targetName = targetName;
+ this.targetTagList = targetTagList;
+ this.targetEventTagList = targetEventTagList;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List lastShownList = model.getFilteredPersonList();
+ String dummyName = " ";
+
+ for (Tag t : targetTagList) {
+ if (!model.hasTag(t)) {
+ throw new CommandException(MESSAGE_ASSIGN_TAG_MISSING);
+ }
+ }
+
+ for (Tag t : targetEventTagList) {
+ if (!model.hasEventTag(t.tagName)) {
+ throw new CommandException(MESSAGE_ASSIGN_TAG_MISSING);
+ }
+ }
+
+ if (targetIndex != null) {
+ if (targetIndex.getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ }
+ Person personToAssign = lastShownList.get(targetIndex.getZeroBased());
+ model.assign(personToAssign, targetTagList, targetEventTagList);
+ return new CommandResult(String.format(MESSAGE_ASSIGN_PERSON_SUCCESS, Messages.format(personToAssign)));
+
+ } else if (targetName != dummyName) {
+ Optional personToFind = lastShownList.stream().filter(person -> person.getName()
+ .toString().equals(targetName)).findFirst();
+ if (personToFind.isPresent()) {
+ Person personToAssign = personToFind.get();
+ model.assign(personToAssign, targetTagList, targetEventTagList);
+ return new CommandResult(String.format(MESSAGE_ASSIGN_PERSON_SUCCESS, Messages.format(personToAssign)));
+ } else {
+ throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_NAME);
+ }
+ } else {
+ throw new CommandException(MESSAGE_ASSIGN_PERSON_MISSING);
+ }
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof AssignCommand)) {
+ return false;
+ }
+
+ AssignCommand otherAssignCommand = (AssignCommand) other;
+ return (targetIndex.equals(otherAssignCommand.targetIndex)
+ && targetTagList.equals(otherAssignCommand.targetTagList)
+ && targetEventTagList.equals(otherAssignCommand.targetEventTagList)
+ && targetName.equals((otherAssignCommand.targetName)));
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this)
+ .add("targetIndex", targetIndex)
+ .add("targetName", targetName)
+ .add("targetTagList", targetTagList)
+ .add("targetTagList", targetEventTagList)
+ .toString();
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
index 9c86b1fa6e4..5a791b5c83a 100644
--- a/src/main/java/seedu/address/logic/commands/ClearCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ClearCommand.java
@@ -11,7 +11,7 @@
public class ClearCommand extends Command {
public static final String COMMAND_WORD = "clear";
- public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
+ public static final String MESSAGE_SUCCESS = "EventBook has been cleared!";
@Override
diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/seedu/address/logic/commands/CommandResult.java
index 249b6072d0d..242e292484c 100644
--- a/src/main/java/seedu/address/logic/commands/CommandResult.java
+++ b/src/main/java/seedu/address/logic/commands/CommandResult.java
@@ -3,8 +3,10 @@
import static java.util.Objects.requireNonNull;
import java.util.Objects;
+import java.util.Optional;
import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.model.tag.EventTag;
/**
* Represents the result of a command execution.
@@ -19,13 +21,23 @@ public class CommandResult {
/** The application should exit. */
private final boolean exit;
+ private final Optional eventTag;
+
/**
* Constructs a {@code CommandResult} with the specified fields.
*/
- public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
+ public CommandResult(String feedbackToUser, boolean showHelp, boolean exit, EventTag eventTag) {
this.feedbackToUser = requireNonNull(feedbackToUser);
this.showHelp = showHelp;
this.exit = exit;
+ this.eventTag = Optional.ofNullable(eventTag);
+ }
+
+ /**
+ * Constructs a {@code CommandResult} with the specified fields, with eventTag set to null.
+ */
+ public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
+ this(feedbackToUser, showHelp, exit, null);
}
/**
@@ -33,7 +45,15 @@ public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
* and other fields set to their default value.
*/
public CommandResult(String feedbackToUser) {
- this(feedbackToUser, false, false);
+ this(feedbackToUser, false, false, null);
+ }
+
+ /**
+ * Constructs a {@code CommandResult} with the specified {@code feedbackToUser} and {@code eventTag},
+ * and other fields set to their default value.
+ */
+ public CommandResult(String feedbackToUser, EventTag eventTag) {
+ this(feedbackToUser, false, false, eventTag);
}
public String getFeedbackToUser() {
@@ -48,6 +68,10 @@ public boolean isExit() {
return exit;
}
+ public Optional getEventTag() {
+ return eventTag;
+ }
+
@Override
public boolean equals(Object other) {
if (other == this) {
diff --git a/src/main/java/seedu/address/logic/commands/CtagCommand.java b/src/main/java/seedu/address/logic/commands/CtagCommand.java
new file mode 100644
index 00000000000..c2da28dcb46
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/CtagCommand.java
@@ -0,0 +1,108 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_END_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EVENT_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_START_DATE;
+
+import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+
+
+/**
+ * Adds a tag to the address book.
+ */
+public class CtagCommand extends Command {
+
+ public static final String COMMAND_WORD = "ctag";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a tag or event tag to the address book. "
+ + "Parameters: "
+ + "tagName\n"
+ + "Example: " + COMMAND_WORD + " "
+ + "FRIEND\n"
+ + "or " + COMMAND_WORD + " " + PREFIX_EVENT_TAG + " eventName" + " "
+ + PREFIX_DESCRIPTION + " Description" + " "
+ + PREFIX_START_DATE + "yyyy-MM-dd HH:mm:ss" + " "
+ + PREFIX_END_DATE + "yyyy-MM-dd HH:mm:ss" + " \n"
+ + "Example: " + COMMAND_WORD + " "
+ + "t/E-orientation dc/Orientation! sd/2024-04-04 02:02:02 ed/2024-04-05 02:02:02";
+
+ public static final String MESSAGE_SUCCESS_TAG = "New tag added: %1$s";
+ public static final String MESSAGE_SUCCESS_EVENT_TAG = "New event tag added: %1$s";
+ public static final String MESSAGE_DUPLICATE_TAG = "This tag already exists in the address book";
+ public static final String MESSAGE_DUPLICATE_EVENT_TAG = "This EventTag already exists in the address book";
+ public static final String MESSAGE_FAILED = "Failed to add any tag or event tag.";
+ private final Tag toAdd;
+ private final EventTag toAddEvent;
+
+ /**
+ * Creates an CtagCommand to add the specified {@code Person}
+ */
+ public CtagCommand(Tag toAdd, EventTag toAddEvent) {
+ this.toAdd = toAdd;
+ this.toAddEvent = toAddEvent;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+
+ boolean isEventTag = toAddEvent != null;
+ boolean isTag = toAdd != null;
+
+ if (isTag) {
+ if (model.hasTag(toAdd)) {
+ throw new CommandException(MESSAGE_DUPLICATE_TAG);
+ }
+ model.addTag(toAdd);
+ return new CommandResult(String.format(MESSAGE_SUCCESS_TAG, toAdd));
+ }
+
+ if (isEventTag) {
+ if (model.hasEventTag(toAddEvent.tagName)) {
+ throw new CommandException(MESSAGE_DUPLICATE_EVENT_TAG);
+ }
+ model.addEventTag(toAddEvent);
+ return new CommandResult(String.format(MESSAGE_SUCCESS_EVENT_TAG, toAddEvent));
+ }
+ return new CommandResult(MESSAGE_FAILED);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof CtagCommand)) {
+ return false;
+ }
+
+ CtagCommand e = (CtagCommand) other;
+ boolean tagType = toAddEvent == null && e.toAddEvent == null
+ && toAdd != null && e.toAdd != null;
+ if (tagType) {
+ return toAdd.equals(e.toAdd);
+ }
+ boolean eTagType = toAddEvent != null && e.toAddEvent != null
+ && toAdd == null && e.toAdd == null;
+ if (eTagType) {
+ return toAddEvent.equals(e.toAddEvent);
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this)
+ .add("toAdd", toAdd)
+ .add("toAddEventTag", toAddEvent)
+ .toString();
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
index 1135ac19b74..26b29a64cc8 100644
--- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java
+++ b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
@@ -3,6 +3,8 @@
import static java.util.Objects.requireNonNull;
import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
import seedu.address.commons.core.index.Index;
import seedu.address.commons.util.ToStringBuilder;
@@ -12,37 +14,60 @@
import seedu.address.model.person.Person;
/**
- * Deletes a person identified using it's displayed index from the address book.
+ * Deletes a person identified using it's displayed index or displayed name 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";
+ + ": Deletes the person identified by the index number or full name used in the displayed person list.\n"
+ + "Parameters: INDEX (must be a positive integer) or NAME (must be the exact full name)\n"
+ + "Example: " + COMMAND_WORD + " 1" + "or" + COMMAND_WORD + " John Doe";
+ public static final String MESSAGE_DELETE_PERSON_ERROR = "Please provide either a name or index to delete.";
public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
-
private final Index targetIndex;
-
- public DeleteCommand(Index targetIndex) {
+ private final String targetName;
+
+ /**
+ * Constructs a DeleteCommand with the specified target index and target name.
+ *
+ * @param targetIndex The index of the person to be deleted.
+ * @param targetName The name of the person to be deleted.
+ */
+ public DeleteCommand(Index targetIndex, String targetName) {
this.targetIndex = targetIndex;
+ this.targetName = targetName;
}
@Override
public CommandResult execute(Model model) throws CommandException {
requireNonNull(model);
List lastShownList = model.getFilteredPersonList();
-
- if (targetIndex.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ String dummyName = " ";
+
+ if (targetIndex != null) {
+ 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, Messages.format(personToDelete)));
+
+ } else if (targetName != dummyName) {
+ Optional personToFind = lastShownList.stream().filter(person -> person.getName()
+ .toString().equals(targetName)).findFirst();
+ if (personToFind.isPresent()) {
+ Person personToDelete = personToFind.get();
+ model.deletePerson(personToDelete);
+ return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, Messages.format(personToDelete)));
+ } else {
+ throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_NAME);
+ }
+ } else {
+ throw new CommandException(MESSAGE_DELETE_PERSON_ERROR);
}
-
- Person personToDelete = lastShownList.get(targetIndex.getZeroBased());
- model.deletePerson(personToDelete);
- return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, Messages.format(personToDelete)));
}
@Override
@@ -57,13 +82,15 @@ public boolean equals(Object other) {
}
DeleteCommand otherDeleteCommand = (DeleteCommand) other;
- return targetIndex.equals(otherDeleteCommand.targetIndex);
+ return Objects.equals(targetIndex, otherDeleteCommand.targetIndex)
+ && Objects.equals(targetName, otherDeleteCommand.targetName);
}
@Override
public String toString() {
return new ToStringBuilder(this)
.add("targetIndex", targetIndex)
+ .add("targetName", targetName)
.toString();
}
}
diff --git a/src/main/java/seedu/address/logic/commands/DeventCommand.java b/src/main/java/seedu/address/logic/commands/DeventCommand.java
new file mode 100644
index 00000000000..635674427f3
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/DeventCommand.java
@@ -0,0 +1,73 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+
+import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.tag.EventTag;
+
+/**
+ * Format devent command for EventBook that deletes a tag.
+ */
+public class DeventCommand extends Command {
+
+ public static final String COMMAND_WORD = "devent";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": delete an event tag from the list\n"
+ + "Parameters: "
+ + "EventTag name\n"
+ + "Example: " + COMMAND_WORD + " "
+ + "FRIEND\n";
+
+ public static final String MESSAGE_SUCCESS_DELETE = "Deleted event tag %1$s";
+ public static final String MESSAGE_NO_EVENT_TAG = "This EventTag does not exists in the address book";
+ public static final String MESSAGE_FAILED = "Failed to remove event tag.";
+ private final String tagName;
+
+ /**
+ * Creates an CtagCommand to add the specified {@code Person}
+ */
+ public DeventCommand(String tagName) {
+ this.tagName = tagName;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ if (!model.hasEventTag(tagName)) {
+ throw new CommandException(MESSAGE_NO_EVENT_TAG);
+ }
+ //get event tag to be used for checking
+ EventTag et = model.getEventTag(tagName);
+ model.clearCurrentEventTag();
+ model.updateTagPersonList(et);
+ model.deleteEventTag(et);
+ model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ return new CommandResult(String.format(MESSAGE_SUCCESS_DELETE, et));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof seedu.address.logic.commands.DeventCommand)) {
+ return false;
+ }
+
+ seedu.address.logic.commands.DeventCommand e = (seedu.address.logic.commands.DeventCommand) other;
+ return this.tagName == ((DeventCommand) other).tagName;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this)
+ .add("tagName", tagName)
+ .toString();
+ }
+}
+
diff --git a/src/main/java/seedu/address/logic/commands/DtagCommand.java b/src/main/java/seedu/address/logic/commands/DtagCommand.java
new file mode 100644
index 00000000000..663efae800d
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/DtagCommand.java
@@ -0,0 +1,67 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+
+import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.Messages;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.tag.Tag;
+
+
+/**
+ * Deletes a tag from the address book.
+ */
+public class DtagCommand extends Command {
+
+ public static final String COMMAND_WORD = "dtag";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + ": Deletes the tag identified by the name used in the displayed tag list.\n"
+ + "Parameters: TAGNAME\n"
+ + "Example: " + COMMAND_WORD + " FRIEND";
+
+ public static final String MESSAGE_DELETE_TAG_SUCCESS = "Deleted Tag: %1$s";
+
+ private final String tagName;
+
+ public DtagCommand(String tagName) {
+ this.tagName = tagName;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+
+ Tag dummyTag = new Tag(tagName);
+ if (!model.hasTag(dummyTag)) {
+ throw new CommandException(Messages.MESSAGE_INVALID_TAG);
+ }
+ model.deleteTag(dummyTag);
+ model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ return new CommandResult(String.format(MESSAGE_DELETE_TAG_SUCCESS, tagName));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof DtagCommand)) {
+ return false;
+ }
+
+ DtagCommand otherDeleteCommand = (DtagCommand) other;
+ return tagName.equals(otherDeleteCommand.tagName);
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this)
+ .add("tagName", tagName)
+ .toString();
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 4b581c7331e..620c7a838b9 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -26,6 +26,7 @@
import seedu.address.model.person.Name;
import seedu.address.model.person.Person;
import seedu.address.model.person.Phone;
+import seedu.address.model.tag.EventTag;
import seedu.address.model.tag.Tag;
/**
@@ -36,9 +37,9 @@ 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. "
+ + "by the index number or the name used in the displayed person list. "
+ "Existing values will be overwritten by the input values.\n"
- + "Parameters: INDEX (must be a positive integer) "
+ + "Parameters: INDEX (must be a positive integer) or NAME (must be the exact name saved)"
+ "[" + PREFIX_NAME + "NAME] "
+ "[" + PREFIX_PHONE + "PHONE] "
+ "[" + PREFIX_EMAIL + "EMAIL] "
@@ -49,21 +50,24 @@ public class EditCommand extends Command {
+ PREFIX_EMAIL + "johndoe@example.com";
public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s";
+ public static final String MESSAGE_EDIT_PERSON_ERROR = "Please provide either a valid name or index to edit.";
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 String name;
private final EditPersonDescriptor editPersonDescriptor;
/**
* @param index of the person in the filtered person list to edit
+ * @param name 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);
+ public EditCommand(Index index, String name, EditPersonDescriptor editPersonDescriptor) {
requireNonNull(editPersonDescriptor);
this.index = index;
+ this.name = name;
this.editPersonDescriptor = new EditPersonDescriptor(editPersonDescriptor);
}
@@ -71,21 +75,43 @@ public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {
public CommandResult execute(Model model) throws CommandException {
requireNonNull(model);
List lastShownList = model.getFilteredPersonList();
+ String dummyName = " ";
- if (index.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
+ if (index != null) {
+ 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);
- Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
+ if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
+ throw new CommandException(MESSAGE_DUPLICATE_PERSON);
+ }
- 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, Messages.format(editedPerson)));
+
+ } else if (name != dummyName) {
+ Optional personToFind = lastShownList.stream().filter(person -> person.getName()
+ .toString().equals(name)).findFirst();
+
+ if (personToFind.isPresent()) {
+ Person personToEdit = personToFind.get();
+ 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, Messages.format(editedPerson)));
+ } else {
+ throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_NAME);
+ }
+ } else {
+ throw new CommandException(MESSAGE_EDIT_PERSON_ERROR);
}
-
- model.setPerson(personToEdit, editedPerson);
- model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
- return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson)));
}
/**
@@ -100,8 +126,9 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
Address updatedAddress = editPersonDescriptor.getAddress().orElse(personToEdit.getAddress());
Set updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
+ Set updatedEventTags = editPersonDescriptor.getEventTags().orElse(personToEdit.getEventTags());
- return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress, updatedTags);
+ return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress, updatedTags, updatedEventTags);
}
@Override
@@ -116,14 +143,20 @@ public boolean equals(Object other) {
}
EditCommand otherEditCommand = (EditCommand) other;
- return index.equals(otherEditCommand.index)
- && editPersonDescriptor.equals(otherEditCommand.editPersonDescriptor);
+ boolean indexEquals = (index == null && otherEditCommand.index == null)
+ || (index != null && index.equals(otherEditCommand.index));
+ boolean nameEquals = (name == null && otherEditCommand.name == null)
+ || (name != null && name.equals(otherEditCommand.name));
+ boolean descriptorEquals = editPersonDescriptor.equals(otherEditCommand.editPersonDescriptor);
+
+ return indexEquals && nameEquals && descriptorEquals;
}
@Override
public String toString() {
return new ToStringBuilder(this)
.add("index", index)
+ .add("name", name)
.add("editPersonDescriptor", editPersonDescriptor)
.toString();
}
@@ -138,6 +171,7 @@ public static class EditPersonDescriptor {
private Email email;
private Address address;
private Set tags;
+ private Set eventTags;
public EditPersonDescriptor() {}
@@ -151,6 +185,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
setEmail(toCopy.email);
setAddress(toCopy.address);
setTags(toCopy.tags);
+ setEventTags(toCopy.eventTags);
}
/**
@@ -209,6 +244,23 @@ public Optional> getTags() {
return (tags != null) ? Optional.of(Collections.unmodifiableSet(tags)) : Optional.empty();
}
+ /**
+ * Sets {@code eventTags} to this object's {@code eventTags}.
+ * A defensive copy of {@code tags} is used internally.
+ */
+ public void setEventTags(Set eventTag) {
+ this.eventTags = (eventTag != null) ? new HashSet<>(eventTag) : null;
+ }
+
+ /**
+ * Returns an unmodifiable event tag set, which throws {@code UnsupportedOperationException}
+ * if modification is attempted.
+ * Returns {@code Optional#empty()} if {@code eventTag} is null.
+ */
+ public Optional> getEventTags() {
+ return (eventTags != null) ? Optional.of(Collections.unmodifiableSet(eventTags)) : Optional.empty();
+ }
+
@Override
public boolean equals(Object other) {
if (other == this) {
diff --git a/src/main/java/seedu/address/logic/commands/ExportCommand.java b/src/main/java/seedu/address/logic/commands/ExportCommand.java
new file mode 100644
index 00000000000..b0d1ccef682
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/ExportCommand.java
@@ -0,0 +1,105 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.commands.ImportExportSyntax.FIELDS;
+import static seedu.address.logic.commands.ImportExportSyntax.NUMBER_OF_FIELDS;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
+import java.util.Set;
+
+import javafx.collections.ObservableList;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+
+
+/**
+ * Exports contacts from address book
+ */
+public class ExportCommand extends Command {
+
+ public static final String COMMAND_WORD = "export";
+ public static final String MESSAGE_SUCCESS = "Contacts from address book have been exported!";
+ public static final String MESSAGE_FAILURE = "Something went wrong! Make sure export.csv is not open!";
+ public static final String EXPORT_PATH = "./export/export.csv";
+ private Set exported = new HashSet<>();
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ exportFile(model);
+ return new CommandResult(MESSAGE_SUCCESS);
+ }
+
+ /**
+ * Reads the current address book and exports to ./export/export.csv
+ *
+ * @param model as in execute()
+ * @throws CommandException in the case that the file cannot be written to
+ */
+ private void exportFile(Model model) throws CommandException {
+ ObservableList list = model.getFilteredPersonList();
+
+ try {
+ File exportFile = new File(EXPORT_PATH);
+ FileWriter fw = new FileWriter(exportFile, StandardCharsets.UTF_8);
+
+ for (int i = 0; i < NUMBER_OF_FIELDS; i++) {
+ fw.write(FIELDS.get(i));
+ if (i + 1 != NUMBER_OF_FIELDS) {
+ fw.write(",");
+ }
+ }
+ fw.write("\n");
+
+ for (Person person : list) {
+ fw.write(person.getName().toString());
+ fw.write(",");
+ fw.write(person.getPhone().toString());
+ fw.write(",");
+ fw.write(person.getEmail().toString());
+ fw.write(",");
+ fw.write(person.getAddress().toString());
+ fw.write(",");
+
+ Set eTags = person.getEventTags();
+ StringBuilder eTagsString = new StringBuilder();
+ for (EventTag eTag : eTags) {
+ if (exported.contains(eTag)) {
+ eTagsString.append(eTag.tagName).append("|");
+ } else {
+ exported.add(eTag);
+ eTagsString.append(eTag.getCodeFormat()).append("|");
+ }
+ }
+ if (eTagsString.length() != 0) {
+ eTagsString.deleteCharAt(eTagsString.length() - 1);
+ }
+ fw.write(eTagsString.toString());
+ fw.write(",");
+
+ Set tags = person.getTags();
+ StringBuilder tagsString = new StringBuilder();
+ for (Tag tag : tags) {
+ tagsString.append(tag.tagName).append("|");
+ }
+ if (tagsString.length() != 0) {
+ tagsString.deleteCharAt(tagsString.length() - 1);
+ }
+ fw.write(tagsString.toString());
+ fw.write(",");
+ fw.write("\n");
+ }
+ fw.close();
+
+ } catch (IOException e) {
+ throw new CommandException(MESSAGE_FAILURE);
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ImportCommand.java b/src/main/java/seedu/address/logic/commands/ImportCommand.java
new file mode 100644
index 00000000000..aba0bfd92d8
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/ImportCommand.java
@@ -0,0 +1,226 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.commands.ImportExportSyntax.FIELDS;
+import static seedu.address.logic.commands.ImportExportSyntax.NUMBER_OF_FIELDS;
+import static seedu.address.logic.commands.ImportExportSyntax.PREFIX_MAP;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+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;
+
+/**
+ * Imports contacts from csv
+ */
+public class ImportCommand extends Command {
+
+ public static final String COMMAND_WORD = "import";
+ public static final String MESSAGE_SUCCESS = "Contacts from csv have been added!";
+ public static final String MESSAGE_FILE_NOT_FOUND = "File could not be found! Check import.csv exists at ./import";
+ public static final String MESSAGE_FIELDS_FORMAT_ERROR = "An error occurred while parsing the csv! "
+ + "Check the field values!";
+ public static final String MESSAGE_VALUES_FORMAT_ERROR = "An error occurred while adding persons to the csv!\n "
+ + "The values in the csv are converted to add command format\n"
+ + "Make sure the values match the correct format for the add command!\n"
+ + "The error with the add command occurred as follows:\n";
+ public static final String MESSAGE_EVENTS_FORMAT_ERROR = "An error occurred while parsing the EVENTS/TAGS portion! "
+ + "Make sure the first occurrence values match the correct format for the add command!\n"
+ + "(See UG for more details)\n"
+ + "The error with the command occurred as follows:\n";
+ public static final String DEFAULT_PATH = "./import/import.csv";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + ": Updates the Address book with contacts from the "
+ + "csv file found at given path."
+ + "If path not specified, default path is: " + DEFAULT_PATH + "\n"
+ + "Parameters: path to file (prefixed with f/)\n"
+ + "Example: " + COMMAND_WORD + " f/" + DEFAULT_PATH + "\n"
+ + "Example: " + COMMAND_WORD + " f/";
+
+ private final String path;
+ private final List personsToAdd = new ArrayList<>(); // To hold the person data from the csv
+ private final List commands = new ArrayList<>(); // Holds commands to assign and generate eventTags;
+
+ /**
+ * @param path of the import.csv file containing contacts to import
+ */
+ public ImportCommand(String path) {
+ requireAllNonNull(path);
+ this.path = (path.isEmpty()) ? DEFAULT_PATH : path;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+
+ try { // parse the csv file at the path w scanner
+ parse(model);
+ checkFields(personsToAdd.get(0));
+ personsToAdd.remove(0); // remove the fields
+ addPersons(model);
+ loadEventTags(model);
+
+ } catch (FileNotFoundException e) {
+ throw new CommandException(MESSAGE_FILE_NOT_FOUND);
+ } catch (IndexOutOfBoundsException e) {
+ throw new CommandException(MESSAGE_FIELDS_FORMAT_ERROR);
+ }
+
+ return new CommandResult(MESSAGE_SUCCESS);
+ }
+
+ /**
+ * Parses the data in the csv into the given list
+ * Takes all the values and formats them into add command format
+ * e.g. John -> n/John
+ *
+ */
+ private void parse(Model model) throws FileNotFoundException, IndexOutOfBoundsException, CommandException {
+ StringBuilder currRow = new StringBuilder(); // To hold the current row data
+ Scanner sc = new Scanner(new File(path));
+ sc.useDelimiter(",|\r?\n");
+ int count = 0; // holds an idx to keep track of the current field
+ String personName = "";
+ Boolean fieldsParsed = false;
+
+ while (sc.hasNext()) {
+ String next = sc.next();
+ if (count == 0) {
+ personName = next;
+ }
+
+ if (!next.isEmpty()) { // append the field in the correct format if present
+ String formatted = formatFieldValue(next, FIELDS.get(count), personName, fieldsParsed);
+ currRow.append(formatted);
+ }
+
+ count += 1;
+
+ if (count == NUMBER_OF_FIELDS) { // add the person data to the list once parsed
+ currRow.deleteCharAt(currRow.length() - 1); // remove trailing " "
+ personsToAdd.add(currRow.toString());
+ currRow = new StringBuilder();
+ count = 0;
+ fieldsParsed = true;
+ }
+ }
+ sc.close();
+ }
+
+ /**
+ * Formats the given data field into proper command format
+ * e.g. John -> n/John
+ *
+ * @param fieldValue the value to be formatted
+ * @param field the field the value belongs to
+ * @param personName holds the current persons name
+ * @param fieldsParsed checks for whether fields are being parsed or not
+ * @return the given field value formatted into command format
+ */
+ private String formatFieldValue(String fieldValue, String field, String personName, Boolean fieldsParsed)
+ throws CommandException {
+ final String rmvChar = "\uFEFF";
+ if (fieldValue.startsWith(rmvChar)) { // to remove extra potential characters added due to csv format
+ fieldValue = fieldValue.substring(1);
+ }
+
+ if (field.equalsIgnoreCase("EVENTS") && fieldsParsed) {
+ String[] eTags = fieldValue.split("\\|");
+ for (String eTag : eTags) {
+ handleEventTag(eTag, personName);
+ }
+ return "";
+ }
+
+ String prefix = PREFIX_MAP.get(field);
+ if (field.equalsIgnoreCase("TAGS") && fieldsParsed) { // handle case of multiple tags in field
+ String[] tags = fieldValue.split("\\|");
+ StringBuilder tagString = new StringBuilder();
+ for (String tag : tags) {
+ tagString.append(prefix).append(tag).append(" ");
+ }
+ return tagString.toString();
+ }
+
+ return prefix + fieldValue + " ";
+ }
+
+ /**
+ * Manages the eventTags to create and assign
+ *
+ * @param details holds the eventTag details
+ */
+ private void handleEventTag(String details, String personName) throws CommandException {
+ if (!details.equals("N/A") && !details.equalsIgnoreCase("EVENTS")) {
+ try {
+ AddressBookParser addressBookParser = new AddressBookParser();
+ if (details.trim().split(" ").length != 1) { // case where event is defined
+ commands.add(addressBookParser.parseCommand("ctag " + details));
+ String eventName = details.trim().split(" ")[0].substring(2);
+ commands.add(addressBookParser.parseCommand("assign " + personName + "t/" + eventName));
+ } else { // case where only event name is given
+ commands.add(addressBookParser.parseCommand("assign " + personName + "t/E-" + details));
+ }
+ } catch (ParseException e) {
+ throw new CommandException(MESSAGE_EVENTS_FORMAT_ERROR + e.getMessage());
+ }
+ }
+ }
+
+ private void loadEventTags(Model model) throws CommandException {
+ try {
+ AddressBookParser addressBookParser = new AddressBookParser();
+ // access model and add/assign events into address book
+ for (Command command : commands) {
+ command.execute(model);
+ }
+ } catch (CommandException e) {
+ throw new CommandException(MESSAGE_EVENTS_FORMAT_ERROR + e.getMessage());
+ }
+ }
+
+ /**
+ * Returns True if given String matches the number and order of fields specified in FIELDS
+ *
+ * @param fieldString String parsed from the first row of the csv file
+ */
+ private void checkFields(String fieldString) throws CommandException {
+ StringBuilder fields = new StringBuilder();
+ for (String field: FIELDS) {
+ fields.append(PREFIX_MAP.get(field));
+ fields.append(field).append(" ");
+ }
+ fields.deleteCharAt(fields.length() - 1); // adjust for extra " "
+ if (!fieldString.equalsIgnoreCase(fields.toString())) {
+ throw new CommandException(MESSAGE_FIELDS_FORMAT_ERROR);
+ }
+ }
+
+ /**
+ * Adds the person data from the list to the addressbook
+ * Simulates the work of AddressBookParser
+ *
+ * @param model reference to the model to add the data into
+ */
+ private void addPersons(Model model) throws CommandException {
+ try {
+ AddressBookParser addressBookParser = new AddressBookParser();
+ // access model and add people into address book
+ for (String person : personsToAdd) {
+ String commandText = "add " + person;
+ Command command = addressBookParser.parseCommand(commandText);
+ command.execute(model);
+ }
+ } catch (CommandException | ParseException e) {
+ throw new CommandException(MESSAGE_VALUES_FORMAT_ERROR);
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ImportExportSyntax.java b/src/main/java/seedu/address/logic/commands/ImportExportSyntax.java
new file mode 100644
index 00000000000..557fd8fdf34
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/ImportExportSyntax.java
@@ -0,0 +1,23 @@
+package seedu.address.logic.commands;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Contains Command Line Interface (CLI) syntax definitions common to multiple commands
+ */
+public class ImportExportSyntax {
+ public static final List FIELDS = List.of(
+ "NAME", "NUMBER", "EMAIL", "ADDRESS", "EVENTS", "TAGS"
+ ); // TO hold the fields present in the csv
+ public static final int NUMBER_OF_FIELDS = FIELDS.size();
+
+ public static final Map PREFIX_MAP = Map.of(
+ "NAME", "n/",
+ "NUMBER", "p/",
+ "EMAIL", "e/",
+ "ADDRESS", "a/",
+ "TAGS", "t/",
+ "EVENTS", ""
+ ); // To format the data in the csv to command format
+}
diff --git a/src/main/java/seedu/address/logic/commands/ListCommand.java b/src/main/java/seedu/address/logic/commands/ListCommand.java
index 84be6ad2596..09b44bf7320 100644
--- a/src/main/java/seedu/address/logic/commands/ListCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ListCommand.java
@@ -1,6 +1,7 @@
package seedu.address.logic.commands;
import static java.util.Objects.requireNonNull;
+import static seedu.address.model.AddressBook.DEFAULT_EVENT_TAG;
import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
import seedu.address.model.Model;
@@ -14,11 +15,11 @@ public class ListCommand extends Command {
public static final String MESSAGE_SUCCESS = "Listed all persons";
-
@Override
public CommandResult execute(Model model) {
requireNonNull(model);
+ model.clearCurrentEventTag();
model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
- return new CommandResult(MESSAGE_SUCCESS);
+ return new CommandResult(MESSAGE_SUCCESS, DEFAULT_EVENT_TAG);
}
}
diff --git a/src/main/java/seedu/address/logic/commands/SearchTagCommand.java b/src/main/java/seedu/address/logic/commands/SearchTagCommand.java
new file mode 100644
index 00000000000..3d50a5ea1f5
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/SearchTagCommand.java
@@ -0,0 +1,63 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Format search instructions for every command for display.
+ */
+public class SearchTagCommand extends Command {
+
+ public static final String COMMAND_WORD = "search";
+
+ public static final String MESSAGE_SUCCESS = "found all person with the tag";
+
+ public static final String MESSAGE_NO_TAG = "no person with this tag is found";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + ": Search people who are associated with this tag "
+ + "by listing the person that it is associated with.\n"
+ + "Parameters: TAG (must be an existing tag) "
+ + "[TAG]\n"
+ + "Example: " + COMMAND_WORD + " school";
+
+ private final Tag tag;
+
+ /**
+ * The constructor for SearchCommand
+ * @param tag the tag that you want to search the list for
+ */
+ public SearchTagCommand(Tag tag) {
+ requireAllNonNull(tag);
+ this.tag = tag;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ if (!model.hasTag(tag)) {
+ throw new CommandException(MESSAGE_NO_TAG);
+ }
+ model.updateTagPersonList(tag);
+ return new CommandResult(MESSAGE_SUCCESS);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof SearchTagCommand)) {
+ return false;
+ }
+
+ SearchTagCommand e = (SearchTagCommand) other;
+ return tag.equals(e.tag);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/SwitchCommand.java b/src/main/java/seedu/address/logic/commands/SwitchCommand.java
new file mode 100644
index 00000000000..6126c186459
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/SwitchCommand.java
@@ -0,0 +1,76 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.time.format.DateTimeFormatter;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Switch command to toggle between different events.
+ */
+public class SwitchCommand extends Command {
+
+ public static final String COMMAND_WORD = "switch";
+
+ public static final String MESSAGE_SUCCESS = "Found all persons with the tag.";
+
+ public static final String MESSAGE_SUCCESS_EVENT_TAG = "Displaying all persons in the event: ";
+ public static final String MESSAGE_NO_EVENT_TAG = "No such event found.";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + ": Finds people who are associated with this tag "
+ + "by listing the person that it is associated with.\n"
+ + "Parameters: TAG (must be an existing tag) "
+ + "[TAG]\n"
+ + "Example: " + COMMAND_WORD + " school";
+
+ private final Tag tag;
+
+ /**
+ * The constructor for SwitchCommand
+ * @param tag the tag that you want to search the list for
+ */
+ public SwitchCommand(Tag tag) {
+ requireAllNonNull(tag);
+ this.tag = tag;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ if (!model.hasEventTag(tag.tagName)) {
+ throw new CommandException(MESSAGE_NO_EVENT_TAG);
+ }
+ EventTag eventTag = model.getEventTag(tag.tagName);
+ model.updateEventTagPersonList(eventTag);
+ return new CommandResult(getEventTagDescription(eventTag), eventTag);
+ }
+
+ private String getEventTagDescription(EventTag eventTag) {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM d, yyyy HH:mm a");
+ return MESSAGE_SUCCESS_EVENT_TAG + eventTag.tagName + "\n"
+ + "Description: " + eventTag.description + "\n"
+ + "Start Date: " + eventTag.startDate.format(formatter) + "\n"
+ + "End Date: " + eventTag.endDate.format(formatter) + "\n";
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof SwitchCommand)) {
+ return false;
+ }
+
+ SwitchCommand e = (SwitchCommand) other;
+ return tag.equals(e.tag);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
index 4ff1a97ed77..16c83146858 100644
--- a/src/main/java/seedu/address/logic/parser/AddCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
@@ -7,6 +7,7 @@
import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import java.util.HashSet;
import java.util.Set;
import java.util.stream.Stream;
@@ -45,7 +46,7 @@ public AddCommand parse(String args) throws ParseException {
Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
Set tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
- Person person = new Person(name, phone, email, address, tagList);
+ Person person = new Person(name, phone, email, address, tagList, new HashSet<>());
return new AddCommand(person);
}
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
index 3149ee07e0b..7a96e40a860 100644
--- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -9,14 +9,22 @@
import seedu.address.commons.core.LogsCenter;
import seedu.address.logic.commands.AddCommand;
+import seedu.address.logic.commands.AssignCommand;
import seedu.address.logic.commands.ClearCommand;
import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CtagCommand;
import seedu.address.logic.commands.DeleteCommand;
+import seedu.address.logic.commands.DeventCommand;
+import seedu.address.logic.commands.DtagCommand;
import seedu.address.logic.commands.EditCommand;
import seedu.address.logic.commands.ExitCommand;
+import seedu.address.logic.commands.ExportCommand;
import seedu.address.logic.commands.FindCommand;
import seedu.address.logic.commands.HelpCommand;
+import seedu.address.logic.commands.ImportCommand;
import seedu.address.logic.commands.ListCommand;
+import seedu.address.logic.commands.SearchTagCommand;
+import seedu.address.logic.commands.SwitchCommand;
import seedu.address.logic.parser.exceptions.ParseException;
/**
@@ -65,6 +73,12 @@ public Command parseCommand(String userInput) throws ParseException {
case ClearCommand.COMMAND_WORD:
return new ClearCommand();
+ case CtagCommand.COMMAND_WORD:
+ return new CtagCommandParser().parse(arguments);
+
+ case DtagCommand.COMMAND_WORD:
+ return new DtagCommandParser().parse(arguments);
+
case FindCommand.COMMAND_WORD:
return new FindCommandParser().parse(arguments);
@@ -77,6 +91,24 @@ public Command parseCommand(String userInput) throws ParseException {
case HelpCommand.COMMAND_WORD:
return new HelpCommand();
+ case ImportCommand.COMMAND_WORD:
+ return new ImportCommandParser().parse(arguments);
+
+ case ExportCommand.COMMAND_WORD:
+ return new ExportCommand();
+
+ case SearchTagCommand.COMMAND_WORD:
+ return new SearchCommandParser().parse(arguments);
+
+ case AssignCommand.COMMAND_WORD:
+ return new AssignCommandParser().parse(arguments);
+
+ case SwitchCommand.COMMAND_WORD:
+ return new SwitchCommandParser().parse(arguments);
+
+ case DeventCommand.COMMAND_WORD:
+ return new DeventCommandParser().parse(arguments);
+
default:
logger.finer("This user input caused a ParseException: " + userInput);
throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
diff --git a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java b/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
index 5c9aebfa488..8dad4406de6 100644
--- a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
+++ b/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
@@ -69,7 +69,7 @@ private static List findPrefixPositions(String argsString, Prefi
* {@code argsString} = "e/hi p/900", {@code prefix} = "p/" and
* {@code fromIndex} = 0, this method returns 5.
*/
- private static int findPrefixPosition(String argsString, String prefix, int fromIndex) {
+ public static int findPrefixPosition(String argsString, String prefix, int fromIndex) {
int prefixIndex = argsString.indexOf(" " + prefix, fromIndex);
return prefixIndex == -1 ? -1
: prefixIndex + 1; // +1 as offset for whitespace
diff --git a/src/main/java/seedu/address/logic/parser/AssignCommandParser.java b/src/main/java/seedu/address/logic/parser/AssignCommandParser.java
new file mode 100644
index 00000000000..18d0b897000
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/AssignCommandParser.java
@@ -0,0 +1,69 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AssignCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.Name;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Parses input arguments and creates a new AssignCommand object
+ */
+public class AssignCommandParser implements Parser {
+ @Override
+ public AssignCommand parse(String userInput) throws ParseException {
+ String[] args = userInput.trim().split("t/");
+ String nameOrIndex = args[0];
+ String tags = " t/" + String.join(" t/", Arrays.copyOfRange(args, 1, args.length));
+
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(tags, PREFIX_TAG);
+ if (!arePrefixesPresent(argMultimap, PREFIX_TAG)
+ || userInput.equals("")) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AssignCommand.MESSAGE_USAGE));
+ }
+
+ Set tagList = new HashSet<>();
+ Set eventTagList = new HashSet<>();
+
+ for (String tagValue : argMultimap.getAllValues(PREFIX_TAG)) {
+ if (tagValue.startsWith("E-")) {
+ Tag eventTag = ParserUtil.parseEventTag(tagValue.substring(2));
+ eventTagList.add(eventTag);
+ } else {
+ Tag normalTag = ParserUtil.parseTag(tagValue);
+ tagList.add(normalTag);
+ }
+ }
+
+ try {
+ Object parsedObject = ParserUtil.parseNameIndex(nameOrIndex);
+ if (parsedObject instanceof Index) {
+ Index index = (Index) parsedObject;
+ String dummyName = " ";
+ return new AssignCommand(index, dummyName, tagList, eventTagList);
+ } else if (parsedObject instanceof Name) {
+ Name name = (Name) parsedObject;
+ String nameString = name.toString();
+ return new AssignCommand(null, nameString, tagList, eventTagList);
+ } else {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AssignCommand.MESSAGE_USAGE));
+ }
+ } catch (ParseException pe) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AssignCommand.MESSAGE_USAGE), pe);
+ }
+ }
+
+ 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/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
index 75b1a9bf119..282f1e0808b 100644
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -11,5 +11,9 @@ public class CliSyntax {
public static final Prefix PREFIX_EMAIL = new Prefix("e/");
public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
public static final Prefix PREFIX_TAG = new Prefix("t/");
-
+ public static final Prefix PREFIX_FILE = new Prefix("f/");
+ public static final Prefix PREFIX_EVENT_TAG = new Prefix("t/E-");
+ public static final Prefix PREFIX_START_DATE = new Prefix("sd/");
+ public static final Prefix PREFIX_END_DATE = new Prefix("ed/");
+ public static final Prefix PREFIX_DESCRIPTION = new Prefix("dc/");
}
diff --git a/src/main/java/seedu/address/logic/parser/CtagCommandParser.java b/src/main/java/seedu/address/logic/parser/CtagCommandParser.java
new file mode 100644
index 00000000000..ea9d522d192
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/CtagCommandParser.java
@@ -0,0 +1,73 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_END_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EVENT_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_START_DATE;
+
+import java.time.LocalDateTime;
+import java.util.stream.Stream;
+
+import seedu.address.logic.commands.CtagCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+/**
+ * Parses input arguments and creates a new CtagCommand object.
+ */
+public class CtagCommandParser implements Parser {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the CtagCommand
+ * and returns a CtagCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ @Override
+ public CtagCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+ String tagName = args.trim();
+ CtagCommand cmd = new CtagCommand(null, null);
+ if (tagName.isEmpty()) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, CtagCommand.MESSAGE_USAGE));
+ }
+
+ boolean isEventTag = ArgumentTokenizer.findPrefixPosition(args, PREFIX_EVENT_TAG.getPrefix(), 0) != -1;
+ boolean isTag = tagName.split(" ").length == 1;
+ //check type of tag: e-tag or normal tag
+ if (isTag) {
+ //if we have a tag string
+ Tag tag = ParserUtil.parseTag(tagName);
+ cmd = new CtagCommand(tag, null);
+ } else if (isEventTag) {
+ //if we have an event tag
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args,
+ PREFIX_EVENT_TAG, PREFIX_DESCRIPTION, PREFIX_START_DATE, PREFIX_END_DATE);
+ if (!containsAllPrefix(argMultimap,
+ PREFIX_EVENT_TAG, PREFIX_DESCRIPTION, PREFIX_START_DATE, PREFIX_END_DATE)
+ || !argMultimap.getPreamble().isEmpty()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, CtagCommand.MESSAGE_USAGE));
+ }
+ argMultimap.verifyNoDuplicatePrefixesFor(
+ PREFIX_EVENT_TAG, PREFIX_DESCRIPTION, PREFIX_START_DATE, PREFIX_END_DATE);
+ String name = argMultimap.getValue(PREFIX_EVENT_TAG).get();
+ LocalDateTime sd = ParserUtil.parseDateTime(argMultimap.getValue(PREFIX_START_DATE).get());
+ LocalDateTime ed = ParserUtil.parseDateTime(argMultimap.getValue(PREFIX_END_DATE).get());
+ String description = argMultimap.getValue(PREFIX_DESCRIPTION).get();
+ EventTag eventTag = new EventTag(name, description, sd, ed);
+ cmd = new CtagCommand(null, eventTag);
+ }
+ return cmd;
+ }
+
+ /**
+ * Check if all prefixes have input, returns true if so
+ * and returns a CtagCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public boolean containsAllPrefix(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
+ return Stream.of(prefixes).allMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java b/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java
index 3527fe76a3e..492a17def37 100644
--- a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java
@@ -5,6 +5,7 @@
import seedu.address.commons.core.index.Index;
import seedu.address.logic.commands.DeleteCommand;
import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.Name;
/**
* Parses input arguments and creates a new DeleteCommand object
@@ -18,12 +19,21 @@ public class DeleteCommandParser implements Parser {
*/
public DeleteCommand parse(String args) throws ParseException {
try {
- Index index = ParserUtil.parseIndex(args);
- return new DeleteCommand(index);
+ Object parsedObject = ParserUtil.parseNameIndex(args);
+ if (parsedObject instanceof Index) {
+ Index index = (Index) parsedObject;
+ String dummyName = " ";
+ return new DeleteCommand(index, dummyName);
+ } else if (parsedObject instanceof Name) {
+ Name name = (Name) parsedObject;
+ String nameString = name.toString();
+ return new DeleteCommand(null, nameString);
+ } else {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
+ }
} catch (ParseException pe) {
throw new ParseException(
String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE), pe);
}
}
-
}
diff --git a/src/main/java/seedu/address/logic/parser/DeventCommandParser.java b/src/main/java/seedu/address/logic/parser/DeventCommandParser.java
new file mode 100644
index 00000000000..451f2091158
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/DeventCommandParser.java
@@ -0,0 +1,30 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.logic.commands.DeventCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+/**
+ * Parser for the devent command.
+ */
+public class DeventCommandParser {
+ /**
+ * Parses the given {@code String} of arguments in the context of the DeventCommand
+ * and returns a DeventCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public DeventCommand parse(String args) throws ParseException {
+ String trimmedArgs = args.trim();
+ if (trimmedArgs.isEmpty()) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeventCommand.MESSAGE_USAGE));
+ }
+ String[] nameKeywords = trimmedArgs.split(" ");
+ if (nameKeywords.length != 1) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeventCommand.MESSAGE_USAGE));
+ }
+ String tagName = nameKeywords[0];
+ return new DeventCommand(tagName);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/DtagCommandParser.java b/src/main/java/seedu/address/logic/parser/DtagCommandParser.java
new file mode 100644
index 00000000000..7ff19e91c5f
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/DtagCommandParser.java
@@ -0,0 +1,29 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.logic.commands.DtagCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new DtagCommand object
+ */
+public class DtagCommandParser implements Parser {
+ /**
+ * Parses the given {@code String} of arguments in the context of the DtagCommand
+ * and returns a DtagCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ @Override
+ public DtagCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+ String tagName = args.trim();
+ if (tagName.isEmpty() || tagName.contains(" ")) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DtagCommand.MESSAGE_USAGE));
+ }
+
+ return new DtagCommand(tagName);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
index 46b3309a78b..ee47e83c216 100644
--- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -17,6 +17,7 @@
import seedu.address.logic.commands.EditCommand;
import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.Name;
import seedu.address.model.tag.Tag;
/**
@@ -34,10 +35,19 @@ public EditCommand parse(String args) throws ParseException {
ArgumentMultimap argMultimap =
ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_TAG);
- Index index;
+ Index index = null;
+ Name name = null;
+ String dummyName = " ";
try {
- index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ Object parsedObject = ParserUtil.parseNameIndex(argMultimap.getPreamble());
+ if (parsedObject instanceof Index) {
+ index = (Index) parsedObject;
+ } else if (parsedObject instanceof Name) {
+ name = (Name) parsedObject;
+ } else {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
+ }
} catch (ParseException pe) {
throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
}
@@ -63,8 +73,13 @@ public EditCommand parse(String args) throws ParseException {
if (!editPersonDescriptor.isAnyFieldEdited()) {
throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
}
-
- return new EditCommand(index, editPersonDescriptor);
+ if (index != null) {
+ return new EditCommand(index, dummyName, editPersonDescriptor);
+ } else if (name != null) {
+ return new EditCommand(null, name.toString(), editPersonDescriptor);
+ } else {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
+ }
}
/**
diff --git a/src/main/java/seedu/address/logic/parser/ImportCommandParser.java b/src/main/java/seedu/address/logic/parser/ImportCommandParser.java
new file mode 100644
index 00000000000..d460c90dfb6
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/ImportCommandParser.java
@@ -0,0 +1,43 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_FILE;
+
+import java.util.stream.Stream;
+
+import seedu.address.logic.commands.ImportCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new ImportCommand object
+ */
+public class ImportCommandParser implements Parser {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the ImportCommand
+ * and returns an ImportCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public ImportCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args,
+ PREFIX_FILE);
+
+ if (!arePrefixesPresent(argMultimap, PREFIX_FILE)
+ || !argMultimap.getPreamble().isEmpty()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, ImportCommand.MESSAGE_USAGE));
+ }
+
+ String path = argMultimap.getValue(PREFIX_FILE).orElse("");
+ return new ImportCommand(path);
+ }
+
+ /**
+ * 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/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
index b117acb9c55..983fd0e4c08 100644
--- a/src/main/java/seedu/address/logic/parser/ParserUtil.java
+++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -1,13 +1,19 @@
package seedu.address.logic.parser;
import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
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.commands.CtagCommand;
+import seedu.address.logic.commands.EditCommand;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.person.Address;
import seedu.address.model.person.Email;
@@ -21,6 +27,9 @@
public class ParserUtil {
public static final String MESSAGE_INVALID_INDEX = "Index is not a non-zero unsigned integer.";
+ public static final String MESSAGE_INVALID_NAME = "Name is not a valid name in the contacts.";
+ public static final String MESSAGE_INVALID_INDEX_OR_NAME = "Index or Name is invalid.";
+ public static final String MESSAGE_INVALID_TIME_FORMAT = "Format of time is must be of YYYY-MM-DD HH:mm:ss";
/**
* Parses {@code oneBasedIndex} into an {@code Index} and returns it. Leading and trailing whitespaces will be
@@ -50,6 +59,27 @@ public static Name parseName(String name) throws ParseException {
return new Name(trimmedName);
}
+ /**
+ * Parses a {@code String} into an {@code Index} or {@code Name} object based on its content.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @param input The string to parse, which can be either an index or a name.
+ * @return Either an {@code Index} or a {@code Name} object based on the input.
+ * @throws ParseException if the input is neither a valid index nor a valid name.
+ */
+ public static Object parseNameIndex(String input) throws ParseException {
+ String trimmedInput = input.trim();
+ if (trimmedInput.equals("0")) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
+ } else if (StringUtil.isNonZeroUnsignedInteger(trimmedInput)) {
+ return Index.fromOneBased(Integer.parseInt(trimmedInput));
+ } else if (Name.isValidName(trimmedInput)) {
+ return new Name(trimmedInput);
+ } else {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
+ }
+ }
+
/**
* Parses a {@code String phone} into a {@code Phone}.
* Leading and trailing whitespaces will be trimmed.
@@ -95,6 +125,23 @@ public static Email parseEmail(String email) throws ParseException {
return new Email(trimmedEmail);
}
+ /**
+ * Parses a {@code String tag} into a {@code EventTag}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @param tag The string representing the event tag.
+ * @return The parsed EventTag object.
+ * @throws ParseException If the tag string is invalid.
+ */
+ public static Tag parseEventTag(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 a {@code String tag} into a {@code Tag}.
* Leading and trailing whitespaces will be trimmed.
@@ -121,4 +168,23 @@ public static Set parseTags(Collection tags) throws ParseException
}
return tagSet;
}
+
+ /**
+ * Parses a {@code String date} into a {@code LocalDateTime}.
+ * Leading and trailing whitespaces will be trimmed.
+ * The String formatted should be of the pattern "yyyy-MM-dd HH:mm:ss" by default.
+ *
+ * @throws DateTimeParseException if the given {@code tag} is invalid.
+ */
+ public static LocalDateTime parseDateTime(String dateTime) throws ParseException {
+ requireNonNull(dateTime);
+ String trimmedTime = dateTime.trim();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ try {
+ LocalDateTime time = LocalDateTime.parse(trimmedTime, formatter);
+ return time;
+ } catch (Exception e) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, CtagCommand.MESSAGE_USAGE));
+ }
+ }
}
diff --git a/src/main/java/seedu/address/logic/parser/SearchCommandParser.java b/src/main/java/seedu/address/logic/parser/SearchCommandParser.java
new file mode 100644
index 00000000000..865afbbe8dc
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/SearchCommandParser.java
@@ -0,0 +1,32 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.logic.commands.SearchTagCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Parser for the search command.
+ */
+public class SearchCommandParser implements Parser {
+ /**
+ * Parses the given {@code String} of arguments in the context of the SearchCommand
+ * and returns a SearchCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public SearchTagCommand parse(String args) throws ParseException {
+ String trimmedArgs = args.trim();
+ if (trimmedArgs.isEmpty()) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SearchTagCommand.MESSAGE_USAGE));
+ }
+ String[] nameKeywords = trimmedArgs.split(" ");
+ if (nameKeywords.length != 1) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SearchTagCommand.MESSAGE_USAGE));
+ }
+ Tag tag = ParserUtil.parseTag(nameKeywords[0]);
+ return new SearchTagCommand(tag);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/SwitchCommandParser.java b/src/main/java/seedu/address/logic/parser/SwitchCommandParser.java
new file mode 100644
index 00000000000..33e8bf0059e
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/SwitchCommandParser.java
@@ -0,0 +1,33 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.logic.commands.SearchTagCommand;
+import seedu.address.logic.commands.SwitchCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Parser for the switch command.
+ */
+public class SwitchCommandParser implements Parser {
+ /**
+ * Parses the given {@code String} of arguments in the context of the SwitchCommand
+ * and returns a SwitchCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public SwitchCommand parse(String args) throws ParseException {
+ String trimmedArgs = args.trim();
+ if (trimmedArgs.isEmpty()) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SearchTagCommand.MESSAGE_USAGE));
+ }
+ String[] nameKeywords = trimmedArgs.split(" ");
+ if (nameKeywords.length != 1) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SearchTagCommand.MESSAGE_USAGE));
+ }
+
+ return new SwitchCommand(new Tag(nameKeywords[0]));
+ }
+}
diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java
index 73397161e84..c354a32ad1e 100644
--- a/src/main/java/seedu/address/model/AddressBook.java
+++ b/src/main/java/seedu/address/model/AddressBook.java
@@ -2,12 +2,20 @@
import static java.util.Objects.requireNonNull;
+import java.time.LocalDateTime;
+import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
+import java.util.Set;
import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
import seedu.address.commons.util.ToStringBuilder;
import seedu.address.model.person.Person;
import seedu.address.model.person.UniquePersonList;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+import seedu.address.model.tag.UniqueTagList;
/**
* Wraps all data at the address-book level
@@ -15,7 +23,12 @@
*/
public class AddressBook implements ReadOnlyAddressBook {
+ public static final EventTag DEFAULT_EVENT_TAG = new EventTag("All", "All contacts in EventBook",
+ LocalDateTime.parse("2024-04-05T14:00:00"), LocalDateTime.parse("2024-04-05T14:00:00"));
+
private final UniquePersonList persons;
+ private final UniqueTagList tagList;
+ private final UniqueTagList eventTagList;
/*
* The 'unusual' code block below is a non-static initialization block, sometimes used to avoid duplication
@@ -26,6 +39,8 @@ public class AddressBook implements ReadOnlyAddressBook {
*/
{
persons = new UniquePersonList();
+ tagList = new UniqueTagList();
+ eventTagList = new UniqueTagList();
}
public AddressBook() {}
@@ -48,6 +63,14 @@ public void setPersons(List persons) {
this.persons.setPersons(persons);
}
+ public void setTagList(Set tagList) {
+ this.tagList.setTags(tagList);
+ }
+
+ public void setEventTagList(Set eventTagList) {
+ this.eventTagList.setTags(eventTagList);
+ }
+
/**
* Resets the existing data of this {@code AddressBook} with {@code newData}.
*/
@@ -55,9 +78,11 @@ public void resetData(ReadOnlyAddressBook newData) {
requireNonNull(newData);
setPersons(newData.getPersonList());
+ setTagList(newData.getTagList());
+ setEventTagList(newData.getEventTagList());
}
- //// person-level operations
+ //// person-level and tag-level operations
/**
* Returns true if a person with the same identity as {@code person} exists in the address book.
@@ -67,12 +92,85 @@ public boolean hasPerson(Person person) {
return persons.contains(person);
}
+ /**
+ * Returns true if a tag {@code tag} exists in the address book.
+ */
+ public boolean hasTag(Tag tag) {
+ requireNonNull(tag);
+ return tagList.contains(tag);
+ }
+
+ /**
+ * Assigns the given tags {@code tags} to {@code targetPerson}.
+ * {@code tags} 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 assign(Person targetPerson, Set tags, Set eventTags) {
+ targetPerson.addTags(tags);
+ Set eventsToAdd = new HashSet<>();
+ for (Tag t : eventTags) {
+ EventTag eventTag = getEventTag(t.tagName);
+ eventsToAdd.add(eventTag);
+ }
+ targetPerson.addEventTags(eventsToAdd);
+ }
+
+ /**
+ * Returns true if an event tag {@code tag} exists in the address book.
+ */
+ public boolean hasEventTag(EventTag eventTag) {
+ requireNonNull(eventTag);
+ return eventTagList.contains(eventTag);
+ }
+
+ /**
+ * Returns true if an event tag with name {@code eventTagName} exists in the address book.
+ */
+ public boolean hasEventTag(String eventTagName) {
+ requireNonNull(eventTagName);
+ return eventTagList.contains(eventTagName);
+ }
+
/**
* 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);
+ for (Tag tag:p.getTags()) {
+ if (!hasTag(tag)) {
+ addTag(tag);
+ }
+ }
+ for (EventTag eventTag:p.getEventTags()) {
+ if (!hasEventTag(eventTag)) {
+ addEventTag(eventTag);
+ }
+ }
+ }
+
+ /**
+ * Adds a tag to the address book.
+ * The tag must not already exist in the address book.
+ */
+ public void addTag(Tag t) {
+ tagList.add(t);
+ }
+
+ /**
+ * Adds an event tag to the address book.
+ * The event tag must not already exist in the address book.
+ */
+ public void addEventTag(EventTag t) {
+ eventTagList.add(t);
+ }
+
+ /**
+ * Gets an event tag to the address book.
+ * The event tag must not already exist in the address book.
+ */
+ public EventTag getEventTag(String t) {
+ return eventTagList.getEventTag(t);
}
/**
@@ -86,6 +184,28 @@ public void setPerson(Person target, Person editedPerson) {
persons.setPerson(target, editedPerson);
}
+ /**
+ * Replaces the given tag {@code target} in the list with {@code editedTag}.
+ * {@code target} must exist in the address book.
+ * The {@code editedTag} must not be the same as another tag in the address book.
+ */
+ public void setTags(Tag target, Tag editedTag) {
+ requireNonNull(editedTag);
+
+ tagList.replace(target, editedTag);
+ }
+
+ /**
+ * Replaces the given event tag {@code target} in the list with {@code editedTag}.
+ * {@code target} must exist in the address book.
+ * The {@code editedTag} must not be the same as another event tag in the address book.
+ */
+ public void setEventTags(EventTag target, EventTag editedTag) {
+ requireNonNull(editedTag);
+
+ eventTagList.replace(target, editedTag);
+ }
+
/**
* Removes {@code key} from this {@code AddressBook}.
* {@code key} must exist in the address book.
@@ -94,12 +214,36 @@ public void removePerson(Person key) {
persons.remove(key);
}
+ /**
+ * Removes {@code key} from this {@code AddressBook}.
+ * {@code key} must exist in the address book.
+ */
+ public void removeTag(Tag key) {
+ for (Person p:persons) {
+ p.removeTag(key);
+ }
+ tagList.remove(key);
+ }
+
+ /**
+ * Removes {@code key} event tag from this {@code AddressBook}.
+ * {@code key} must exist in the address book.
+ */
+ public void removeEventTag(EventTag key) {
+ for (Person p:persons) {
+ p.removeEventTag(key);
+ }
+ eventTagList.remove(key);
+ }
+
//// util methods
@Override
public String toString() {
return new ToStringBuilder(this)
.add("persons", persons)
+ .add("tags", tagList)
+ .add("event tags", eventTagList)
.toString();
}
@@ -108,6 +252,16 @@ public ObservableList getPersonList() {
return persons.asUnmodifiableObservableList();
}
+ @Override
+ public ObservableSet getTagList() {
+ return tagList.asUnmodifiableObservableSet();
+ }
+
+ @Override
+ public ObservableSet getEventTagList() {
+ return eventTagList.asUnmodifiableObservableSet();
+ }
+
@Override
public boolean equals(Object other) {
if (other == this) {
@@ -120,11 +274,13 @@ public boolean equals(Object other) {
}
AddressBook otherAddressBook = (AddressBook) other;
- return persons.equals(otherAddressBook.persons);
+ return persons.equals(otherAddressBook.persons)
+ && tagList.equals(otherAddressBook.tagList)
+ && eventTagList.equals(otherAddressBook.eventTagList);
}
@Override
public int hashCode() {
- return persons.hashCode();
+ return Objects.hash(persons, tagList, eventTagList);
}
}
diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
index d54df471c1f..dba1403c0a1 100644
--- a/src/main/java/seedu/address/model/Model.java
+++ b/src/main/java/seedu/address/model/Model.java
@@ -1,17 +1,23 @@
package seedu.address.model;
import java.nio.file.Path;
+import java.util.Set;
import java.util.function.Predicate;
import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
import seedu.address.commons.core.GuiSettings;
import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
/**
* The API of the Model component.
*/
public interface Model {
- /** {@code Predicate} that always evaluate to true */
+ /**
+ * {@code Predicate} that always evaluate to true
+ */
Predicate PREDICATE_SHOW_ALL_PERSONS = unused -> true;
/**
@@ -49,7 +55,9 @@ public interface Model {
*/
void setAddressBook(ReadOnlyAddressBook addressBook);
- /** Returns the AddressBook */
+ /**
+ * Returns the AddressBook
+ */
ReadOnlyAddressBook getAddressBook();
/**
@@ -76,12 +84,60 @@ public interface Model {
*/
void setPerson(Person target, Person editedPerson);
- /** Returns an unmodifiable view of the filtered person list */
+ /**
+ * Returns true if a tag with the same identity as {@code tag} exists in the address book.
+ */
+ boolean hasTag(Tag tag);
+
+ /**
+ * Assigns the given tags {@code tags} to {@code targetPerson}.
+ * {@code tags} 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 assign(Person targetPerson, Set tags, Set eventTags);
+
+ /**
+ * Deletes the given tag.
+ * The tag must exist in the address book.
+ */
+ void deleteTag(Tag tag);
+
+
+ /**
+ * Adds the given tag.
+ * {@code tag} must not already exist in the address book.
+ */
+ void addTag(Tag tag);
+
+ boolean hasEventTag(EventTag tag);
+
+ boolean hasEventTag(String tagName);
+
+ void deleteEventTag(EventTag tag);
+
+ void addEventTag(EventTag tag);
+
+ EventTag getEventTag(String tag);
+
+ /**
+ * Returns an unmodifiable view of the filtered person list
+ */
ObservableList getFilteredPersonList();
+ void updateTagPersonList(Tag t);
+
/**
* 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 predicate);
+
+ ObservableSet getEventTagList();
+
+ void updateEventTagPersonList(EventTag t);
+
+ void setCurrentEventTag(EventTag tagName);
+
+ void clearCurrentEventTag();
}
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
index 57bc563fde6..6e0f258467e 100644
--- a/src/main/java/seedu/address/model/ModelManager.java
+++ b/src/main/java/seedu/address/model/ModelManager.java
@@ -4,14 +4,18 @@
import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
import java.nio.file.Path;
+import java.util.Set;
import java.util.function.Predicate;
import java.util.logging.Logger;
import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
import javafx.collections.transformation.FilteredList;
import seedu.address.commons.core.GuiSettings;
import seedu.address.commons.core.LogsCenter;
import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
/**
* Represents the in-memory model of the address book data.
@@ -22,6 +26,7 @@ public class ModelManager implements Model {
private final AddressBook addressBook;
private final UserPrefs userPrefs;
private final FilteredList filteredPersons;
+ private EventTag currentEventTag;
/**
* Initializes a ModelManager with the given addressBook and userPrefs.
@@ -34,6 +39,7 @@ public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyUserPrefs userPrefs
this.addressBook = new AddressBook(addressBook);
this.userPrefs = new UserPrefs(userPrefs);
filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
+ currentEventTag = null;
}
public ModelManager() {
@@ -111,6 +117,59 @@ public void setPerson(Person target, Person editedPerson) {
addressBook.setPerson(target, editedPerson);
}
+ @Override
+ public boolean hasTag(Tag tag) {
+ requireNonNull(tag);
+ return addressBook.hasTag(tag);
+ }
+
+ @Override
+ public void assign(Person targetPerson, Set tags, Set eventTags) {
+ requireAllNonNull(targetPerson, tags, eventTags);
+ addressBook.assign(targetPerson, tags, eventTags);
+ updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ }
+
+ @Override
+ public void deleteTag(Tag tag) {
+ addressBook.removeTag(tag);
+ updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ }
+
+ @Override
+ public void addTag(Tag tag) {
+ addressBook.addTag(tag);
+ updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ }
+
+ @Override
+ public boolean hasEventTag(EventTag tag) {
+ requireNonNull(tag);
+ return addressBook.hasEventTag(tag);
+ }
+
+ @Override
+ public boolean hasEventTag(String tagName) {
+ requireNonNull(tagName);
+ return addressBook.hasEventTag(tagName);
+ }
+
+ @Override
+ public void deleteEventTag(EventTag tag) {
+ addressBook.removeEventTag(tag);
+ }
+
+ @Override
+ public void addEventTag(EventTag tag) {
+ addressBook.addEventTag(tag);
+ updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ }
+
+ @Override
+ public EventTag getEventTag(String tag) {
+ return addressBook.getEventTag(tag);
+ }
+
//=========== Filtered Person List Accessors =============================================================
/**
@@ -128,6 +187,40 @@ public void updateFilteredPersonList(Predicate predicate) {
filteredPersons.setPredicate(predicate);
}
+ @Override
+ public void updateTagPersonList(Tag t) {
+ requireNonNull(t);
+ if (currentEventTag != null) {
+ Predicate eventTagPredicate = person -> person.containsEventTag(currentEventTag);
+ Predicate normalTagPredicate = person -> person.containsTag(t);
+ filteredPersons.setPredicate(eventTagPredicate.and(normalTagPredicate));
+ } else {
+ filteredPersons.setPredicate(person -> person.containsTag(t));
+ }
+ }
+
+ @Override
+ public void updateEventTagPersonList(EventTag t) {
+ requireNonNull(t);
+ setCurrentEventTag(t);
+ filteredPersons.setPredicate(person -> person.containsEventTag(currentEventTag));
+ }
+
+ /**
+ * Sets the current event tag to filter by.
+ * @param eventTag The event tag to filter by.
+ */
+ public void setCurrentEventTag(EventTag eventTag) {
+ this.currentEventTag = eventTag;
+ }
+
+ /**
+ * Clears the current event tag.
+ */
+ public void clearCurrentEventTag() {
+ this.currentEventTag = null;
+ }
+
@Override
public boolean equals(Object other) {
if (other == this) {
@@ -145,4 +238,13 @@ public boolean equals(Object other) {
&& filteredPersons.equals(otherModelManager.filteredPersons);
}
+ //=========== Filtered Event List Accessors =============================================================
+ /**
+ * Returns an unmodifiable view of the list of {@code EventTag} backed by the internal list of
+ * {@code versionedAddressBook}
+ */
+ public ObservableSet getEventTagList() {
+ return addressBook.getEventTagList();
+ }
+
}
diff --git a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java b/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
index 6ddc2cd9a29..3447e728358 100644
--- a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
+++ b/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
@@ -1,7 +1,10 @@
package seedu.address.model;
import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
/**
* Unmodifiable view of an address book
@@ -14,4 +17,7 @@ public interface ReadOnlyAddressBook {
*/
ObservableList getPersonList();
+ ObservableSet getTagList();
+
+ ObservableSet getEventTagList();
}
diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
index abe8c46b535..2edef8d8c27 100644
--- a/src/main/java/seedu/address/model/person/Person.java
+++ b/src/main/java/seedu/address/model/person/Person.java
@@ -8,11 +8,12 @@
import java.util.Set;
import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.model.tag.EventTag;
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.
+ * Guarantees: details are present and not null, field values are validated.
*/
public class Person {
@@ -24,17 +25,19 @@ public class Person {
// Data fields
private final Address address;
private final Set tags = new HashSet<>();
+ private final Set eventTags = new HashSet<>();
/**
* Every field must be present and not null.
*/
- public Person(Name name, Phone phone, Email email, Address address, Set tags) {
+ public Person(Name name, Phone phone, Email email, Address address, Set tags, Set eventTags) {
requireAllNonNull(name, phone, email, address, tags);
this.name = name;
this.phone = phone;
this.email = email;
this.address = address;
this.tags.addAll(tags);
+ this.eventTags.addAll(eventTags);
}
public Name getName() {
@@ -61,6 +64,74 @@ public Set getTags() {
return Collections.unmodifiableSet(tags);
}
+ /**
+ * Returns an immutable event tag set, which throws {@code UnsupportedOperationException}
+ * if modification is attempted.
+ */
+ public Set getEventTags() {
+ return Collections.unmodifiableSet(eventTags);
+ }
+
+ /**
+ * Returns true if a person contains a tag, which throws {@code UnsupportedOperationException}
+ * if modification is attempted.
+ */
+ public boolean containsTag(Tag tag) {
+ for (Tag t : tags) {
+ if (t.isSameTag(tag)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if a person contains a tag, which throws {@code UnsupportedOperationException}
+ * if modification is attempted.
+ */
+ public boolean containsEventTag(EventTag tag) {
+ for (EventTag t : eventTags) {
+ if (t.isSameTag(tag)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Removes a tag from the Person if it exists in the tags for this Person.
+ */
+ public void removeTag(Tag key) {
+ if (this.containsTag(key)) {
+ tags.remove(key);
+ }
+ }
+
+ /**
+ * Adds an event tag to the Person.
+ *
+ * @param eventTags The event tags to be added.
+ */
+ public void addEventTags(Set eventTags) {
+ this.eventTags.addAll(eventTags);
+ }
+
+ /**
+ * Adds a tag to the Person.
+ */
+ public void addTags(Set tags) {
+ this.tags.addAll(tags);
+ }
+
+ /**
+ * Removes a tag from the Person if it exists in the tags for this Person.
+ */
+ public void removeEventTag(EventTag key) {
+ if (this.containsEventTag(key)) {
+ eventTags.remove(key);
+ }
+ }
+
/**
* Returns true if both persons have the same name.
* This defines a weaker notion of equality between two persons.
@@ -94,7 +165,8 @@ public boolean equals(Object other) {
&& phone.equals(otherPerson.phone)
&& email.equals(otherPerson.email)
&& address.equals(otherPerson.address)
- && tags.equals(otherPerson.tags);
+ && tags.equals(otherPerson.tags)
+ && eventTags.equals(otherPerson.eventTags);
}
@Override
@@ -111,6 +183,7 @@ public String toString() {
.add("email", email)
.add("address", address)
.add("tags", tags)
+ .add("eventTags", eventTags)
.toString();
}
diff --git a/src/main/java/seedu/address/model/tag/EventTag.java b/src/main/java/seedu/address/model/tag/EventTag.java
new file mode 100644
index 00000000000..1afcfdde86b
--- /dev/null
+++ b/src/main/java/seedu/address/model/tag/EventTag.java
@@ -0,0 +1,68 @@
+package seedu.address.model.tag;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Represents an EventTag in the address book.
+ * Guarantees: immutable; name is valid as declared in {@link #isValidTagName(String)}
+ */
+public class EventTag extends Tag {
+ public final String description;
+
+ public final LocalDateTime startDate;
+
+ public final LocalDateTime endDate;
+ /**
+ * Constructs a {@code EventTag}.
+ *
+ * @param tagName A valid tag name.
+ * @param description A Description for the event.
+ */
+ public EventTag(String tagName, String description, LocalDateTime startDate, LocalDateTime endDate) {
+ super(tagName);
+ requireNonNull(tagName);
+ checkArgument(isValidTagName(tagName), MESSAGE_CONSTRAINTS);
+ this.description = description;
+ this.startDate = startDate;
+ this.endDate = endDate;
+ }
+
+ public String getCodeFormat() {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ return "t/E-" + tagName + " dc/" + description + " sd/" + startDate.format(formatter)
+ + " ed/" + endDate.format(formatter);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EventTag)) {
+ return false;
+ }
+
+ EventTag otherTag = (EventTag) other;
+ boolean nameEqual = tagName.equals(otherTag.tagName) && description.equals(otherTag.description);
+ boolean timeEqual = startDate.isEqual(((EventTag) other).startDate)
+ && endDate.equals(((EventTag) other).endDate);
+ return nameEqual && timeEqual;
+ }
+
+ /**
+ * Format state as text for viewing.
+ */
+ @Override
+ public String toString() {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String startTime = startDate.format(formatter);
+ String endTime = endDate.format(formatter);
+ return '[' + tagName + ']' + " from " + startTime + " to " + endTime + ".\n" + description;
+ }
+}
diff --git a/src/main/java/seedu/address/model/tag/Tag.java b/src/main/java/seedu/address/model/tag/Tag.java
index f1a0d4e233b..adcb1189c7e 100644
--- a/src/main/java/seedu/address/model/tag/Tag.java
+++ b/src/main/java/seedu/address/model/tag/Tag.java
@@ -9,7 +9,7 @@
*/
public class Tag {
- public static final String MESSAGE_CONSTRAINTS = "Tags names should be alphanumeric";
+ public static final String MESSAGE_CONSTRAINTS = "Tags names should be alphanumeric and not contain spaces";
public static final String VALIDATION_REGEX = "\\p{Alnum}+";
public final String tagName;
@@ -25,6 +25,24 @@ public Tag(String tagName) {
this.tagName = tagName;
}
+ /**
+ * Returns true if both tags have the same name.
+ */
+ public boolean isSameTag(Tag otherTag) {
+ if (otherTag == this) {
+ return true;
+ }
+
+ return otherTag != null
+ && otherTag.tagName.equals(tagName);
+ }
+ /**
+ * Returns true if this tag has the given name.
+ */
+ public boolean hasName(String tagName) {
+ return this.tagName.equals(tagName);
+ }
+
/**
* Returns true if a given string is a valid tag name.
*/
diff --git a/src/main/java/seedu/address/model/tag/UniqueTagList.java b/src/main/java/seedu/address/model/tag/UniqueTagList.java
new file mode 100644
index 00000000000..06188629537
--- /dev/null
+++ b/src/main/java/seedu/address/model/tag/UniqueTagList.java
@@ -0,0 +1,203 @@
+package seedu.address.model.tag;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableSet;
+import seedu.address.model.tag.exceptions.DuplicateTagException;
+import seedu.address.model.tag.exceptions.TagNotFoundException;
+
+/**
+ * Represents a list of unique tags.
+ * A UniqueTagList ensures that no duplicate tags are stored.
+ */
+public class UniqueTagList implements Iterable {
+
+ private final ObservableSet internalSet = FXCollections.observableSet();
+
+ /**
+ * Constructs an empty UniqueTagList.
+ */
+ public UniqueTagList() {}
+
+ /**
+ * Constructs a UniqueTagList with the given tags.
+ * @param tags A list of tags.
+ */
+ public UniqueTagList(Set tags) {
+ internalSet.addAll(tags);
+ }
+
+ /**
+ * Returns true if the list contains an equivalent tag as the given argument of type Tag.
+ */
+ public boolean contains(T toCheck) {
+ requireNonNull(toCheck);
+ return internalSet.stream().anyMatch(tag -> tag.equals(toCheck));
+ }
+
+ /**
+ * Returns true if the list contains an equivalent tag as the given argument of type String.
+ */
+ public boolean contains(String toCheck) {
+ requireNonNull(toCheck);
+ return internalSet.stream().anyMatch(tag -> tag.tagName.equals(toCheck));
+ }
+
+ /**
+ * Adds a tag to the list.
+ * The tag must not already exist in the list.
+ */
+ public void add(T toAdd) {
+ requireNonNull(toAdd);
+ if (contains(toAdd)) {
+ throw new DuplicateTagException();
+ }
+ internalSet.add(toAdd);
+ }
+
+ /**
+ * Replaces the specified tag in the list with the new tag.
+ * @param oldTag The tag to be replaced.
+ * @param newTag The new tag to replace the old tag.
+ */
+ public void replace(T oldTag, T newTag) {
+ requireAllNonNull(oldTag, newTag);
+
+ if (!internalSet.contains(oldTag)) {
+ throw new TagNotFoundException();
+ }
+
+ if (!oldTag.isSameTag(newTag) && contains(newTag)) {
+ throw new DuplicateTagException();
+ }
+
+ internalSet.remove(oldTag);
+ internalSet.add(newTag);
+ }
+
+ /**
+ * Removes the equivalent tag from the list.
+ * The argument of type Tag must exist in the list.
+ */
+ public void remove(T toRemove) {
+ requireNonNull(toRemove);
+ if (!internalSet.remove(toRemove)) {
+ throw new TagNotFoundException();
+ }
+ }
+
+ /**
+ * Removes the equivalent tag from the list.
+ * The argument of type String must exist in the list.
+ */
+ public void remove(String toRemove) {
+ requireNonNull(toRemove);
+ if (!internalSet.removeIf(tag -> tag.tagName.equals(toRemove))) {
+ throw new TagNotFoundException();
+ }
+ }
+ /**
+ * Replaces all tags in this list with the tags from the replacement list.
+ * @param replacement The replacement UniqueTagList.
+ */
+ public void setTags(UniqueTagList replacement) {
+ requireNonNull(replacement);
+ internalSet.clear();
+ internalSet.addAll(replacement.internalSet);
+ }
+
+ /**
+ * Replaces the tags in the list with the given set of tags.
+ * @param tags The set of tags to replace the current tags.
+ */
+ public void setTags(Set tags) {
+ requireAllNonNull(tags);
+ internalSet.clear();
+ internalSet.addAll(tags);
+ }
+
+ /**
+ * Returns the event tag with the specified event tag name, if it exists in the list.
+ * Returns null if no such event tag is found.
+ * @param eventTagName The name of the event tag to retrieve.
+ * @return The event tag with the specified event tag name, or null if not found.
+ */
+ public EventTag getEventTag(String eventTagName) {
+ requireNonNull(eventTagName);
+ for (T tag : internalSet) {
+ if (tag instanceof EventTag && tag.tagName.equals(eventTagName)) {
+ return (EventTag) tag;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Removes all the event tags given a specified event tag name, if it exists in the list.
+ * Returns null if no such event tag is found.
+ * @param eventTagName The name of the event tag to retrieve.
+ * @return The event tag with the specified event tag name, or null if not found.
+ */
+ public EventTag removeEvent(String eventTagName) {
+ requireNonNull(eventTagName);
+ for (T tag : internalSet) {
+ if (tag instanceof EventTag && tag.tagName.equals(eventTagName)) {
+ internalSet.removeIf(t -> t.equals(tag));
+ return (EventTag) tag;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the backing set as an unmodifiable {@code ObservableSet}.
+ */
+ public ObservableSet asUnmodifiableObservableSet() {
+ return FXCollections.unmodifiableObservableSet(internalSet);
+ }
+
+ @Override
+ public Iterator iterator() {
+ return internalSet.iterator();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ // handle nulls
+ if (!(other instanceof UniqueTagList)) {
+ return false;
+ }
+
+ UniqueTagList otherUniqueTagSet = (UniqueTagList) other;
+ return internalSet.equals(otherUniqueTagSet.internalSet);
+ }
+
+ @Override
+ public String toString() {
+ return internalSet.toString();
+ }
+
+ /**
+ * Returns true if {@code tags} contains only unique tags.
+ */
+ private boolean tagsAreUnique(Set tags) {
+ Set uniqueTags = new HashSet<>();
+ for (T tag : tags) {
+ if (!uniqueTags.add(tag)) {
+ return false; // Duplicate tag found
+ }
+ }
+ return true; // No duplicate tags found
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/tag/exceptions/DuplicateTagException.java b/src/main/java/seedu/address/model/tag/exceptions/DuplicateTagException.java
new file mode 100644
index 00000000000..fd0c4c2576a
--- /dev/null
+++ b/src/main/java/seedu/address/model/tag/exceptions/DuplicateTagException.java
@@ -0,0 +1,12 @@
+package seedu.address.model.tag.exceptions;
+
+/**
+ * Signals that the operation will result in duplicate Tags (Tags are considered duplicates if they have the same
+ * name).
+ */
+public class DuplicateTagException extends RuntimeException {
+ public DuplicateTagException() {
+ super("Operation would result in duplicate tags");
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/tag/exceptions/TagNotFoundException.java b/src/main/java/seedu/address/model/tag/exceptions/TagNotFoundException.java
new file mode 100644
index 00000000000..9de0aa2c897
--- /dev/null
+++ b/src/main/java/seedu/address/model/tag/exceptions/TagNotFoundException.java
@@ -0,0 +1,6 @@
+package seedu.address.model.tag.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified tag.
+ */
+public class TagNotFoundException extends RuntimeException {}
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
index 1806da4facf..8d6c9858205 100644
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ b/src/main/java/seedu/address/model/util/SampleDataUtil.java
@@ -1,6 +1,8 @@
package seedu.address.model.util;
+import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
@@ -11,6 +13,7 @@
import seedu.address.model.person.Name;
import seedu.address.model.person.Person;
import seedu.address.model.person.Phone;
+import seedu.address.model.tag.EventTag;
import seedu.address.model.tag.Tag;
/**
@@ -19,24 +22,62 @@
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 Person(new Name("Alex Yeoh"), new Phone("99999999"), new Email("alexyeoh@example.com"),
new Address("Blk 30 Geylang Street 29, #06-40"),
- getTagSet("friends")),
+ getTagSet("operations"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
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")),
+ getTagSet("marketing"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
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")),
+ getTagSet("logistics"),
+ getEventTagSet("Rag|Rag event|2024-04-05T14:00:00|2024-04-05T16:00:00")),
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")),
+ getTagSet("publicity"),
+ getEventTagSet("Rag|Rag event|2024-04-05T14:00:00|2024-04-05T16:00:00")),
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")),
+ getTagSet("publicity"),
+ getEventTagSet("Rag|Rag event|2024-04-05T14:00:00|2024-04-05T16:00:00")),
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"))
+ getTagSet("VPD"),
+ getEventTagSet("Rag|Rag event|2024-04-05T14:00:00|2024-04-05T16:00:00")),
+ new Person(new Name("Tom Goh"), new Phone("91234812"), new Email("hi@mail.com"),
+ new Address("Blk 98 Telok Blangah Street 85, #11-09"),
+ getTagSet("secretary"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
+ new Person(new Name("John Tan"), new Phone("91232345"), new Email("john@john.com"),
+ new Address("Blk 1 Hougang Street 3, #07-18"),
+ getTagSet("operations"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
+ new Person(new Name("Ben Tan"), new Phone("83478596"), new Email("ben@mail.com"),
+ new Address("NA"),
+ getTagSet("operations"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
+ new Person(new Name("Ann Lee"), new Phone("82882919"), new Email("Ann@mail.com"),
+ new Address("NA"),
+ getTagSet("head", "publicity"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
+ new Person(new Name("Amy Lim"), new Phone("82882919"), new Email("Amy@mail.com"),
+ new Address("AMK Blk 91"),
+ getTagSet("head", "operations"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
+ new Person(new Name("Betty Ho"), new Phone("93882919"), new Email("Betty@mail.com"),
+ new Address("AMK Blk 10"),
+ getTagSet("logistics"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
+ new Person(new Name("Zack Goh"), new Phone("82820119"), new Email("zack@mail.com"),
+ new Address("AMK Blk 10"),
+ getTagSet("logistics"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
+ new Person(new Name("Xan"), new Phone("82882919"), new Email("xan@mail.com"),
+ new Address("Bishan Blk 10"),
+ getTagSet("logistics"),
+ getEventTagSet("Flag|Flag event|2024-04-10T18:00:00|2024-04-10T22:00:00")),
};
}
@@ -57,4 +98,23 @@ public static Set getTagSet(String... strings) {
.collect(Collectors.toSet());
}
+ /**
+ * Returns a set of event tags containing the list of strings given.
+ */
+ public static Set getEventTagSet(String... strings) {
+ Set eventTags = new HashSet<>();
+ for (String s : strings) {
+ // parse string to extract tag name, description, start date, and end date
+ // eg. "tagName|description|startDate|endDate"
+ String[] parts = s.split("\\|");
+ String tagName = parts[0];
+ String description = parts[1];
+ LocalDateTime startDate = LocalDateTime.parse(parts[2]);
+ LocalDateTime endDate = LocalDateTime.parse(parts[3]);
+
+ eventTags.add(new EventTag(tagName, description, startDate, endDate));
+ }
+ return eventTags;
+ }
+
}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedEventTag.java b/src/main/java/seedu/address/storage/JsonAdaptedEventTag.java
new file mode 100644
index 00000000000..05a7dbb0ef7
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedEventTag.java
@@ -0,0 +1,76 @@
+package seedu.address.storage;
+
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Jackson-friendly version of {@link EventTag}.
+ */
+class JsonAdaptedEventTag {
+
+ private final String tagName;
+ private final String description;
+ private final LocalDateTime startDate;
+ private final LocalDateTime endDate;
+
+ /**
+ * Constructs a {@code JsonAdaptedEventTag} with the given details.
+ */
+ @JsonCreator
+ public JsonAdaptedEventTag(@JsonProperty("tagName") String tagName,
+ @JsonProperty("description") String description,
+ @JsonProperty("startDate") LocalDateTime startDate,
+ @JsonProperty("endDate") LocalDateTime endDate) {
+ this.tagName = tagName;
+ this.description = description;
+ this.startDate = startDate;
+ this.endDate = endDate;
+ }
+
+
+ /**
+ * Converts a given {@code EventTag} into this class for Jackson use.
+ */
+ public JsonAdaptedEventTag(EventTag source) {
+ tagName = source.tagName;
+ description = source.description;
+ startDate = source.startDate;
+ endDate = source.endDate;
+ }
+
+ @JsonProperty("tagName")
+ public String getTagName() {
+ return tagName;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public LocalDateTime getStartDate() {
+ return startDate;
+ }
+
+ public LocalDateTime getEndDate() {
+ return endDate;
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted event tag object into the model's {@code EventTag} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted tag.
+ */
+ public EventTag toModelType() throws IllegalValueException {
+ if (!Tag.isValidTagName(tagName)) {
+ throw new IllegalValueException(Tag.MESSAGE_CONSTRAINTS);
+ }
+
+ return new EventTag(tagName, description, startDate, endDate);
+ }
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
index bd1ca0f56c8..76fe2d7a9ce 100644
--- a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
+++ b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
@@ -15,6 +15,7 @@
import seedu.address.model.person.Name;
import seedu.address.model.person.Person;
import seedu.address.model.person.Phone;
+import seedu.address.model.tag.EventTag;
import seedu.address.model.tag.Tag;
/**
@@ -29,6 +30,7 @@ class JsonAdaptedPerson {
private final String email;
private final String address;
private final List tags = new ArrayList<>();
+ private final List eventTags = new ArrayList<>();
/**
* Constructs a {@code JsonAdaptedPerson} with the given person details.
@@ -36,7 +38,8 @@ class JsonAdaptedPerson {
@JsonCreator
public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone") String phone,
@JsonProperty("email") String email, @JsonProperty("address") String address,
- @JsonProperty("tags") List tags) {
+ @JsonProperty("tags") List tags,
+ @JsonProperty("eventTags") List eventTags) {
this.name = name;
this.phone = phone;
this.email = email;
@@ -44,6 +47,9 @@ public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone
if (tags != null) {
this.tags.addAll(tags);
}
+ if (eventTags != null) {
+ this.eventTags.addAll(eventTags);
+ }
}
/**
@@ -57,6 +63,9 @@ public JsonAdaptedPerson(Person source) {
tags.addAll(source.getTags().stream()
.map(JsonAdaptedTag::new)
.collect(Collectors.toList()));
+ eventTags.addAll(source.getEventTags().stream()
+ .map(JsonAdaptedEventTag::new)
+ .collect(Collectors.toList()));
}
/**
@@ -70,6 +79,11 @@ public Person toModelType() throws IllegalValueException {
personTags.add(tag.toModelType());
}
+ final List personEventTags = new ArrayList<>();
+ for (JsonAdaptedEventTag eventTag : eventTags) {
+ personEventTags.add(eventTag.toModelType());
+ }
+
if (name == null) {
throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName()));
}
@@ -103,7 +117,8 @@ public Person toModelType() throws IllegalValueException {
final Address modelAddress = new Address(address);
final Set modelTags = new HashSet<>(personTags);
- return new Person(modelName, modelPhone, modelEmail, modelAddress, modelTags);
+ final Set modelEventTags = new HashSet<>(personEventTags);
+ return new Person(modelName, modelPhone, modelEmail, modelAddress, modelTags, modelEventTags);
}
}
diff --git a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java b/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
index 5efd834091d..7f5f582e878 100644
--- a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
+++ b/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
@@ -12,6 +12,8 @@
import seedu.address.model.AddressBook;
import seedu.address.model.ReadOnlyAddressBook;
import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
/**
* An Immutable AddressBook that is serializable to JSON format.
@@ -20,15 +22,24 @@
class JsonSerializableAddressBook {
public static final String MESSAGE_DUPLICATE_PERSON = "Persons list contains duplicate person(s).";
+ public static final String MESSAGE_DUPLICATE_TAG = "Tags list contains duplicate tag(s).";
+ public static final String MESSAGE_DUPLICATE_EVENT_TAG = "Events tag list contains duplicate event tag(s).";
private final List persons = new ArrayList<>();
+ private final List tagList = new ArrayList<>();
+ private final List eventTagList = new ArrayList<>();
+
/**
* Constructs a {@code JsonSerializableAddressBook} with the given persons.
*/
@JsonCreator
- public JsonSerializableAddressBook(@JsonProperty("persons") List persons) {
+ public JsonSerializableAddressBook(@JsonProperty("persons") List persons,
+ @JsonProperty("tagList") List tags,
+ @JsonProperty("eventTagList") List eventTags) {
this.persons.addAll(persons);
+ this.tagList.addAll(tags);
+ this.eventTagList.addAll(eventTags);
}
/**
@@ -38,6 +49,10 @@ public JsonSerializableAddressBook(@JsonProperty("persons") List {
+
+ private static final String FXML = "EventCard.fxml";
+
+ public final EventTag eventTag;
+
+ @FXML
+ private HBox cardPane;
+ @FXML
+ private Label eventName;
+
+ /**
+ * Creates a {@code EventCard} with the given {@code EventTag} to display.
+ */
+ public EventCard(EventTag eventTag) {
+ super(FXML);
+ this.eventTag = eventTag;
+ eventName.setText(eventTag.tagName);
+ }
+}
diff --git a/src/main/java/seedu/address/ui/EventListPanel.java b/src/main/java/seedu/address/ui/EventListPanel.java
new file mode 100644
index 00000000000..e23cf3dce75
--- /dev/null
+++ b/src/main/java/seedu/address/ui/EventListPanel.java
@@ -0,0 +1,79 @@
+package seedu.address.ui;
+
+import static seedu.address.model.AddressBook.DEFAULT_EVENT_TAG;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import javafx.collections.ObservableSet;
+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.tag.EventTag;
+
+/**
+ * Panel containing the list of events.
+ */
+public class EventListPanel extends UiPart {
+ private static final String FXML = "EventListPanel.fxml";
+ private final Logger logger = LogsCenter.getLogger(EventListPanel.class);
+
+ @FXML
+ private ListView eventListView;
+
+ /**
+ * Creates a {@code EventListPanel} with the given {@code ObservableList}.
+ */
+ public EventListPanel(ObservableSet eventSet) {
+ super(FXML);
+ eventListView.setCellFactory(listView -> new EventListViewCell());
+ addDefaultEventCard();
+ addExistingTagEventCard(eventSet);
+
+ eventListView.getSelectionModel().select(DEFAULT_EVENT_TAG);
+ }
+
+ private void addDefaultEventCard() {
+ eventListView.getItems().add(DEFAULT_EVENT_TAG);
+ }
+
+ private void addExistingTagEventCard(ObservableSet eventSet) {
+ List eventList = new ArrayList<>(eventSet);
+ eventListView.getItems().addAll(eventList);
+ }
+
+
+ //@@author {peienlim}-reused
+ //Reused from https://github.com/AY2324S1-CS2103T-F08-3/tp
+ //(src/main/java/seedu/address/ui/AnimalListPanel.java) Lines 45 to 51 with minor modifications
+ public void selectEvent(EventTag eventTag) {
+ eventListView.getSelectionModel().select(eventTag);
+ }
+
+ public void clearEventSelection() {
+ eventListView.getSelectionModel().select(DEFAULT_EVENT_TAG);
+ }
+ //@@author
+
+ /**
+ * Custom {@code ListCell} that displays the graphics of a {@code Event} using a {@code EventCard}.
+ */
+ class EventListViewCell extends ListCell {
+ @Override
+ protected void updateItem(EventTag eventTag, boolean empty) {
+ super.updateItem(eventTag, empty);
+
+ if (empty || eventTag == null) {
+ setGraphic(null);
+ setText(null);
+ } else {
+ EventCard eventCard = new EventCard(eventTag);
+ setGraphic(eventCard.getRoot());
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/seedu/address/ui/HelpWindow.java b/src/main/java/seedu/address/ui/HelpWindow.java
index 3f16b2fcf26..37784bd7524 100644
--- a/src/main/java/seedu/address/ui/HelpWindow.java
+++ b/src/main/java/seedu/address/ui/HelpWindow.java
@@ -15,7 +15,7 @@
*/
public class HelpWindow extends UiPart {
- public static final String USERGUIDE_URL = "https://se-education.org/addressbook-level3/UserGuide.html";
+ public static final String USERGUIDE_URL = "https://ay2324s2-cs2103t-t11-3.github.io/tp/UserGuide.html";
public static final String HELP_MESSAGE = "Refer to the user guide: " + USERGUIDE_URL;
private static final Logger logger = LogsCenter.getLogger(HelpWindow.class);
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
index 79e74ef37c0..1d5d7f28e57 100644
--- a/src/main/java/seedu/address/ui/MainWindow.java
+++ b/src/main/java/seedu/address/ui/MainWindow.java
@@ -1,5 +1,8 @@
package seedu.address.ui;
+import static seedu.address.model.AddressBook.DEFAULT_EVENT_TAG;
+
+import java.util.Optional;
import java.util.logging.Logger;
import javafx.event.ActionEvent;
@@ -16,6 +19,7 @@
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.exceptions.CommandException;
import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.tag.EventTag;
/**
* The Main Window. Provides the basic application layout containing
@@ -32,6 +36,7 @@ public class MainWindow extends UiPart {
// Independent Ui parts residing in this Ui container
private PersonListPanel personListPanel;
+ private EventListPanel eventListPanel;
private ResultDisplay resultDisplay;
private HelpWindow helpWindow;
@@ -44,6 +49,9 @@ public class MainWindow extends UiPart {
@FXML
private StackPane personListPanelPlaceholder;
+ @FXML
+ private StackPane eventListPanelPlaceholder;
+
@FXML
private StackPane resultDisplayPlaceholder;
@@ -113,6 +121,9 @@ void fillInnerParts() {
personListPanel = new PersonListPanel(logic.getFilteredPersonList());
personListPanelPlaceholder.getChildren().add(personListPanel.getRoot());
+ eventListPanel = new EventListPanel(logic.getEventTagList());
+ eventListPanelPlaceholder.getChildren().add(eventListPanel.getRoot());
+
resultDisplay = new ResultDisplay();
resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
@@ -186,7 +197,27 @@ private CommandResult executeCommand(String commandText) throws CommandException
handleExit();
}
+ eventListPanel = new EventListPanel(logic.getEventTagList());
+ eventListPanelPlaceholder.getChildren().add(eventListPanel.getRoot());
+
+ //@@author {peienlim}-reused
+ //Reused from https://github.com/AY2324S1-CS2103T-F08-3/tp
+ //(src/main/java/seedu/address/ui/MainWindow.java) Lines 196 to 202 with minor modifications
+ Optional eventTag = commandResult.getEventTag();
+
+ if (eventTag.isPresent()) {
+ if (eventTag.get().equals(DEFAULT_EVENT_TAG)) { // list command, change back to all contacts tab
+ eventListPanel.clearEventSelection();
+ }
+ eventListPanel.selectEvent(eventTag.get());
+ }
+
+ //@@author {peienlim}
+ personListPanel = new PersonListPanel(logic.getFilteredPersonList());
+ personListPanelPlaceholder.getChildren().add(personListPanel.getRoot());
+
return commandResult;
+
} catch (CommandException | ParseException e) {
logger.info("An error occurred while executing command: " + commandText);
resultDisplay.setFeedbackToUser(e.getMessage());
diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/PersonCard.java
index 094c42cda82..f32bd1fd493 100644
--- a/src/main/java/seedu/address/ui/PersonCard.java
+++ b/src/main/java/seedu/address/ui/PersonCard.java
@@ -40,6 +40,8 @@ public class PersonCard extends UiPart {
private Label email;
@FXML
private FlowPane tags;
+ @FXML
+ private FlowPane eventTags;
/**
* Creates a {@code PersonCode} with the given {@code Person} and index to display.
@@ -55,5 +57,8 @@ public PersonCard(Person person, int displayedIndex) {
person.getTags().stream()
.sorted(Comparator.comparing(tag -> tag.tagName))
.forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
+ person.getEventTags().stream()
+ .sorted(Comparator.comparing(eventTag -> eventTag.tagName))
+ .forEach(eventTag -> eventTags.getChildren().add(new Label(eventTag.tagName)));
}
}
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 36e6b001cd8..f2fb8ddc273 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -340,6 +340,8 @@
#tags {
-fx-hgap: 7;
-fx-vgap: 3;
+ -fx-border-radius: 10;
+ -fx-padding: 2 0 2 0;
}
#tags .label {
@@ -350,3 +352,19 @@
-fx-background-radius: 2;
-fx-font-size: 11;
}
+
+#eventTags {
+ -fx-hgap: 7;
+ -fx-vgap: 3;
+ -fx-border-radius: 10;
+ -fx-padding: 2 0 2 0;
+}
+
+#eventTags .label {
+ -fx-text-fill: white;
+ -fx-background-color: #8e7ebd;
+ -fx-padding: 1 3 1 3;
+ -fx-border-radius: 2;
+ -fx-background-radius: 2;
+ -fx-font-size: 11;
+}
diff --git a/src/main/resources/view/EventCard.fxml b/src/main/resources/view/EventCard.fxml
new file mode 100644
index 00000000000..36f26a5cb8f
--- /dev/null
+++ b/src/main/resources/view/EventCard.fxml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/view/EventListPanel.fxml b/src/main/resources/view/EventListPanel.fxml
new file mode 100644
index 00000000000..c3e4fe19580
--- /dev/null
+++ b/src/main/resources/view/EventListPanel.fxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index 7778f666a0a..ebf4c773cfe 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -6,11 +6,11 @@
-
+
@@ -46,12 +46,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index f5e812e25e6..6d21ab93df5 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -28,6 +28,7 @@
+
diff --git a/src/test/data/ImportTest/invalidFieldsTest.csv b/src/test/data/ImportTest/invalidFieldsTest.csv
new file mode 100644
index 00000000000..6c81d83c71d
--- /dev/null
+++ b/src/test/data/ImportTest/invalidFieldsTest.csv
@@ -0,0 +1,3 @@
+Name,Number,LOL,LOL,EVENTS,TAGS
+John ,91232345,john@john.com,NTU,N/A,
+Ben,83478596,ben@mail.com,NA,N/A,
diff --git a/src/test/data/ImportTest/invalidValueTest.csv b/src/test/data/ImportTest/invalidValueTest.csv
new file mode 100644
index 00000000000..bdf4d01d4f3
--- /dev/null
+++ b/src/test/data/ImportTest/invalidValueTest.csv
@@ -0,0 +1,3 @@
+Name,Number,Email,Address,Events,Tags
+John ,91232345,john@john.com,NTU,N/A,has fun
+Ben,83478596,ben@mail.com,NA,N/A,cool
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
index 6a4d2b7181c..b859aeac72a 100644
--- a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
+++ b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
@@ -9,5 +9,6 @@
"phone": "948asdf2424",
"email": "hans@example.com",
"address": "4th street"
- } ]
+ } ],
+ "tagList": ["friends"]
}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
index ccd21f7d1a9..a0a95369a82 100644
--- a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
+++ b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
@@ -4,5 +4,8 @@
"phone": "9482424",
"email": "hans@example.com",
"address": "4th street"
- } ]
+ } ],
+ "tagList": [
+ "friends"
+ ]
}
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
index a7427fe7aa2..8560fffd7c0 100644
--- a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
@@ -1,14 +1,66 @@
{
- "persons": [ {
- "name": "Alice Pauline",
- "phone": "94351253",
- "email": "alice@example.com",
- "address": "123, Jurong West Ave 6, #08-111",
- "tags": [ "friends" ]
- }, {
- "name": "Alice Pauline",
- "phone": "94351253",
- "email": "pauline@example.com",
- "address": "4th street"
- } ]
+ "persons" : [ {
+ "name" : "Alex Yeoh",
+ "phone" : "87438807",
+ "email" : "alexyeoh@example.com",
+ "address" : "Blk 30 Geylang Street 29, #06-40",
+ "tags" : [ "friends" ]
+ }, {
+ "name" : "Bernice Yu",
+ "phone" : "99272758",
+ "email" : "berniceyu@example.com",
+ "address" : "Blk 30 Lorong 3 Serangoon Gardens, #07-18",
+ "tags" : [ "colleagues", "friends" ]
+ }, {
+ "name" : "Bernice Yu",
+ "phone" : "99272758",
+ "email" : "berniceyu@example.com",
+ "address" : "Blk 30 Lorong 3 Serangoon Gardens, #07-18",
+ "tags" : [ "colleagues", "friends" ]
+ }, {
+ "name" : "Charlotte Oliveiro",
+ "phone" : "93210283",
+ "email" : "charlotte@example.com",
+ "address" : "Blk 11 Ang Mo Kio Street 74, #11-04",
+ "tags" : [ "neighbours" ]
+ }, {
+ "name" : "David Li",
+ "phone" : "91031282",
+ "email" : "lidavid@example.com",
+ "address" : "Blk 436 Serangoon Gardens Street 26, #16-43",
+ "tags" : [ "family" ]
+ }, {
+ "name" : "Irfan Ibrahim",
+ "phone" : "92492021",
+ "email" : "irfan@example.com",
+ "address" : "Blk 47 Tampines Street 20, #17-35",
+ "tags" : [ "classmates" ]
+ }, {
+ "name" : "Roy Balakrishnan",
+ "phone" : "92624417",
+ "email" : "royb@example.com",
+ "address" : "Blk 45 Aljunied Street 85, #11-31",
+ "tags" : [ "colleagues" ]
+ } ],
+ "tagList" : [ "classmates", "hi", "neighbours", "family", "friends", "colleagues" ],
+ "eventTagList": [
+ {
+ "tagName": "meeting",
+ "description": "Team meeting",
+ "startDate": "2024-04-01T09:00:00",
+ "endDate": "2024-04-01T10:00:00"
+ },
+ {
+ "tagName": "presentation",
+ "description": "Project presentation",
+ "startDate": "2024-04-05T14:00:00",
+ "endDate": "2024-04-05T16:00:00"
+ },
+ {
+ "tagName": "birthday",
+ "description": "Birthday party",
+ "startDate": "2024-04-10T18:00:00",
+ "endDate": "2024-04-10T22:00:00"
+ }
+ ]
}
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicateTagAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicateTagAddressBook.json
new file mode 100644
index 00000000000..cfc56f0e1c9
--- /dev/null
+++ b/src/test/data/JsonSerializableAddressBookTest/duplicateTagAddressBook.json
@@ -0,0 +1,60 @@
+{
+ "persons" : [ {
+ "name" : "Alex Yeoh",
+ "phone" : "87438807",
+ "email" : "alexyeoh@example.com",
+ "address" : "Blk 30 Geylang Street 29, #06-40",
+ "tags" : [ "friends" ]
+ }, {
+ "name" : "Bernice Yu",
+ "phone" : "99272758",
+ "email" : "berniceyu@example.com",
+ "address" : "Blk 30 Lorong 3 Serangoon Gardens, #07-18",
+ "tags" : [ "colleagues", "friends" ]
+ }, {
+ "name" : "Charlotte Oliveiro",
+ "phone" : "93210283",
+ "email" : "charlotte@example.com",
+ "address" : "Blk 11 Ang Mo Kio Street 74, #11-04",
+ "tags" : [ "neighbours" ]
+ }, {
+ "name" : "David Li",
+ "phone" : "91031282",
+ "email" : "lidavid@example.com",
+ "address" : "Blk 436 Serangoon Gardens Street 26, #16-43",
+ "tags" : [ "family" ]
+ }, {
+ "name" : "Irfan Ibrahim",
+ "phone" : "92492021",
+ "email" : "irfan@example.com",
+ "address" : "Blk 47 Tampines Street 20, #17-35",
+ "tags" : [ "classmates" ]
+ }, {
+ "name" : "Roy Balakrishnan",
+ "phone" : "92624417",
+ "email" : "royb@example.com",
+ "address" : "Blk 45 Aljunied Street 85, #11-31",
+ "tags" : [ "colleagues" ]
+ } ],
+ "tagList" : [ "classmates", "hi", "neighbours", "family", "friends", "colleagues", "hi" ],
+ "eventTagList": [
+ {
+ "tagName": "meeting",
+ "description": "Team meeting",
+ "startDate": "2024-04-01T09:00:00",
+ "endDate": "2024-04-01T10:00:00"
+ },
+ {
+ "tagName": "presentation",
+ "description": "Project presentation",
+ "startDate": "2024-04-05T14:00:00",
+ "endDate": "2024-04-05T16:00:00"
+ },
+ {
+ "tagName": "birthday",
+ "description": "Birthday party",
+ "startDate": "2024-04-10T18:00:00",
+ "endDate": "2024-04-10T22:00:00"
+ }
+ ]
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
index ad3f135ae42..9f7994b30f8 100644
--- a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
@@ -1,8 +1,59 @@
{
- "persons": [ {
- "name": "Hans Muster",
- "phone": "9482424",
- "email": "invalid@email!3e",
- "address": "4th street"
- } ]
+ "persons" : [ {
+ "name" : "Alex Yeoh",
+ "email" : "alexyeoh@example.com",
+ "address" : "Blk 30 Geylang Street 29, #06-40",
+ "tags" : [ "friends" ]
+ }, {
+ "name" : "Bernice Yu",
+ "phone" : "99272758",
+ "email" : "berniceyu@example.com",
+ "address" : "Blk 30 Lorong 3 Serangoon Gardens, #07-18",
+ "tags" : [ "colleagues", "friends" ]
+ }, {
+ "name" : "Charlotte Oliveiro",
+ "phone" : "93210283",
+ "email" : "charlotte@example.com",
+ "address" : "Blk 11 Ang Mo Kio Street 74, #11-04",
+ "tags" : [ "neighbours" ]
+ }, {
+ "name" : "David Li",
+ "phone" : "91031282",
+ "email" : "lidavid@example.com",
+ "address" : "Blk 436 Serangoon Gardens Street 26, #16-43",
+ "tags" : [ "family" ]
+ }, {
+ "name" : "Irfan Ibrahim",
+ "phone" : "92492021",
+ "email" : "irfan@example.com",
+ "address" : "Blk 47 Tampines Street 20, #17-35",
+ "tags" : [ "classmates" ]
+ }, {
+ "name" : "Roy Balakrishnan",
+ "phone" : "92624417",
+ "email" : "royb@example.com",
+ "address" : "Blk 45 Aljunied Street 85, #11-31",
+ "tags" : [ "colleagues" ]
+ } ],
+ "tagList" : [ "classmates", "hi", "neighbours", "family", "friends", "colleagues" ],
+ "eventTagList": [
+ {
+ "tagName": "meeting",
+ "description": "Team meeting",
+ "startDate": "2024-04-01T09:00:00",
+ "endDate": "2024-04-01T10:00:00"
+ },
+ {
+ "tagName": "presentation",
+ "description": "Project presentation",
+ "startDate": "2024-04-05T14:00:00",
+ "endDate": "2024-04-05T16:00:00"
+ },
+ {
+ "tagName": "birthday",
+ "description": "Birthday party",
+ "startDate": "2024-04-10T18:00:00",
+ "endDate": "2024-04-10T22:00:00"
+ }
+ ]
}
diff --git a/src/test/data/JsonSerializableAddressBookTest/original tests/duplicatePersonAddressBook original.json b/src/test/data/JsonSerializableAddressBookTest/original tests/duplicatePersonAddressBook original.json
new file mode 100644
index 00000000000..8e68d5da675
--- /dev/null
+++ b/src/test/data/JsonSerializableAddressBookTest/original tests/duplicatePersonAddressBook original.json
@@ -0,0 +1,17 @@
+{
+ "persons": [ {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "email": "alice@example.com",
+ "address": "123, Jurong West Ave 6, #08-111",
+ "tags": [ "friends" ]
+ }, {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "email": "pauline@example.com",
+ "address": "4th street"
+ } ],
+ "tagList": [
+ "friends"
+ ]
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/original tests/duplicateTagAddressBook original.json b/src/test/data/JsonSerializableAddressBookTest/original tests/duplicateTagAddressBook original.json
new file mode 100644
index 00000000000..a0481ff1bee
--- /dev/null
+++ b/src/test/data/JsonSerializableAddressBookTest/original tests/duplicateTagAddressBook original.json
@@ -0,0 +1,13 @@
+{
+ "persons": [ {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "email": "alice@example.com",
+ "address": "123, Jurong West Ave 6, #08-111",
+ "tags": [ "friends" ]
+ }],
+ "tagList": [
+ "friends",
+ "friends"
+ ]
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/original tests/invalidPersonAddressBook original.json b/src/test/data/JsonSerializableAddressBookTest/original tests/invalidPersonAddressBook original.json
new file mode 100644
index 00000000000..00e36aa0198
--- /dev/null
+++ b/src/test/data/JsonSerializableAddressBookTest/original tests/invalidPersonAddressBook original.json
@@ -0,0 +1,9 @@
+{
+ "persons": [ {
+ "name": "Hans Muster",
+ "phone": "9482424",
+ "email": "invalid@email!3e",
+ "address": "4th street"
+ } ],
+ "tagList": []
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
index 72262099d35..9f78ed24f0d 100644
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
@@ -42,5 +42,31 @@
"email" : "anna@example.com",
"address" : "4th street",
"tags" : [ ]
- } ]
+ } ],
+ "tagList": [
+ "friends",
+ "owesMoney",
+ "colleagues"
+ ],
+ "eventTagList": [
+ {
+ "tagName": "meeting",
+ "description": "Team meeting",
+ "startDate": "2024-04-01T09:00:00",
+ "endDate": "2024-04-01T10:00:00"
+ },
+ {
+ "tagName": "presentation",
+ "description": "Project presentation",
+ "startDate": "2024-04-05T14:00:00",
+ "endDate": "2024-04-05T16:00:00"
+ },
+ {
+ "tagName": "birthday",
+ "description": "Birthday party",
+ "startDate": "2024-04-10T18:00:00",
+ "endDate": "2024-04-10T22:00:00"
+ }
+ ]
}
+
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
index 90e8253f48e..7ae3872a884 100644
--- a/src/test/java/seedu/address/logic/commands/AddCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
@@ -10,11 +10,13 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Set;
import java.util.function.Predicate;
import org.junit.jupiter.api.Test;
import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
import seedu.address.commons.core.GuiSettings;
import seedu.address.logic.Messages;
import seedu.address.logic.commands.exceptions.CommandException;
@@ -23,6 +25,8 @@
import seedu.address.model.ReadOnlyAddressBook;
import seedu.address.model.ReadOnlyUserPrefs;
import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
import seedu.address.testutil.PersonBuilder;
public class AddCommandTest {
@@ -148,6 +152,52 @@ public void setPerson(Person target, Person editedPerson) {
throw new AssertionError("This method should not be called.");
}
+ @Override
+ public boolean hasTag(Tag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void assign(Person targetPerson, Set tags, Set eventTags) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void deleteTag(Tag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+
+ @Override
+ public void addTag(Tag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public boolean hasEventTag(EventTag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public boolean hasEventTag(String tagName) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void deleteEventTag(EventTag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void addEventTag(EventTag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public EventTag getEventTag(String tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
@Override
public ObservableList getFilteredPersonList() {
throw new AssertionError("This method should not be called.");
@@ -157,6 +207,31 @@ public ObservableList getFilteredPersonList() {
public void updateFilteredPersonList(Predicate predicate) {
throw new AssertionError("This method should not be called.");
}
+
+ @Override
+ public ObservableSet getEventTagList() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void updateEventTagPersonList(EventTag t) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setCurrentEventTag(EventTag tagName) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void clearCurrentEventTag() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void updateTagPersonList(Tag t) {
+ throw new AssertionError("This method should not be called.");
+ }
}
/**
diff --git a/src/test/java/seedu/address/logic/commands/CtagCommandTest.java b/src/test/java/seedu/address/logic/commands/CtagCommandTest.java
new file mode 100644
index 00000000000..2f437c7e7ea
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/CtagCommandTest.java
@@ -0,0 +1,78 @@
+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.logic.commands.CtagCommand.MESSAGE_SUCCESS_EVENT_TAG;
+import static seedu.address.logic.commands.CtagCommand.MESSAGE_SUCCESS_TAG;
+import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+
+import java.time.LocalDateTime;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+//
+public class CtagCommandTest {
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ private Tag tag = new Tag("dummy");
+ private Tag tag2 = new Tag("dummy2");
+ private EventTag eTag = new EventTag("dummy",
+ "description",
+ LocalDateTime.of(2001, 1, 1, 1, 1, 1),
+ LocalDateTime.of(2001, 1, 1, 1, 1, 1));
+ private EventTag eTag2 = new EventTag("dummy",
+ "description",
+ LocalDateTime.of(2001, 1, 1, 1, 1, 1),
+ LocalDateTime.of(2001, 1, 1, 1, 1, 1));
+
+ @Test
+ public void constructor_cTagInvalid_throwsFailedMessage() {
+ CtagCommand dummy = new CtagCommand(null, null);
+ try {
+ assertEquals(new CommandResult(CtagCommand.MESSAGE_FAILED), dummy.execute(model));
+ } catch (CommandException e) {
+ assertEquals(1, 0);
+ }
+ }
+
+ @Test
+ public void execute_testEquals_throwsSuccess() {
+ CtagCommand tagTag = new CtagCommand(tag, null);
+ CtagCommand eventTag = new CtagCommand(null, eTag);
+
+ assertTrue(tagTag.equals(tagTag));
+ assertTrue(eventTag.equals(eventTag));
+
+ CtagCommand tagTagCopy = new CtagCommand(tag, null);
+ CtagCommand eTagCopy = new CtagCommand(null, eTag);
+ assertTrue(tagTag.equals(tagTagCopy));
+ assertTrue(eventTag.equals(eTagCopy));
+
+ assertFalse(tagTag.equals(new CtagCommand(tag2, null)));
+ assertTrue(eventTag.equals(new CtagCommand(null, eTag2)));
+
+ assertFalse(tagTag.equals(1));
+ assertFalse(eventTag.equals(1));
+ }
+
+ @Test
+ public void execute_cTagInvalid_throwsFailedMessage() {
+ try {
+ CtagCommand dOne = new CtagCommand(tag, null);
+ CommandResult r = dOne.execute(model);
+ assertEquals(String.format(MESSAGE_SUCCESS_TAG, tag), r.getFeedbackToUser());
+
+ CtagCommand dTwo = new CtagCommand(null, eTag);
+ CommandResult r2 = dTwo.execute(model);
+ assertEquals(String.format(MESSAGE_SUCCESS_EVENT_TAG, eTag), r2.getFeedbackToUser());
+ } catch (Exception e) {
+ assertEquals(1, 0);
+ }
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
index b6f332eabca..43f7b604227 100644
--- a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
@@ -8,6 +8,8 @@
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.TypicalNames.NAME_ALICE;
+import static seedu.address.testutil.TypicalNames.NAME_BOB;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
import org.junit.jupiter.api.Test;
@@ -25,12 +27,13 @@
*/
public class DeleteCommandTest {
+ public static final String DUMMY_NAME = " ";
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);
+ DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON, DUMMY_NAME);
String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS,
Messages.format(personToDelete));
@@ -44,17 +47,24 @@ public void execute_validIndexUnfilteredList_success() {
@Test
public void execute_invalidIndexUnfilteredList_throwsCommandException() {
Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
- DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
+ DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex, DUMMY_NAME);
assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
+ @Test
+ public void execute_invalidNameUnfilteredList_throwsCommandException() {
+ DeleteCommand deleteCommand = new DeleteCommand(null, "InvalidName");
+
+ assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_NAME);
+ }
+
@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);
+ DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON, DUMMY_NAME);
String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS,
Messages.format(personToDelete));
@@ -74,38 +84,47 @@ public void execute_invalidIndexFilteredList_throwsCommandException() {
// ensures that outOfBoundIndex is still in bounds of address book list
assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
- DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
+ DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex, DUMMY_NAME);
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);
+ DeleteCommand deleteFirstCommand = new DeleteCommand(INDEX_FIRST_PERSON, DUMMY_NAME);
+ DeleteCommand deleteSecondCommand = new DeleteCommand(INDEX_SECOND_PERSON, DUMMY_NAME);
+ DeleteCommand deleteThirdCommand = new DeleteCommand(null, NAME_ALICE.toString());
+ DeleteCommand deleteFourthCommand = new DeleteCommand(null, NAME_BOB.toString());
// same object -> returns true
assertTrue(deleteFirstCommand.equals(deleteFirstCommand));
+ assertTrue(deleteThirdCommand.equals(deleteThirdCommand));
// same values -> returns true
- DeleteCommand deleteFirstCommandCopy = new DeleteCommand(INDEX_FIRST_PERSON);
+ DeleteCommand deleteFirstCommandCopy = new DeleteCommand(INDEX_FIRST_PERSON, DUMMY_NAME);
assertTrue(deleteFirstCommand.equals(deleteFirstCommandCopy));
+ DeleteCommand deleteThirdCommandCopy = new DeleteCommand(null, NAME_ALICE.toString());
+ assertTrue(deleteThirdCommand.equals(deleteThirdCommandCopy));
// different types -> returns false
assertFalse(deleteFirstCommand.equals(1));
// null -> returns false
assertFalse(deleteFirstCommand.equals(null));
+ assertFalse(deleteThirdCommand.equals(null));
// different person -> returns false
assertFalse(deleteFirstCommand.equals(deleteSecondCommand));
+ assertFalse(deleteThirdCommand.equals(deleteFourthCommand));
}
@Test
public void toStringMethod() {
Index targetIndex = Index.fromOneBased(1);
- DeleteCommand deleteCommand = new DeleteCommand(targetIndex);
- String expected = DeleteCommand.class.getCanonicalName() + "{targetIndex=" + targetIndex + "}";
+ String targetName = NAME_ALICE.toString();
+ DeleteCommand deleteCommand = new DeleteCommand(targetIndex, targetName);
+ String expected = DeleteCommand.class.getCanonicalName() + "{targetIndex=" + targetIndex
+ + ", targetName=" + targetName + "}";
assertEquals(expected, deleteCommand.toString());
}
diff --git a/src/test/java/seedu/address/logic/commands/DtagCommandTest.java b/src/test/java/seedu/address/logic/commands/DtagCommandTest.java
new file mode 100644
index 00000000000..e455e570875
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/DtagCommandTest.java
@@ -0,0 +1,4 @@
+package seedu.address.logic.commands;
+
+public class DtagCommandTest {
+}
diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
index 469dd97daa7..edd353ab273 100644
--- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
@@ -13,6 +13,8 @@
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.TypicalNames.NAME_ALICE;
+import static seedu.address.testutil.TypicalNames.NAME_BOB;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
import org.junit.jupiter.api.Test;
@@ -32,14 +34,14 @@
* Contains integration tests (interaction with the Model) and unit tests for EditCommand.
*/
public class EditCommandTest {
-
+ public static final String DUMMY_NAME = " ";
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);
+ EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, DUMMY_NAME, descriptor);
String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));
@@ -60,7 +62,7 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
.withPhone(VALID_PHONE_BOB).withTags(VALID_TAG_HUSBAND).build();
- EditCommand editCommand = new EditCommand(indexLastPerson, descriptor);
+ EditCommand editCommand = new EditCommand(indexLastPerson, DUMMY_NAME, descriptor);
String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));
@@ -72,7 +74,7 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
@Test
public void execute_noFieldSpecifiedUnfilteredList_success() {
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, new EditPersonDescriptor());
+ EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, DUMMY_NAME, new EditPersonDescriptor());
Person editedPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));
@@ -88,7 +90,7 @@ public void execute_filteredList_success() {
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,
+ EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, DUMMY_NAME,
new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, Messages.format(editedPerson));
@@ -103,7 +105,7 @@ public void execute_filteredList_success() {
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);
+ EditCommand editCommand = new EditCommand(INDEX_SECOND_PERSON, DUMMY_NAME, descriptor);
assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_PERSON);
}
@@ -114,7 +116,7 @@ public void execute_duplicatePersonFilteredList_failure() {
// 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,
+ EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, DUMMY_NAME,
new EditPersonDescriptorBuilder(personInList).build());
assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_PERSON);
@@ -124,7 +126,7 @@ public void execute_duplicatePersonFilteredList_failure() {
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);
+ EditCommand editCommand = new EditCommand(outOfBoundIndex, DUMMY_NAME, descriptor);
assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
@@ -140,7 +142,7 @@ public void execute_invalidPersonIndexFilteredList_failure() {
// ensures that outOfBoundIndex is still in bounds of address book list
assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
- EditCommand editCommand = new EditCommand(outOfBoundIndex,
+ EditCommand editCommand = new EditCommand(outOfBoundIndex, DUMMY_NAME,
new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
@@ -148,37 +150,47 @@ public void execute_invalidPersonIndexFilteredList_failure() {
@Test
public void equals() {
- final EditCommand standardCommand = new EditCommand(INDEX_FIRST_PERSON, DESC_AMY);
+ final EditCommand standardCommand = new EditCommand(INDEX_FIRST_PERSON, DUMMY_NAME, DESC_AMY);
+ final EditCommand standardCommand2 = new EditCommand(null, NAME_ALICE.toString(), DESC_AMY);
// same values -> returns true
EditPersonDescriptor copyDescriptor = new EditPersonDescriptor(DESC_AMY);
- EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST_PERSON, copyDescriptor);
+ EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST_PERSON, DUMMY_NAME, copyDescriptor);
assertTrue(standardCommand.equals(commandWithSameValues));
+ EditCommand commandWithSameValuesByName = new EditCommand(null, NAME_ALICE.toString(), copyDescriptor);
+ assertTrue(standardCommand2.equals(commandWithSameValuesByName));
+
+
// same object -> returns true
assertTrue(standardCommand.equals(standardCommand));
+ assertTrue(standardCommand2.equals(standardCommand2));
// null -> returns false
assertFalse(standardCommand.equals(null));
+ assertFalse(standardCommand2.equals(null));
// different types -> returns false
assertFalse(standardCommand.equals(new ClearCommand()));
+ assertFalse(standardCommand2.equals(new ClearCommand()));
// different index -> returns false
- assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_PERSON, DESC_AMY)));
+ assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_PERSON, DUMMY_NAME, DESC_AMY)));
+ assertFalse(standardCommand2.equals(new EditCommand(null, NAME_BOB.toString(), DESC_AMY)));
// different descriptor -> returns false
- assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_PERSON, DESC_BOB)));
+ assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_PERSON, DUMMY_NAME, DESC_BOB)));
+ assertFalse(standardCommand2.equals(new EditCommand(null, NAME_BOB.toString(), DESC_BOB)));
}
@Test
public void toStringMethod() {
Index index = Index.fromOneBased(1);
+ String name = NAME_ALICE.toString();
EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
- EditCommand editCommand = new EditCommand(index, editPersonDescriptor);
- String expected = EditCommand.class.getCanonicalName() + "{index=" + index + ", editPersonDescriptor="
- + editPersonDescriptor + "}";
+ EditCommand editCommand = new EditCommand(index, name, editPersonDescriptor);
+ String expected = EditCommand.class.getCanonicalName() + "{index=" + index + ", name="
+ + name + ", editPersonDescriptor=" + editPersonDescriptor + "}";
assertEquals(expected, editCommand.toString());
}
-
}
diff --git a/src/test/java/seedu/address/logic/commands/ExportCommandTest.java b/src/test/java/seedu/address/logic/commands/ExportCommandTest.java
new file mode 100644
index 00000000000..089c0414c4a
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/ExportCommandTest.java
@@ -0,0 +1,5 @@
+package seedu.address.logic.commands;
+
+public class ExportCommandTest {
+ //todo
+}
diff --git a/src/test/java/seedu/address/logic/commands/ImportCommandTest.java b/src/test/java/seedu/address/logic/commands/ImportCommandTest.java
new file mode 100644
index 00000000000..449f126c477
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/ImportCommandTest.java
@@ -0,0 +1,38 @@
+package seedu.address.logic.commands;
+
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for ImportCommand.
+ */
+public class ImportCommandTest {
+
+ @Test
+ public void execute_invalidFilePath_failure() {
+ Model model = new ModelManager();
+
+ assertCommandFailure(new ImportCommand("xxx"), model, ImportCommand.MESSAGE_FILE_NOT_FOUND);
+ }
+
+ @Test
+ public void execute_invalidFileValues_failure() {
+ Model model = new ModelManager();
+
+ assertCommandFailure(new ImportCommand("./src/test/data/ImportTest/invalidValueTest.csv"),
+ model, ImportCommand.MESSAGE_VALUES_FORMAT_ERROR);
+ }
+
+ @Test
+ public void execute_invalidFieldValues_failure() {
+ Model model = new ModelManager();
+
+ assertCommandFailure(new ImportCommand("./src/test/data/ImportTest/invalidFieldsTest.csv"),
+ model, ImportCommand.MESSAGE_FIELDS_FORMAT_ERROR);
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/SearchTagCommandTest.java b/src/test/java/seedu/address/logic/commands/SearchTagCommandTest.java
new file mode 100644
index 00000000000..cf8397ef7c4
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/SearchTagCommandTest.java
@@ -0,0 +1,36 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.tag.Tag;
+
+public class SearchTagCommandTest {
+ private Model model;
+
+ @BeforeEach
+ public void setUp() {
+ model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ }
+
+ @Test
+ public void execute_friendTagSearch_showSuccess() throws CommandException {
+ SearchTagCommand sc = new SearchTagCommand(new Tag("friends"));
+ CommandResult result = sc.execute(model);
+ assertEquals(SearchTagCommand.MESSAGE_SUCCESS, result.getFeedbackToUser());
+ }
+
+ @Test
+ public void execute_unknownTagSearch_throws() {
+ SearchTagCommand sc = new SearchTagCommand(new Tag("Uzuzuzuz"));
+ assertThrows(CommandException.class, () -> sc.execute(model));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/SwitchCommandTest.java b/src/test/java/seedu/address/logic/commands/SwitchCommandTest.java
new file mode 100644
index 00000000000..461586df218
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/SwitchCommandTest.java
@@ -0,0 +1,256 @@
+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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.commands.SwitchCommand.MESSAGE_NO_EVENT_TAG;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.Test;
+
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
+import seedu.address.commons.core.GuiSettings;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyUserPrefs;
+import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+
+public class SwitchCommandTest {
+
+ private static final String TAG_NAME = "Meeting";
+ private static final String DESCRIPTION = "Discuss project";
+ private static final LocalDateTime START_DATE = LocalDateTime.of(2022, 3, 15, 10, 0);
+ private static final LocalDateTime END_DATE = LocalDateTime.of(2022, 3, 15, 12, 0);
+
+ private ModelStubWithEventTag modelStub = new ModelStubWithEventTag();
+
+ @Test
+ public void constructor_nullTag_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new SwitchCommand(null));
+ }
+
+ @Test
+ public void execute_validTag_success() throws Exception {
+ SwitchCommand switchCommand = new SwitchCommand(new Tag(TAG_NAME));
+ CommandResult commandResult = switchCommand.execute(modelStub);
+ assertEquals(String.format(SwitchCommand.MESSAGE_SUCCESS_EVENT_TAG + "%s\n"
+ + "Description: %s\n"
+ + "Start Date: %s\n"
+ + "End Date: %s\n", TAG_NAME, DESCRIPTION,
+ START_DATE.format(DateTimeFormatter.ofPattern("MMM d, yyyy HH:mm a")),
+ END_DATE.format(DateTimeFormatter.ofPattern("MMM d, yyyy HH:mm a"))),
+ commandResult.getFeedbackToUser());
+ }
+
+ @Test
+ public void execute_noEventTag_throwsCommandException() {
+ SwitchCommand switchCommand = new SwitchCommand(new Tag("Nonexistent"));
+ assertThrows(CommandException.class, MESSAGE_NO_EVENT_TAG, () -> switchCommand.execute(modelStub));
+ }
+
+ @Test
+ public void equals() {
+ Tag meetingTag = new Tag(TAG_NAME);
+ Tag discussionTag = new Tag("Discussion");
+
+ SwitchCommand switchCommandWithMeetingTag = new SwitchCommand(meetingTag);
+ SwitchCommand switchCommandWithDiscussionTag = new SwitchCommand(discussionTag);
+
+ // same object -> returns true
+ assertTrue(switchCommandWithMeetingTag.equals(switchCommandWithMeetingTag));
+
+ // same values -> returns true
+ SwitchCommand switchCommandWithMeetingTagCopy = new SwitchCommand(meetingTag);
+ assertTrue(switchCommandWithMeetingTag.equals(switchCommandWithMeetingTagCopy));
+
+ // different types -> returns false
+ assertFalse(switchCommandWithMeetingTag.equals(1));
+
+ // null -> returns false
+ assertFalse(switchCommandWithMeetingTag.equals(null));
+
+ // different tag -> returns false
+ assertFalse(switchCommandWithMeetingTag.equals(switchCommandWithDiscussionTag));
+ }
+
+ /**
+ * 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 boolean hasTag(Tag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void assign(Person targetPerson, Set tags, Set eventTags) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void deleteTag(Tag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+
+ @Override
+ public void addTag(Tag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public boolean hasEventTag(EventTag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public boolean hasEventTag(String tagName) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void deleteEventTag(EventTag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void addEventTag(EventTag tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public EventTag getEventTag(String tag) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ObservableList getFilteredPersonList() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void updateFilteredPersonList(Predicate predicate) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ObservableSet getEventTagList() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void updateEventTagPersonList(EventTag t) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setCurrentEventTag(EventTag tagName) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void clearCurrentEventTag() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void updateTagPersonList(Tag t) {
+ throw new AssertionError("This method should not be called.");
+ }
+ }
+
+ /**
+ * A Model stub that contains an event tag.
+ */
+ private class ModelStubWithEventTag extends ModelStub {
+ private final EventTag eventTag = new EventTag(TAG_NAME, DESCRIPTION, START_DATE, END_DATE);
+
+ @Override
+ public boolean hasEventTag(String tagName) {
+ return TAG_NAME.equals(tagName);
+ }
+
+ @Override
+ public EventTag getEventTag(String tagName) {
+ return eventTag;
+ }
+
+ @Override
+ public void updateEventTagPersonList(EventTag t) {
+ // Do nothing
+ }
+
+ }
+}
+
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
index 5a1ab3dbc0c..0cf2dcb8ffb 100644
--- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -48,18 +48,20 @@ public void parseCommand_clear() throws Exception {
@Test
public void parseCommand_delete() throws Exception {
+ String dummyName = " ";
DeleteCommand command = (DeleteCommand) parser.parseCommand(
DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
- assertEquals(new DeleteCommand(INDEX_FIRST_PERSON), command);
+ assertEquals(new DeleteCommand(INDEX_FIRST_PERSON, dummyName), command);
}
@Test
public void parseCommand_edit() throws Exception {
+ String dummyName = " ";
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);
+ assertEquals(new EditCommand(INDEX_FIRST_PERSON, dummyName, descriptor), command);
}
@Test
diff --git a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java b/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
index 6a40e14a649..5f07960bbb3 100644
--- a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
@@ -21,12 +21,18 @@ public class DeleteCommandParserTest {
private DeleteCommandParser parser = new DeleteCommandParser();
@Test
- public void parse_validArgs_returnsDeleteCommand() {
- assertParseSuccess(parser, "1", new DeleteCommand(INDEX_FIRST_PERSON));
+ public void parse_validIndexArgs_returnsDeleteCommand() {
+ String dummyName = " ";
+ assertParseSuccess(parser, "1", new DeleteCommand(INDEX_FIRST_PERSON, dummyName));
+ }
+
+ @Test
+ public void parse_validNameArgs_returnsDeleteCommand() {
+ assertParseSuccess(parser, "Alice", new DeleteCommand(null, "Alice"));
}
@Test
public void parse_invalidArgs_throwsParseException() {
- assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
+ assertParseFailure(parser, " ", String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
}
}
diff --git a/src/test/java/seedu/address/logic/parser/DtagCommandParserTest.java b/src/test/java/seedu/address/logic/parser/DtagCommandParserTest.java
new file mode 100644
index 00000000000..d3d91c5b02b
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/DtagCommandParserTest.java
@@ -0,0 +1,27 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.DtagCommand;
+
+
+
+public class DtagCommandParserTest {
+
+ private DtagCommandParser parser = new DtagCommandParser();
+
+ @Test
+ public void parse_validArgs_returnsDtagCommand() {
+ assertParseSuccess(parser, "friends", new DtagCommand("friends"));
+ }
+
+ @Test
+ public void parse_invalidArgs_throwsParseException() {
+ assertParseFailure(parser, "", String.format(MESSAGE_INVALID_COMMAND_FORMAT, DtagCommand.MESSAGE_USAGE));
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
index cc7175172d4..4389477e64c 100644
--- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
@@ -51,17 +51,17 @@ public class EditCommandParserTest {
private static final String MESSAGE_INVALID_FORMAT =
String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE);
-
+ private static final String DUMMY_NAME = " ";
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 field specified
+ assertParseFailure(parser, VALID_NAME_AMY, EditCommand.MESSAGE_NOT_EDITED);
+
// no index and no field specified
assertParseFailure(parser, "", MESSAGE_INVALID_FORMAT);
}
@@ -69,20 +69,26 @@ public void parse_missingParts_failure() {
@Test
public void parse_invalidPreamble_failure() {
// negative index
- assertParseFailure(parser, "-5" + NAME_DESC_AMY, MESSAGE_INVALID_FORMAT);
+ assertParseFailure(parser, "-5", 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);
+ assertParseFailure(parser, "0", MESSAGE_INVALID_FORMAT);
// invalid prefix being parsed as preamble
assertParseFailure(parser, "1 i/ string", MESSAGE_INVALID_FORMAT);
+
+ // invalid prefix being parsed as preamble
+ assertParseFailure(parser, "tom i/ string", MESSAGE_INVALID_FORMAT);
}
@Test
public void parse_invalidValue_failure() {
+ assertParseFailure(parser, VALID_NAME_AMY + INVALID_NAME_DESC, Name.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, VALID_NAME_AMY + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, VALID_NAME_AMY + INVALID_EMAIL_DESC, Email.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, VALID_NAME_AMY + INVALID_ADDRESS_DESC, Address.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, VALID_NAME_AMY + INVALID_TAG_DESC, Tag.MESSAGE_CONSTRAINTS);
+
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
@@ -91,6 +97,7 @@ public void parse_invalidValue_failure() {
// invalid phone followed by valid email
assertParseFailure(parser, "1" + INVALID_PHONE_DESC + EMAIL_DESC_AMY, Phone.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, VALID_NAME_AMY + INVALID_PHONE_DESC + EMAIL_DESC_AMY, 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
@@ -98,13 +105,23 @@ public void parse_invalidValue_failure() {
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);
+ assertParseFailure(parser, VALID_NAME_AMY
+ + TAG_DESC_FRIEND + TAG_DESC_HUSBAND + TAG_EMPTY, Tag.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, VALID_NAME_AMY
+ + TAG_DESC_FRIEND + TAG_EMPTY + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, VALID_NAME_AMY
+ + 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);
+
+ assertParseFailure(parser, VALID_NAME_AMY + INVALID_NAME_DESC
+ + INVALID_EMAIL_DESC + VALID_ADDRESS_AMY + VALID_PHONE_AMY, Name.MESSAGE_CONSTRAINTS);
}
@Test
- public void parse_allFieldsSpecified_success() {
+ public void parse_editByIndexWithAllFieldsSpecified_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;
@@ -112,59 +129,119 @@ public void parse_allFieldsSpecified_success() {
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);
+ EditCommand expectedCommand = new EditCommand(targetIndex, DUMMY_NAME, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@Test
- public void parse_someFieldsSpecified_success() {
+ public void parse_editByNameWithAllFieldsSpecified_success() {
+ String targetName = "Alice";
+ String userInput = targetName + 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(null, targetName, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_editByIndexWithSomeFieldsSpecified_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);
+ EditCommand expectedCommand = new EditCommand(targetIndex, DUMMY_NAME, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@Test
- public void parse_oneFieldSpecified_success() {
+ public void parse_editByNameWithSomeFieldsSpecified_success() {
+ String targetName = "Alice";
+ String userInput = targetName + PHONE_DESC_BOB + EMAIL_DESC_AMY;
+
+ EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
+ .withEmail(VALID_EMAIL_AMY).build();
+ EditCommand expectedCommand = new EditCommand(null, targetName, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_editByIndexWithOneFieldSpecified_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);
+ EditCommand expectedCommand = new EditCommand(targetIndex, DUMMY_NAME, 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);
+ expectedCommand = new EditCommand(targetIndex, DUMMY_NAME, 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);
+ expectedCommand = new EditCommand(targetIndex, DUMMY_NAME, 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);
+ expectedCommand = new EditCommand(targetIndex, DUMMY_NAME, 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);
+ expectedCommand = new EditCommand(targetIndex, DUMMY_NAME, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_editByNameWithOneFieldSpecified_success() {
+ // name
+ String targetName = "Alice";
+ String userInput = targetName + NAME_DESC_AMY;
+ EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY).build();
+ EditCommand expectedCommand = new EditCommand(null, targetName, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // phone
+ userInput = targetName + PHONE_DESC_AMY;
+ descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_AMY).build();
+ expectedCommand = new EditCommand(null, targetName, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // email
+ userInput = targetName + EMAIL_DESC_AMY;
+ descriptor = new EditPersonDescriptorBuilder().withEmail(VALID_EMAIL_AMY).build();
+ expectedCommand = new EditCommand(null, targetName, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // address
+ userInput = targetName + ADDRESS_DESC_AMY;
+ descriptor = new EditPersonDescriptorBuilder().withAddress(VALID_ADDRESS_AMY).build();
+ expectedCommand = new EditCommand(null, targetName, descriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // tags
+ userInput = targetName + TAG_DESC_FRIEND;
+ descriptor = new EditPersonDescriptorBuilder().withTags(VALID_TAG_FRIEND).build();
+ expectedCommand = new EditCommand(null, targetName, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@Test
- public void parse_multipleRepeatedFields_failure() {
+ public void parse_editByIndexWithMultipleRepeatedFields_failure() {
// More extensive testing of duplicate parameter detections is done in
// AddCommandParserTest#parse_repeatedNonTagValue_failure()
@@ -179,7 +256,7 @@ public void parse_multipleRepeatedFields_failure() {
assertParseFailure(parser, userInput, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE));
- // mulltiple valid fields repeated
+ // multiple valid fields repeated
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;
@@ -196,12 +273,55 @@ public void parse_multipleRepeatedFields_failure() {
}
@Test
- public void parse_resetTags_success() {
+ public void parse_editByNameWithMultipleRepeatedFields_failure() {
+ // More extensive testing of duplicate parameter detections is done in
+ // AddCommandParserTest#parse_repeatedNonTagValue_failure()
+
+ // valid followed by invalid
+ String targetName = "Alice";
+ String userInput = targetName + INVALID_PHONE_DESC + PHONE_DESC_BOB;
+
+ assertParseFailure(parser, userInput, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE));
+
+ // invalid followed by valid
+ userInput = targetName + PHONE_DESC_BOB + INVALID_PHONE_DESC;
+
+ assertParseFailure(parser, userInput, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE));
+
+ // multiple valid fields repeated
+ userInput = targetName + 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;
+
+ assertParseFailure(parser, userInput,
+ Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS));
+
+ // multiple invalid values
+ userInput = targetName + INVALID_PHONE_DESC + INVALID_ADDRESS_DESC + INVALID_EMAIL_DESC
+ + INVALID_PHONE_DESC + INVALID_ADDRESS_DESC + INVALID_EMAIL_DESC;
+
+ assertParseFailure(parser, userInput,
+ Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS));
+ }
+
+ @Test
+ public void parse_editByIndexWithResetTags_success() {
Index targetIndex = INDEX_THIRD_PERSON;
String userInput = targetIndex.getOneBased() + TAG_EMPTY;
EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withTags().build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ EditCommand expectedCommand = new EditCommand(targetIndex, DUMMY_NAME, descriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_editByNameWithResetTags_success() {
+ String targetName = "Alice";
+ String userInput = targetName + TAG_EMPTY;
+
+ EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withTags().build();
+ EditCommand expectedCommand = new EditCommand(null, targetName, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
diff --git a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
index 4256788b1a7..26c38d1e27e 100644
--- a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
+++ b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
@@ -193,4 +193,9 @@ public void parseTags_collectionWithValidTags_returnsTagSet() throws Exception {
assertEquals(expectedTagSet, actualTagSet);
}
+
+ @Test
+ public void parseDateTime_stringWithInvalidTime_throwsException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseDateTime("2020-2-3 15:03:03"));
+ }
}
diff --git a/src/test/java/seedu/address/logic/parser/SearchTagCommandParserTest.java b/src/test/java/seedu/address/logic/parser/SearchTagCommandParserTest.java
new file mode 100644
index 00000000000..8d6203db0aa
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/SearchTagCommandParserTest.java
@@ -0,0 +1,34 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.SearchTagCommand;
+import seedu.address.model.tag.Tag;
+
+public class SearchTagCommandParserTest {
+ private SearchCommandParser parser = new SearchCommandParser();
+
+ @Test
+ public void parse_emptyArg_throwsParseException() {
+ assertParseFailure(parser, " ",
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SearchTagCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_moreThanOneArg_throwsParseException() {
+ assertParseFailure(parser, "2222 3333 ",
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SearchTagCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_validArgs_returnsSearchCommand() {
+ // no leading and trailing whitespaces
+ SearchTagCommand expectedFindCommand =
+ new SearchTagCommand(new Tag("friends"));
+ assertParseSuccess(parser, "friends", expectedFindCommand);
+ }
+}
diff --git a/src/test/java/seedu/address/logic/parser/SwitchCommandParserTest.java b/src/test/java/seedu/address/logic/parser/SwitchCommandParserTest.java
new file mode 100644
index 00000000000..ff35dc9db04
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/SwitchCommandParserTest.java
@@ -0,0 +1,35 @@
+package seedu.address.logic.parser;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.SwitchCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.tag.Tag;
+
+public class SwitchCommandParserTest {
+
+ private final SwitchCommandParser parser = new SwitchCommandParser();
+
+ @Test
+ public void parse_validArgs_returnsSwitchCommand() throws ParseException {
+ String tagName = "Meeting";
+ assertEquals(new SwitchCommand(new Tag(tagName)), parser.parse(tagName));
+ }
+
+ @Test
+ public void parse_emptyArgs_throwsParseException() {
+ assertThrows(ParseException.class, () -> parser.parse(""));
+ }
+
+ @Test
+ public void parse_invalidArgs_throwsParseException() {
+ // Test with more than one argument
+ assertThrows(ParseException.class, () -> parser.parse("Meeting Room"));
+
+ // Test with invalid characters
+ assertThrows(IllegalArgumentException.class, () -> parser.parse("Invalid$Tag"));
+ }
+}
diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
index 68c8c5ba4d5..36169a2a0a0 100644
--- a/src/test/java/seedu/address/model/AddressBookTest.java
+++ b/src/test/java/seedu/address/model/AddressBookTest.java
@@ -1,5 +1,6 @@
package seedu.address.model;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -8,18 +9,27 @@
import static seedu.address.testutil.Assert.assertThrows;
import static seedu.address.testutil.TypicalPersons.ALICE;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalTags.FRIEND;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.junit.jupiter.api.Test;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
import seedu.address.model.person.Person;
import seedu.address.model.person.exceptions.DuplicatePersonException;
+import seedu.address.model.person.exceptions.PersonNotFoundException;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
+import seedu.address.model.tag.exceptions.DuplicateTagException;
+import seedu.address.model.tag.exceptions.TagNotFoundException;
import seedu.address.testutil.PersonBuilder;
public class AddressBookTest {
@@ -29,6 +39,7 @@ public class AddressBookTest {
@Test
public void constructor() {
assertEquals(Collections.emptyList(), addressBook.getPersonList());
+ assertEquals(Collections.emptySet(), addressBook.getTagList());
}
@Test
@@ -49,7 +60,9 @@ public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
.build();
List newPersons = Arrays.asList(ALICE, editedAlice);
- AddressBookStub newData = new AddressBookStub(newPersons);
+ List newTags = List.of();
+ List newEventTags = List.of();
+ AddressBookStub newData = new AddressBookStub(newPersons, newTags, newEventTags);
assertThrows(DuplicatePersonException.class, () -> addressBook.resetData(newData));
}
@@ -59,17 +72,33 @@ public void hasPerson_nullPerson_throwsNullPointerException() {
assertThrows(NullPointerException.class, () -> addressBook.hasPerson(null));
}
+ @Test
+ public void hasTag_nullTag_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> addressBook.hasTag((Tag) null));
+ }
+
@Test
public void hasPerson_personNotInAddressBook_returnsFalse() {
assertFalse(addressBook.hasPerson(ALICE));
}
+ @Test
+ public void hasTag_tagNotInAddressBook_returnsFalse() {
+ assertFalse(addressBook.hasTag(FRIEND));
+ }
+
@Test
public void hasPerson_personInAddressBook_returnsTrue() {
addressBook.addPerson(ALICE);
assertTrue(addressBook.hasPerson(ALICE));
}
+ @Test
+ public void hasTag_tagInAddressBook_returnsTrue() {
+ addressBook.addTag(FRIEND);
+ assertTrue(addressBook.hasTag(FRIEND));
+ }
+
@Test
public void hasPerson_personWithSameIdentityFieldsInAddressBook_returnsTrue() {
addressBook.addPerson(ALICE);
@@ -79,30 +108,108 @@ public void hasPerson_personWithSameIdentityFieldsInAddressBook_returnsTrue() {
}
@Test
- public void getPersonList_modifyList_throwsUnsupportedOperationException() {
- assertThrows(UnsupportedOperationException.class, () -> addressBook.getPersonList().remove(0));
+ public void hasTag_tagWithSameNameInAddressBook_returnsTrue() {
+ addressBook.addTag(FRIEND);
+ Tag editedFriend = new Tag("friends");
+ assertTrue(addressBook.hasTag(editedFriend));
+ }
+
+ @Test
+ public void addDuplicatePerson_throwsDuplicatePersonException() {
+ addressBook.addPerson(ALICE);
+ assertThrows(DuplicatePersonException.class, () -> addressBook.addPerson(ALICE));
}
+ @Test
+ public void addDuplicateTag_throwsDuplicateTagException() {
+ addressBook.addTag(FRIEND);
+ assertThrows(DuplicateTagException.class, () -> addressBook.addTag(FRIEND));
+ }
+
+ @Test
+ public void setPerson_withDifferentIdentityFields_success() {
+ addressBook.addPerson(ALICE);
+ Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
+ .build();
+ assertDoesNotThrow(() -> addressBook.setPerson(ALICE, editedAlice));
+ }
+
+ @Test
+ public void setTags_withUniqueTags_success() {
+ Set uniqueTags = new HashSet<>(Arrays.asList(FRIEND, new Tag("colleague")));
+ assertDoesNotThrow(() -> addressBook.setTagList(uniqueTags));
+ }
+
+ @Test
+ public void removePerson_notExistingPerson_throwsPersonNotFoundException() {
+ assertThrows(PersonNotFoundException.class, () -> addressBook.removePerson(ALICE));
+ }
+
+ @Test
+ public void removeTag_notExistingTag_throwsTagNotFoundException() {
+ assertThrows(TagNotFoundException.class, () -> addressBook.removeTag(FRIEND));
+ }
+
+
+
+ @Test
+ public void removePerson_existingPerson_success() {
+ addressBook.addPerson(ALICE);
+ assertDoesNotThrow(() -> addressBook.removePerson(ALICE));
+ }
+
+ @Test
+ public void removeTag_existingTag_success() {
+ addressBook.addTag(FRIEND);
+ assertDoesNotThrow(() -> addressBook.removeTag(FRIEND));
+ }
+
+
@Test
public void toStringMethod() {
- String expected = AddressBook.class.getCanonicalName() + "{persons=" + addressBook.getPersonList() + "}";
+ String expected = AddressBook.class.getCanonicalName() + "{persons=" + addressBook.getPersonList()
+ + ", tags=" + addressBook.getTagList() + ", event tags=" + addressBook.getEventTagList() + "}";
assertEquals(expected, addressBook.toString());
}
+ @Test
+ public void getPersonList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> addressBook.getPersonList().remove(0));
+ }
+
+ @Test
+ public void getTagList_modifySet_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> addressBook.getTagList().remove(FRIEND));
+ }
+
/**
* A stub ReadOnlyAddressBook whose persons list can violate interface constraints.
*/
private static class AddressBookStub implements ReadOnlyAddressBook {
private final ObservableList persons = FXCollections.observableArrayList();
+ private final ObservableSet tags = FXCollections.observableSet();
+ private final ObservableSet eventTags = FXCollections.observableSet();
- AddressBookStub(Collection persons) {
+ AddressBookStub(Collection persons, Collection tags, Collection eventTags) {
this.persons.setAll(persons);
+ this.tags.addAll(tags);
+ this.eventTags.addAll(eventTags);
}
@Override
public ObservableList getPersonList() {
return persons;
}
+
+ @Override
+ public ObservableSet getTagList() {
+ return tags;
+ }
+
+ @Override
+ public ObservableSet getEventTagList() {
+ return eventTags;
+ }
}
}
diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
index 31a10d156c9..f25ccaebbdc 100644
--- a/src/test/java/seedu/address/model/person/PersonTest.java
+++ b/src/test/java/seedu/address/model/person/PersonTest.java
@@ -93,7 +93,8 @@ public void equals() {
@Test
public void toStringMethod() {
String expected = Person.class.getCanonicalName() + "{name=" + ALICE.getName() + ", phone=" + ALICE.getPhone()
- + ", email=" + ALICE.getEmail() + ", address=" + ALICE.getAddress() + ", tags=" + ALICE.getTags() + "}";
+ + ", email=" + ALICE.getEmail() + ", address=" + ALICE.getAddress() + ", tags=" + ALICE.getTags()
+ + ", eventTags=" + ALICE.getEventTags() + "}";
assertEquals(expected, ALICE.toString());
}
}
diff --git a/src/test/java/seedu/address/model/tag/EventTagTest.java b/src/test/java/seedu/address/model/tag/EventTagTest.java
new file mode 100644
index 00000000000..715fb103e7e
--- /dev/null
+++ b/src/test/java/seedu/address/model/tag/EventTagTest.java
@@ -0,0 +1,71 @@
+package seedu.address.model.tag;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.LocalDateTime;
+
+import org.junit.jupiter.api.Test;
+
+public class EventTagTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new EventTag(null, "test",
+ LocalDateTime.now(), LocalDateTime.now()));
+ }
+
+ @Test
+ public void constructor_invalidTagName_throwsIllegalArgumentException() {
+ String invalidTagName = "";
+ assertThrows(IllegalArgumentException.class, () -> new EventTag(invalidTagName, "test",
+ LocalDateTime.now(), LocalDateTime.now()));
+ }
+ @Test
+ public void getCodeFormat_validInput_returnsFormattedString() {
+ LocalDateTime startDate = LocalDateTime.of(2022, 3, 15, 10, 0);
+ LocalDateTime endDate = LocalDateTime.of(2022, 3, 15, 12, 0);
+ EventTag eventTag = new EventTag("Meeting", "Discuss project", startDate, endDate);
+
+ String expectedCodeFormat = "t/E-Meeting dc/Discuss project sd/2022-03-15 10:00:00 ed/2022-03-15 12:00:00";
+ assertEquals(expectedCodeFormat, eventTag.getCodeFormat());
+ }
+
+ @Test
+ public void equals_equalObjects_returnsTrue() {
+ LocalDateTime startDate1 = LocalDateTime.of(2022, 3, 15, 10, 0);
+ LocalDateTime endDate1 = LocalDateTime.of(2022, 3, 15, 12, 0);
+ EventTag eventTag1 = new EventTag("Meeting", "Discuss project", startDate1, endDate1);
+
+ LocalDateTime startDate2 = LocalDateTime.of(2022, 3, 15, 10, 0);
+ LocalDateTime endDate2 = LocalDateTime.of(2022, 3, 15, 12, 0);
+ EventTag eventTag2 = new EventTag("Meeting", "Discuss project", startDate2, endDate2);
+
+ assertEquals(eventTag1, eventTag2);
+ }
+
+ @Test
+ public void equals_notEqualObjects_returnsFalse() {
+ LocalDateTime startDate1 = LocalDateTime.of(2022, 3, 15, 10, 0);
+ LocalDateTime endDate1 = LocalDateTime.of(2022, 3, 15, 12, 0);
+ EventTag eventTag1 = new EventTag("Meeting", "Discuss project", startDate1, endDate1);
+
+ LocalDateTime startDate2 = LocalDateTime.of(2022, 3, 15, 11, 0);
+ LocalDateTime endDate2 = LocalDateTime.of(2022, 3, 15, 13, 0);
+ EventTag eventTag2 = new EventTag("Meeting", "Discuss project", startDate2, endDate2);
+
+ assertNotEquals(eventTag1, eventTag2);
+ }
+
+ @Test
+ public void toString_validInput_returnsFormattedString() {
+ LocalDateTime startDate = LocalDateTime.of(2022, 3, 15, 10, 0);
+ LocalDateTime endDate = LocalDateTime.of(2022, 3, 15, 12, 0);
+ EventTag eventTag = new EventTag("Meeting", "Discuss project", startDate, endDate);
+
+ String expectedToString = "[Meeting] from 2022-03-15 10:00:00 to 2022-03-15 12:00:00.\nDiscuss project";
+ assertEquals(expectedToString, eventTag.toString());
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/tag/UniqueTagListTest.java b/src/test/java/seedu/address/model/tag/UniqueTagListTest.java
new file mode 100644
index 00000000000..3567669937e
--- /dev/null
+++ b/src/test/java/seedu/address/model/tag/UniqueTagListTest.java
@@ -0,0 +1,198 @@
+package seedu.address.model.tag;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.tag.exceptions.DuplicateTagException;
+import seedu.address.model.tag.exceptions.TagNotFoundException;
+
+public class UniqueTagListTest {
+
+ private final UniqueTagList uniqueTagList = new UniqueTagList<>();
+
+ @Test
+ public void contains_nullTag_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueTagList.contains((Tag) null));
+ }
+
+ @Test
+ public void contains_nullTagString_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueTagList.contains((String) null));
+ }
+
+ @Test
+ public void contains_tagNotInList_returnsFalse() {
+ assertFalse(uniqueTagList.contains(new Tag("friends")));
+ }
+
+ @Test
+ public void contains_tagNotInListString_returnsFalse() {
+ assertFalse(uniqueTagList.contains("friends"));
+ }
+
+ @Test
+ public void contains_tagInList_returnsTrue() {
+ uniqueTagList.add(new Tag("friends"));
+ assertTrue(uniqueTagList.contains(new Tag("friends")));
+ }
+
+ @Test
+ public void contains_tagInListString_returnsTrue() {
+ uniqueTagList.add(new Tag("friends"));
+ assertTrue(uniqueTagList.contains("friends"));
+ }
+
+ @Test
+ public void contains_tagWithSameNameInList_returnsTrue() {
+ uniqueTagList.add(new Tag("friends"));
+ assertTrue(uniqueTagList.contains(new Tag("friends")));
+ }
+
+ @Test
+ public void add_nullTag_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueTagList.add(null));
+ }
+
+ @Test
+ public void add_duplicateTag_throwsDuplicateTagException() {
+ uniqueTagList.add(new Tag("friends"));
+ assertThrows(DuplicateTagException.class, () -> uniqueTagList.add(new Tag("friends")));
+ }
+
+ @Test
+ public void replace_validTags_replacesTag() {
+ Tag oldTag = new Tag("old");
+ Tag newTag = new Tag("new");
+ uniqueTagList.add(oldTag);
+ uniqueTagList.replace(oldTag, newTag);
+ assertTrue(uniqueTagList.contains(newTag) && !uniqueTagList.contains(oldTag));
+ }
+
+ @Test
+ public void replace_nonExistingOldTag_throwsTagNotFoundException() {
+ assertThrows(TagNotFoundException.class, () -> uniqueTagList.replace(new Tag("old"), new Tag("new")));
+ }
+
+ @Test
+ public void replace_existingNewTag_throwsDuplicateTagException() {
+ uniqueTagList.add(new Tag("old"));
+ uniqueTagList.add(new Tag("new"));
+ assertThrows(DuplicateTagException.class, () -> uniqueTagList.replace(new Tag("old"), new Tag("new")));
+ }
+
+ @Test
+ public void remove_nullTag_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueTagList.remove((Tag) null));
+ }
+
+ @Test
+ public void remove_nullTagString_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueTagList.remove((String) null));
+ }
+
+ @Test
+ public void remove_tagDoesNotExist_throwsTagNotFoundException() {
+ assertThrows(TagNotFoundException.class, () -> uniqueTagList.remove(new Tag("friends")));
+ }
+
+ @Test
+ public void remove_tagDoesNotExistString_throwsTagNotFoundException() {
+ assertThrows(TagNotFoundException.class, () -> uniqueTagList.remove("friends"));
+ }
+
+ @Test
+ public void remove_existingTag_removesTag() {
+ uniqueTagList.add(new Tag("friends"));
+ uniqueTagList.remove(new Tag("friends"));
+ UniqueTagList expectedUniqueTagList = new UniqueTagList<>();
+ assertEquals(expectedUniqueTagList, uniqueTagList);
+ }
+
+ @Test
+ public void remove_existingTagString_removesTag() {
+ uniqueTagList.add(new Tag("friends"));
+ uniqueTagList.remove("friends");
+ UniqueTagList expectedUniqueTagList = new UniqueTagList<>();
+ assertEquals(expectedUniqueTagList, uniqueTagList);
+ }
+ @Test
+ public void setTags_nullUniqueTagList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueTagList.setTags((UniqueTagList) null));
+ }
+
+ @Test
+ public void setTags_uniqueTagList_replacesOwnListWithProvidedUniqueTagList() {
+ uniqueTagList.add(new Tag("friends"));
+ UniqueTagList expectedUniqueTagList = new UniqueTagList<>();
+ expectedUniqueTagList.add(new Tag("colleagues"));
+ uniqueTagList.setTags(expectedUniqueTagList);
+ assertEquals(expectedUniqueTagList, uniqueTagList);
+ }
+
+ @Test
+ public void setTags_nullSet_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueTagList.setTags((Set) null));
+ }
+
+ @Test
+ public void setTags_set_replacesOwnListWithProvidedSet() {
+ uniqueTagList.add(new Tag("friends"));
+ Set tagSet = new HashSet<>(Arrays.asList(new Tag("colleagues"), new Tag("family")));
+ uniqueTagList.setTags(tagSet);
+ UniqueTagList expectedUniqueTagList = new UniqueTagList<>();
+ expectedUniqueTagList.add(new Tag("colleagues"));
+ expectedUniqueTagList.add(new Tag("family"));
+ assertEquals(expectedUniqueTagList, uniqueTagList);
+ }
+
+ @Test
+ public void getEventTag_existingEventTag_returnsEventTag() {
+ EventTag eventTag = new EventTag("event", "get event tag test",
+ LocalDateTime.now(), LocalDateTime.now());
+ uniqueTagList.add(eventTag);
+ assertSame(eventTag, uniqueTagList.getEventTag("event"));
+ }
+
+ @Test
+ public void getEventTag_nonExistingEventTag_returnsNull() {
+ assertNull(uniqueTagList.getEventTag("nonExistingEvent"));
+ }
+
+ @Test
+ public void removeEvent_existingEventTag_removesEventTag() {
+ EventTag eventTag = new EventTag("event", "get event tag test",
+ LocalDateTime.now(), LocalDateTime.now());
+ uniqueTagList.add(eventTag);
+ assertNotNull(uniqueTagList.removeEvent("event"));
+ assertFalse(uniqueTagList.contains(eventTag));
+ }
+
+ @Test
+ public void removeEvent_nonExistingEventTag_returnsNull() {
+ assertNull(uniqueTagList.removeEvent("nonExistingEvent"));
+ }
+
+ @Test
+ public void asUnmodifiableObservableSet_modifySet_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, ()
+ -> uniqueTagList.asUnmodifiableObservableSet().remove(new Tag("friends")));
+ }
+
+ @Test
+ public void toStringMethod() {
+ assertEquals(uniqueTagList.asUnmodifiableObservableSet().toString(), uniqueTagList.toString());
+ }
+}
+
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
index 83b11331cdb..5e3c39c2461 100644
--- a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
+++ b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
@@ -31,6 +31,9 @@ public class JsonAdaptedPersonTest {
private static final List VALID_TAGS = BENSON.getTags().stream()
.map(JsonAdaptedTag::new)
.collect(Collectors.toList());
+ private static final List VALID_EVENT_TAGS = BENSON.getEventTags().stream()
+ .map(JsonAdaptedEventTag::new)
+ .collect(Collectors.toList());
@Test
public void toModelType_validPersonDetails_returnsPerson() throws Exception {
@@ -41,14 +44,16 @@ public void toModelType_validPersonDetails_returnsPerson() throws Exception {
@Test
public void toModelType_invalidName_throwsIllegalValueException() {
JsonAdaptedPerson person =
- new JsonAdaptedPerson(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
+ new JsonAdaptedPerson(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS,
+ VALID_EVENT_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);
+ JsonAdaptedPerson person = new JsonAdaptedPerson(null, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS,
+ VALID_EVENT_TAGS);
String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
}
@@ -56,14 +61,16 @@ public void toModelType_nullName_throwsIllegalValueException() {
@Test
public void toModelType_invalidPhone_throwsIllegalValueException() {
JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
+ new JsonAdaptedPerson(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS,
+ VALID_EVENT_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);
+ JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, null, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS,
+ VALID_EVENT_TAGS);
String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
}
@@ -71,14 +78,16 @@ public void toModelType_nullPhone_throwsIllegalValueException() {
@Test
public void toModelType_invalidEmail_throwsIllegalValueException() {
JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
+ new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_ADDRESS, VALID_TAGS,
+ VALID_EVENT_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);
+ JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, null, VALID_ADDRESS, VALID_TAGS,
+ VALID_EVENT_TAGS);
String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
}
@@ -86,14 +95,16 @@ public void toModelType_nullEmail_throwsIllegalValueException() {
@Test
public void toModelType_invalidAddress_throwsIllegalValueException() {
JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_ADDRESS, VALID_TAGS);
+ new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_ADDRESS, VALID_TAGS,
+ VALID_EVENT_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);
+ JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, null, VALID_TAGS,
+ VALID_EVENT_TAGS);
String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName());
assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
}
@@ -103,7 +114,8 @@ public void toModelType_invalidTags_throwsIllegalValueException() {
List invalidTags = new ArrayList<>(VALID_TAGS);
invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, invalidTags);
+ new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, invalidTags,
+ VALID_EVENT_TAGS);
assertThrows(IllegalValueException.class, person::toModelType);
}
diff --git a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java b/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
index 188c9058d20..cba13a1fc32 100644
--- a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
+++ b/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
@@ -19,9 +19,10 @@ public class 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");
+ private static final Path DUPLICATE_TAG_FILE = TEST_DATA_FOLDER.resolve("duplicateTagAddressBook.json");
@Test
- public void toModelType_typicalPersonsFile_success() throws Exception {
+ public void toModelType_typicalPersonsAndTagsFile_success() throws Exception {
JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(TYPICAL_PERSONS_FILE,
JsonSerializableAddressBook.class).get();
AddressBook addressBookFromFile = dataFromFile.toModelType();
@@ -44,4 +45,12 @@ public void toModelType_duplicatePersons_throwsIllegalValueException() throws Ex
dataFromFile::toModelType);
}
+ @Test
+ public void toModelType_duplicateTags_throwsIllegalValueException() throws Exception {
+ JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(DUPLICATE_TAG_FILE,
+ JsonSerializableAddressBook.class).get();
+ assertThrows(IllegalValueException.class, JsonSerializableAddressBook.MESSAGE_DUPLICATE_TAG,
+ dataFromFile::toModelType);
+ }
+
}
diff --git a/src/test/java/seedu/address/testutil/PersonBuilder.java b/src/test/java/seedu/address/testutil/PersonBuilder.java
index 6be381d39ba..92d248d3393 100644
--- a/src/test/java/seedu/address/testutil/PersonBuilder.java
+++ b/src/test/java/seedu/address/testutil/PersonBuilder.java
@@ -8,6 +8,7 @@
import seedu.address.model.person.Name;
import seedu.address.model.person.Person;
import seedu.address.model.person.Phone;
+import seedu.address.model.tag.EventTag;
import seedu.address.model.tag.Tag;
import seedu.address.model.util.SampleDataUtil;
@@ -26,6 +27,7 @@ public class PersonBuilder {
private Email email;
private Address address;
private Set tags;
+ private Set eventTags;
/**
* Creates a {@code PersonBuilder} with the default details.
@@ -36,6 +38,7 @@ public PersonBuilder() {
email = new Email(DEFAULT_EMAIL);
address = new Address(DEFAULT_ADDRESS);
tags = new HashSet<>();
+ eventTags = new HashSet<>();
}
/**
@@ -47,6 +50,7 @@ public PersonBuilder(Person personToCopy) {
email = personToCopy.getEmail();
address = personToCopy.getAddress();
tags = new HashSet<>(personToCopy.getTags());
+ eventTags = new HashSet<>(personToCopy.getEventTags());
}
/**
@@ -65,6 +69,14 @@ public PersonBuilder withTags(String ... tags) {
return this;
}
+ /**
+ * Parses the {@code eventTags} into a {@code Set} and set it to the {@code Person} that we are building.
+ */
+ public PersonBuilder withEventTags(String... eventTags) {
+ this.eventTags = SampleDataUtil.getEventTagSet(eventTags);
+ return this;
+ }
+
/**
* Sets the {@code Address} of the {@code Person} that we are building.
*/
@@ -90,7 +102,7 @@ public PersonBuilder withEmail(String email) {
}
public Person build() {
- return new Person(name, phone, email, address, tags);
+ return new Person(name, phone, email, address, tags, eventTags);
}
}
diff --git a/src/test/java/seedu/address/testutil/TypicalEventTags.java b/src/test/java/seedu/address/testutil/TypicalEventTags.java
new file mode 100644
index 00000000000..2dee18c89ba
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/TypicalEventTags.java
@@ -0,0 +1,32 @@
+package seedu.address.testutil;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import seedu.address.model.tag.EventTag;
+
+/**
+ * A utility class containing a list of {@code Tag} objects to be used in tests.
+ */
+public class TypicalEventTags {
+ public static final EventTag MEETING = new EventTag("meeting",
+ "Team meeting",
+ LocalDateTime.parse("2024-04-01T09:00:00"),
+ LocalDateTime.parse("2024-04-01T10:00:00"));
+ public static final EventTag PRESENTATION = new EventTag("presentation",
+ "Project presentation",
+ LocalDateTime.parse("2024-04-05T14:00:00"),
+ LocalDateTime.parse("2024-04-05T16:00:00"));
+ public static final EventTag BIRTHDAY = new EventTag("birthday",
+ "Birthday party",
+ LocalDateTime.parse("2024-04-10T18:00:00"),
+ LocalDateTime.parse("2024-04-10T22:00:00"));
+
+ private TypicalEventTags() {}
+
+ public static List getTypicalEventTags() {
+ return new ArrayList<>(Arrays.asList(MEETING, PRESENTATION, BIRTHDAY));
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/TypicalNames.java b/src/test/java/seedu/address/testutil/TypicalNames.java
new file mode 100644
index 00000000000..efbbbc4e37a
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/TypicalNames.java
@@ -0,0 +1,13 @@
+package seedu.address.testutil;
+
+import seedu.address.model.person.Name;
+
+/**
+ * A utility class containing a list of {@code Name} objects to be used in tests.
+ */
+public class TypicalNames {
+ // Example names
+ public static final Name NAME_ALICE = new Name("Alice");
+ public static final Name NAME_BOB = new Name("Bob");
+ public static final Name NAME_CAROL = new Name("Carol");
+}
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
index fec76fb7129..237c642b92b 100644
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ b/src/test/java/seedu/address/testutil/TypicalPersons.java
@@ -10,6 +10,8 @@
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.testutil.TypicalEventTags.getTypicalEventTags;
+import static seedu.address.testutil.TypicalTags.getTypicalTags;
import java.util.ArrayList;
import java.util.Arrays;
@@ -17,6 +19,8 @@
import seedu.address.model.AddressBook;
import seedu.address.model.person.Person;
+import seedu.address.model.tag.EventTag;
+import seedu.address.model.tag.Tag;
/**
* A utility class containing a list of {@code Person} objects to be used in tests.
@@ -64,9 +68,15 @@ private TypicalPersons() {} // prevents instantiation
*/
public static AddressBook getTypicalAddressBook() {
AddressBook ab = new AddressBook();
+ for (Tag tag : getTypicalTags()) {
+ ab.addTag(tag);
+ }
for (Person person : getTypicalPersons()) {
ab.addPerson(person);
}
+ for (EventTag eventTag : getTypicalEventTags()) {
+ ab.addEventTag(eventTag);
+ }
return ab;
}
diff --git a/src/test/java/seedu/address/testutil/TypicalTags.java b/src/test/java/seedu/address/testutil/TypicalTags.java
new file mode 100644
index 00000000000..67189fc8928
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/TypicalTags.java
@@ -0,0 +1,23 @@
+package seedu.address.testutil;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import seedu.address.model.tag.Tag;
+
+/**
+ * A utility class containing a list of {@code Tag} objects to be used in tests.
+ */
+public class TypicalTags {
+ public static final Tag FRIEND = new Tag("friends");
+ public static final Tag OWES_MONEY = new Tag("owesMoney");
+ public static final Tag COLLEAGUE = new Tag("colleagues");
+
+ private TypicalTags() {}
+
+ public static List getTypicalTags() {
+ return new ArrayList<>(Arrays.asList(FRIEND, OWES_MONEY, COLLEAGUE));
+ }
+
+}
-
-[[homepage](http://www.comp.nus.edu.sg/~damithch)]
-[[github](https://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
-
-* Role: Project Advisor
+### Owen
-### Jane Doe
+
-
-### Johnny Doe
+[[github](http://github.com/peterXGD)]
+* Role: Developer
-
+[[github](http://github.com/cleowenxuan)]
* Role: Developer
-* Responsibilities: Data
-### Jean Doe
+### Jonathan
-
+[[github](http://github.com/jonpwk)]
* Role: Developer
-* Responsibilities: Dev Ops + Threading
-
-### James Doe
-
+[[github](http://github.com/peienlim)]
* Role: Developer
-* Responsibilities: UI
diff --git a/docs/Configuration.md b/docs/Configuration.md
index 13cf0faea16..32f6255f3b9 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -1,6 +1,8 @@
---
-layout: page
-title: Configuration guide
+ layout: default.md
+ title: "Configuration guide"
---
+# 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
index d2fd91a6001..8228c845e86 100644
--- a/docs/DevOps.md
+++ b/docs/DevOps.md
@@ -1,12 +1,15 @@
---
-layout: page
-title: DevOps guide
+ layout: default.md
+ title: "DevOps guide"
+ pageNav: 3
---
-* Table of Contents
-{:toc}
+# DevOps guide
---------------------------------------------------------------------------------------------------------------------
+
+
+
+
+
+
+
+
-
-
+
+
+
-
+
+ 
+ 
+