[F11-2] Concierge #68

adamwth · 2018-09-20T12:41:43Z

@pikulet
@teowz46
@JiaqingTan
@neilish3re

liliwei25

Proceed to work towards v1.1. 👍

damithc · 2018-10-02T07:48:22Z

Guys, the current version of your team repo is failing CI checks. Try to fix before v1.1

liliwei25

There seems to some discrepancies in your docs. Please double check.

Great effort! 👍

liliwei25 · 2018-10-07T06:01:22Z

LICENSE

@@ -2,11 +2,11 @@ MIT License

 Copyright (c) 2016 Software Engineering Education - FOSS Resources

-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission is hereby granted, free of charge, to any guest obtaining a copy


I don't think you're supposed to edit the license

Oops, thanks!

liliwei25 · 2018-10-07T06:16:54Z

docs/UserGuide.adoc

+Lists all the available rooms of that type for the next NUM_DAYS days +
+Format: `avail r/ROOM TYPE num/NUM_DAYS`
+
+Lists all available rooms from start to end date. Dates have to be given in YYMMDD format


This is confusing. Is this searched from a start to end date or is this searched for next NUM_DAYS? And where is the YYMMDD date used as input?

liliwei25 · 2018-10-07T06:17:59Z

docs/UserGuide.adoc


-Adds a person to the address book +
+=== Clearing all entries : `avail`


is 'avail' used for clearing all entries?

liliwei25 · 2018-10-07T06:19:33Z

docs/UserGuide.adoc

+
+Examples:
+
+* `avail r/Double Room num/5`


These examples for 'avail' is separated from the 'avail' command description by the 'add' command

liliwei25 · 2018-10-07T06:20:26Z

docs/UserGuide.adoc

+* `avail r/Double Room num/5`
+* `avail r/Double Room ds/20180910 de/21080912`
+
+=== Listing all guests : `list`


So are you listing all guests or all room types?

liliwei25 · 2018-10-07T06:31:44Z

docs/DeveloperGuide.adoc

@@ -582,9 +582,9 @@ Do take a look at <<Design-Model>> before attempting to modify the `Model` compo
 * Hints
 ** The link:{repoURL}/src/main/java/seedu/address/model/Model.java[`Model`] and the link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`] API need to be updated.
 ** Think about how you can use SLAP to design the method. Where should we place the main logic of deleting tags?
-**  Find out which of the existing API methods in  link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`] and link:{repoURL}/src/main/java/seedu/address/model/person/Person.java[`Person`] classes can be used to implement the tag removal logic. link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`] allows you to update a person, and link:{repoURL}/src/main/java/seedu/address/model/person/Person.java[`Person`] allows you to update the tags.
+**  Find out which of the existing API methods in  link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`] and link:{repoURL}/src/main/java/seedu/address/model/guest/Person.java[`Person`] classes can be used to implement the tag removal logic. link:{repoURL}/src/main/java/seedu/address/model/AddressBook.java[`AddressBook`] allows you to update a guest, and link:{repoURL}/src/main/java/seedu/address/model/guest/Person.java[`Person`] allows you to update the tags.


/guest/Person.java or /person/Guest.java?

liliwei25 · 2018-10-07T06:38:02Z

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

+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Assigns a guest to a room.\n"
+            + "Parameters: GUEST_NAME ROOM_NUMBER\n"
+            + "Example: " + COMMAND_WORD + " Thomas 056";


This format is different from the one specified in your User docs. Please make it consistent

liliwei25 · 2018-10-07T06:48:27Z

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

+        Guest guestToAssign = lastShownList.get(targetIndex.getZeroBased());
+        model.commitAddressBook();
+
+        return new CommandResult(String.format(MESSAGE_ASSIGN_GUEST_SUCCESS, guestToAssign));


String accepts two inputs but only one was given

liliwei25 · 2018-10-07T07:20:51Z

src/main/java/seedu/address/model/room/Capacity.java

