SSCSCI-1548

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

@@ -8,5 +8,4 @@ java:
     SCHEDULE_LISTING_FEATURE: true
     TESTING_SUPPORT_ENABLED: true
     POST_HEARINGS_B_FEATURE: true
-    POST_HEARINGS_FEATURE: true
-    INFECTED_BLOOD_COMPENSATION_ENABLED: true
+    POST_HEARINGS_FEATURE: true

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

@@ -59,31 +59,6 @@ java:
     HOURS_END_TIME: 23
     RUN_DB_MIGRATION_ON_STARTUP: true
     TEST_RECIPIENTS_POSTCODE: "*"
-    INFECTED_BLOOD_COMPENSATION_ENABLED: true
-    # START - SSCS-IB RELEASE VARIABLES
-    DOCUMENTS_ENGLISH_DIRECTION_ISSUED: TB-SCS-GNO-ENG-directions-notice-v2.docx
-    DOCUMENTS_WELSH_DIRECTION_ISSUED: TB-SCS-GNO-ENG-directions-notice-v2.docx
-    BUNDLE_ENGLISH_CONFIG: sscs-ib-bundle-config.yaml
-    BUNDLE_EDITED_CONFIG: sscs-ib-bundle-edited-config.yaml
-    DOCUMENTS_ENGLISH_SOR_WRITE: TB-SCS-GNO-ENG-sor-directions-notice-v2.docx
-    DOCUMENTS_WELSH_SOR_WRITE: TB-SCS-GNO-ENG-sor-directions-notice-v2.docx
-    NOTIFICATION_ENGLISH_APPEALRECEIVED_REPRESENTATIVE_DOCMOSISID: TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx
-    NOTIFICATION_ENGLISH_RESENDAPPEALCREATED_REPRESENTATIVE_DOCMOSISID: TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx
-    NOTIFICATION_WELSH_APPEALRECEIVED_REPRESENTATIVE_DOCMOSISID: TB-SCS-LET-WEL-Appeal-Lodged-Representative-v2.docx
-    NOTIFICATION_WELSH_RESENDAPPEALCREATED_REPRESENTATIVE_DOCMOSISID: TB-SCS-LET-WEL-Appeal-Lodged-Representative-v2.docx
-    NOTIFICATION_ENGLISH_APPEALRECEIVED_APPELLANT_DOCMOSISID: TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx
-    NOTIFICATION_ENGLISH_RESENDAPPEALCREATED_APPELLANT_DOCMOSISID: TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx
-    NOTIFICATION_WELSH_APPEALRECEIVED_APPELLANT_DOCMOSISID: TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx
-    NOTIFICATION_WELSH_RESENDAPPEALCREATED_APPELLANT_DOCMOSISID: TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx
-    NOTIFICATION_ENGLISH_ISSUEADJOURNMENTNOTICE_APPELLANT_DOCMOSISID: TB-SCS-GNO-ENG-00510-v2.docx
-    NOTIFICATION_ENGLISH_ISSUEADJOURNMENTNOTICE_APPOINTEE_DOCMOSISID: TB-SCS-GNO-ENG-00510-v2.docx
-    NOTIFICATION_ENGLISH_ISSUEADJOURNMENTNOTICE_JOINT_PARTY_DOCMOSISID: TB-SCS-GNO-ENG-00510-v2.docx
-    NOTIFICATION_WELSH_ISSUEADJOURNMENTNOTICEWELSH_APPELLANT_DOCMOSISID: TB-SCS-GNO-WEL-00649-v2.docx
-    NOTIFICATION_WELSH_ISSUEADJOURNMENTNOTICEWELSH_APPOINTEE_DOCMOSISID: TB-SCS-GNO-WEL-00649-v2.docx
-    NOTIFICATION_WELSH_ISSUEADJOURNMENTNOTICEWELSH_REPRESENTATIVE_DOCMOSISID: TB-SCS-GNO-WEL-00649-v2.docx
-    NOTIFICATION_WELSH_ISSUEADJOURNMENTNOTICEWELSH_JOINT_PARTY_DOCMOSISID: TB-SCS-GNO-WEL-00649-v2.docx
-    NOTIFICATION_WELSH_ISSUEADJOURNMENTNOTICEWELSH_OTHER_PARTY_DOCMOSISID: TB-SCS-GNO-WEL-00649-v2.docx
-    # END - SSCS-IB RELEASE VARIABLES
   secrets:
     JOB_SCHEDULER_DB_PASSWORD:
       secretRef: postgres
