Code Rabbit Fixes

jembi · Oct 22, 2024 · a5dc6b0 · a5dc6b0
1 parent 7439648
commit a5dc6b0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/BackEnd.java b/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/BackEnd.java
@@ -528,7 +528,7 @@ private Behavior<Event> getFieldCountHandler(final GetFieldCountRequest request)
          request.replyTo.tell(new GetFieldCountResponse(getCount));
       } catch (Exception e) {
          LOGGER.error(e.getLocalizedMessage(), e);
-         LOGGER.error("libMPI.findExpandedGoldenRecord failed for goldenId: {} with error: {}", e.getMessage());
+         LOGGER.error("libMPI.getFieldCount failed for goldenId: {} with error: {}", e.getMessage());
       }
       return Behaviors.same();
    }
@@ -543,7 +543,7 @@ private Behavior<Event> getAgeGroupCountHandler(final GetAgeGroupCountRequest re
          request.replyTo.tell(new GetAgeGroupCountResponse(getCount));
       } catch (Exception e) {
          LOGGER.error(e.getLocalizedMessage(), e);
-         LOGGER.error("libMPI.findExpandedGoldenRecord failed for goldenId: {} with error: {}", e.getMessage());
+         LOGGER.error("libMPI.getAgeGroupCountHandler failed for goldenId: {} with error: {}", e.getMessage());
       }
       return Behaviors.same();
    }
@@ -569,14 +569,14 @@ public static double calculateAvarageAge(final List<String> dobList) {
         int count = 0;
         // Iterate through the list of DOBs and calculate the age for each
         for (String dob : dobList) {
-            if (!dob.isEmpty()) {
+            if (dob != null && !dob.isEmpty()) {
                try {
                 LocalDate birthDate = LocalDate.parse(dob, formatter);  // Try to convert DOB to LocalDate
                 int age = Period.between(birthDate, today).getYears();  // Calculate age in years
                 totalAge += age;
                 count++;
                } catch (DateTimeParseException e) {
-                  LOGGER.error("Invalid date format for dob: " + dob + ". Skipping this record.");
+                  LOGGER.error("Invalid date format for dob: {}. Skipping this record.", dob);
                }
             }
         }

diff --git a/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/Routes.java b/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/Routes.java
@@ -8,7 +8,6 @@
 import akka.http.javadsl.model.*;
 import akka.http.javadsl.server.Route;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jembi.jempi.libmpi.MpiServiceError;
@@ -559,10 +558,9 @@ public static Route getFieldCount(
                             if (!result.isSuccess()) {
                                 return handleError(result.failed().get());
                             }
-                            ObjectMapper objectMapper = new ObjectMapper();
                             JsonNode jsonResponse = null;
                             try {
-                                jsonResponse = objectMapper.readTree(result.get().genderCount());
+                                jsonResponse = OBJECT_MAPPER.readTree(result.get().genderCount());
                             } catch (JsonProcessingException e) {
                                 throw new RuntimeException(e);
                             }

diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/dgraph/DgraphQueries.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/dgraph/DgraphQueries.java
@@ -489,7 +489,7 @@ static String getFieldCount(final ApiModels.CountFields countFields) {
     String endDate = countFields.endDate(); // Assume endDate is of LocalDate type
 
     boolean hasValues = fieldValues != null && !fieldValues.isEmpty();
-    boolean hasDateRange = startDate != null && endDate != null;
+    boolean hasDateRange = startDate != null && endDate != null && !startDate.isEmpty() && !endDate.isEmpty();
 
     StringBuilder queryBuilder = new StringBuilder();
     queryBuilder.append("query count() {");
@@ -1292,7 +1292,7 @@ public static List<String> getAllList(final ApiModels.AllList allListRequest) {
 
          // Build the query dynamically based on date range availability
          String query;
-         if (!startDate.isEmpty() && !endDate.isEmpty()) {
+         if (startDate != null && endDate != null && !startDate.isEmpty() && !endDate.isEmpty()) {
             query = String.format("""
                {
                      peopleInDateRange(func: has(GoldenRecord.%s)) 
@@ -1326,14 +1326,16 @@ private static List<String> parseDobFromResponse(final String responseJson) thro
         List<String> dobList = new ArrayList<>();
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jsonNode = mapper.readTree(responseJson);
-        JsonNode peopleArray = jsonNode.get("peopleInDateRange");
+        JsonNode recordArray = jsonNode.get("peopleInDateRange");
 
         // Extract each `dob` and add to the list
-        for (JsonNode person : peopleArray) {
-            if (person.has("GoldenRecord.dob")) {
-                dobList.add(person.get("GoldenRecord.dob").asText());
+        if (recordArray != null) {
+            for (JsonNode person : recordArray) {
+                  if (person.has("GoldenRecord.dob")) {
+                     dobList.add(person.get("GoldenRecord.dob").asText());
+                  }
             }
-        }
+      }
         return dobList;
     }
 

diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/ApiModels.java b/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/ApiModels.java
@@ -444,6 +444,7 @@ public record ApiOffsetSearch(
          Boolean sortAsc) {
          }
 
+   @JsonInclude(JsonInclude.Include.NON_NULL)
    public record AllList(String field, String startDate, String endDate) { }
 
    public record AverageAgeResponse(double averageAge) { }