[CS2113-T18-3] Budget_planner #22
Open
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
Brian030601
added a commit
to Brian030601/tp
that referenced
this pull request
Oct 19, 2023
Implement Calendar Command
irving11119
reviewed
Oct 28, 2023
| * This command supports searching by a specific date or by a month. If a date isn't provided, it will not be used | ||
| * as a filter. Similarly, if the category or description isn't provided, they won't be used as filters. | ||
| */ | ||
| public class FindCommand extends Commands { |
| throw new KaChinnnngException("Failed to create directory " + dir.getAbsolutePath()); | ||
| } | ||
| } | ||
| FileHandler fh = new FileHandler("logs/FindCommand.log", true); |
There was a problem hiding this comment.
You could perhaps change logs/FindCommand.log into a static variable
| * @throws KaChinnnngException if there is an error in the command | ||
| */ | ||
| public void setAmount(double amount) throws KaChinnnngException { | ||
| assert amount >= 0 : "amount should not be negative"; |
There was a problem hiding this comment.
Good use of assertions in this class
Comment on lines
68
to
108
| if (expenseCategoryString.equals("food")) { | ||
| if (expenseTypeString.equals("breakfast")) { | ||
| return new Food(expenseDescriptionString, expenseDate, expenseAmount, MealType.BREAKFAST); | ||
| } else if (expenseTypeString.equals("lunch")) { | ||
| return new Food(expenseDescriptionString, expenseDate, expenseAmount, MealType.LUNCH); | ||
| } else if (expenseTypeString.equals("dinner")) { | ||
| return new Food(expenseDescriptionString, expenseDate, expenseAmount, MealType.DINNER); | ||
| } else { | ||
| return new Food(expenseDescriptionString, expenseDate, expenseAmount, MealType.UNDEFINED); | ||
| } | ||
| } else if (expenseCategoryString.equals("transport")){ | ||
| if (expenseTypeString.equals("train")) { | ||
| return new Transport(expenseDescriptionString, expenseDate, expenseAmount, | ||
| TransportationType.TRAIN); | ||
| } else if (expenseTypeString.equals("bus")) { | ||
| return new Transport(expenseDescriptionString, expenseDate, expenseAmount, | ||
| TransportationType.BUS); | ||
| } else if (expenseTypeString.equals("taxi")) { | ||
| return new Transport(expenseDescriptionString, expenseDate, expenseAmount, | ||
| TransportationType.TAXI); | ||
| } else if (expenseTypeString.equals("fuel")) { | ||
| return new Transport(expenseDescriptionString, expenseDate, expenseAmount, | ||
| TransportationType.FUEL); | ||
| } else { | ||
| return new Transport(expenseDescriptionString, expenseDate, expenseAmount, | ||
| TransportationType.UNDEFINED); | ||
| } | ||
| } else if (expenseCategoryString.equals("utilities")) { | ||
| if (expenseTypeString.equals("water")) { | ||
| return new Utilities(expenseDescriptionString, expenseDate, expenseAmount, UtilityType.WATER); | ||
| } else if (expenseTypeString.equals("electricity")) { | ||
| return new Utilities(expenseDescriptionString, expenseDate, expenseAmount, UtilityType.ELECTRICITY); | ||
| } else if (expenseTypeString.equals("gas")) { | ||
| return new Utilities(expenseDescriptionString, expenseDate, expenseAmount, UtilityType.GAS); | ||
| } else{ | ||
| return new Utilities(expenseDescriptionString, expenseDate, expenseAmount, UtilityType.UNDEFINED); | ||
| } | ||
| } else { | ||
| throw new KaChinnnngException("Please enter a valid category"); | ||
| } | ||
| } |
There was a problem hiding this comment.
You could look at reducing nesting here to reduce arrowhead code!
Comment on lines
49
to
57
| if (incomes.isEmpty()) { | ||
| System.out.println("You have no recorded incomes."); | ||
| } else { | ||
| System.out.println("Here are your incomes:"); | ||
| for (int i = 0; i < incomes.size(); i++) { | ||
| System.out.println((i + 1) + ". " + incomes.get(i).toString()); | ||
| totalIncome += incomes.get(i).getAmount(); | ||
| } | ||
| System.out.printf("Total income is: $%.2f.\n", totalIncome); |
There was a problem hiding this comment.
Personally I feel you could abstract this out into a method as it is quite similar to your for loop below. This also helps to make your code neater.
Comment on lines
20
to
35
| public void getHelp(){ | ||
| ui.showLineDivider(); | ||
| // Shows a message linking the user to the user guide of our app | ||
| System.out.println("You can access our user guide by " + | ||
| "https://docs.google.com/document/d/1BOz_v4eYQ8y7Dje6Jm6nqymi9jmrsb9MAohLCL_sLvI/edit?usp=sharing\n"); | ||
| // Displays the various commands that user can use including the respective formats of the commands | ||
| System.out.println("Functions and their format:\n"); | ||
| System.out.println("Adding an entry: add\nFormat:\n" + "Add expense /category /description /value\n" + | ||
| "Add income /description /value\n"); | ||
| System.out.println("Listing all entries: list\nFormat:\n" + "list\n" + "list income\n" + | ||
| "list expense\n"); | ||
| System.out.println("Deleting an entry: delete\nFormat:\ndelete income [index_pos]\n" + | ||
| "delete expense [index_pos]\n"); | ||
| System.out.println("Check balance of income: balance\nFormat:\n" + "balance\n"); | ||
| System.out.println("Exiting the program: exit\nFormat:\n" + "exit"); | ||
| ui.showLineDivider(); |
There was a problem hiding this comment.
You could consider constants for this rather than string literals. You could make your entire menu in a string constant and thus simplify this method.
| double amountFromFile = Double. parseDouble(textLine.split(" \\| ")[2]); | ||
| LocalDate dateFromFile = LocalDate.parse(textLine.split(" \\| ")[3]); | ||
| // Check for valid amount range | ||
| if (amountFromFile > 999999.99 || amountFromFile <= 0) { |
There was a problem hiding this comment.
Perhaps you could convert this into a constant variable rather than a string literal in case you'd like to change your boundary values in the future and it needs to be used elsewhere in your codebase.
Added JUnit tests and javadocs
Bryan more j unit test
…nCheung18/tp into JUnit-test-for-clear-function
JUnit test for storage
J unit test for clear function
* add-expense-manager-unit-tests: add expenseManager unit tests
Fix find parser bug
minor bug fix
edited ug and dg
no message
no message
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.
A financial tracker for general users