AB#1011 Add locationName to ReportDto

NCI-Agency · Jan 7, 2025 · 207a791 · 207a791
1 parent cbef6c6
commit 207a791
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/mil/dds/anet/beans/mart/ReportDto.java b/src/main/java/mil/dds/anet/beans/mart/ReportDto.java
@@ -25,6 +25,7 @@ public class ReportDto {
   private Instant engagementDate;
   private String intent;
   private String locationUuid;
+  private String locationName;
   private String reportText;
 
   private String customFields;
@@ -136,6 +137,14 @@ public void setLocationUuid(String locationUuid) {
     this.locationUuid = locationUuid;
   }
 
+  public String getLocationName() {
+    return locationName;
+  }
+
+  public void setLocationName(String locationName) {
+    this.locationName = locationName;
+  }
+
   public String getReportText() {
     return reportText;
   }
@@ -175,4 +184,5 @@ public String getRank() {
   public void setRank(String rank) {
     this.rank = rank;
   }
+
 }
diff --git a/src/main/java/mil/dds/anet/threads/mart/MartReportImporterWorker.java b/src/main/java/mil/dds/anet/threads/mart/MartReportImporterWorker.java
@@ -223,7 +223,9 @@ private Report processReportInfo(ReportDto martReport, StringBuilder errors) {
     // Validate report location, it not valid finish
     final Location location = locationDao.getByUuid(martReport.getLocationUuid());
     if (location == null) {
-      errors.append("Can not find report location: ").append(martReport.getLocationUuid());
+      errors.append("Can not find report location: ").append(martReport.getLocationName());
+          .append("' with uuid: ")
+          .append(martReport.getLocationUuid());
       return null;
     }
 

diff --git a/src/test/java/mil/dds/anet/test/TestData.java b/src/test/java/mil/dds/anet/test/TestData.java
@@ -95,7 +95,7 @@ public static TaskInput createTaskInput(String shortName, String longName, Strin
   }
 
   public static ReportDto createGoodMartReport() {
-    ReportDto reportDto = new ReportDto();
+    final ReportDto reportDto = new ReportDto();
     // User Info
     reportDto.setUuid(UUID.randomUUID().toString());
     reportDto.setOrganizationUuid("9a35caa7-a095-4963-ac7b-b784fde4d583");
@@ -120,7 +120,7 @@ public static ReportDto createGoodMartReport() {
         "{\"attitude\":\"Positive\", \"contacts\":\"Contacts\", \"remarks\":\"Remarks\", \"rcAssessment\":\"rcAssessment\"}");
 
     // Tasks
-    Map<String, String> tasks = new HashMap<>();
+    final Map<String, String> tasks = new HashMap<>();
     tasks.put("19364d81-3203-483d-a6bf-461d58888c76", "Intelligence");
     tasks.put("does not exist", "does not exist");
     reportDto.setTasks(tasks);
@@ -129,16 +129,17 @@ public static ReportDto createGoodMartReport() {
   }
 
   public static ReportDto createMartReportWrongOrganization() {
-    ReportDto reportDto = new ReportDto();
+    final ReportDto reportDto = new ReportDto();
     reportDto.setOrganizationUuid("does not exist");
     reportDto.setOrganizationName("does not exist");
     return reportDto;
   }
 
   public static ReportDto createMartReportWrongLocation() {
-    ReportDto reportDto = new ReportDto();
+    final ReportDto reportDto = new ReportDto();
     reportDto.setOrganizationUuid("9a35caa7-a095-4963-ac7b-b784fde4d583");
     reportDto.setLocationUuid("does not exist");
+    reportDto.setLocationName("does not exist");
     return reportDto;
   }
 }
diff --git a/src/test/java/mil/dds/anet/test/integration/mart/MartReportImporterWorkerTest.java b/src/test/java/mil/dds/anet/test/integration/mart/MartReportImporterWorkerTest.java
@@ -139,8 +139,9 @@ void testWorker() {
     List<MartImportedReport> martImportedReports = martImportedReportDao.getAll();
 
     assertThat(martImportedReports.stream()
-        .filter(martImportedReport -> !martImportedReport.isSuccess() && martImportedReport
-            .getErrors().equals("Can not find report location: does not exist")))
+        .filter(
+            martImportedReport -> !martImportedReport.isSuccess() && martImportedReport.getErrors()
+                .equals("Can not find report location: 'does not exist' with uuid: does not exist"))
         .hasSize(1);
 
     assertThat(martImportedReports.stream()