@@ -574,7 +549,6 @@ sscs-tribunals-frontend:
       SERVICES_IDAM_LOGIN_URL: https://idam-web-public.aat.platform.hmcts.net/login
       SERVICES_IDAM_API_URL: https://idam-api.aat.platform.hmcts.net
       UV_THREADPOOL_SIZE: 64
-      INFECTED_BLOOD_COMPENSATION_ENABLED: true
     keyVaults:
       sscs:
         secrets:

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

@@ -40,7 +40,7 @@ public static Object[][] documentParameters() {
         return new Object[][] {
                 {LanguagePreference.ENGLISH, EventType.CORRECTION_GRANTED, Optional.empty(), "TB-SCS-GNO-ENG-corrected-decision-notice.docx"},
                 {LanguagePreference.ENGLISH, EventType.DECISION_ISSUED, Optional.empty(), "TB-SCS-GNO-ENG-draft-decision-notice.docx"},
-                {LanguagePreference.ENGLISH, EventType.DIRECTION_ISSUED, Optional.empty(), "TB-SCS-GNO-ENG-directions-notice.docx"},
+                {LanguagePreference.ENGLISH, EventType.DIRECTION_ISSUED, Optional.empty(), "TB-SCS-GNO-ENG-directions-notice-v2.docx"},
                 {LanguagePreference.ENGLISH, EventType.ISSUE_FINAL_DECISION, Optional.empty(), "TB-SCS-GNO-ENG-final-decision-notice.docx"},
                 {LanguagePreference.WELSH, EventType.CORRECTION_GRANTED, Optional.empty(), "TB-SCS-GNO-ENG-corrected-decision-notice.docx"},
                 {LanguagePreference.WELSH, EventType.DECISION_ISSUED, Optional.empty(), "TB-SCS-GNO-WEL-00473.docx"},

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsDelayedNotificationsIt.java

@@ -106,7 +106,7 @@ private Object[] generateAppointeeNotificationScenariosForDelayedNotifications()
                 "paper",
                 Collections.singletonList("78cf9c9c-e2b8-44d7-bcf1-220311f114cb"),
                 Collections.singletonList("ede384aa-0b6e-4311-9f01-ee547573a07b"),
-                Collections.singletonList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"),
+                Collections.singletonList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"),
                 "yes",
                 "yes",
                 "1",
@@ -119,7 +119,7 @@ private Object[] generateAppointeeNotificationScenariosForDelayedNotifications()
                 "oral",
                 Collections.singletonList("78cf9c9c-e2b8-44d7-bcf1-220311f114cb"),
                 Collections.singletonList("ede384aa-0b6e-4311-9f01-ee547573a07b"),
-                Collections.singletonList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"),
+                Collections.singletonList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"),
                 "yes",
                 "yes",
                 "1",
@@ -132,7 +132,7 @@ private Object[] generateAppointeeNotificationScenariosForDelayedNotifications()
                 "paper",
                 Collections.emptyList(),
                 Collections.emptyList(),
-                Collections.singletonList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"),
+                Collections.singletonList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"),
                 "no",
                 "no",
                 "0",
@@ -228,7 +228,7 @@ private Object[] generateRepsNotificationScenariosForDelayedNotifications() {
                 "oral",
                 Arrays.asList("d5fd9f65-1283-4533-a1be-10043dae7af6", "3d05393a-e593-400a-963f-a26893a0b672"),
                 Arrays.asList("ede384aa-0b6e-4311-9f01-ee547573a07b", "99bd4a56-256c-4de8-b187-d43a8dde466f"),
-                Arrays.asList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx", "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"),
+                Arrays.asList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"),
                 "yes",
                 "yes",
                 "yes",
@@ -242,7 +242,7 @@ private Object[] generateRepsNotificationScenariosForDelayedNotifications() {
                 "paper",
                 Collections.singletonList("3d05393a-e593-400a-963f-a26893a0b672"),
                 Arrays.asList("ede384aa-0b6e-4311-9f01-ee547573a07b", "99bd4a56-256c-4de8-b187-d43a8dde466f"),
-                Arrays.asList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx", "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"),
+                Arrays.asList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"),
                 "no",
                 "yes",
                 "yes",
@@ -256,7 +256,7 @@ private Object[] generateRepsNotificationScenariosForDelayedNotifications() {
                 "paper",
                 Collections.emptyList(),
                 Collections.emptyList(),
-                Arrays.asList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx", "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"),
+                Arrays.asList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"),
                 "no",
                 "no",
                 "no",

src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsIt.java

@@ -733,7 +733,7 @@ private Object[] generateJointPartyNotificationScenarios() {
                 GAPS_ROUTE,
                 Collections.emptyList(),
                 Collections.emptyList(),
-                Arrays.asList("TB-SCS-GNO-ENG-00510.docx", "TB-SCS-GNO-ENG-00510.docx"),
+                Arrays.asList("TB-SCS-GNO-ENG-00510-v2.docx", "TB-SCS-GNO-ENG-00510-v2.docx"),
                 "yes",
                 "yes",
                 "0",
@@ -746,7 +746,7 @@ private Object[] generateJointPartyNotificationScenarios() {
                 GAPS_ROUTE,
                 Collections.emptyList(),
                 Collections.emptyList(),
-                Arrays.asList("TB-SCS-GNO-WEL-00649.docx", "TB-SCS-GNO-WEL-00649.docx"),
+                Arrays.asList("TB-SCS-GNO-WEL-00649-v2.docx", "TB-SCS-GNO-WEL-00649-v2.docx"),
                 "yes",
                 "yes",
                 "0",
@@ -1137,7 +1137,7 @@ private Object[] generateJointPartyNotificationScenarios() {
                 LIST_ASSIST_ROUTE,
                 Collections.emptyList(),
                 Collections.emptyList(),
-                Arrays.asList("TB-SCS-GNO-ENG-00510.docx", "TB-SCS-GNO-ENG-00510.docx"),
+                Arrays.asList("TB-SCS-GNO-ENG-00510-v2.docx", "TB-SCS-GNO-ENG-00510-v2.docx"),
                 "yes",
                 "yes",
                 "0",
@@ -1150,7 +1150,7 @@ private Object[] generateJointPartyNotificationScenarios() {
                 LIST_ASSIST_ROUTE,
                 Collections.emptyList(),
                 Collections.emptyList(),
-                Arrays.asList("TB-SCS-GNO-WEL-00649.docx", "TB-SCS-GNO-WEL-00649.docx"),
+                Arrays.asList("TB-SCS-GNO-WEL-00649-v2.docx", "TB-SCS-GNO-WEL-00649-v2.docx"),
                 "yes",
                 "yes",
                 "0",

src/IntegrationTests/resources/config/application_es_it.properties

@@ -10,15 +10,15 @@ pdf.api.url=http://localhost:10005
 bundle.url=${BUNDLE_URL:}
 
 documents.english.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-notice.docx
-documents.english.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice.docx
+documents.english.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice-v2.docx
 documents.english.DECISION_ISSUED=TB-SCS-GNO-ENG-draft-decision-notice.docx
 documents.english.ISSUE_FINAL_DECISION=TB-SCS-GNO-ENG-final-decision-notice.docx
-documents.english.SOR_WRITE=TB-SCS-GNO-ENG-final-decision-notice.docx
+documents.english.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice-v2.docx
 documents.welsh.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-notice.docx
 documents.welsh.DIRECTION_ISSUED=TB-SCS-GNO-WEL-00473.docx
 documents.welsh.DECISION_ISSUED=TB-SCS-GNO-WEL-00473.docx
 documents.welsh.ISSUE_FINAL_DECISION=TB-SCS-GNO-ENG-final-decision-notice.docx
-documents.welsh.SOR_WRITE=TB-SCS-GNO-ENG-final-decision-notice.docx
+documents.welsh.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice-v2.docx
 
 evidence.english.template=TB-SCS-GNO-ENG-00012.docx
 evidence.english.hmctsImgVal="[userImage:hmcts.png]"

src/IntegrationTests/resources/config/application_it.properties

@@ -10,15 +10,15 @@ pdf.api.url=http://localhost:10005
 bundle.url=${BUNDLE_URL:}
 
 documents.english.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-notice.docx
-documents.english.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice.docx
+documents.english.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice-v2.docx
 documents.english.DECISION_ISSUED=TB-SCS-GNO-ENG-draft-decision-notice.docx
 documents.english.ISSUE_FINAL_DECISION=TB-SCS-GNO-ENG-final-decision-notice.docx
-documents.english.SOR_WRITE=TB-SCS-GNO-ENG-final-decision-notice.docx
+documents.english.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice-v2.docx
 documents.welsh.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-notice.docx
 documents.welsh.DIRECTION_ISSUED=TB-SCS-GNO-WEL-00473.docx
 documents.welsh.DECISION_ISSUED=TB-SCS-GNO-WEL-00473.docx
 documents.welsh.ISSUE_FINAL_DECISION=TB-SCS-GNO-ENG-final-decision-notice.docx
-documents.welsh.SOR_WRITE=TB-SCS-GNO-ENG-final-decision-notice.docx
+documents.welsh.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice-v2.docx
 
 evidence.english.template=TB-SCS-GNO-ENG-00012.docx
 evidence.english.hmctsImgVal="[userImage:hmcts.png]"

src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java

@@ -8,7 +8,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import uk.gov.hmcts.reform.sscs.ccd.callback.Callback;
 import uk.gov.hmcts.reform.sscs.ccd.callback.CallbackType;
@@ -35,9 +34,6 @@ public class CaseUpdatedAboutToStartHandler implements PreSubmitCallbackHandler<
 
     private final VerbalLanguagesService verbalLanguagesService;
 
-    @Value("${feature.infected-blood-compensation.enabled}")
-    private boolean isInfectedBloodCompensationEnabled;
-
     @Override
     public boolean canHandle(CallbackType callbackType, Callback<SscsCaseData> callback) {
         requireNonNull(callback, "callback must not be null");
@@ -95,7 +91,7 @@ private void setupBenefitSelection(SscsCaseData sscsCaseData) {
         BenefitType benefitType = sscsCaseData.getAppeal().getBenefitType();
 
         if (!isNull(benefitType)) {
-            DynamicList benefitDescriptions = SscsUtil.getBenefitDescriptions(isInfectedBloodCompensationEnabled);
+            DynamicList benefitDescriptions = SscsUtil.getBenefitDescriptions();
             DynamicListItem selectedBenefit = getSelectedDynamicListItem(benefitDescriptions.getListItems(), sscsCaseData.getBenefitCode());
             benefitDescriptions.setValue(selectedBenefit);
             benefitType.setDescriptionSelection(benefitDescriptions);

src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java

@@ -4,7 +4,6 @@
 import static java.util.Objects.requireNonNull;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import uk.gov.hmcts.reform.sscs.ccd.callback.Callback;
 import uk.gov.hmcts.reform.sscs.ccd.callback.CallbackType;
@@ -17,9 +16,6 @@
 @Slf4j
 public class CreateCaseAboutToStartHandler implements PreSubmitCallbackHandler<SscsCaseData> {
 
-    @Value("${feature.infected-blood-compensation.enabled}")
-    private boolean isInfectedBloodCompensationEnabled;
-
     @Override
     public boolean canHandle(CallbackType callbackType, Callback<SscsCaseData> callback) {
         requireNonNull(callback, "callback must not be null");
@@ -52,7 +48,7 @@ public PreSubmitCallbackResponse<SscsCaseData> handle(CallbackType callbackType,
             appeal.setBenefitType(type);
         }
 
-        appeal.getBenefitType().setDescriptionSelection(SscsUtil.getBenefitDescriptions(isInfectedBloodCompensationEnabled));
+        appeal.getBenefitType().setDescriptionSelection(SscsUtil.getBenefitDescriptions());
 
         if (isNull(appeal.getAppellant())) {
             Appellant appellant = Appellant.builder().build();

src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java

@@ -1,7 +1,6 @@
 package uk.gov.hmcts.reform.sscs.model;
 
 import java.util.List;
-import java.util.Objects;
 
 public class AppConstants {
 
@@ -40,7 +39,7 @@ public class AppConstants {
     public static final String DWP_DOCUMENT_EDITED_RESPONSE_FILENAME_PREFIX = "FTA edited response received";
     public static final String DWP_DOCUMENT_EDITED_EVIDENCE_FILENAME_PREFIX = "FTA edited evidence received";
     public static final String DATE_FORMAT_YYYYMMDD = "yyyy-MM-dd";
-    public static final List<String> BENEFIT_CODES_FOR_ISSUE_AND_SEND_TO_ADMIN = Objects.equals(System.getenv("INFECTED_BLOOD_COMPENSATION_ENABLED"), "true") ? List.of("093", "016", "022") : List.of("093");
+    public static final List<String> BENEFIT_CODES_FOR_ISSUE_AND_SEND_TO_ADMIN = List.of("093", "016", "022");
     public static final String IBCA_BENEFIT_CODE = "093";
     public static final String INFECTED_BLOOD_COMPENSATION = "infectedBloodCompensation";
     public static final int FUNCTIONAL_FETCH_ATTEMPTS = 5;

src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java

@@ -435,9 +435,8 @@ public static DynamicListItem getPortOfEntryFromCode(String locationCode) {
             .orElseGet(() -> new DynamicListItem(null, null));
     }
 
-    public static DynamicList getBenefitDescriptions(boolean isInfectedBloodCompensationEnabled) {
+    public static DynamicList getBenefitDescriptions() {
         List<DynamicListItem> items = Arrays.stream(Benefit.values())
-                .filter(benefit -> isInfectedBloodCompensationEnabled || !benefit.getShortName().equals("infectedBloodCompensation"))
                 .sorted(Comparator.comparing(Benefit::getDescription))
                 .map(SscsUtil::getBenefitDescriptionList)
                 .flatMap(List::stream)

src/main/resources/config/application.properties.old

@@ -69,13 +69,13 @@ docmosis.health.endpoint= ${PDF_SERVICE_HEALTH_URL:https://docmosis.aat.platform
 docmosis.uri=${DOCMOSIS_SERVICE_BASE_URL:https://docmosis.aat.platform.hmcts.net/rs/render}
 
 documents.english.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-notice.docx
-documents.english.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice.docx
-documents.english.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice.docx
+documents.english.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice-v2.docx
+documents.english.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice-v2.docx
 documents.english.DECISION_ISSUED=TB-SCS-GNO-ENG-draft-decision-notice.docx
 documents.english.ISSUE_FINAL_DECISION=TB-SCS-GNO-ENG-final-decision-notice.docx
 documents.welsh.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-notice.docx
-documents.welsh.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice.docx
-documents.welsh.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice.docx
+documents.welsh.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice-v2.docx
+documents.welsh.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice-v2.docx
 documents.welsh.DECISION_ISSUED=TB-SCS-GNO-ENG-draft-decision-notice.docx
 documents.welsh.ISSUE_FINAL_DECISION=TB-SCS-GNO-ENG-final-decision-notice.docx