From 84eda88d4d9a4d53e30e7744952758106f850908 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 25 Nov 2022 11:39:49 +0100 Subject: [PATCH] RSS-252: Added all unique batch numbers to SCM report --- .../report/v1/server/service/RSSPoc2Service.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java index bbd3814..146adb7 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java @@ -145,7 +145,7 @@ public class RSSPoc2Service { resultMap.put(EXPERIMENTAL_STARTING_DATE, getExperimentalStartDate(redactionLog)); resultMap.put(EXPERIMENTAL_COMPLETION_DATE, getExperimentalEndDate(redactionLog)); resultMap.put(GLP_STUDY, getGlpStudy(redactionLog)); - resultMap.put(CERTIFICATE_OF_ANALYSIS_BATCH_IDENTIFICATION, getBatchNumber(redactionLog)); + resultMap.put(CERTIFICATE_OF_ANALYSIS_BATCH_IDENTIFICATION, getJoinedUniqueValues(redactionLog, "batch_number", ", ")); resultMap.put(TEST_GUIDELINE_1, getTestGuideline1(redactionLog)); var testGuideline2 = getTestGuideline2(redactionLog); resultMap.put(TEST_GUIDELINE_2, testGuideline2 == null ? "" : testGuideline2); @@ -788,14 +788,6 @@ public class RSSPoc2Service { } - private String getBatchNumber(RedactionLog redactionLog) { - - var batchNumber = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals("batch_number")).map(RedactionLogEntry::getValue).findFirst(); - - return batchNumber.orElse(""); - } - - private String getGlpStudy(RedactionLog redactionLog) { var glpStudy = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals("glp_study")).map(RedactionLogEntry::getValue).findFirst();