SSCSSI-34: merge evidence share to tribunals api

Jenkinsfile_CNP

@@ -20,17 +20,24 @@ def secrets = [
     'sscs-${env}'      : [
         secret('idam-api', 'IDAM_API_URL'),
         secret('idam-oauth-user', 'IDAM_OAUTH2_CLIENT_ID'),
-        secret('ccd-api', 'CORE_CASE_DATA_API_URL'),
         secret('idam-redirect', 'IDAM_OAUTH2_REDIRECT_URL'),
         secret('idam-sscs-systemupdate-user', 'IDAM_SSCS_SYSTEMUPDATE_USER'),
         secret('idam-sscs-systemupdate-password', 'IDAM_SSCS_SYSTEMUPDATE_PASSWORD'),
         secret('idam-sscs-oauth2-client-secret', 'IDAM_OAUTH2_CLIENT_SECRET'),
         secret('idam-s2s-api', 'IDAM_S2S_AUTH'),
+        secret('ccd-api', 'CORE_CASE_DATA_API_URL'),
+        secret('ccd-jid', 'CORE_CASE_DATA_JURISDICTION_ID'),
+        secret('ccd-tid', 'CORE_CASE_DATA_CASE_TYPE_ID'),
         secret('sscs-s2s-secret', 'IDAM_S2S_AUTH_TOTP_SECRET'),
         secret('s2s-micro', 'IDAM_S2S_AUTH_MICROSERVICE'),
         secret('docmosis-endpoint', 'PDF_SERVICE_CONVERT_URL'),
         secret('docmosis-api-key', 'PDF_SERVICE_ACCESS_KEY'),
         secret('AppInsightsInstrumentationKey', 'APPINSIGHTS_INSTRUMENTATIONKEY'),
+        secret('robotics-email-from', 'ROBOTICS_EMAIL_FROM'),
+        secret('robotics-email-to', 'ROBOTICS_EMAIL_TO'),
+        secret('robotics-email-scottish-to', 'ROBOTICS_EMAIL_SCOTTISH_TO'),
+        secret('robotics-email-pip-ae-to', 'ROBOTICS_EMAIL_PIP_AE_TO'),
+        secret('AppInsightsInstrumentationKey', 'APPINSIGHTS_INSTRUMENTATIONKEY'),
     ],
     's2s-${env}'      : [
             secret('microservicekey-ccd-gw', 'CCD_API_GATEWAY_S2S_SECRET'),

build.gradle

@@ -96,6 +96,7 @@ tasks.withType(Test) {
 }
 
 task integration(type: Test) {
+    jvmArgs = ['-Xms1024m', '-Xmx2048m']
     setTestClassesDirs(sourceSets.integrationTest.output.classesDirs)
     setClasspath(sourceSets.integrationTest.runtimeClasspath)
 }
@@ -208,10 +209,12 @@ sonarqube {
         property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.exclusions", "**/CreateCaseException.java," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/domain/**," +
+                "src/main/java/uk/gov/hmcts/reform/sscs/evidenceshare/domain/**," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/TribunalsCaseApiApplication.java," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/email/Email.java," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/config/*," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/model/**/*.java," +
+                "src/main/java/uk/gov/hmcts/reform/sscs/evidenceshare/model/**/*.java," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/service/EvidenceUploadService.java," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/service/OnlineHearingService.java," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/service/pdf/data/EvidenceDescriptionPdfData.java," +
@@ -222,7 +225,10 @@ sonarqube {
                 "src/main/java/uk/gov/hmcts/reform/sscs/controllers/CreateCaseController.java," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/service/pdf/data/PdfData.java," +
                 "src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/writefinaldecision/esa/EsaWriteFinalDecisionMidEventValidationHandler.java," +
-                "src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/writefinaldecision/uc/UcWriteFinalDecisionMidEventValidationHandler.java"
+                "src/main/java/uk/gov/hmcts/reform/sscs/evidenceshare/config/**," +
+                "src/main/java/uk/gov/hmcts/reform/sscs/service/servicebus/messaging/**," +
+                "src/main/java/uk/gov/hmcts/reform/sscs/docmosis/domain/**," +
+                "src/main/java/uk/gov/hmcts/reform/sscs/docmosis/config/**,"
         property "sonar.host.url", "https://sonar.reform.hmcts.net/"
         property "sonar.pitest.mode", "reuseReport"
         property "sonar.pitest.reportsDirectory", "build/reports/pitest"
@@ -342,6 +348,7 @@ dependencies {
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.3'
 
     implementation group:'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+    implementation group: 'org.springframework', name: 'spring-jms'
     implementation group: 'org.apache.qpid', name: 'qpid-jms-client', version: '1.10.0'
 
     implementation group: 'org.pitest', name: 'pitest', version:  '1.14.2'
@@ -373,6 +380,13 @@ dependencies {
     implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.86'
     implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.86'
 
+    //evidence-share depenedencies
+    implementation group: 'com.github.hmcts', name: 'cmc-pdf-service-client', version: '7.0.1'
+    implementation group: 'com.github.hmcts', name: 'send-letter-client', version: '3.0.23'
+    // Remove this dependency once the secure doc-store is in use
+    implementation group: 'com.github.hmcts', name: 'document-management-client', version: '7.0.1'
+    implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '6.2.1'
+
     integrationTestImplementation group: 'commons-io', name: 'commons-io', version:  '2.13.0'
 
     functionalTestImplementation group: 'commons-io', name: 'commons-io', version:  '2.13.0'

charts/sscs-tribunals-api/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: sscs-tribunals-api
 home: https://github.com/hmcts/sscs-tribunals-case-api
-version: 0.0.129
+version: 0.0.130
 description: SSCS Tribunals Case API
 maintainers:
   - name: HMCTS SSCS Team

charts/sscs-tribunals-api/values.ccd.preview.template.yaml

@@ -568,7 +568,7 @@ elastic:
 sscs-evidence-share:
   enabled: true
   java:
-    image: hmctspublic.azurecr.io/sscs/evidence-share:latest
+    image: hmctspublic.azurecr.io/sscs/evidence-share:pr-1618
     releaseNameOverride: ${SERVICE_NAME}-sscs-evidence-share
     environment:
       SEND_LETTER_SERVICE_ENABLED: "true"
@@ -586,6 +586,7 @@ sscs-evidence-share:
       ROBOTICS_EMAIL_PIP_AE_TO: "fake3"
       CASE_ACCESS_MANAGEMENT_FEATURE: true
       ISSUE_GENERIC_LETTER: true
+      BYPASS_EVIDENCE_SHARE_SERVICE: true
     secrets:
       AMQP_PASSWORD:
         secretRef: sscs-sb-preview

charts/sscs-tribunals-api/values.preview.template.yaml

@@ -14,4 +14,16 @@ java:
     CASE_DOCUMENT_AM_URL: http://ccd-case-document-am-api-aat.service.core-compute-aat.internal
     WORK_ALLOCATION_FEATURE: true
     CASE_ACCESS_MANAGEMENT_FEATURE: true
-    SCHEDULE_LISTING_FEATURE: true
+    SCHEDULE_LISTING_FEATURE: true
+    SEND_LETTER_SERVICE_ENABLED: "true"
+    SEND_LETTER_SERVICE_BASEURL: "http://rpe-send-letter-service-aat.service.core-compute-aat.internal"
+    SUBSCRIPTION_NAME: "sscs-evidenceshare-subscription-aat"
+    TOPIC_NAME: "sscs-evidenceshare-topic-aat"
+    AMQP_HOST: "sscs-servicebus-aat.servicebus.windows.net"
+    AMQP_USERNAME: "SendAndListenSharedAccessKey"
+    ROBOTICS_EMAIL_FROM: "sscs@hmcts.net"
+    ROBOTICS_EMAIL_TO: "fake"
+    ROBOTICS_EMAIL_SCOTTISH_TO: "fake2"
+    ROBOTICS_EMAIL_PIP_AE_TO: "fake3"
+    ISSUE_GENERIC_LETTER: true
+    BYPASS_EVIDENCE_SHARE_SERVICE: true

charts/sscs-tribunals-api/values.yaml

@@ -13,6 +13,9 @@ java:
           alias: SUBSCRIPTIONS_MAC_SECRET
         - name: idam-oauth-user
           alias: IDAM_OAUTH2_CLIENT_ID
+        - name: idam-redirect
+        - name: ccd-api
+          alias: CORE_CASE_DATA_API_URL
         - name: ccd-jid
           alias: CORE_CASE_DATA_JURISDICTION_ID
         - name: ccd-tid
@@ -43,6 +46,13 @@ java:
           alias: HEARINGS_EVENT_SERVICE_BUS_CONNECTION_STRING
         - name: evidence-share-topic-shared-access-key
           alias: AMQP_PASSWORD
+        - robotics-email-to
+        - robotics-email-from
+        - robotics-email-scottish-to
+        - robotics-email-pip-ae-to
+        - ld-sdk-key
+        - sendgrid-api-key
+
   environment:
     SERVER_PORT: 8080
     REFORM_TEAM: sscs
@@ -81,10 +91,24 @@ java:
     UPLOAD_HEARING_FILTER_ENABLED: false
     CITIZEN_LOGIN_SERVICE_V2: false
     ADD_LINK_TO_OTHER_ASSOCIATED_CASES_V2: false
+    IDAM_OAUTH2_CLIENT_ID: "sscs"
+    CORE_CASE_DATA_JURISDICTION_ID: SSCS
+    CORE_CASE_DATA_CASE_TYPE_ID: Benefit
+    SEND_LETTER_SERVICE_BASEURL: "http://rpe-send-letter-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
+    SEND_LETTER_SERVICE_ENABLED: "true"
+    TRUST_ALL_CERTS: "true"
     SUBSCRIPTION_NAME: "sscs-evidenceshare-subscription-{{ .Values.global.environment }}"
     TOPIC_NAME: "sscs-evidenceshare-topic-{{ .Values.global.environment }}"
     AMQP_HOST: "sscs-servicebus-{{ .Values.global.environment }}.servicebus.windows.net"
     AMQP_USERNAME: "SendAndListenSharedAccessKey"
+    MAX_RETRY_ATTEMPTS: 3
+    PDF_SERVICE_BASE_URL: https://docmosis.aat.platform.hmcts.net/rs/render
+    ROBOTICS_EMAIL_MESSAGE: "Please find attached the robotics json file \nPlease do not respond to this email"
+    EMAIL_SERVER_HOST: "mta.reform.hmcts.net"
+    EMAIL_SERVER_PORT: "25"
+    EMAIL_SMTP_TLS_ENABLED: "true"
+    EMAIL_SMTP_SSL_TRUST: "*"
+    BYPASS_EVIDENCE_SHARE_SERVICE: false
 
 idam-pr:
   enabled: false

gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx2048M

infrastructure/main.tf

@@ -9,4 +9,4 @@ data "azurerm_key_vault" "sscs_key_vault" {
 
 locals {
   azureVaultName = "sscs-${var.env}"
-}
+}

infrastructure/state.tf

@@ -7,4 +7,4 @@ terraform {
       version = "~> 3.68.0"
     }
   }
-}
+}

infrastructure/variables.tf

@@ -32,4 +32,4 @@ variable "common_tags" {
 variable "appinsights_instrumentation_key" {
   description = "Instrumentation key of the App Insights instance this webapp should use. Module will create own App Insights resource if this is not provided"
   default     = ""
-}
+}

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/callback/AbstractEventIt.java

@@ -92,15 +92,15 @@ protected void setJsonAndReplace(String fileLocation, List<String> replaceKeys,
 
     protected void setJson(SscsCaseData sscsCaseData, EventType eventType) throws JsonProcessingException {
         CaseDetails<SscsCaseData> caseDetails = new CaseDetails<>(parseLong(sscsCaseData.getCcdCaseId()), JURISDICTION,
-                sscsCaseData.getState(), sscsCaseData, LocalDateTime.now(), "Benefit");
+            sscsCaseData.getState(), sscsCaseData, LocalDateTime.now(), "Benefit");
         Callback<SscsCaseData> callback = new Callback<>(caseDetails, Optional.empty(),
-                eventType, false);
+            eventType, false);
         json = mapper.writeValueAsString(callback);
     }
 
     protected String getJson(String fileLocation) throws IOException {
         String path = Objects.requireNonNull(getClass().getClassLoader()
-                .getResource(fileLocation)).getFile();
+            .getResource(fileLocation)).getFile();
         return FileUtils.readFileToString(new File(path), StandardCharsets.UTF_8.name());
     }
 
@@ -125,9 +125,9 @@ protected PreSubmitCallbackResponse<SscsCaseData> assertResponseOkAndGetResult(C
     public PreSubmitCallbackResponse<SscsCaseData> deserialize(String source) {
         try {
             return mapper.readValue(
-                    source,
-                    new TypeReference<>() {
-                    }
+                source,
+                new TypeReference<>() {
+                }
             );
 
         } catch (IOException e) {

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/config/DocumentConfigurationTest.java

@@ -11,16 +11,22 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
 import uk.gov.hmcts.reform.sscs.ccd.domain.EventType;
 import uk.gov.hmcts.reform.sscs.ccd.domain.LanguagePreference;
+import uk.gov.hmcts.reform.sscs.service.AirLookupService;
 
 @SpringBootTest
 @RunWith(JUnitParamsRunner.class)
 @TestPropertySource(locations = "classpath:config/application_it.properties")
 public class DocumentConfigurationTest {
+
+    @MockBean
+    protected AirLookupService airLookupService;
+
     @ClassRule
     public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
 

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/CitizenRequestControllerIt.java

@@ -30,6 +30,7 @@
 import uk.gov.hmcts.reform.sscs.idam.IdamService;
 import uk.gov.hmcts.reform.sscs.idam.IdamTokens;
 import uk.gov.hmcts.reform.sscs.idam.UserDetails;
+import uk.gov.hmcts.reform.sscs.service.AirLookupService;
 import uk.gov.hmcts.reform.sscs.service.OnlineHearingService;
 
 
@@ -38,6 +39,8 @@
 @AutoConfigureMockMvc(addFilters = false)
 public class CitizenRequestControllerIt {
 
+    @MockBean
+    protected AirLookupService airLookupService;
     private static final String CASE_ID = "1625080769409918";
     private static final String AUTHORIZATION = "Bearer 1203912-39012-=391231";
     private static final String E_MAIL = "sscs-citizen2@hmcts.net";

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/SubscriptionsControllerIt.java

@@ -17,6 +17,7 @@
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
+import uk.gov.hmcts.reform.sscs.service.AirLookupService;
 import uk.gov.hmcts.reform.sscs.service.MessageAuthenticationService;
 
 @RunWith(SpringRunner.class)
@@ -25,6 +26,9 @@
 @AutoConfigureMockMvc(addFilters = false)
 public class SubscriptionsControllerIt {
 
+    @MockBean
+    protected AirLookupService airLookupService;
+
     @Autowired
     private MockMvc mockMvc;
 

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/controller/SyaControllerTest.java

@@ -31,6 +31,7 @@
 import uk.gov.hmcts.reform.sscs.domain.wrapper.SyaCaseWrapper;
 import uk.gov.hmcts.reform.sscs.idam.Authorize;
 import uk.gov.hmcts.reform.sscs.model.draft.Draft;
+import uk.gov.hmcts.reform.sscs.service.AirLookupService;
 import uk.gov.hmcts.reform.sscs.util.SyaServiceHelper;
 
 
@@ -39,6 +40,9 @@
 @AutoConfigureMockMvc
 public class SyaControllerTest {
 
+    @MockBean
+    protected AirLookupService airLookupService;
+
     private final long ccdId = 1L;
     @Autowired
     private MockMvc mockMvc;

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/evidence/EvidenceDocumentUploadEndpointIt.java

@@ -29,14 +29,16 @@
 import uk.gov.hmcts.reform.document.DocumentUploadClientApi;
 import uk.gov.hmcts.reform.document.domain.Classification;
 import uk.gov.hmcts.reform.document.domain.UploadResponse;
+import uk.gov.hmcts.reform.sscs.service.AirLookupService;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:config/application_it.properties")
 @AutoConfigureMockMvc
 public class EvidenceDocumentUploadEndpointIt {
 
-
+    @MockBean
+    protected AirLookupService airLookupService;
     public static final String AUTH_TOKEN = "authToken";
 
     public static final String DUMMY_OAUTH_2_TOKEN = "oauth2Token";

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/evidenceshare/config/DocmosisTemplateConfigTest.java

@@ -0,0 +1,46 @@
+package uk.gov.hmcts.reform.sscs.evidenceshare.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.rules.SpringClassRule;
+import org.springframework.test.context.junit4.rules.SpringMethodRule;
+import uk.gov.hmcts.reform.sscs.ccd.callback.DocumentType;
+import uk.gov.hmcts.reform.sscs.ccd.domain.LanguagePreference;
+import uk.gov.hmcts.reform.sscs.service.AirLookupService;
+
+@SpringBootTest
+@TestPropertySource(locations = "classpath:config/application_it.properties")
+public class DocmosisTemplateConfigTest {
+
+    // Below rules are needed to use the junitParamsRunner together with SpringRunner
+    @ClassRule
+    public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+
+    @Rule
+    public final SpringMethodRule springMethodRule = new SpringMethodRule();
+    //end of rules needed for junitParamsRunner
+
+    @Autowired
+    private DocmosisTemplateConfig docmosisTemplateConfig;
+
+    @MockBean
+    protected AirLookupService airLookupService;
+
+    @Test
+    public void docmosisTemplate() {
+        assertThat("TB-SCS-GNO-ENG-00010.doc").isEqualTo(
+            docmosisTemplateConfig.getTemplate()
+                .get(LanguagePreference.ENGLISH).get(DocumentType.DL6.getValue()).get("name"));
+        assertThat("TB-SCS-GNO-WEL-00469.docx").isEqualTo(
+            docmosisTemplateConfig.getTemplate().get(LanguagePreference.WELSH).get("d609-97").get(
+                "name"));
+
+    }
+}