commit salaryInfo #1274
Open
commit salaryInfo #1274
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
MentorMA
suggested changes
May 3, 2024
Comment on lines
23
to
27
| Date entryDate = dateFormat.parse(parts[0]); | ||
| if (name.equals(parts[1]) && !entryDate.before(fromDate) | ||
| && !entryDate.after(toDate)) { | ||
| int hours = Integer.parseInt(parts[2]); | ||
| int rate = Integer.parseInt(parts[3]); |
sarakhmen
suggested changes
May 3, 2024
Comment on lines
16
to
17
| SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy"); | ||
| dateFormat.setLenient(false); |
There was a problem hiding this comment.
please move this local variable to the class fields
Comment on lines
22
to
28
| List<String> reportLines = new ArrayList<>(); | ||
| reportLines.add("Report for period " + dateFrom + " - " + dateTo); | ||
| for (String name : names) { | ||
| int earned = calculateEarnedSalary(name, data, fromDate, toDate, dateFormat); | ||
| reportLines.add(name + " - " + earned); | ||
| } | ||
| return String.join(System.lineSeparator(), reportLines); |
There was a problem hiding this comment.
let's use StringBuilder for these purposes
sarakhmen
suggested changes
May 3, 2024
okuzan
suggested changes
May 5, 2024
Comment on lines
17
to
18
| Date fromDate = dateFormat.parse(dateFrom); | ||
| Date toDate = dateFormat.parse(dateTo); |
There was a problem hiding this comment.
checklist issue, Date is outdated since Java 8, use LocalDate instead
| public String getSalaryInfo(String[] names, String[] data, String dateFrom, String dateTo) { | ||
| return null; | ||
| dateFormat.setLenient(false); | ||
| try { |
Comment on lines
28
to
30
| if (i < names.length - 1) { | ||
| reportLines.append(System.lineSeparator()); | ||
| } |
There was a problem hiding this comment.
instead of this check, just put lineSeparator at the beginning of each line (and remove it on line 22)
okuzan
suggested changes
May 5, 2024
Comment on lines
8
to
11
| static final int DATE_INDEX = 0; | ||
| static final int NAME_INDEX = 1; | ||
| static final int HOUR_INDEX = 2; | ||
| static final int RATE_INDEX = 3; |
okuzan
suggested changes
May 6, 2024
Comment on lines
13
to
14
| LocalDate fromDate = LocalDate.parse(dateFrom, DateTimeFormatter.ofPattern("dd.MM.yyyy")); | ||
| LocalDate toDate = LocalDate.parse(dateTo, DateTimeFormatter.ofPattern("dd.MM.yyyy")); |
There was a problem hiding this comment.
https://github.com/mate-academy/jv-salary-info/blob/master/checklist.md#if-you-create-a-formatter-make-it-a-constant-field
Sorry I haven't noticed it the first time :)
| for (String entry : data) { | ||
| String[] parts = entry.split(" "); | ||
| LocalDate entryDate = LocalDate.parse(parts[DATE_INDEX], | ||
| DateTimeFormatter.ofPattern("dd.MM.yyyy")); |
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.
No description provided.