Pull request #104: RED-2757

Merge in RED/redaction-report-service from RED-2757-port to master

* commit '2655479c56af293bc868ca248b73a8302c7ed524':
  RED-2757 Syngenta urgent issue: IUCLID report does not show "non-readable content" for rectangle redactions PORT

redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/IuclidFunctionService.java

@@ -6,6 +6,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.redaction.report.v1.server.model.ReportRedactionEntry;
@@ -32,8 +33,12 @@ public class IuclidFunctionService {
             Iterator<ReportRedactionEntry> iterator = entriesPerJustification.get(key).iterator();
             while (iterator.hasNext()) {
                 ReportRedactionEntry entry = iterator.next();
-                s.append("P").append(entry.getPage());
-                s.append(" ").append(entry.getValue() != null ? entry.getValue() : "non-readable content");
+                s.append("P").append(entry.getPage()).append(" ");
+                if(StringUtils.isBlank(entry.getValue()) || entry.getValue().equalsIgnoreCase("Rectangle")) {
+                    s.append("non-readable content");
+                } else {
+                    s.append(entry.getValue());
+                }
                 if (iterator.hasNext()) {
                     s.append(", ");
                 }

redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java

@@ -409,11 +409,11 @@ public class RedactionReportIntegrationTest {
     public void testIuclidReport() {
         String dossierTemplateId = "dossierTemplateId";
 
-        ClassPathResource redactionLogResource = new ClassPathResource("files/S11RedactionLog.json");
+        ClassPathResource redactionLogResource = new ClassPathResource("files/redaction-log.json");
 
         RedactionLog redactionLog = objectMapper.readValue(redactionLogResource.getInputStream(), RedactionLog.class);
 
-        ClassPathResource legalBasisMappingResource = new ClassPathResource("files/S1116LegalBasis.json");
+        ClassPathResource legalBasisMappingResource = new ClassPathResource("files/legalBasisMappingNew.json");
 
         List<LegalBasis> legalBasisMapping = objectMapper.readValue(legalBasisMappingResource.getInputStream(), new TypeReference<>() {
         });

redaction-report-service-v1/redaction-report-service-server-v1/src/test/resources/files/legalBasisMappingNew.json

@@ -0,0 +1,47 @@
+[
+  {
+    "name": "1.1 personal data (incl. geolocation); Article 39(e)(3)",
+    "description": "(Regulations (EU) 2016/679 and (EU) 2018/1725 shall apply to the processing of personal data carried out pursuant to this Regulation. Any personal data made public pursuant to Article 38 of this Regulation and this Article shall only be used to ensure the transparency of the risk assessment under this Regulation and shall not be further processed in a manner that is incompatible with these purposes, in accordance with point (b) of Article 5(1) of Regulation (EU) 2016/679 and point (b) of Article 4(1) of Regulation (EU) 2018/1725, as the case may be)",
+    "reason": "Article 39(e)(3) of Regulation (EC) No 178/2002"
+  },
+  {
+    "name": "1.2 vertebrate study related personal data (incl. geolocation); Article 39(e)(2)",
+    "description": "personal data (names and addresses) of individuals involved in testing on vertebrate studies or in obtaining toxicological information",
+    "reason": "Article 39(e)(2) of Regulation (EC) No 178/2002"
+  },
+  {
+    "name": "2. manufacturing or production process",
+    "description": "the manufacturing or production process, including the method and innovative aspects thereof, as well as other technical and industrial specifications inherent to that process or method, except for information which is relevant to the assessment of safety",
+    "reason": "Article 63(2)(a) of Regulation (EC) No 1107/2009 (making reference to Article 39 of Regulation EC No 178/2002)"
+  },
+  {
+    "name": "3. links between a producer and applicant",
+    "description": "commercial links between a producer or importer and the applicant or the authorisation holder, where applicable",
+    "reason": "Article 63(2)(a) of Regulation (EC) No 1107/2009 (making reference to Article 39 of Regulation EC No  178/2002)"
+  },
+  {
+    "name": "4. commercial information",
+    "description": "commercial information revealing sourcing, market shares or business strategy of the applicant",
+    "reason": "Article 63(2)(a) of Regulation (EC) No 1107/2009  (making reference to Article 39 of Regulation EC No 178/2002)"
+  },
+  {
+    "name": "5. quantitative composition",
+    "description": "quantitative composition of the subject matter of the request, except for information which is relevant to the assessment of safety",
+    "reason": "Article 63(2)(a) of Regulation (EC) No  1107/2009 (making reference to Article 39 of Regulation EC No 178/2002)"
+  },
+  {
+    "name": "6. specification of impurity",
+    "description": "the specification of impurity of the active substance and the related methods of analysis for impurities in the active substance as manufactured, except for the impurities that are considered to be toxicologically, ecotoxicologically or environmentally relevant and the related methods of analysis for such impurities",
+    "reason": "Article 63(2)(b) of Regulation (EC) No 1107/2009"
+  },
+  {
+    "name": "7. results of production batches",
+    "description": "results of production batches of the active substance including impurities",
+    "reason": "Article 63(2)(c) of Regulation (EC) No 1107/2009"
+  },
+  {
+    "name": "8. composition of a plant protection product",
+    "description": "information on the complete composition of a plant protection product",
+    "reason": "Article 63(2)(d) of Regulation (EC) No 1107/2009"
+  }
+]