Change recommendCommand to no longer kick out user if bad input is given #154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
IanFH
approved these changes
Apr 8, 2024
Comment on lines
+53
to
+73
| /** | ||
| * Gets the name the user wants to make for the recommended bouquet and makes sure the name does not already exist | ||
| * @param ui Ui to take input and print messages | ||
| * @param bouquetList List that contains all bouquets | ||
| * @return The chosen valid bouquetName | ||
| */ | ||
| public String askBouquetName(Ui ui, ArrayList<Bouquet> bouquetList) { | ||
| boolean isValidName = false; | ||
| String bouquetName = "placeHolder"; | ||
| ui.printAskBouquetName(); | ||
| while (!isValidName) { | ||
| bouquetName = ui.getInput(); | ||
| if (bouquetList.contains(new Bouquet(bouquetName))) { | ||
| System.out.println("Sorry a bouquet with this name already exists, please enter another name"); | ||
| } else { | ||
| isValidName = true; | ||
| } | ||
| } | ||
| return bouquetName; | ||
| } | ||
|
|
There was a problem hiding this comment.
This should fix the naming issue, great job 👍
Comment on lines
+96
to
+106
| boolean isValidFormat = false; | ||
| boolean isValidOccasion = false; | ||
| String occasionInput = "placeholder"; | ||
| while (!(isValidFormat && isValidOccasion)) { | ||
| occasionInput = ui.printAskOccasion(); | ||
| isValidFormat = Parser.parseOccasion(occasionInput); | ||
| isValidOccasion = Flower.isValidOccasion(occasionInput); | ||
| // check if occasion is in our dictionary | ||
| if (!isValidOccasion) { | ||
| System.out.println("This occasion does not exist."); | ||
| } |
Comment on lines
+143
to
+150
| String saveInput = "placeHolder"; | ||
| boolean isValidFormat = false; | ||
| boolean isValidInput = false; | ||
| while (!(isValidInput && isValidFormat)) { | ||
| saveInput = ui.printAskSaveBouquet(recommendedBouquet); | ||
| isValidFormat = Parser.parseSaveBouquet(saveInput); | ||
| isValidInput = (saveInput.equalsIgnoreCase("yes") || saveInput.equalsIgnoreCase("no")); | ||
| } |
There was a problem hiding this comment.
isValidInput might not be necessary since parseSaveBouquet already used regex, although that one only accepts lower case input. If you didn't change parseSaveBouquet, the method might still reject capitalised yes even with equalsIgnoreCase.
Comment on lines
-287
to
+290
| throw new FlorizzException("Incorrect format detected! " + | ||
| System.out.println("Incorrect format detected! " + | ||
| "Please input a single occasion"); | ||
| return false; |
There was a problem hiding this comment.
It might be good if all system.out should be done by Ui only to follow single responsibility principle. I understand why you remove the florizz exception since it kinds of stop users from inputting more command.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[IMPORTANT] I changed the recommend command function to no longer throw execeptions and kick out the user if they sent the wrong input. Please do take a look and request changes if something doesnt look right. As of my brief testing the only time it gets kicked out is if they input a occasion colour combi that does not have any flowers under