diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/domain/request/PdfDocumentRequest.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/domain/request/PdfDocumentRequest.java index 1a703465..01fc3dde 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/domain/request/PdfDocumentRequest.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/domain/request/PdfDocumentRequest.java @@ -19,5 +19,9 @@ public class PdfDocumentRequest { private String devMode; + private boolean pdfTagged; + + private boolean pdfUniversalAccessibility; + private Map data; } diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPDFGenerationServiceImpl.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPDFGenerationServiceImpl.java index 7227f2eb..644f87e7 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPDFGenerationServiceImpl.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPDFGenerationServiceImpl.java @@ -83,6 +83,8 @@ private PdfDocumentRequest request(String templateName, Map plac .templateName(templateName) .outputName("result.pdf") .devMode(docmosisDevMode) + .pdfTagged(true) + .pdfUniversalAccessibility(true) .data(templateDataMapper.map(placeholders)) .build(); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 74254e3b..c73e6ebf 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -474,13 +474,13 @@ document: - templateName: PRL-LEG-REP-REMOVED.docx filename: Cover_letter_with_access_code.pdf document-generator: docmosis - - templateName: FL-PRL-APP-ENG-C100-DRAFT-V3.docx + - templateName: FL-PRL-APP-ENG-C100-Draft-V4.docx filename: C100DraftDocument.pdf document-generator: docmosis - templateName: FL-PRL-APP-ENG-C100-Final-V3.docx filename: C100FinalDocument.pdf document-generator: docmosis - - templateName: FL-PRL-APP-WEL-C100-Draft-V3.docx + - templateName: FL-PRL-APP-WEL-C100-Draft-V4.docx filename: C100DraftWelshDocument.pdf document-generator: docmosis - templateName: FL-PRL-APP-WEL-C100-Final-V3.docx diff --git a/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPdfGenerationServiceImplUTest.java b/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPdfGenerationServiceImplUTest.java index e4bbebf7..35ae5d77 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPdfGenerationServiceImplUTest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPdfGenerationServiceImplUTest.java @@ -2,16 +2,20 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.reflect.FieldUtils; +import org.checkerframework.checker.units.qual.C; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; +import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -19,6 +23,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; +import uk.gov.hmcts.reform.prl.documentgenerator.domain.request.PdfDocumentRequest; import uk.gov.hmcts.reform.prl.documentgenerator.exception.PDFGenerationException; import uk.gov.hmcts.reform.prl.documentgenerator.mapper.TemplateDataMapper; import uk.gov.hmcts.reform.prl.documentgenerator.util.NullOrEmptyValidator; @@ -42,6 +47,9 @@ public class DocmosisPdfGenerationServiceImplUTest { @Mock ObjectMapper objectMapper; + @Captor + private ArgumentCaptor> httpEntityArgumentCaptor; + @InjectMocks @Spy @@ -97,8 +105,14 @@ public void givenHttpRequestGoesThrough_whenGenerateFromHtml_thenReturnProperRes ArgumentMatchers.>any())).thenReturn(myEntity); byte[] expected = classUnderTest.generate(template, placeholders); - Assert.assertNotNull(expected); + Mockito.verify(restTemplate).exchange(ArgumentMatchers.any(String.class), + ArgumentMatchers.any(HttpMethod.class), + httpEntityArgumentCaptor.capture(), + ArgumentMatchers.>any()); + HttpEntity value = httpEntityArgumentCaptor.getValue(); + Assert.assertTrue("PDF tagged", value.getBody().isPdfTagged()); + Assert.assertTrue("PDF pdfUniversalAccessibility", value.getBody().isPdfUniversalAccessibility()); } @Test @@ -115,7 +129,6 @@ public void givenFileNAme_whenConvertPDf_thenReturnProperResponse() throws Excep ArgumentMatchers.>any())).thenReturn(test); byte[] expected = classUnderTest.converToPdf(placeholders,"testFile"); - Assert.assertNotNull(expected); }