+    /**
+     * Returns true if a given int is a valid capacity.
+     */
+    public static boolean isValidCapacity(int test) {


'test' is not a good variable/parameter name

src/test/java/seedu/address/logic/commands/CheckoutCommandTest.java

liliwei25

Good amount of effort! 👍

Some classes/methods/variables can be renamed since this is not an addressbook anymore
The class diagrams should include the visibility of the attributes
Should set up for reposense too

liliwei25 · 2018-10-20T05:06:08Z

commands_log/commands_log.txt

@@ -0,0 +1,42 @@
+19/10/2018 06:33:22  a


Should not add this file to git

liliwei25 · 2018-10-20T05:14:25Z

docs/DeveloperGuide.adoc

+. `Room#checkout` will
+.. throw `NoBookingException` if the room has no bookings
+.. throw `NoActiveOrExpiredBookingException` if the room has no active or expired bookings
+.. delete the first booking from the list of bookings


Does it delete the first booking or booking of room "001"?

liliwei25 · 2018-10-20T05:50:03Z

src/main/java/seedu/address/logic/CommandHistory.java

+            string.append(it.next() + newLine);
+        }
+        String inputString = string.toString();
+        System.out.println(inputString);


extra println statement?

liliwei25 · 2018-10-20T05:52:33Z

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

    }

    @Override
    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
        requireNonNull(model);

