SSCSCI-1179

Jenkinsfile_CNP

@@ -39,12 +39,12 @@ def secrets = [
         secret('evidence-share-topic-shared-access-key', 'AMQP_PASSWORD'),
 
         // hearing-api
-        secret('idam-s2s-api', 'IDAM_S2S_URL'),
-        secret('caseworker-ref-api', 'CASEWORKER_REF_API_URL'),
-        secret('ccd-api', 'CORE_CASE_DATA_API_URL'),
-        secret('judicial-ref-api', 'JUDICIAL_REF_API_URL'),
-        secret('s2s-micro', 'IDAM_S2S_AUTH_MICROSERVICES'),
-        secret('common-ref-data-api', 'COMMON_REF_API_URL'),
+        // secret('idam-s2s-api', 'IDAM_S2S_URL'),
+        // secret('caseworker-ref-api', 'CASEWORKER_REF_API_URL'),
+        // secret('ccd-api', 'CORE_CASE_DATA_API_URL'),
+        // secret('judicial-ref-api', 'JUDICIAL_REF_API_URL'),
+        // secret('s2s-micro', 'IDAM_S2S_AUTH_MICROSERVICES'),
+        // secret('common-ref-data-api', 'COMMON_REF_API_URL'),
 
         // e2es
         secret('test-e2e-caseofficer-username', 'TEST_CASEOFFICER_USERNAME'),
@@ -207,6 +207,7 @@ def setAatEnvVars() {
     env.PREVIEW_BRANCH_WITH_LOCAL_CCD = false;
     env.TEST_E2E_URL_WEB = "https://manage-case.aat.platform.hmcts.net/"
     env.TEST_E2E_API_URI = "http://sscs-tribunals-api-aat.service.core-compute-aat.internal"
+    env.TEST_URL = "http://sscs-tribunals-api-aat.service.core-compute-aat.internal"
     env.CCD_API_URL = "http://ccd-data-store-api-aat.service.core-compute-aat.internal"
     env.CORE_CASE_DATA_API_URL = "http://ccd-data-store-api-aat.service.core-compute-aat.internal"
     env.CCD_GW_API = "https://gateway-ccd.aat.platform.hmcts.net"
@@ -218,6 +219,7 @@ def setPreviewEnvVars() {
     env.PREVIEW_BRANCH_WITH_LOCAL_CCD = true;
     env.TEST_E2E_URL_WEB = "https://xui-sscs-tribunals-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
     env.TEST_E2E_API_URI = "https://sscs-tribunals-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
+    env.TEST_URL = "https://sscs-tribunals-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
     env.CCD_API_URL = "https://ccd-data-store-api-sscs-tribunals-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
     env.CORE_CASE_DATA_API_URL = "https://ccd-data-store-api-sscs-tribunals-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
     env.CCD_GW_API = "http://sscs-tribunals-api-pr-${CHANGE_ID}-ccd-api-gw"

build.gradle

@@ -351,7 +351,7 @@ dependencies {
     implementation group: 'org.flywaydb', name: 'flyway-core', version: '9.22.3'
     implementation group: 'org.postgresql', name: 'postgresql', version: '42.6.0'
 
-    implementation group: 'com.github.hmcts', name: 'sscs-common', version: '5.12.8'
+    implementation group: 'com.github.hmcts', name: 'sscs-common', version: '5.12.9'
 
     implementation group: 'com.github.hmcts', name: 'sscs-pdf-email-common', version: '5.2.14'
 

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

@@ -538,7 +538,7 @@ sscs-tribunals-frontend:
   nodejs:
     memoryLimits: "2Gi"
     cpuLimits: 2000m
-    image: hmctspublic.azurecr.io/sscs/tribunals-frontend:latest
+    image: hmctspublic.azurecr.io/sscs/tribunals-frontend:pr-1548
     ingressHost: sya-${SERVICE_FQDN}
     registerAdditionalDns:
       enabled: true
@@ -583,9 +583,9 @@ redis:
 #Turning either hearings api (with either listener on) or cft hearing service on requires
 #service bus to be turned on.
 sscs-hearings-api:
-  enabled: true
+  enabled: false
   java:
-    image: "hmctspublic.azurecr.io/sscs/hearings-api:pr-646" #Change to pr if required
+    image: "hmctspublic.azurecr.io/sscs/hearings-api:latest" #Change to pr if required
     releaseNameOverride: ${SERVICE_NAME}-sscs-hearings-api
     ingressHost: hearings-${SERVICE_FQDN}
     environment:

definitions/benefit/sheets/CaseTypeTab/CaseTypeTab.json

@@ -15,7 +15,7 @@
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "urgentCase", "TabFieldDisplayOrder": 9},
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryName", "TabFieldDisplayOrder": 10},
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryAddress", "TabFieldDisplayOrder": 11},
-  {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryNino", "TabFieldDisplayOrder": 12},
+  {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryNino", "FieldShowCondition": "appeal.benefitType.code!=\"infectedBloodAppeal\"", "TabFieldDisplayOrder": 12},
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryDOB", "TabFieldDisplayOrder": 13},
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryRole", "FieldShowCondition": "appeal.appellant.role.name!=\"\"", "TabFieldDisplayOrder": 14},
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryRoleDescription", "FieldShowCondition": "appeal.appellant.role.description!=\"\"", "TabFieldDisplayOrder": 15},
@@ -33,7 +33,8 @@
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "confidentialityRequestOutcomeJointParty", "TabFieldDisplayOrder": 26},
 
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryBenefitType", "TabFieldDisplayOrder": 27},
-  {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryCaseReference", "TabFieldDisplayOrder": 28},
+  {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryCaseReference", "FieldShowCondition": "appeal.benefitType.code!=\"infectedBloodAppeal\"", "TabFieldDisplayOrder": 28},
+  {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryIbcaReference", "FieldShowCondition": "appeal.benefitType.code=\"infectedBloodAppeal\"", "TabFieldDisplayOrder": 28},
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryState", "TabFieldDisplayOrder": 29},
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryHearingType", "TabFieldDisplayOrder": 30},
   {"LiveFrom": "", "CaseTypeID": "Benefit", "TabID": "summary_sscs", "TabLabel": "Summary", "TabDisplayOrder": 1, "CaseFieldID": "summaryConfidentialityRequired", "FieldShowCondition": "appeal.appellant.confidentialityRequired!=\"\"", "TabFieldDisplayOrder": 31},

src/functionalTest/java/uk/gov/hmcts/reform/sscs/functional/mya/SubscriptionTest.java

@@ -4,13 +4,18 @@
 import static org.hamcrest.Matchers.is;
 
 import java.io.IOException;
+import org.junit.Rule;
 import org.junit.Test;
 import uk.gov.hmcts.reform.sscs.ccd.domain.SscsCaseDetails;
+import uk.gov.hmcts.reform.sscs.functional.tyanotifications.Retry;
 
 public class SubscriptionTest extends BaseFunctionTest {
     private static final String YES = "yes";
     private static final String NO = "no";
 
+    @Rule
+    public Retry retry = new Retry(3);
+
     @Test
     public void shouldUpdateSubscription() throws IOException, InterruptedException {
         String newUserEmail = createRandomEmail();

src/functionalTest/java/uk/gov/hmcts/reform/sscs/functional/tyanotifications/handlers/AdminAppealWithdrawnNotificationsTest.java

@@ -27,11 +27,10 @@ public AdminAppealWithdrawnNotificationsTest() {
     }
 
     @Rule
-    public Retry retry = new Retry(0);
+    public Retry retry = new Retry(3);
 
-    //Test method runs three times and in worst case it needs 90 seconds waiting time.
     @Rule
-    public Timeout globalTimeout = Timeout.seconds(100);
+    public Timeout globalTimeout = Timeout.seconds(90);
 
     @Before
     public void setUp() {
@@ -63,12 +62,15 @@ public void givenCallbackWithSubscriptions_shouldSendEmailSmsAndLetterNotificati
     }
 
     private boolean fetchLetters(int expectedNumLetters, String subscription) {
+        int fetchCount = 0;
         do {
             if (getNumberOfLetterCorrespondence(subscription) == expectedNumLetters) {
                 return true;
             }
+            fetchCount++;
             delayInSeconds(5);
-        } while (true);
+        } while (fetchCount < 5);
+        return false;
     }
 
     private void initialiseCcdCase() {

src/functionalTest/java/uk/gov/hmcts/reform/sscs/functional/tyanotifications/sya/notifications/NotificationsFunctionalTest.java

@@ -8,13 +8,15 @@
 import java.util.stream.Collectors;
 import junitparams.Parameters;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Value;
 import uk.gov.hmcts.reform.sscs.ccd.domain.ReasonableAdjustmentStatus;
 import uk.gov.hmcts.reform.sscs.ccd.domain.SscsCaseData;
 import uk.gov.hmcts.reform.sscs.ccd.domain.SscsCaseDetails;
 import uk.gov.hmcts.reform.sscs.ccd.domain.YesNo;
 import uk.gov.hmcts.reform.sscs.functional.tyanotifications.AbstractFunctionalTest;
+import uk.gov.hmcts.reform.sscs.functional.tyanotifications.Retry;
 import uk.gov.service.notify.Notification;
 import uk.gov.service.notify.NotificationClientException;
 
@@ -154,6 +156,9 @@ public NotificationsFunctionalTest() {
         super(30);
     }
 
+    @Rule
+    public Retry retry = new Retry(3);
+
     @Test
     public void shouldSendEvidenceReceivedNotification() throws NotificationClientException, IOException {
         simulateCcdCallback(EVIDENCE_RECEIVED);

src/main/java/uk/gov/hmcts/reform/sscs/domain/wrapper/SyaAppellant.java

@@ -28,12 +28,17 @@ public class SyaAppellant {
 
     private String nino;
 
+    private String ibcaReference;
+
     @JsonProperty("contactDetails")
     private SyaContactDetails contactDetails;
 
     @JsonProperty("isAddressSameAsAppointee")
     private Boolean isAddressSameAsAppointee;
 
+    @JsonProperty("ibcRole")
+    private String ibcRole;
+
     public void setNino(String nino) {
         this.nino = normaliseNino(nino);
     }

src/main/java/uk/gov/hmcts/reform/sscs/domain/wrapper/SyaContactDetails.java

@@ -13,4 +13,7 @@ public class SyaContactDetails {
     private String emailAddress;
     private String postcodeLookup;
     private String postcodeAddress;
+    private String portOfEntry;
+    private String country;
+    private Boolean inMainlandUk;
 }