return assessments id to reports

Author: cthermolia-grnet

CHANGELOG.md

@@ -108,9 +108,9 @@ According to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) , the `Unr
 - [#552](https://github.com/FC4E-CAT/fc4e-cat-api/pull/552) CAT-1018 Prevent auto signout of admin when validated
 - [#563](https://github.com/FC4E-CAT/fc4e-cat-api/pull/563) Use pretty-print Zenodo publication state in responses
 - [#567](https://github.com/FC4E-CAT/fc4e-cat-api/pull/567) CAT-1065 API: Grant reporter role permissions to view an assessment
+- [#568](https://github.com/FC4E-CAT/fc4e-cat-api/pull/568) CAT-1067 Return ids of assessments to report response
 - [#569](https://github.com/FC4E-CAT/fc4e-cat-api/pull/569) CAT-1068 Investigate 500 error when retrieving reports
 
-
 ## 2.0.0 - 2025-03-31
 ---
 

data-transfer-object/src/main/java/org/grnet/cat/dtos/report/ReportResponseDto.java

@@ -7,6 +7,7 @@
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
 import java.util.List;
+import java.util.Map;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @Getter
@@ -90,12 +91,13 @@ public class ReportResponseDto {
 
     @Schema(
             type = SchemaType.ARRAY,
-            implementation = String.class,
-            description = "List of column labels (e.g. assessments)",
-            example = "[\"Assessment-1\", \"Assessment-2\"]"
+            implementation = Map.class,
+            description = "Map of column keys to their labels",
+            example = "{\"name\":\"Assessment-1\", \"id\":\"c203-c367-555f-4672s\"}"
     )
     @JsonProperty("columns")
-    public List<String> columns;
+    public List<Map<String, String>> columns;
+
 
     @Schema(
             type = SchemaType.ARRAY,
@@ -141,10 +143,14 @@ public List<String> getRows() {
         return rows;
     }
 
-    public List<String> getColumns() {
+    public List<Map<String, String>> getColumns() {
         return columns;
     }
 
+    public void setColumns(List<Map<String, String>> columns) {
+        this.columns = columns;
+    }
+
     public List<List<String>> getData() {
         return data;
     }
@@ -185,9 +191,6 @@ public void setRows(List<String> rows) {
         this.rows = rows;
     }
 
-    public void setColumns(List<String> columns) {
-        this.columns = columns;
-    }
 
     public void setData(List<List<String>> data) {
         this.data = data;

repository/src/main/java/org/grnet/cat/repositories/ReportRepository.java

@@ -39,7 +39,7 @@ public List<Object[]> fetchReportData(List<String> motivations,
         var def = findById(reportDefinitionId);
 
         var where = new StringBuilder("WHERE 1=1 ");
-
+        var select =new StringBuilder();
         // Handle publicationStatus (IDs: 1 = published, 2 = unpublished)
         if (!publicationStatus.isEmpty()) {
             where.append("AND (");
@@ -62,13 +62,16 @@ public List<Object[]> fetchReportData(List<String> motivations,
             where.append(") ");
         }
 
-        String selectRow;
-        String selectCol;
-
+        String selectRow="";
+        String selectCol="";
+        String selectId="";
         if (reportDefinitionId == 1) {
             // Actors × Assessments
             selectRow = "a.assessment_doc->'actor'->>'name'";
             selectCol = "a.assessment_doc->>'name'";
+            selectId = "a.assessment_doc->>'id'";
+            select.append(  "SELECT " + selectRow + " AS rowLabel, "
+                    + selectCol + " AS colLabel ");
 
             if (!actors.isEmpty()) {
                 where.append("AND (");
@@ -84,6 +87,9 @@ public List<Object[]> fetchReportData(List<String> motivations,
             // Organisations × Assessments
             selectRow = "a.assessment_doc->'organisation'->>'name'";
             selectCol = "a.assessment_doc->>'name'";
+            selectId = "a.assessment_doc->>'id'";
+             select.append("SELECT " + selectRow + " AS rowLabel, "
+                     + selectCol + " AS colLabel ");
 
             if (!organisations.isEmpty()) {
                 where.append("AND (");
@@ -100,6 +106,9 @@ public List<Object[]> fetchReportData(List<String> motivations,
             selectRow = "a.assessment_doc->'subject'->>'name'";
             selectCol = "(a.assessment_doc->'assessment_type'->>'name') || ' / ' || (a.assessment_doc->'actor'->>'name')";
 
+          select.append("SELECT " + selectRow + " AS rowLabel, "
+                    + selectCol + " AS colLabel ");
+
             // Subject filter
             if (!subjects.isEmpty()) {
                 where.append("AND (");
@@ -126,14 +135,14 @@ public List<Object[]> fetchReportData(List<String> motivations,
             throw new IllegalArgumentException("Unsupported definition: " + def);
         }
 
-        var sql = "SELECT " + selectRow + " AS rowLabel, "
-                + selectCol + " AS colLabel, "
-                + "a.assessment_doc AS assessmentDoc "
-                + "FROM MotivationAssessment a "
-                + where
-                + "ORDER BY 1, 2";
+        var sql = select.append(",").append("a.assessment_doc AS assessmentDoc ");
+             if(!selectId.isEmpty()) {
+                sql.append(",").append(selectId).append(" AS colId ");
+             }
+             sql.append( " FROM MotivationAssessment a ")
+                .append(where).append(" ORDER BY 1, 2");
 
-        var q = em.createNativeQuery(sql);
+        var q = em.createNativeQuery(sql.toString());
 
         // Bind publicationStatus using enum
         for (int i = 0; i < publicationStatus.size(); i++) {

service/src/main/java/org/grnet/cat/services/report/ReportService.java

@@ -2,6 +2,9 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
@@ -136,7 +139,7 @@ public ReportResponseDto run(Long id, ReportFilterDto request, String userId) {
 
         // 5. Build matrix
         var matrix = new LinkedHashMap<String, Map<String, String>>();
-        var colSet = new LinkedHashSet<String>();
+        var colSet = new LinkedHashSet<Map<String,String>>();
         buildMatrix(raw, matrix, colSet);
 
         // 6. Return response
@@ -158,18 +161,27 @@ private boolean validateListType(List<String> values, String expectedType) {
 
     private void buildMatrix(List<Object[]> raw,
                              Map<String, Map<String, String>> matrix,
-                             Set<String> colSet) {
+                             Set<Map<String,String>> colSet) {
         for (Object[] row : raw) {
             var rowLabel = safeLabel((String) row[0]);
             var colLabel = safeLabel((String) row[1]);
             var assessmentDoc = (String) row[2];
+            var compliance = extractCompliance(assessmentDoc);
+            var columnInfo = new JsonObject();
+            columnInfo.addProperty("name", colLabel);
+            var colMap=new HashMap<String,String>();
+            colMap.put("name",colLabel);
+            if(row.length>3){
+                var colId = safeLabel((String) row[3]);
+                columnInfo.addProperty("id", colId);
+                colMap.put("id",colId);
 
-            var value = extractCompliance(assessmentDoc);
-
+            }
+            colSet.add(colMap);
             matrix.computeIfAbsent(rowLabel, k -> new LinkedHashMap<>())
-                    .put(colLabel, value);
+                    .put(colLabel, compliance);
+
 
-            colSet.add(colLabel);
         }
     }
 
@@ -199,7 +211,7 @@ private ReportResponseDto buildResponse(ReportDefinitionDto def,
                                             ReportFilterDto request,
                                             String userId,
                                             LinkedHashMap<String, Map<String, String>> matrix,
-                                            LinkedHashSet<String> colSet) {
+                                            LinkedHashSet<Map<String,String>> colSet) {
 
         var table = matrixToDto(matrix, colSet);
 
@@ -234,9 +246,34 @@ public String exportToCsv(ReportResponseDto report) {
 
         // Header: first cell = report label (no separate title row)
         sb.append(escapeCsv(report.label != null ? report.label : ""));
-        for (String col : report.columns) {
-            sb.append(",").append(escapeCsv(col));
+        String nameValue = null;
+        String idValue = null;
+
+        for (Map<String, String> col : report.columns) {
+            for (Map.Entry<String, String> entry : col.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+
+            if ("name".equalsIgnoreCase(key)) {
+                nameValue = value;
+            } else if ("id".equalsIgnoreCase(key)) {
+                idValue = value;
+            } else {
+                sb.append(",").append(escapeCsv(value));
+            }
+        }
+
+// After loop, handle name/id concatenation if they exist
+       var cellValue=new StringBuilder();
+        if (nameValue != null ) {
+            cellValue.append(nameValue);
         }
+        if(idValue != null) {
+            cellValue.append("/").append(idValue);
+        }
+            sb.append(",").append(escapeCsv(cellValue.toString()));
+        }
+
         sb.append("\n");
 
         // Data rows
@@ -263,23 +300,25 @@ private String escapeCsv(String value) {
     /**
      * Builds the response DTO from definition, userId, and table data.
      */
-    ReportResponseDto matrixToDto(Map<String, Map<String, String>> matrix, Set<String> assessments) {
+    ReportResponseDto matrixToDto(Map<String, Map<String, String>> matrix, Set<Map<String, String>> assessments) {
         var result = new ReportResponseDto();
         result.rows = new ArrayList<>(matrix.keySet());
         result.columns = new ArrayList<>(assessments);
 
         List<List<String>> tableData = new ArrayList<>();
         for (String org : result.rows) {
             List<String> rowData = new ArrayList<>();
-            for (String assess : result.columns) {
+            for (Map<String, String> assess : result.columns) {
                 String val = "N/A";
-                if (matrix.containsKey(org) && matrix.get(org).containsKey(assess)) {
-                    val = matrix.get(org).get(assess);
+                if (assess.containsKey("name") && matrix.containsKey(org) && matrix.get(org).containsKey(assess.get("name"))) {
+                    val = matrix.get(org).get(assess.get("name"));
                 }
                 rowData.add(val);
             }
+
             tableData.add(rowData);
         }
+
         result.data = tableData;
         return result;
     }