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

Add Recipe functionality #23

Merged
merged 25 commits into from
Sep 27, 2020
Merged

Add Recipe functionality #23

merged 25 commits into from
Sep 27, 2020

Conversation

Rahul0506
Copy link

Refactor code base to be more general, add functionality to add recipes.
TODO:

  • Delete Legacy
  • Fix JavaDocs
  • Fix and add test cases

@Rahul0506
Clone item package, edit Recipe class
074a056
@Rahul0506
Add Ingredient, IngredientList; modify Recipe to use IngredientList
e0e2a17
@Rahul0506
Tidy up classes and Fix JavaDocs in recipe package
e698226
@Rahul0506
Refactor and fix model package
31938e4
@Rahul0506
Fix JavaDocs of model package
a0f2a05
@Rahul0506
Clone and fix classes in storage package
e2e7be4
@Rahul0506
Add recipe sample data
5de79bd
@Rahul0506
Add description field to Recipe
b65e1de
@Rahul0506
Add functionality to add recipes, fix logic package and adapt model p…
4ffc995 
…ackage
@Rahul0506
Add adding a recipe adds its ID to product's recipeIds
5ae343b
@Rahul0506
Add fxml files
5a2ab3d
@Rahul0506
Add save model in Storage
60f74bc
@Rahul0506
Modify managers to handle all data
799b579
@Rahul0506
Modify add item to process adding location ids in the ModelManager in…
71e12ab 
…stead of Parser
@Rahul0506
Fix adding item and recipe IDs to recipes and items respectively
55924df
@Rahul0506
Remove unnecessary constructors
b8ce050
@Rahul0506
Rename classes/files to better reflect purpose
3ea162d
aqcd
aqcd reviewed Sep 24, 2020
View reviewed changes
Copy link

@aqcd aqcd left a comment

Choose a reason for hiding this comment

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

Preliminary review. Mostly cosmetic since functionality isn't complete.

Initial apple having [1...6] for locationId and recipeId may not be intentional (bug?)
Initial recipes have item ids of items that don't exist.

src/main/java/seedu/address/InventoryMainApp.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/logic/Logic.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/logic/Logic.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/logic/Logic.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/logic/LogicManager.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/logic/parser/AddRecipeCommandParser.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/logic/parser/AddRecipeCommandParser.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -18,4 +18,10 @@
public static final Prefix PREFIX_ITEM_DESCRIPTION = new Prefix("-d ");
public static final Prefix PREFIX_ITEM_LOCATION = new Prefix("-l ");

// recipes start here
public static final Prefix PREFIX_RECIPE_PRODUCT_NAME = new Prefix("-n ");
public static final Prefix PREFIX_RECIPE_INGREDIENTS = new Prefix("-items ");
Copy link

Choose a reason for hiding this comment

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

can consider shorter prefix

Copy link
Author

Choose a reason for hiding this comment

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

This was specified in user guide, can be changed easily regardless

khenghun
khenghun reviewed Sep 25, 2020
View reviewed changes
Copy link

@khenghun khenghun left a comment

Choose a reason for hiding this comment

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

just one bug, also need to remove test cases or update, LGTM

src/main/java/seedu/address/model/util/SampleDataUtil.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/model/recipe/Recipe.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/model/recipe/ProductQuantity.java Outdated
* Represents a Recipe's product's quantity number in the inventory.
* Guarantees: immutable; is valid as declared in {@link #isValidQuantity(String)}
*/
public class ProductQuantity {
Copy link

Choose a reason for hiding this comment

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

can extend Quantity class if you want

Copy link
Author

Choose a reason for hiding this comment

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

Good note, modified

@Rahul0506 Rahul0506 linked an issue Sep 25, 2020 that may be closed by this pull request
As a user, I want to be able to create a recipe for an item so I can reference it in the future. #4
Closed
@Rahul0506 Rahul0506 merged commit 17e8286 into AY2021S1-CS2103T-F13-1:master Sep 27, 2020
@Rahul0506 Rahul0506 added this to the v1.1 milestone Oct 1, 2020
blackonyyx added a commit that referenced this pull request Nov 4, 2020
@blackonyyx
Merge pull request #23 from AY2021S1-CS2103T-F13-1/master
7011c54 
update local
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@khenghun khenghun khenghun left review comments

@aqcd aqcd aqcd left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.

As a user, I want to be able to create a recipe for an item so I can reference it in the future.
3 participants
@Rahul0506 @khenghun @aqcd