Merge branch 'master' into release/0.8

Author: mkimberlin

server/src/main/java/com/objectcomputing/checkins/services/reports/CompensationHistory.java

@@ -23,7 +23,8 @@ public class CompensationHistory extends CSVProcessor {
     public record Compensation(
             UUID memberId,
             LocalDate startDate,
-            float amount
+            String amount,
+            String totalComp
     ) {
     }
 
@@ -45,11 +46,13 @@ protected void loadImpl(MemberProfileRepository memberProfileRepository,
             if (date == null) {
               LOG.error("Unable to parse date: {}", startDate);
             } else {
+              String value = csvRecord.get("compensation");
               Compensation comp = new Compensation(
                       memberProfile.get().getId(),
                       date,
-                      Float.parseFloat(csvRecord.get("compensation")
-                                                .replaceAll("[^\\d\\.,]", "")));
+                      value == null ? null : value.replaceAll("[^\\d\\.,]", ""),
+                      csvRecord.get("totalComp")
+              );
               history.add(comp);
             }
           } else {

server/src/test/java/com/objectcomputing/checkins/services/reports/ReportDataControllerTest.java

@@ -185,9 +185,10 @@ void validateReportData(JsonNode node, MemberProfile user) {
 
     // Compensation History
     ArrayNode comp = (ArrayNode)node.get("compensationHistory");
-    assertEquals(5, comp.size());
+    assertEquals(10, comp.size());
     assertEquals(memberId, comp.get(0).get("memberId").asText());
     assertTrue(comp.get(0).get("amount").asDouble() > 0);
+    assertFalse(comp.get(9).get("totalComp").asText().isEmpty());
 
     // Current Information
     JsonNode curr = node.get("currentInformation");

server/src/test/java/com/objectcomputing/checkins/services/reports/data/compensationHistory.csv

@@ -1,11 +1,21 @@
-"emailAddress","startDate","compensation"
-"[email protected]","1/1/2024","100000.00"
-"[email protected]","1/1/2023","95000.00"
-"[email protected]","1/1/2022","90000.00"
-"[email protected]","1/1/2021","85000.00"
-"[email protected]","1/1/2020","80000.00"
-"[email protected]","2/1/2024","100000.00"
-"[email protected]","2/1/2023","95000.00"
-"[email protected]","2/1/2022","90000.00"
-"[email protected]","2/1/2021","85000.00"
-"[email protected]","2/1/2020","80000.00"
+"emailAddress","startDate","compensation","totalComp"
+"[email protected]","1/1/2024","100000.00",
+"[email protected]","1/1/2023","95000.00",
+"[email protected]","1/1/2022","90000.00",
+"[email protected]","1/1/2021","85000.00",
+"[email protected]","1/1/2020","80000.00",
+"[email protected]","2/1/2024","100000.00",
+"[email protected]","2/1/2023","95000.00",
+"[email protected]","2/1/2022","90000.00",
+"[email protected]","2/1/2021","85000.00",
+"[email protected]","2/1/2020","80000.00",
+"[email protected]","2024",,"103000.00"
+"[email protected]","2023",,"98000.00"
+"[email protected]","2022",,"93000.00"
+"[email protected]","2021",,"88000.00"
+"[email protected]","2020",,"83000.00"
+"[email protected]","2024",,"103000.00"
+"[email protected]","2023",,"98000.00"
+"[email protected]","2022",,"93000.00"
+"[email protected]","2021",,"88000.00"
+"[email protected]","2020",,"83000.00"

web-ui/src/pages/MeritReportPage.jsx

@@ -432,9 +432,8 @@ const MeritReportPage = () => {
     return text;
   };
 
-  const markdownCompensationHistory = (data) => {
-    // Sort them latest to oldest and truncate to the first 3.
-    const compHistory = data.compensationHistory.sort((a, b) => {
+  const prepareCompensationHistory = (data, fn) => {
+    return data.compensationHistory.filter(fn).sort((a, b) => {
       for(let i = 0; i < a.length; i++) {
         if (a.startDate[i] != b.startDate[i]) {
           return b.startDate[i] - a.startDate[i];
@@ -443,10 +442,20 @@ const MeritReportPage = () => {
       return 0;
     }).slice(0, 3);
 
+  };
+
+  const markdownCompensationHistory = (data) => {
+    // Sort them latest to oldest and truncate to the first 3.
+    const compBase = prepareCompensationHistory(data, (comp) => !!comp.amount);
+    const compTotal = prepareCompensationHistory(data, (comp) => !!comp.totalComp);
+
     let text = markdown.headers.h2("Compensation History");
-    text += markdown.lists.ul(compHistory,
+    text += markdown.lists.ul(compBase,
                 (comp) => formatDate(dateFromArray(comp.startDate)) + " - " +
-                "$" + comp.amount.toFixed(2) + " (base)");
+                "$" + parseFloat(comp.amount).toFixed(2) + " (base)");
+    text += markdown.lists.ul(compTotal,
+                (comp) => dateFromArray(comp.startDate).getFullYear() + " - " +
+                comp.totalComp);
     return text;
   };