fixed breaking change, changing pdf document name

hmcts · Nov 15, 2022 · 04e6079 · 04e6079
1 parent 6c79a6f
commit 04e6079
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/uk/gov/hmcts/reform/et/syaapi/service/CaseService.java b/src/main/java/uk/gov/hmcts/reform/et/syaapi/service/CaseService.java
@@ -206,14 +206,14 @@ public CaseDetails submitCase(String authorization, CaseRequest caseRequest)
             log.error("Invalid ACAS numbers", e);
         }
 
-        PdfDecodedMultipartFile casePdfFile =
+        List<PdfDecodedMultipartFile> casePdfFiles =
             pdfService.convertCaseDataToPdfDecodedMultipartFile(caseData);
         caseDetails.getData().put("ClaimantPcqId", caseData.getClaimantPcqId());
         caseDetails.getData().put("documentCollection",
                                   caseDocumentService
                                       .uploadAllDocuments(authorization,
                                                           caseRequest.getCaseTypeId(),
-                                                          casePdfFile,
+                                                          casePdfFiles,
                                                           acasCertificates));
         String emailTemplateId = WELSH_LANGUAGE.equals(caseData.getClaimantType().getClaimantContactLanguage())
             ? notificationsProperties.getCySubmitCaseEmailTemplateId()

diff --git a/src/main/java/uk/gov/hmcts/reform/et/syaapi/service/pdf/PdfService.java b/src/main/java/uk/gov/hmcts/reform/et/syaapi/service/pdf/PdfService.java
@@ -31,6 +31,9 @@
 @RequiredArgsConstructor()
 public class PdfService {
 
+    private static final String ENGLISH = "English";
+    private static final String WELSH = "Welsh";
+
     private final PdfMapperService pdfMapperService;
     @Value("${pdf.english}")
     public String englishPdfTemplateSource;
@@ -88,8 +91,7 @@ private static String createPdfDocumentNameFromCaseData(CaseData caseData, Strin
             + caseData.getClaimantIndType().getClaimantFirstNames().replace(" ", "_")
             + "_"
             + caseData.getClaimantIndType().getClaimantLastName().replace(" ", "_")
-            + "_"
-            + documentLanguage
+            +  (documentLanguage.equals(ENGLISH) ? "" : "_" + documentLanguage)
             + ".pdf";
     }
 
@@ -125,13 +127,13 @@ public List<PdfDecodedMultipartFile> convertCaseDataToPdfDecodedMultipartFile(Ca
         throws PdfServiceException {
         List<PdfDecodedMultipartFile> files = new ArrayList<>();
         files.add(new PdfDecodedMultipartFile(convertCaseToPdf(caseData, this.englishPdfTemplateSource),
-                                              createPdfDocumentNameFromCaseData(caseData, "English"),
+                                              createPdfDocumentNameFromCaseData(caseData, ENGLISH),
                                               PDF_FILE_TIKA_CONTENT_TYPE,
                                               createPdfDocumentDescriptionFromCaseData(caseData)));
 
-        if (caseData.getClaimantType().getClaimantContactLanguage().equals("Welsh")) {
+        if (caseData.getClaimantType().getClaimantContactLanguage().equals(WELSH)) {
             files.add(new PdfDecodedMultipartFile(convertCaseToPdf(caseData, this.welshPdfTemplateSource),
-                                                  createPdfDocumentNameFromCaseData(caseData, "Welsh"),
+                                                  createPdfDocumentNameFromCaseData(caseData, WELSH),
                                                   PDF_FILE_TIKA_CONTENT_TYPE,
                                                   createPdfDocumentDescriptionFromCaseData(caseData)));
         }