FACT-1395 remove assertEnvelopeContainsDocsOfAllowedTypesForService DO NOT MERGE (#3269)

* removed assertEnvelopeContainsDocsOfAllowedTypesForService and relevant tests

* remove integration test

* attempt to put pact fix

* wrong version

* trying move finalizedby to runAndPublishConsumerPactTests

* undo pact attempt stuff

* removed unused bit of code

* attempt to update pact

* updated java version

* pact back to old one

Author: justiceia

src/integrationTest/java/uk/gov/hmcts/reform/bulkscanprocessor/tasks/BlobProcessorTaskTestForFailedStatus.java

@@ -135,21 +135,6 @@ public void should_record_validation_failure_when_ocr_data_is_missing_for_form_s
         errorWasSent(SAMPLE_ZIP_FILE_NAME, ErrorCode.ERR_METAFILE_INVALID);
     }
 
-    @Test
-    public void should_record_validation_failure_when_document_type_is_not_supported_for_service() throws Exception {
-        // given
-        uploadToBlobStorage(SAMPLE_ZIP_FILE_NAME, zipDir("zipcontents/invalid-document-type-for-service"));
-
-        // when
-        processor.processBlobs();
-
-        // then
-        envelopeWasNotCreated();
-        eventsWereCreated(ZIPFILE_PROCESSING_STARTED, FILE_VALIDATION_FAILURE);
-        fileWasDeleted(SAMPLE_ZIP_FILE_NAME);
-        errorWasSent(SAMPLE_ZIP_FILE_NAME, ErrorCode.ERR_METAFILE_INVALID);
-    }
-
     @Test
     public void should_record_validation_failure_when_document_type_is_not_supported() throws Exception {
         // given

src/main/java/uk/gov/hmcts/reform/bulkscanprocessor/services/EnvelopeHandler.java

@@ -92,7 +92,6 @@ public void handleEnvelope(
         envelopeValidator.assertPaymentsEnabledForContainerIfPaymentsArePresent(
             inputEnvelope, paymentsEnabled, containerMappings.getMappings()
         );
-        envelopeValidator.assertEnvelopeContainsDocsOfAllowedTypesForService(inputEnvelope);
         envelopeValidator.assertEnvelopeContainsDocsOfAllowedTypesOnly(inputEnvelope);
 
         envelopeProcessor.assertDidNotFailToUploadBefore(inputEnvelope.zipFileName, containerName);

src/main/java/uk/gov/hmcts/reform/bulkscanprocessor/validation/EnvelopeValidator.java

@@ -27,7 +27,6 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
 import static java.util.Objects.isNull;
 import static java.util.stream.Collectors.counting;
 import static java.util.stream.Collectors.groupingBy;
@@ -49,16 +48,6 @@ public final class EnvelopeValidator {
             "SSCS", InputDocumentType.SSCS1
         );
 
-    private static final String probateJurisdiction = "PROBATE";
-    private static final Map<InputDocumentType, List<String>> jurisdictionSpecificDocumentTypes =
-        Map.of(InputDocumentType.WILL, singletonList(probateJurisdiction),
-               InputDocumentType.IHT, singletonList(probateJurisdiction),
-               InputDocumentType.FORENSIC_SHEETS, singletonList(probateJurisdiction),
-               InputDocumentType.SUPPORTING_DOCUMENTS, List.of(probateJurisdiction, "BULKSCAN"),
-               InputDocumentType.PPS_LEGAL_STATEMENT, singletonList(probateJurisdiction),
-               InputDocumentType.PPS_LEGAL_STATEMENT_WITHOUT_APOSTROPHE, singletonList(probateJurisdiction)
-        );
-
     private static final Map<Classification, List<InputDocumentType>> disallowedDocumentTypes =
         Map.of(
             Classification.EXCEPTION, emptyList(),
@@ -67,34 +56,6 @@ Classification.SUPPLEMENTARY_EVIDENCE, asList(InputDocumentType.FORM, InputDocum
             Classification.SUPPLEMENTARY_EVIDENCE_WITH_OCR, emptyList()
         );
 
-    /**
-     * Assert envelope contains only scannable items of types that are allowed for the envelope's jurisdiction.
-     *
-     * @param envelope to assert against
-     * @throws DisallowedDocumentTypesException if envelope contains scannable items of types that are not allowed
-     */
-    public void assertEnvelopeContainsDocsOfAllowedTypesForService(InputEnvelope envelope) {
-        List<String> disallowedDocTypesFound =
-            envelope
-                .scannableItems
-                .stream()
-                .filter(item -> jurisdictionSpecificDocumentTypes.containsKey(item.documentType)
-                    && !jurisdictionSpecificDocumentTypes.get(item.documentType).contains(envelope.jurisdiction))
-                .map(item -> item.documentType.toString())
-                .collect(toList());
-
-        if (!disallowedDocTypesFound.isEmpty()) {
-
-            String errorMessage = String.format(
-                "Envelope contains scannable item(s) of types that are not allowed for jurisdiction '%s': [%s]",
-                envelope.jurisdiction,
-                StringUtils.join(disallowedDocTypesFound, ", ")
-            );
-
-            throw new DisallowedDocumentTypesException(errorMessage);
-        }
-    }
-
     /**
      * Assert envelope contains only scannable items of types that are allowed for the envelope's classification.
      *

src/test/java/uk/gov/hmcts/reform/bulkscanprocessor/validation/EnvelopeValidatorTest.java

@@ -678,48 +678,6 @@ void assertServiceEnabled_passes_if_pobox_is_correct_multiple_poboxes() {
         );
     }
 
-    @Test
-    void assertEnvelopeContainsDocsOfAllowedTypesForService_should_pass() {
-        // given
-        InputEnvelope envelope = InputEnvelopeCreator.inputEnvelope(
-            "BULKSCAN",
-            "POBOX",
-            Classification.EXCEPTION,
-            List.of(
-                scannableItem("file1", InputDocumentType.CHERISHED),
-                scannableItem("file2", InputDocumentType.SUPPORTING_DOCUMENTS)
-            )
-        );
-
-        // when
-        // then
-        assertDoesNotThrow(() -> envelopeValidator.assertEnvelopeContainsDocsOfAllowedTypesForService(envelope));
-    }
-
-    @Test
-    void assertEnvelopeContainsDocsOfAllowedTypesForService_should_fail() {
-        // given
-        InputEnvelope envelope = InputEnvelopeCreator.inputEnvelope(
-            "BULKSCAN",
-            "POBOX",
-            Classification.EXCEPTION,
-            List.of(
-                scannableItem("file1", InputDocumentType.CHERISHED),
-                scannableItem("file2", InputDocumentType.SUPPORTING_DOCUMENTS),
-                scannableItem("file3", InputDocumentType.IHT),
-                scannableItem("file4", InputDocumentType.OTHER)
-            )
-        );
-
-        // when
-        // then
-        assertThatThrownBy(() -> envelopeValidator.assertEnvelopeContainsDocsOfAllowedTypesForService(envelope))
-            .isInstanceOf(DisallowedDocumentTypesException.class)
-            .hasMessage(
-                "Envelope contains scannable item(s) of types that are not allowed for jurisdiction 'BULKSCAN': [IHT]"
-            );
-    }
-
     @Test
     void assertServiceEnabled_throws_if_pobox_is_incorrect() {
         // given