-        if (model.hasPerson(toAdd)) {
+        if (model.hasPerson(guestToAdd)) {


maybe can change method name to "hasGuest" to standardize

liliwei25 · 2018-10-20T05:52:54Z

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

            throw new CommandException(MESSAGE_DUPLICATE_PERSON);
        }
+        model.addPerson(guestToAdd);


"addPerson" -> "addGuest"?

liliwei25 · 2018-10-20T06:00:45Z

src/main/java/seedu/address/model/AddressBook.java

@@ -15,7 +21,8 @@
 public class AddressBook implements ReadOnlyAddressBook {


maybe can rename the class as well since this is no longer an addressbook

liliwei25 · 2018-10-20T06:22:18Z

src/test/java/seedu/address/testutil/TypicalPersons.java

 import seedu.address.model.person.Guest;
+import seedu.address.model.person.UniqueGuestList;

 /**
 * A utility class containing a list of {@code Guest} objects to be used in tests.
 */
 public class TypicalPersons {


Maybe can rename to TypicalGuests?

liliwei25 · 2018-10-20T06:23:10Z

src/test/java/seedu/address/testutil/TypicalAddressBook.java

+/**
+ * A utility class containing a {@code UniqueGuestList} and {@code UniqueRoomList} objects to be used in tests.
+ */
+public class TypicalAddressBook {


maybe can rename to something that suits your app?

liliwei25 · 2018-10-20T06:26:08Z

src/test/java/seedu/address/testutil/ExpenseBuilder.java

+    }
+
+    /**
+     * Initializes the ExpenseBuilder with the data of {@code bookingToCopy}.


liliwei25 · 2018-10-20T07:18:41Z

src/main/java/seedu/address/model/room/booking/Booking.java

+    // Identity fields
+    private final Guest guest;
+    private final BookingPeriod bookingPeriod;
+    private final Boolean checkIn;


check naming convention for booleans

Restore UI for V1.2

…shaw_yeong_changes add AnalyticsCommandTest and update UML Diagrams

…of valid concierge, refactor to remove SOME hard-coded test cases from AB4

…nciergeClean, and getTypicalConciergeWithRoomBookings -> getTypicalConcierge

… tests

… for updated tests

* XmlAdaptedRoom: fix IllegalValueException due to expenses present in a checked-in but expired booking The current implementation of XmlAdaptedRoom will only allow expenses to be added to rooms that have active and checked-in bookings. However, this does not reflect the real-life scenario. For example, the user might exit the app on the same day as the last day of a booking with expenses, without checking out the room. The next day, the booking will become expired, and starting the app will thus throw an error. This behaviour should be prevented as it is possible that users may forget to check out after the day. The section on adding expenses has been adjusted to allow for this. Expenses can now be added as long as there is a booking, and that booking is checked-in. * SampleDataUtil: add two more expense types into sample Two expense types were added for the purpose of representing discounts and typo corrections. This is necessary since there is no command for editing or deleting an expense, hence any adjustment will have to be added as an expense with either positive or negative value. These two expense types are thus general expense types for such a purpose. * UserGuide: update service section with the two adjustment expense types A description for the usage of the two adjustment expense types has been added. * UserGuide: fix minor stuff * DeveloperGuide: add ServiceCommand stuff with a flowchart Stuff was added. May add more stuff. * ModelClassDiagram: update with current structure The ModelClassDiagram illustrated the Address Book structure. The diagram has been updated to reflect our Concierge structure. * ModelClassDiagram: update the better diagram also The other diagram was updated with our current terminology. UniqueRoomList and Menu were not included, otherwise it would be too cluttered (and also because I'm lazy). * DeveloperGuide: add sequence diagram for addExpense Sequence diagram for the entire process of adding an expense is added. This is to supplement the flowchart with more detail on how an expense is added. * DeveloperGuide: make addExpense sequence diagram bigger The words are a bit unreadable. * DeveloperGuide: add more design considerations * all: fix checkstyle errors * docs: add my own PPP * XmlAdaptedRoomTest: add more tests to increase coverage Tests targeted at some of the highlighted parts in Coveralls. Not sure why the other highlighted parts were not covered. * XmlAdaptedRoomTest: fix checkstyle errors * UserGuide: add minor corrections

* XmlAdaptedRoom: fix IllegalValueException due to expenses present in a checked-in but expired booking The current implementation of XmlAdaptedRoom will only allow expenses to be added to rooms that have active and checked-in bookings. However, this does not reflect the real-life scenario. For example, the user might exit the app on the same day as the last day of a booking with expenses, without checking out the room. The next day, the booking will become expired, and starting the app will thus throw an error. This behaviour should be prevented as it is possible that users may forget to check out after the day. The section on adding expenses has been adjusted to allow for this. Expenses can now be added as long as there is a booking, and that booking is checked-in. * SampleDataUtil: add two more expense types into sample Two expense types were added for the purpose of representing discounts and typo corrections. This is necessary since there is no command for editing or deleting an expense, hence any adjustment will have to be added as an expense with either positive or negative value. These two expense types are thus general expense types for such a purpose. * UserGuide: update service section with the two adjustment expense types A description for the usage of the two adjustment expense types has been added. * UserGuide: fix minor stuff * DeveloperGuide: add ServiceCommand stuff with a flowchart Stuff was added. May add more stuff. * ModelClassDiagram: update with current structure The ModelClassDiagram illustrated the Address Book structure. The diagram has been updated to reflect our Concierge structure. * ModelClassDiagram: update the better diagram also The other diagram was updated with our current terminology. UniqueRoomList and Menu were not included, otherwise it would be too cluttered (and also because I'm lazy). * DeveloperGuide: add sequence diagram for addExpense Sequence diagram for the entire process of adding an expense is added. This is to supplement the flowchart with more detail on how an expense is added. * DeveloperGuide: make addExpense sequence diagram bigger The words are a bit unreadable. * DeveloperGuide: add more design considerations * all: fix checkstyle errors * docs: add my own PPP * XmlAdaptedRoomTest: add more tests to increase coverage Tests targeted at some of the highlighted parts in Coveralls. Not sure why the other highlighted parts were not covered. * XmlAdaptedRoomTest: fix checkstyle errors * UserGuide: add minor corrections * UserGuide and DeveloperGuide: minor edits from previous PR * UserGuide: use important icon * UserGuide: fix some formatting errors

# Conflicts: # docs/UserGuide.adoc

* XmlAdaptedRoom: fix IllegalValueException due to expenses present in a checked-in but expired booking The current implementation of XmlAdaptedRoom will only allow expenses to be added to rooms that have active and checked-in bookings. However, this does not reflect the real-life scenario. For example, the user might exit the app on the same day as the last day of a booking with expenses, without checking out the room. The next day, the booking will become expired, and starting the app will thus throw an error. This behaviour should be prevented as it is possible that users may forget to check out after the day. The section on adding expenses has been adjusted to allow for this. Expenses can now be added as long as there is a booking, and that booking is checked-in. * SampleDataUtil: add two more expense types into sample Two expense types were added for the purpose of representing discounts and typo corrections. This is necessary since there is no command for editing or deleting an expense, hence any adjustment will have to be added as an expense with either positive or negative value. These two expense types are thus general expense types for such a purpose. * UserGuide: update service section with the two adjustment expense types A description for the usage of the two adjustment expense types has been added. * UserGuide: fix minor stuff * DeveloperGuide: add ServiceCommand stuff with a flowchart Stuff was added. May add more stuff. * ModelClassDiagram: update with current structure The ModelClassDiagram illustrated the Address Book structure. The diagram has been updated to reflect our Concierge structure. * ModelClassDiagram: update the better diagram also The other diagram was updated with our current terminology. UniqueRoomList and Menu were not included, otherwise it would be too cluttered (and also because I'm lazy). * DeveloperGuide: add sequence diagram for addExpense Sequence diagram for the entire process of adding an expense is added. This is to supplement the flowchart with more detail on how an expense is added. * DeveloperGuide: make addExpense sequence diagram bigger The words are a bit unreadable. * DeveloperGuide: add more design considerations * all: fix checkstyle errors * docs: add my own PPP * XmlAdaptedRoomTest: add more tests to increase coverage Tests targeted at some of the highlighted parts in Coveralls. Not sure why the other highlighted parts were not covered. * XmlAdaptedRoomTest: fix checkstyle errors * UserGuide: add minor corrections * UserGuide and DeveloperGuide: minor edits from previous PR * UserGuide: use important icon * UserGuide: fix some formatting errors * UserGuide: rearrange stuff in service

AboutUs update

…html and github (#259)

* UG: update checkin/out, ContactUs: update email * PPP: update * asciidoctor: remove line 381 - fixes html links appearing in pdf * DG: add update UML diagrams * fix style * update name as shown in IVLE * PPP: add terminology

* Modify find function include both guests and rooms searching * Change test details, convert prefixes over to new ones. * Minor format change * More minor change * Change for Travis * Files not in sync, have to commit and check travis again and again * Update for Travis/Testing * Replace code to utilize tokenizer * Replace code to utilize tokenizer * Made room list appear first, create tests for ListCommand and its parser * More fixes * AdocUpdates and Ui.png * More fixes kill me soon * - Fix PE Dry Run Issues - Change Find Command predicate argument types - Change Find command to find both archieved and checked-in - Feature to find room by guest name - Change listCommandUml - Add findCommandUml - Portfolio Documentation * Fixes to merge conflicts * Fix for Not On FX Application Errors * Even more unused import changes * A bit more fixes and coveralls * Fix for Integer.parseInt for capacity * omg travis stop * Update PPP, change gitignore to include config.json to change app name to "Concierge" * Try fix no newline eof * Update gitignore to include config.json again * Edits to devguide and PPP * Update UserGuide List and Find feature

* Update diagrams * UserGuide: update undoable commands * Update grammar

* SampleDataUtil: add yesterday-today booking to r/005 * SampleDataUtil: add expired booking to r/006

* Update PPP links

* README: update link for ConciergeFinal.png to show properly in index.html and github * README: show Ui.png * README: minor edit

* Update PPP links * Update PPP links * Update PPP links * Add instructions for manual testing: autocomplete, find, list * Change room number for list command

…267) - forced merge * SampleDataUtil: add yesterday-today booking to r/005 * SampleDataUtil: add expired booking to r/006 * readme fix * DG: update * undo readme change

* DG: fix description

nus-se-pr-bot added team.2 tutorial.F11 labels Sep 20, 2018

nus-se-pr-bot assigned liliwei25 Sep 20, 2018

nus-se-pr-bot requested a review from liliwei25 September 20, 2018 12:46

liliwei25 reviewed Sep 23, 2018

View reviewed changes

liliwei25 added the Mid-v1.1-Reviewed label Sep 23, 2018

liliwei25 reviewed Oct 7, 2018

View reviewed changes

liliwei25 added v1.1-Reviewed and removed Mid-v1.1-Reviewed labels Oct 7, 2018

liliwei25 reviewed Oct 20, 2018

View reviewed changes

liliwei25 added v1.2-Reviewed and removed v1.1-Reviewed labels Oct 20, 2018

bannified pushed a commit to bannified/addressbook-level4 that referenced this pull request Oct 25, 2018

Merge pull request nus-cs2103-AY1819S1#68 from jiholim/master

70c453c

Restore UI for V1.2

Bellaaarh pushed a commit to Bellaaarh/addressbook-level4 that referenced this pull request Oct 29, 2018

Merge pull request nus-cs2103-AY1819S1#68 from CS2103-AY1819S1-W12-2/…

c6a8420

…shaw_yeong_changes add AnalyticsCommandTest and update UML Diagrams

Adam and others added 15 commits October 30, 2018 03:35

Resolve merge conflict from #153 and #162

4f6643a

LogInCommandParser.java: Add parseAndHash method for password

d9583b7

ModelManager.java: Create username field

dc1235f

Model.java: Introduce InvalidPasswordException

780d331

fix style

1cdf159

PasswordHashUtil.java: Add reference site

2dd1762

PasswordsStorage.java: Add password storage interface

4d8c5d6

UserPrefs.java: Add functionality to read in password file path

b6eae31

XmlUtilTest and XmlSerializableConciergeTest: update with new format …

573cd51

…of valid concierge, refactor to remove SOME hard-coded test cases from AB4

XmlSerializableConciergeTest: update

8b72ea3

TypicalConcerge: Refactor name of getTypicalConcierge -> getTypicalCo…

d3b349f

…nciergeClean, and getTypicalConciergeWithRoomBookings -> getTypicalConcierge

fix style

d1e5d0d

XmlConciergeStorageTest: update tests and relevant xml files used for…

1307c4b

… tests

XmlSerializableConciergeTest: update tests and add relevant XML files…

ddce539

… for updated tests

Fix checkstyle errors

d4c4387

teowz46 and others added 30 commits November 12, 2018 10:50

UserGuide: add minor corrections

58700e6

Change uppercase PNG to lowercase png (#250)

db39bcd

Merge remote-tracking branch 'upstream/master' into user-dev-guide

d1a7a6b

UserGuide and DeveloperGuide: minor edits from previous PR

5511dc6

UserGuide: use important icon

a7a14fd

UserGuide: fix some formatting errors

09a16c0

UserGuide: rearrange stuff in service

87112f6

Merge remote-tracking branch 'upstream/master' into user-dev-guide

3c5352e

# Conflicts: # docs/UserGuide.adoc

AboutUs: update my PPP link

acb4536

Updated LogicComponentClassDiagram (#251)

5d6ded3

AboutUs: update my pic

787fa8c

Merge remote-tracking branch 'upstream/master' into user-dev-guide

298d416

Merge pull request #254 from teowz46/user-dev-guide

9dd368f

AboutUs update

Renaming of parser in Logic Component Class Diagram (#255)

31fa3a1

AddExpenseSequenceDiagram: fix out of alignment objects (#256)

9f6e7d2

README: update link for ConciergeFinal.png to show properly in index.…

fbb4eed

…html and github (#259)

Remove gitter badge

a8d9903

[v1.4] Docs update (#257)

e5f8172

* UG: update checkin/out, ContactUs: update email * PPP: update * asciidoctor: remove line 381 - fixes html links appearing in pdf * DG: add update UML diagrams * fix style * update name as shown in IVLE * PPP: add terminology

Update documentation (#260)

f692f06

* Update diagrams * UserGuide: update undoable commands * Update grammar

[v1.4] SampleDataUtil: add yesterday-today booking to r/005 (#263)

a20c63b

* SampleDataUtil: add yesterday-today booking to r/005 * SampleDataUtil: add expired booking to r/006

Update PPP links (#262) - forced merge

c7b7174

* Update PPP links

README (#264)

7573517

* README: update link for ConciergeFinal.png to show properly in index.html and github * README: show Ui.png * README: minor edit

DeveloperGuide: add manual testing instructions for service (#265)

c857168

Add instructions for manual testing: list, find, autocomplete (#266)

8f9c6c7

* Update PPP links * Update PPP links * Update PPP links * Add instructions for manual testing: autocomplete, find, list * Change room number for list command

DG: update manual test instructions for checkin, checkout, reassign (#…

7d02fae

…267) - forced merge * SampleDataUtil: add yesterday-today booking to r/005 * SampleDataUtil: add expired booking to r/006 * readme fix * DG: update * undo readme change

DG fix (#268)

4bd7e62

* DG: fix description

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[F11-2] Concierge #68

[F11-2] Concierge #68

adamwth commented Sep 20, 2018 •

edited

Loading

liliwei25 left a comment

damithc commented Oct 2, 2018

liliwei25 left a comment

liliwei25 Oct 7, 2018

adamwth Oct 11, 2018

liliwei25 Oct 7, 2018

liliwei25 Oct 7, 2018

liliwei25 Oct 7, 2018

liliwei25 Oct 7, 2018

liliwei25 Oct 7, 2018

liliwei25 Oct 7, 2018

liliwei25 Oct 7, 2018

liliwei25 Oct 7, 2018

liliwei25 left a comment •

edited

Loading

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018

liliwei25 Oct 20, 2018


		Adds a person to the address book +
		=== Clearing all entries : `avail`

		@@ -15,7 +21,8 @@
		public class AddressBook implements ReadOnlyAddressBook {

[F11-2] Concierge #68

Are you sure you want to change the base?

[F11-2] Concierge #68

Conversation

adamwth commented Sep 20, 2018 • edited Loading

liliwei25 left a comment

Choose a reason for hiding this comment

damithc commented Oct 2, 2018

liliwei25 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

liliwei25 left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adamwth commented Sep 20, 2018 •

edited

Loading

liliwei25 left a comment •

edited

Loading