Merge pull request #4145 from devgateway/issue/AMP-30735/ETHIOPIA--error-when-you-add-Region-column-to-report

Issue/amp 30735/ethiopia  error when you add region column to report

Author: jdeanquin-dg

amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/reports/designer/ReportColumnProvider.java

@@ -140,6 +140,9 @@ public class ReportColumnProvider extends ReportEntityProvider {
             Comparator.comparing(c -> ME_COLUMNS_ORDER.getOrDefault(c.getColumnName(), DEFAULT_ORDER_VALUE));
 
     private TranslatorService translatorService;
+    public TranslatorService getTranslatorService() {
+        return translatorService;
+    }
 
     private Map<ReportType, Map<String, List<AmpColumns>>> ampTreeColumnsMapByType = new HashMap<>();
 

amp/WEB-INF/src/org/digijava/kernel/ampapi/endpoints/reports/designer/validators/ReportColumnValidator.java

@@ -6,7 +6,9 @@
 import org.digijava.kernel.ampapi.endpoints.reports.designer.ReportProfile;
 import org.digijava.kernel.ampapi.endpoints.reports.designer.ReportRequest;
 import org.digijava.kernel.ampapi.endpoints.reports.designer.ReportType;
+import org.digijava.module.aim.dbentity.AmpColumns;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -29,6 +31,7 @@ public class ReportColumnValidator implements ReportValidator {
     private boolean isEmpty;
 
     private List<String> invalidIds;
+    private List<String> invalidColumnsNames;
 
     public ReportColumnValidator(final ReportColumnProvider columnProvider) {
         this.columnProvider = columnProvider;
@@ -53,6 +56,17 @@ public boolean isValid(Object value) {
                 .map(String::valueOf)
                 .collect(Collectors.toList());
 
+        if (!invalidIds.isEmpty()) {
+            invalidColumnsNames = new ArrayList<>();
+            for (String id : invalidIds) {
+                final int idNumber = Integer.parseInt(id);
+                AmpColumns ampColumn = columnProvider.fetchAmpColumns().stream().filter(column -> column.getColumnId() == idNumber).collect(Collectors.toList()).get(0);
+                String name = columnProvider.getTranslatorService().translateText( ampColumn.getColumnName() );
+                String errorText = " - [" + id + "] " + name;
+                invalidColumnsNames.add(errorText);
+            }
+        }
+
         return invalidIds.isEmpty();
     }
 
@@ -61,7 +75,7 @@ public ApiErrorMessage getErrorMessage() {
             return REPORT_FIELD_REQUIRED.withDetails(COLUMNS);
         }
 
-        return REPORT_INVALID_COLUMNS.withDetails(invalidIds);
+        return REPORT_INVALID_COLUMNS.withDetails(invalidColumnsNames);
     }
 
 }