Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: Add Shopping List #157

Merged
merged 42 commits into from
Oct 26, 2021
Merged

Feat: Add Shopping List #157

merged 42 commits into from
Oct 26, 2021

Conversation

BryanElmer
Copy link
Collaborator

@BryanElmer BryanElmer commented Oct 26, 2021 •
edited
Loading

This PR adds the following features:

  • When the user removes an item, that item's quantity becomes 0, and that item name does not exist in the ingredient list:
    • The user has the choice to put the item into the shopping list.
    • The user decides the quantity to be put into the shopping list.
  • When the user adds or updates an item into Fridget:
    • The following will happen automatically:
      • If the item exists in the shopping list, the quantity in the shopping list will be subtracted by the quantity added or updated.
      • If the quantity of any item in the shopping list reaches 0, it will be deleted.

Fixes #158, Fixes #159, Fixes #160, Fixes #161, Fixes #162, Fixes #163

@BryanElmer
Add ShoppingList class
05b1d41 
Implement addIngredient
@BryanElmer
Add ShoppingList parameter in execute functions
8b23603
@BryanElmer
Add ShopListCommand class
4037d98
@BryanElmer
Add Shopping List file path
c22be97
@BryanElmer
Add shopping list text file
d8787db
@BryanElmer
Implement read and write to shopping file
4a408e7
@BryanElmer
Fix javadoc for storage.java
696348a
@BryanElmer
Add overload constructor for ingredient
f22f37f
@BryanElmer
Add function for shopping list format in ingredient
ab86398
@BryanElmer
Add function to print items in shopping list
914aa8a
@BryanElmer
Add shoplist command in parser
b1ec07a
@BryanElmer
Update storage test
87f636c
@BryanElmer
Add updateShopList function
34ab0e5 
Function prompts user to add item into shopping list if the item disappears from the ingredient list (qty = 0) when doing a remove command
@BryanElmer
Fix error message for no items in shopping list
af78964
@BryanElmer
Add assert in parseCommand
627286e
@BryanElmer
Add function for shopping list update
d160775 
Add function that prompts the user to add items into shopping list and gets the quantity. Add function that prints out the success message
@BryanElmer
Update removeIngredient function
802e694 
Change return value to boolean
@BryanElmer
Fix add shopping list function
d9decd7
@BryanElmer
Add javadoc
1558cee
@BryanElmer
Fix bug that prompts adding into shopping list
badbae2
@BryanElmer
Add removeIngredient function in ShoppingList.java
1d972ba
@BryanElmer
Add updateShopList function
e62227f
@BryanElmer
Add updateShopList function in update command
85a516c
@BryanElmer
Fix to java coding standard
7babfd3
@BryanElmer
Add javadocs
a4676e5 
Fix bug in UpdateCommand.java
@BryanElmer BryanElmer added type.Story A user story priority.High Must do! labels Oct 26, 2021
@BryanElmer BryanElmer added this to the v2.0 milestone Oct 26, 2021
@BryanElmer BryanElmer self-assigned this Oct 26, 2021
zonglun99
zonglun99 approved these changes Oct 26, 2021
View reviewed changes
Copy link
Collaborator

@zonglun99 zonglun99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved but you might want to get Anderson and Alvin to check through also since it is a large commit

alvynben
alvynben approved these changes Oct 26, 2021
View reviewed changes
Copy link
Collaborator

@alvynben alvynben left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@BryanElmer BryanElmer merged commit 4a7a170 into AY2122S1-CS2113T-W12-4:master Oct 26, 2021
This was linked to issues Oct 26, 2021
19. As a lazy house-husband, I want to add items I always want to have in the fridge #4
Closed
8. As a busy house-husband, I want to check if any ingredients require replenishment so that I can easily curate my shopping list #24
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zonglun99 zonglun99 zonglun99 approved these changes

@alvynben alvynben alvynben approved these changes

Assignees

@BryanElmer BryanElmer

Labels
priority.High Must do! type.Story A user story
Projects
None yet
Milestone
v2.0
3 participants
@BryanElmer @zonglun99 @alvynben