From 9aee1d0ce618a601c1627d8b252235489b91e865 Mon Sep 17 00:00:00 2001
From: rishikrsharma <rishikrsharma@users.noreply.github.com>
Date: Fri, 12 Jan 2024 13:26:06 +0000
Subject: [PATCH] DFR-2629: Send letter pass recipients in additional data
 (#1898)

* DFR-2629: Send letter pass recipients in additional data

* DFR-2629: Send letter pass recipients in additional data

* DFR-2629: Send letter pass recipients in additional data
---
 dependency-check-suppressions.xml             | 154 ++++++++++++++++++
 .../service/BulkPrintService.java             |   3 +-
 .../service/BulkPrintServiceTest.java         |   2 +-
 3 files changed, 156 insertions(+), 3 deletions(-)

diff --git a/dependency-check-suppressions.xml b/dependency-check-suppressions.xml
index 976066f547..2691470936 100644
--- a/dependency-check-suppressions.xml
+++ b/dependency-check-suppressions.xml
@@ -309,4 +309,158 @@
         <packageUrl regex="true">pkg:maven/org\.quartz-scheduler/quartz@.*$</packageUrl>
         <cve>CVE-2023-39017</cve>
     </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: bcprov-jdk15on-1.70.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.bouncycastle/bcprov\-jdk15on@.*$</packageUrl>
+        <cve>CVE-2023-33202</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: logback-classic-1.2.10.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-classic@.*$</packageUrl>
+        <cve>CVE-2023-6378</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: logback-core-1.2.10.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-core@.*$</packageUrl>
+        <cve>CVE-2023-6378</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-actuator-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-actuator@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-actuator-autoconfigure-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-actuator\-autoconfigure@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-autoconfigure-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-autoconfigure@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-configuration-processor-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-configuration\-processor@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-devtools-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-devtools@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-actuator-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-actuator@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-aop-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-aop@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-data-jpa-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-data\-jpa@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-jdbc-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-jdbc@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-json-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-json@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-logging-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-logging@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-quartz-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-quartz@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-tomcat-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-tomcat@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-validation-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-validation@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-boot-starter-web-2.7.17.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-web@.*$</packageUrl>
+        <cve>CVE-2023-34055</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: tomcat-embed-core-9.0.82.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.apache\.tomcat\.embed/tomcat\-embed\-core@.*$</packageUrl>
+        <cve>CVE-2023-46589</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: tomcat-embed-websocket-9.0.82.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.apache\.tomcat\.embed/tomcat\-embed\-websocket@.*$</packageUrl>
+        <cve>CVE-2023-46589</cve>
+    </suppress>
 </suppressions>
diff --git a/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/service/BulkPrintService.java b/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/service/BulkPrintService.java
index a533e06a30..2792c4e919 100644
--- a/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/service/BulkPrintService.java
+++ b/src/main/java/uk/gov/hmcts/reform/divorce/orchestration/service/BulkPrintService.java
@@ -26,7 +26,6 @@ public class BulkPrintService {
     private static final String LETTER_TYPE_KEY = "letterType";
     private static final String CASE_REFERENCE_NUMBER_KEY = "caseReferenceNumber";
     private static final String CASE_IDENTIFIER_KEY = "caseIdentifier";
-    private static final String RECIPIENTS_PROD = "party";
     private static final String RECIPIENTS = "recipients";
 
     private final AuthTokenGenerator authTokenGenerator;
@@ -83,7 +82,7 @@ private Map<String, Object> getAdditionalData(final String caseId, final String
         log.info("isSendLetterDuplicateCheckEnabled {} for caseId {}",
             featureToggleService.isFeatureEnabled(Features.SEND_LETTER_RECIPIENT_CHECK), caseId);
         if (featureToggleService.isFeatureEnabled(Features.SEND_LETTER_RECIPIENT_CHECK)) {
-            additionalData.put(RECIPIENTS_PROD, new String[]{RECIPIENTS});
+            additionalData.put(RECIPIENTS, new String[]{RECIPIENTS});
         } else {
             additionalData.put(RECIPIENTS, new String[]{"%s:%d".formatted(RECIPIENTS, System.nanoTime())});
         }
diff --git a/src/test/java/uk/gov/hmcts/reform/divorce/orchestration/service/BulkPrintServiceTest.java b/src/test/java/uk/gov/hmcts/reform/divorce/orchestration/service/BulkPrintServiceTest.java
index d28b90cd5d..499b6672b5 100644
--- a/src/test/java/uk/gov/hmcts/reform/divorce/orchestration/service/BulkPrintServiceTest.java
+++ b/src/test/java/uk/gov/hmcts/reform/divorce/orchestration/service/BulkPrintServiceTest.java
@@ -125,7 +125,7 @@ public void happyPathWhenSendLetterRecipientCheckEnabled() {
             "letterType",
             "caseIdentifier",
             "caseReferenceNumber",
-            "party");
+            "recipients");
 
         final String xeroxType = "DIV001";
         assertThat(letterRequestCaptor.getValue(), allOf(