Added InvalidDataException

mate-academy · Jul 27, 2024 · de15d38 · de15d38
1 parent e7a76f6
commit de15d38
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/core/basesyntax/InvalidDataException.java b/src/main/java/core/basesyntax/InvalidDataException.java
@@ -0,0 +1,7 @@
+package core.basesyntax;
+
+public class InvalidDataException extends RuntimeException {
+    InvalidDataException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/core/basesyntax/SalaryInfo.java b/src/main/java/core/basesyntax/SalaryInfo.java
@@ -25,9 +25,11 @@ public String getSalaryInfo(String[] names, String[] data, String dateFrom, Stri
             if ((parsedDate.isAfter(parsedDateFrom) || parsedDate.isEqual(parsedDateFrom))
                     && (parsedDate.isBefore(parsedDateTo) || parsedDate.isEqual(parsedDateTo))) {
                 String[] nameAndSalaryArray = datum.substring(++whiteSpaceIndex).split(" ");
+
                 totalSalaryArray[getTotalSalaryArrayIndex(nameAndSalaryArray[NAME_INDEX], names)] +=
                         getSalary(nameAndSalaryArray[HOURS_WORKED_INDEX],
                                 nameAndSalaryArray[INCOME_PER_HOUR_INDEX]);
+
             }
         }
 
@@ -39,13 +41,13 @@ public String getSalaryInfo(String[] names, String[] data, String dateFrom, Stri
         return totalSalarySummary.toString();
     }
 
-    private int getTotalSalaryArrayIndex(String name, String[] names) {
+    private int getTotalSalaryArrayIndex(String name, String[] names) throws RuntimeException {
         for (int i = 0; i < names.length; i++) {
             if (names[i].equals(name)) {
                 return i;
             }
         }
-        return 0;
+        throw new InvalidDataException("Сould not find " + name + " in the array of names");
     }
 
     private int getSalary(String hours, String incomePerHour) {