FPVTL-1304: DAC A - Missing Tags [PDF]

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<String,Object> data;
 }

src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPDFGenerationServiceImpl.java

@@ -83,6 +83,8 @@ private PdfDocumentRequest request(String templateName, Map<String, Object> plac
             .templateName(templateName)
             .outputName("result.pdf")
             .devMode(docmosisDevMode)
+            .pdfTagged(true)
+            .pdfUniversalAccessibility(true)
             .data(templateDataMapper.map(placeholders))
             .build();
     }

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

src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocmosisPdfGenerationServiceImplUTest.java

@@ -2,23 +2,28 @@
 
 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;
 import org.springframework.http.MediaType;
 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<HttpEntity<PdfDocumentRequest>> httpEntityArgumentCaptor;
+
 
     @InjectMocks
     @Spy
@@ -97,8 +105,14 @@ public void givenHttpRequestGoesThrough_whenGenerateFromHtml_thenReturnProperRes
                 ArgumentMatchers.<Class<byte[]>>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.<Class<byte[]>>any());
+        HttpEntity<PdfDocumentRequest> 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.<Class<byte[]>>any())).thenReturn(test);
 
         byte[] expected = classUnderTest.converToPdf(placeholders,"testFile");
-
         Assert.assertNotNull(expected);
     }