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

salaryInfo done #1321

Open

VolodymyrNyshta wants to merge 5 commits into mate-academy:master from VolodymyrNyshta:salaryinfoHW

VolodymyrNyshta commented Aug 28, 2024

No description provided.


          salaryInfo done

5db6c10

mateacademy-ai-mentor suggested changes

View reviewed changes

mateacademy-ai-mentor left a comment

Hey there! 👋 It looks like there are a few important areas that need some attention before we can move forward. The method names could be more informative, and it's essential to avoid using two-dimensional arrays as suggested in the checklist. Also, let's make sure to use constants instead of magic numbers to make the code clearer and more maintainable. Keep up the great work, and with a bit of tweaking, your code will be in top shape! 🚀

✨ Please rate this review in the Platform's notification center. I will be grateful for your feedback! ✨

src/main/java/core/basesyntax/Main.java

		@@ -0,0 +1,21 @@
		package core.basesyntax;

		public class Main {

mateacademy-ai-mentor Aug 28, 2024

Don't begin class or method implementation with an empty line. Please remove the empty line at the start of the class definition.

src/main/java/core/basesyntax/Main.java Outdated

+              public class Main {
+                  public static void main(String[] args) {
+                      String dateFrom = "01.04.2019";

mateacademy-ai-mentor Aug 28, 2024

Any magic numbers should be constants. Consider defining 'dateFrom' and 'dateTo' as constant fields if they are not meant to be changed.

src/main/java/core/basesyntax/Main.java Outdated

+              public class Main {
+                  public static void main(String[] args) {
+                      String dateFrom = "01.04.2019";
+                      String dateTo = "30.04.2019";

mateacademy-ai-mentor Aug 28, 2024

Any magic numbers should be constants. Consider defining 'dateFrom' and 'dateTo' as constant fields if they are not meant to be changed.

src/main/java/core/basesyntax/Main.java

+                  public static void main(String[] args) {
+                      String dateFrom = "01.04.2019";
+                      String dateTo = "30.04.2019";
+                      String[] names = new String[] {"John", "Andrew", "Kate"};

mateacademy-ai-mentor Aug 28, 2024

Remember about informative names of the variables and methods. The variable 'names' could be more descriptive, like 'employeeNames'.

src/main/java/core/basesyntax/SalaryInfo.java Outdated

               public class SalaryInfo {
                   public String getSalaryInfo(String[] names, String[] data, String dateFrom, String dateTo) {
-                      return null;
+                      String[][] salaryByName = new String[names.length][2];

mateacademy-ai-mentor Aug 28, 2024

Don't use two-dimension arrays as it's mentioned in the checklist. Instead, consider creating a class to represent the employee's salary details or use a different approach to store this information.

src/main/java/core/basesyntax/SalaryInfo.java Outdated

+                          salaryByName[i][0] = names[i];
+                          salaryByName[i][1] = "0";
+                      }
+                      String[][] splitedData = splitData(data);

mateacademy-ai-mentor Aug 28, 2024

The use of two-dimension arrays is discouraged as per the checklist. Try to find an alternative way to process the data without using two-dimension arrays.

src/main/java/core/basesyntax/SalaryInfo.java Outdated

+                  }
+                  private boolean dayCheck(String dateToCheck, String dateFrom, String dateTo) {
+                      DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");

mateacademy-ai-mentor Aug 28, 2024

As per the checklist, if you create a formatter, make it a constant field. This allows for better reusability and maintainability of the code.

src/main/java/core/basesyntax/SalaryInfo.java Outdated

Comment on lines 16 to 30

+                          if (dayCheck(splitedData[i][0], dateFrom, dateTo)) {
+                              for (int j = 0; j < names.length; j++) {
+                                  if (splitedData[i][1].equals(salaryByName[j][0])) {
+                                      try {
+                                          salaryByName[j][1] =
+                                                  String.valueOf((Integer.parseInt(salaryByName[j][1])
+                                                  + (Integer.parseInt(splitedData[i][2])
+                                                  * Integer.parseInt(splitedData[i][3]))));
+                                      } catch (NumberFormatException ex) {
+                                          System.out.println("Error parsing string to number: "
+                                                  + ex.getMessage());
+                                      }
+                                  }
+                              }
+                          }

mateacademy-ai-mentor Aug 28, 2024

Don't create redundant loops. Two loops are enough to solve this task. Try to optimize the code to use only two loops.

src/main/java/core/basesyntax/SalaryInfo.java Outdated

Comment on lines 35 to 43

+                  private String getRezultToString(String[][] salaryByName, String dateFrom, String dateTo) {
+                      StringBuilder rezultMessage = new StringBuilder();
+                      rezultMessage.append("Report for period ").append(dateFrom).append(" - ")
+                              .append(dateTo).append(System.lineSeparator());
+                      for (int i = 0; i < salaryByName.length; i++) {
+                          rezultMessage.append(salaryByName[i][0]).append(" - ")
+                                  .append(salaryByName[i][1]).append(System.lineSeparator());
+                      }
+                      return rezultMessage.toString();

mateacademy-ai-mentor Aug 28, 2024

The method name 'getRezultToString' has a typo and is not very informative. Consider renaming it to accurately reflect its purpose, such as 'formatSalaryReport'.

src/main/java/core/basesyntax/SalaryInfo.java Outdated

+                      return rezultMessage.toString();
+                  }
+                  private boolean dayCheck(String dateToCheck, String dateFrom, String dateTo) {

mateacademy-ai-mentor Aug 28, 2024

The method name 'dayCheck' is not informative. Consider renaming it to something more descriptive, like 'isDateWithinRange'.


          salaryInfo create EmploeeSalary class

c61e971

VolodymyrNyshta requested a review from mateacademy-ai-mentor

August 29, 2024 17:58


          salaryInfo fixed formatSalaryReport

0bc0ef4

Elena-Bruyako suggested changes

View reviewed changes

src/main/java/core/basesyntax/SalaryInfo.java Outdated

+                      for (int i = 0; i < names.length; i++) {
+                          emploeesSalaries[i] = new EmploeesSalary();
+                          emploeesSalaries[i].setEmploeesName(names[i]);
+                          emploeesSalaries[i].setEarnedSalary(0);

Elena-Bruyako Aug 30, 2024

all magic numbers should be constant, check all


          removed magic number

2f0df76

VolodymyrNyshta requested a review from Elena-Bruyako

August 30, 2024 17:42

okuzan suggested changes

View reviewed changes

src/main/java/core/basesyntax/SalaryInfo.java Outdated

Comment on lines 100 to 102

+                          if (i < emploeesSalaries.length - 1) {
+                              resultMessage.append(System.lineSeparator());
+                          }

okuzan Aug 31, 2024

instead of this hack just add lineSeparator at the beginning, not the end

src/main/java/core/basesyntax/SalaryInfo.java Outdated

Comment on lines 85 to 90

+                      if ((dateToCheck.isAfter(dateFrom) && dateToCheck.isBefore(dateTo))
+                              || (dateToCheck.isEqual(dateFrom) || dateToCheck.isEqual(dateTo))) {
+                          return true;
+                      } else {
+                          return false;
+                      }

okuzan Aug 31, 2024

instead of
if boolean return true else return false
just write
return boolean

src/main/java/core/basesyntax/EmploeesSalary.java Outdated

		@@ -0,0 +1,22 @@
		package core.basesyntax;

		public class EmploeesSalary {

okuzan Aug 31, 2024

Suggested change

      
            public class EmploeesSalary {
          
            public class Employee {

do you really need two model classes?


          removed two model classes

5fd8b06

VolodymyrNyshta requested a review from okuzan

September 4, 2024 05:59

okuzan approved these changes

View reviewed changes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet