From 33d253d123d69e10e8da81782843f449279206da Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 09:21:20 +0000 Subject: [PATCH 01/12] removing INFECTED_BLOOD_COMPENSATION_ENABLED reference --- charts/sscs-tribunals-api/values.aat.template.yaml | 3 +-- charts/sscs-tribunals-api/values.preview.template.yaml | 2 -- .../caseupdated/CaseUpdatedAboutToStartHandler.java | 5 +---- .../presubmit/createcase/CreateCaseAboutToStartHandler.java | 5 +---- .../java/uk/gov/hmcts/reform/sscs/model/AppConstants.java | 2 +- src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java | 4 ++-- src/main/resources/config/application.yaml | 2 -- 7 files changed, 6 insertions(+), 17 deletions(-) diff --git a/charts/sscs-tribunals-api/values.aat.template.yaml b/charts/sscs-tribunals-api/values.aat.template.yaml index a8bec8f43e4..93916b5d75e 100644 --- a/charts/sscs-tribunals-api/values.aat.template.yaml +++ b/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 \ No newline at end of file + POST_HEARINGS_FEATURE: true \ No newline at end of file diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index 13ed24d89dd..9874e6c4e22 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -59,7 +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 @@ -574,7 +573,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: diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java index 2e16a5e9405..fe2ce77cc2c 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java @@ -35,9 +35,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 callback) { requireNonNull(callback, "callback must not be null"); @@ -95,7 +92,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); diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java index 3175ca115ef..c5dafc76aa8 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java @@ -17,9 +17,6 @@ @Slf4j public class CreateCaseAboutToStartHandler implements PreSubmitCallbackHandler { - @Value("${feature.infected-blood-compensation.enabled}") - private boolean isInfectedBloodCompensationEnabled; - @Override public boolean canHandle(CallbackType callbackType, Callback callback) { requireNonNull(callback, "callback must not be null"); @@ -52,7 +49,7 @@ public PreSubmitCallbackResponse 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(); diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java b/src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java index 18c17a0c49c..72915dc9a3e 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java @@ -40,7 +40,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 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 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; diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java b/src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java index e5070a5a86e..552ccfe5b62 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java @@ -435,9 +435,9 @@ public static DynamicListItem getPortOfEntryFromCode(String locationCode) { .orElseGet(() -> new DynamicListItem(null, null)); } - public static DynamicList getBenefitDescriptions(boolean isInfectedBloodCompensationEnabled) { + public static DynamicList getBenefitDescriptions() { List items = Arrays.stream(Benefit.values()) - .filter(benefit -> isInfectedBloodCompensationEnabled || !benefit.getShortName().equals("infectedBloodCompensation")) + .filter(benefit -> !benefit.getShortName().equals("infectedBloodCompensation")) .sorted(Comparator.comparing(Benefit::getDescription)) .map(SscsUtil::getBenefitDescriptionList) .flatMap(List::stream) diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index 366bf0abd3d..6da8e8afa7f 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -253,8 +253,6 @@ feature: enabled: ${GAPS_SWITCHOVER_FEATURE:false} hearing-recording-filter: enabled: ${UPLOAD_HEARING_FILTER_ENABLED:false} - infected-blood-compensation: - enabled: ${INFECTED_BLOOD_COMPENSATION_ENABLED:false} postHearings: enabled: ${POST_HEARINGS_FEATURE:false} postHearingsB: From 1c2d941469a2790a6974956ae69818f702cecb5a Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 09:22:56 +0000 Subject: [PATCH 02/12] hardcoding new direction issued template --- charts/sscs-tribunals-api/values.preview.template.yaml | 2 -- .../hmcts/reform/sscs/config/DocumentConfigurationTest.java | 2 +- .../resources/config/application_es_it.properties | 2 +- .../resources/config/application_it.properties | 2 +- src/main/resources/config/application.properties.old | 4 ++-- src/main/resources/config/application.yaml | 4 ++-- .../ActionPostponementRequestMidEventHandlerTest.java | 2 +- .../decisionissued/DecisionIssuedMidEventHandlerTest.java | 2 +- .../directionissued/DirectionIssuedMidEventHandlerTest.java | 2 +- .../ProcessAudioVideoEvidenceAboutToSubmitHandlerTest.java | 2 +- .../ProcessAudioVideoEvidenceMidEventHandlerTest.java | 2 +- .../WriteFinalDecisionPreviewDecisionServiceTestBase.java | 2 +- 12 files changed, 13 insertions(+), 15 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index 9874e6c4e22..bd84575afd7 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -60,8 +60,6 @@ java: RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" # 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 diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/config/DocumentConfigurationTest.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/config/DocumentConfigurationTest.java index 474fafb53a0..a6e756758d2 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/config/DocumentConfigurationTest.java +++ b/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"}, diff --git a/src/IntegrationTests/resources/config/application_es_it.properties b/src/IntegrationTests/resources/config/application_es_it.properties index fd751a94661..cd68dae47bd 100644 --- a/src/IntegrationTests/resources/config/application_es_it.properties +++ b/src/IntegrationTests/resources/config/application_es_it.properties @@ -10,7 +10,7 @@ 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 diff --git a/src/IntegrationTests/resources/config/application_it.properties b/src/IntegrationTests/resources/config/application_it.properties index 2c4a60ee389..21ad8482530 100644 --- a/src/IntegrationTests/resources/config/application_it.properties +++ b/src/IntegrationTests/resources/config/application_it.properties @@ -10,7 +10,7 @@ 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 diff --git a/src/main/resources/config/application.properties.old b/src/main/resources/config/application.properties.old index 66b8ba84812..fa8b5d8bc60 100644 --- a/src/main/resources/config/application.properties.old +++ b/src/main/resources/config/application.properties.old @@ -69,12 +69,12 @@ 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.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice-v2.docx documents.english.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice.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.DIRECTION_ISSUED=TB-SCS-GNO-ENG-directions-notice-v2.docx documents.welsh.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice.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 diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index 6da8e8afa7f..c2b11dfe64e 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -209,13 +209,13 @@ documents: english: CORRECTION_GRANTED: TB-SCS-GNO-ENG-corrected-decision-notice.docx DECISION_ISSUED: TB-SCS-GNO-ENG-draft-decision-notice.docx - DIRECTION_ISSUED: TB-SCS-GNO-ENG-directions-notice.docx + DIRECTION_ISSUED: TB-SCS-GNO-ENG-directions-notice-v2.docx ISSUE_FINAL_DECISION: TB-SCS-GNO-ENG-final-decision-notice.docx SOR_WRITE: TB-SCS-GNO-ENG-sor-directions-notice.docx welsh: CORRECTION_GRANTED: TB-SCS-GNO-ENG-corrected-decision-notice.docx DECISION_ISSUED: TB-SCS-GNO-ENG-draft-decision-notice.docx - DIRECTION_ISSUED: TB-SCS-GNO-ENG-directions-notice.docx + DIRECTION_ISSUED: TB-SCS-GNO-ENG-directions-notice-v2.docx ISSUE_FINAL_DECISION: TB-SCS-GNO-ENG-final-decision-notice.docx SOR_WRITE: TB-SCS-GNO-ENG-sor-directions-notice.docx dwp: diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/actionpostponementrequest/ActionPostponementRequestMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/actionpostponementrequest/ActionPostponementRequestMidEventHandlerTest.java index 8d1aa8f9d1d..65ed0c21aa8 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/actionpostponementrequest/ActionPostponementRequestMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/actionpostponementrequest/ActionPostponementRequestMidEventHandlerTest.java @@ -64,7 +64,7 @@ public void setUp() { openMocks(this); Map englishEventTypeDocs = new HashMap<>(); - englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice.docx"); + englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice-v2.docx"); Map> documents = new HashMap<>(); documents.put(LanguagePreference.ENGLISH, englishEventTypeDocs); diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/decisionissued/DecisionIssuedMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/decisionissued/DecisionIssuedMidEventHandlerTest.java index 6bf39104428..ed4d4ff9e26 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/decisionissued/DecisionIssuedMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/decisionissued/DecisionIssuedMidEventHandlerTest.java @@ -75,7 +75,7 @@ public class DecisionIssuedMidEventHandlerTest { public void setUp() { openMocks(this); Map englishEventTypeDocs = new HashMap<>(); - englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice.docx"); + englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice-v2.docx"); englishEventTypeDocs.put(EventType.DECISION_ISSUED, "TB-SCS-GNO-ENG-draft-decision-notice.docx"); englishEventTypeDocs.put(EventType.ISSUE_FINAL_DECISION, "TB-SCS-GNO-ENG-00453.docx"); diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/directionissued/DirectionIssuedMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/directionissued/DirectionIssuedMidEventHandlerTest.java index 72f897d7222..8b0780c8dd0 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/directionissued/DirectionIssuedMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/directionissued/DirectionIssuedMidEventHandlerTest.java @@ -62,7 +62,7 @@ public class DirectionIssuedMidEventHandlerTest { public void setUp() { openMocks(this); Map englishEventTypeDocs = new HashMap<>(); - englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice.docx"); + englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice-v2.docx"); englishEventTypeDocs.put(EventType.DECISION_ISSUED, "TB-SCS-GNO-ENG-draft-decision-notice.docx"); englishEventTypeDocs.put(EventType.ISSUE_FINAL_DECISION, "TB-SCS-GNO-ENG-00453.docx"); diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/procesaudiovideo/ProcessAudioVideoEvidenceAboutToSubmitHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/procesaudiovideo/ProcessAudioVideoEvidenceAboutToSubmitHandlerTest.java index ad363cc3ea0..900860b742e 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/procesaudiovideo/ProcessAudioVideoEvidenceAboutToSubmitHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/procesaudiovideo/ProcessAudioVideoEvidenceAboutToSubmitHandlerTest.java @@ -74,7 +74,7 @@ public void setUp() { openMocks(this); Map englishEventTypeDocs = new HashMap<>(); - englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice.docx"); + englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice-v2.docx"); Map> documents = new HashMap<>(); documents.put(LanguagePreference.ENGLISH, englishEventTypeDocs); diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/procesaudiovideo/ProcessAudioVideoEvidenceMidEventHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/procesaudiovideo/ProcessAudioVideoEvidenceMidEventHandlerTest.java index a7281fea930..2aec35fe1ed 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/procesaudiovideo/ProcessAudioVideoEvidenceMidEventHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/procesaudiovideo/ProcessAudioVideoEvidenceMidEventHandlerTest.java @@ -87,7 +87,7 @@ public void setUp() { openMocks(this); Map englishEventTypeDocs = new HashMap<>(); - englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice.docx"); + englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice-v2.docx"); Map> documents = new HashMap<>(); documents.put(LanguagePreference.ENGLISH, englishEventTypeDocs); diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/writefinaldecision/WriteFinalDecisionPreviewDecisionServiceTestBase.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/writefinaldecision/WriteFinalDecisionPreviewDecisionServiceTestBase.java index 74d8dbeb334..732fd2f735b 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/writefinaldecision/WriteFinalDecisionPreviewDecisionServiceTestBase.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/writefinaldecision/WriteFinalDecisionPreviewDecisionServiceTestBase.java @@ -88,7 +88,7 @@ public void setUp() throws IOException { openMocks(this); final Map englishEventTypeDocs = new HashMap<>(); englishEventTypeDocs.put(EventType.CORRECTION_GRANTED, "TB-SCS-GNO-ENG-corrected-decision-notice.docx"); - englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice.docx"); + englishEventTypeDocs.put(EventType.DIRECTION_ISSUED, "TB-SCS-GNO-ENG-directions-notice-v2.docx"); englishEventTypeDocs.put(EventType.DECISION_ISSUED, "TB-SCS-GNO-ENG-draft-decision-notice.docx"); Map welshEventTypeDocs = new HashMap<>(); welshEventTypeDocs.put(EventType.CORRECTION_GRANTED, "TB-SCS-GNO-ENG-corrected-decision-notice.docx"); From 949c2e1e51cbb506295eb02a9141d778447f644e Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 09:59:50 +0000 Subject: [PATCH 03/12] setting bundle config back to original (that has been updated with IB cover letter) --- .../values.preview.template.yaml | 2 -- src/main/resources/config/application.yaml | 15 ++++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index bd84575afd7..a4efe0c8a1d 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -60,8 +60,6 @@ java: RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" # START - SSCS-IB RELEASE VARIABLES - 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 diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index c2b11dfe64e..47179851430 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -113,9 +113,15 @@ azure: bundle: english: - config: ${BUNDLE_ENGLISH_CONFIG:sscs-bundle-config.yaml} + config: sscs-bundle-config.yaml edited: - config: ${BUNDLE_EDITED_CONFIG:sscs-bundle-edited-config.yaml} + config: sscs-bundle-edited-config.yaml + welsh: + config: sscs-bundle-welsh-config.yaml + edited: + config: sscs-bundle-welsh-edited-config.yaml + url: ${BUNDLE_URL:http://localhost:4623} + # Below may be redundant new: edited: config: ${BUNDLE_EDITED_CONFIG:sscs-new-bundle-edited-config.yaml} @@ -129,11 +135,6 @@ bundle: config: ${BUNDLE_WELSH_EDITED_CONFIG:sscs-new-bundle-welsh-edited-config.yaml} unedited: config: ${BUNDLE_WELSH_UNEDITED_CONFIG:sscs-new-bundle-welsh-unedited-config.yaml} - url: ${BUNDLE_URL:http://localhost:4623} - welsh: - config: ${BUNDLE_WELSH_CONFIG:sscs-bundle-welsh-config.yaml} - edited: - config: ${BUNDLE_WELSH_EDITED_CONFIG:sscs-bundle-welsh-edited-config.yaml} case_document_am: url: ${CASE_DOCUMENT_AM_URL:http://localhost:4455} From b3f6086b724ffb70b9bf0656e672f1458b223537 Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 10:02:21 +0000 Subject: [PATCH 04/12] SOR_WRITE template --- charts/sscs-tribunals-api/values.preview.template.yaml | 2 -- .../resources/config/application_es_it.properties | 4 ++-- .../resources/config/application_it.properties | 4 ++-- src/main/resources/config/application.properties.old | 4 ++-- src/main/resources/config/application.yaml | 4 ++-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index a4efe0c8a1d..c4cc740c261 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -60,8 +60,6 @@ java: RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" # START - SSCS-IB RELEASE VARIABLES - 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 diff --git a/src/IntegrationTests/resources/config/application_es_it.properties b/src/IntegrationTests/resources/config/application_es_it.properties index cd68dae47bd..effe390b637 100644 --- a/src/IntegrationTests/resources/config/application_es_it.properties +++ b/src/IntegrationTests/resources/config/application_es_it.properties @@ -13,12 +13,12 @@ documents.english.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-notice.do 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]" diff --git a/src/IntegrationTests/resources/config/application_it.properties b/src/IntegrationTests/resources/config/application_it.properties index 21ad8482530..10d79fb5583 100644 --- a/src/IntegrationTests/resources/config/application_it.properties +++ b/src/IntegrationTests/resources/config/application_it.properties @@ -13,12 +13,12 @@ documents.english.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-notice.do 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]" diff --git a/src/main/resources/config/application.properties.old b/src/main/resources/config/application.properties.old index fa8b5d8bc60..fe013072361 100644 --- a/src/main/resources/config/application.properties.old +++ b/src/main/resources/config/application.properties.old @@ -70,12 +70,12 @@ docmosis.uri=${DOCMOSIS_SERVICE_BASE_URL:https://docmosis.aat.platform.hmcts.net documents.english.CORRECTION_GRANTED=TB-SCS-GNO-ENG-corrected-decision-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.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-v2.docx -documents.welsh.SOR_WRITE=TB-SCS-GNO-ENG-sor-directions-notice.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 diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index 47179851430..9c76a6afe27 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -212,13 +212,13 @@ documents: DECISION_ISSUED: TB-SCS-GNO-ENG-draft-decision-notice.docx DIRECTION_ISSUED: TB-SCS-GNO-ENG-directions-notice-v2.docx ISSUE_FINAL_DECISION: TB-SCS-GNO-ENG-final-decision-notice.docx - SOR_WRITE: TB-SCS-GNO-ENG-sor-directions-notice.docx + SOR_WRITE: TB-SCS-GNO-ENG-sor-directions-notice-v2.docx welsh: CORRECTION_GRANTED: TB-SCS-GNO-ENG-corrected-decision-notice.docx DECISION_ISSUED: TB-SCS-GNO-ENG-draft-decision-notice.docx DIRECTION_ISSUED: TB-SCS-GNO-ENG-directions-notice-v2.docx ISSUE_FINAL_DECISION: TB-SCS-GNO-ENG-final-decision-notice.docx - SOR_WRITE: TB-SCS-GNO-ENG-sor-directions-notice.docx + SOR_WRITE: TB-SCS-GNO-ENG-sor-directions-notice-v2.docx dwp: response: due: From d91d26f4f9b24ca03100cbf20df38f7324fe13fe Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 10:04:13 +0000 Subject: [PATCH 05/12] Appeal-Lodged-Representative english template --- .../sscs-tribunals-api/values.preview.template.yaml | 2 -- .../config/NotificationConfigTestIt.java | 12 ++++++------ .../tya/NotificationsDelayedNotificationsIt.java | 6 +++--- src/main/resources/config/application.yaml | 4 ++-- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index c4cc740c261..05525c2b085 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -60,8 +60,6 @@ java: RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" # START - SSCS-IB RELEASE VARIABLES - 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 diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java index ad238315d24..c262d74f02f 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java @@ -108,7 +108,7 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, GAPS, "readyToList", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, GAPS, "validAppeal", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", null}, new Object[]{APPEAL_RECEIVED, false, APPOINTEE, PAPER, GAPS, null, "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", null}, - new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, GAPS, "readyToList", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"}, + new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, GAPS, "readyToList", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, GAPS, "validAppeal", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", null}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, PAPER, GAPS, null, "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", null}, new Object[]{APPEAL_RECEIVED, true, APPELLANT, ORAL, GAPS, "readyToList", "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx"}, @@ -318,8 +318,8 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, PAPER, GAPS, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, ORAL, GAPS, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, PAPER, GAPS, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, ORAL, GAPS, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, PAPER, GAPS, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, ORAL, GAPS, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, PAPER, GAPS, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, new Object[]{SUBSCRIPTION_UPDATED, false, null, ORAL, GAPS, null, "b8b2904f-629d-42cf-acea-1b74bde5b2ff", List.of("7397a76f-14cb-468c-b1a7-0570940ead91"), null, null}, new Object[]{SUBSCRIPTION_UPDATED, true, null, ORAL, GAPS, null, "020c9611-6547-4a66-a05b-eca7e9a415ae", List.of("c4ecf5b9-2190-4256-a525-0e5f5bee27d0", "7397a76f-14cb-468c-b1a7-0570940ead91"), null, null}, @@ -420,7 +420,7 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, LIST_ASSIST, "readyToList", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, LIST_ASSIST, "validAppeal", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", null}, new Object[]{APPEAL_RECEIVED, false, APPOINTEE, PAPER, LIST_ASSIST, null, "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", null}, - new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, "readyToList", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"}, + new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, "readyToList", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, "validAppeal", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", null}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, PAPER, LIST_ASSIST, null, "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", null}, new Object[]{APPEAL_RECEIVED, true, APPELLANT, ORAL, LIST_ASSIST, "readyToList", "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx"}, @@ -630,8 +630,8 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, PAPER, LIST_ASSIST, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, ORAL, LIST_ASSIST, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, PAPER, LIST_ASSIST, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, PAPER, LIST_ASSIST, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, PAPER, LIST_ASSIST, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, new Object[]{SUBSCRIPTION_UPDATED, false, null, ORAL, LIST_ASSIST, null, "b8b2904f-629d-42cf-acea-1b74bde5b2ff", List.of("7397a76f-14cb-468c-b1a7-0570940ead91"), null, null}, new Object[]{SUBSCRIPTION_UPDATED, true, null, ORAL, LIST_ASSIST, null, "020c9611-6547-4a66-a05b-eca7e9a415ae", List.of("c4ecf5b9-2190-4256-a525-0e5f5bee27d0", "7397a76f-14cb-468c-b1a7-0570940ead91"), null, null}, diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsDelayedNotificationsIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsDelayedNotificationsIt.java index b98152edae7..1e9d3ce3725 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsDelayedNotificationsIt.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsDelayedNotificationsIt.java @@ -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.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.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.docx", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"), "no", "no", "no", diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index 9c76a6afe27..de9d8ba2d14 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -516,7 +516,7 @@ notification: emailId: 3d05393a-e593-400a-963f-a26893a0b672 smsId: 99bd4a56-256c-4de8-b187-d43a8dde466f letterId: 77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf - docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx + docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx appointee: emailId: 78cf9c9c-e2b8-44d7-bcf1-220311f114cb smsId: ede384aa-0b6e-4311-9f01-ee547573a07b @@ -681,7 +681,7 @@ notification: representative: emailId: 652753bf-59b4-46eb-9c24-bd762338a098 smsId: a6c09fad-6265-4c7c-8b95-36245ffa5352 - docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Representative.docx + docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx appointee: emailId: 362d9a85-e0e4-412b-b874-020c0464e2b4 smsId: f41222ef-c05c-4682-9634-6b034a166368 From ebd736242b5b5b9827dd5a319bc3e4e21ab6dc07 Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 10:06:38 +0000 Subject: [PATCH 06/12] Appeal-Lodged-Representative welsh template --- charts/sscs-tribunals-api/values.preview.template.yaml | 2 -- .../tyanotifications/config/NotificationConfigTestIt.java | 4 ++-- src/main/resources/config/application.yaml | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index 05525c2b085..17b914b966b 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -60,8 +60,6 @@ java: RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" # START - SSCS-IB RELEASE VARIABLES - 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 diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java index c262d74f02f..415c5d732ae 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java @@ -117,7 +117,7 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, GAPS, "readyToList", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx"}, new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, GAPS, "validAppeal", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", null}, new Object[]{APPEAL_RECEIVED, true, APPOINTEE, PAPER, GAPS, null, "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", null}, - new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, ORAL, GAPS, "readyToList", "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", "TB-SCS-LET-WEL-Appeal-Lodged-Representative.docx"}, + new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, ORAL, GAPS, "readyToList", "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", "TB-SCS-LET-WEL-Appeal-Lodged-Representative-v2.docx"}, new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, ORAL, GAPS, "validAppeal", "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", null}, new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, PAPER, GAPS, null, "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", null}, @@ -429,7 +429,7 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, LIST_ASSIST, "readyToList", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx"}, new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, LIST_ASSIST, "validAppeal", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", null}, new Object[]{APPEAL_RECEIVED, true, APPOINTEE, PAPER, LIST_ASSIST, null, "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", null}, - new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, ORAL, LIST_ASSIST, "readyToList", "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", "TB-SCS-LET-WEL-Appeal-Lodged-Representative.docx"}, + new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, ORAL, LIST_ASSIST, "readyToList", "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", "TB-SCS-LET-WEL-Appeal-Lodged-Representative-v2.docx"}, new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, ORAL, LIST_ASSIST, "validAppeal", "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", null}, new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, PAPER, LIST_ASSIST, null, "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", null}, diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index de9d8ba2d14..72a45b0c2dd 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -1155,7 +1155,7 @@ notification: emailId: e7993ed9-982a-44eb-8459-932d6d7653ea smsId: 6970bdda-7293-46d6-8876-7e1a7c4295fc letterId: 89cbb9d8-3b7d-4766-b481-585832e8bd90 - docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Representative.docx + docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Representative-v2.docx appointee: emailId: c77d9768-5343-42a5-9333-7b399e3d7199 smsId: 53369ca5-75a8-43a7-8e5e-4eda9df04001 @@ -1320,7 +1320,7 @@ notification: representative: emailId: 364bccc5-ffa6-495d-8035-e642d15114bf smsId: f8391d2b-4d80-480e-87a9-816710f5650b - docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Representative.docx + docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Representative-v2.docx appointee: emailId: e0355abd-42a6-4f94-836b-ec7ee22631cc smsId: 6a39acc9-7a3f-4ed7-a0b1-d30f6594fe82 From f01b63f036bdf6952a86484de18496dfcfdb0093 Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 10:11:27 +0000 Subject: [PATCH 07/12] Appeal-Lodged-Appellant english template --- .../values.preview.template.yaml | 2 -- .../config/NotificationConfigTestIt.java | 24 +++++++++---------- .../NotificationsDelayedNotificationsIt.java | 12 +++++----- src/main/resources/config/application.yaml | 8 +++---- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index 17b914b966b..0fbd70483c7 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -60,8 +60,6 @@ java: RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" # START - SSCS-IB RELEASE VARIABLES - 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 diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java index 415c5d732ae..d83afbc12d8 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java @@ -102,10 +102,10 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{APPEAL_LAPSED, true, REPRESENTATIVE, ORAL, GAPS, null, "dc8164a8-b923-4896-9308-3bf8e74d5665", List.of("77180ecb-c7e8-407c-8d74-618ae37b47b6","ee58f7d0-8de7-4bee-acd4-252213db6b7b"), null, "TB-SCS-GNO-WEL-00658.docx"}, new Object[]{APPEAL_LAPSED, true, REPRESENTATIVE, PAPER, GAPS, null, "dc8164a8-b923-4896-9308-3bf8e74d5665", List.of("77180ecb-c7e8-407c-8d74-618ae37b47b6","ee58f7d0-8de7-4bee-acd4-252213db6b7b"), null, "TB-SCS-GNO-WEL-00658.docx"}, - new Object[]{APPEAL_RECEIVED, false, APPELLANT, ORAL, GAPS, "readyToList", "d5fd9f65-1283-4533-a1be-10043dae7af6", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "91143b85-dd9d-430c-ba23-e42ec90f44f8", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, + new Object[]{APPEAL_RECEIVED, false, APPELLANT, ORAL, GAPS, "readyToList", "d5fd9f65-1283-4533-a1be-10043dae7af6", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "91143b85-dd9d-430c-ba23-e42ec90f44f8", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{APPEAL_RECEIVED, false, APPELLANT, ORAL, GAPS, "validAppeal", "d5fd9f65-1283-4533-a1be-10043dae7af6", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "91143b85-dd9d-430c-ba23-e42ec90f44f8", null}, new Object[]{APPEAL_RECEIVED, false, APPELLANT, PAPER, GAPS, null, "d5fd9f65-1283-4533-a1be-10043dae7af6", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "91143b85-dd9d-430c-ba23-e42ec90f44f8", null}, - new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, GAPS, "readyToList", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, + new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, GAPS, "readyToList", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, GAPS, "validAppeal", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", null}, new Object[]{APPEAL_RECEIVED, false, APPOINTEE, PAPER, GAPS, null, "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", null}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, GAPS, "readyToList", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, @@ -314,10 +314,10 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{REQUEST_FOR_INFORMATION, true, JOINT_PARTY, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00589.docx"}, new Object[]{REQUEST_FOR_INFORMATION, true, REPRESENTATIVE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00589.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, ORAL, GAPS, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, PAPER, GAPS, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, ORAL, GAPS, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, PAPER, GAPS, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, ORAL, GAPS, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, PAPER, GAPS, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, ORAL, GAPS, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, PAPER, GAPS, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, ORAL, GAPS, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, PAPER, GAPS, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, @@ -414,10 +414,10 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{APPEAL_LAPSED, true, REPRESENTATIVE, ORAL, LIST_ASSIST, null, "dc8164a8-b923-4896-9308-3bf8e74d5665", List.of("77180ecb-c7e8-407c-8d74-618ae37b47b6","ee58f7d0-8de7-4bee-acd4-252213db6b7b"), null, "TB-SCS-GNO-WEL-00658.docx"}, new Object[]{APPEAL_LAPSED, true, REPRESENTATIVE, PAPER, LIST_ASSIST, null, "dc8164a8-b923-4896-9308-3bf8e74d5665", List.of("77180ecb-c7e8-407c-8d74-618ae37b47b6","ee58f7d0-8de7-4bee-acd4-252213db6b7b"), null, "TB-SCS-GNO-WEL-00658.docx"}, - new Object[]{APPEAL_RECEIVED, false, APPELLANT, ORAL, LIST_ASSIST, "readyToList", "d5fd9f65-1283-4533-a1be-10043dae7af6", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "91143b85-dd9d-430c-ba23-e42ec90f44f8", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, + new Object[]{APPEAL_RECEIVED, false, APPELLANT, ORAL, LIST_ASSIST, "readyToList", "d5fd9f65-1283-4533-a1be-10043dae7af6", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "91143b85-dd9d-430c-ba23-e42ec90f44f8", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{APPEAL_RECEIVED, false, APPELLANT, ORAL, LIST_ASSIST, "validAppeal", "d5fd9f65-1283-4533-a1be-10043dae7af6", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "91143b85-dd9d-430c-ba23-e42ec90f44f8", null}, new Object[]{APPEAL_RECEIVED, false, APPELLANT, PAPER, LIST_ASSIST, null, "d5fd9f65-1283-4533-a1be-10043dae7af6", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "91143b85-dd9d-430c-ba23-e42ec90f44f8", null}, - new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, LIST_ASSIST, "readyToList", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, + new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, LIST_ASSIST, "readyToList", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{APPEAL_RECEIVED, false, APPOINTEE, ORAL, LIST_ASSIST, "validAppeal", "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", null}, new Object[]{APPEAL_RECEIVED, false, APPOINTEE, PAPER, LIST_ASSIST, null, "78cf9c9c-e2b8-44d7-bcf1-220311f114cb", List.of("ede384aa-0b6e-4311-9f01-ee547573a07b"), "747d026e-1bec-4e96-8a34-28f36e30bba5", null}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, "readyToList", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, @@ -626,10 +626,10 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{REQUEST_FOR_INFORMATION, true, JOINT_PARTY, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00589.docx"}, new Object[]{REQUEST_FOR_INFORMATION, true, REPRESENTATIVE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00589.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, ORAL, LIST_ASSIST, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, PAPER, LIST_ASSIST, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, ORAL, LIST_ASSIST, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, - new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, PAPER, LIST_ASSIST, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, ORAL, LIST_ASSIST, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, APPELLANT, PAPER, LIST_ASSIST, null, "01293b93-b23e-40a3-ad78-2c6cd01cd21c", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, ORAL, LIST_ASSIST, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, + new Object[]{RESEND_APPEAL_CREATED, false, APPOINTEE, PAPER, LIST_ASSIST, null, "362d9a85-e0e4-412b-b874-020c0464e2b4", List.of("f41222ef-c05c-4682-9634-6b034a166368"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, new Object[]{RESEND_APPEAL_CREATED, false, REPRESENTATIVE, PAPER, LIST_ASSIST, null, "652753bf-59b4-46eb-9c24-bd762338a098", List.of("a6c09fad-6265-4c7c-8b95-36245ffa5352"), null, "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsDelayedNotificationsIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsDelayedNotificationsIt.java index 1e9d3ce3725..75922d1d616 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsDelayedNotificationsIt.java +++ b/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-v2.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-v2.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-v2.docx"), + Arrays.asList("TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"), "no", "no", "no", diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index 72a45b0c2dd..2324d2eb6b2 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -511,7 +511,7 @@ notification: emailId: d5fd9f65-1283-4533-a1be-10043dae7af6 smsId: ede384aa-0b6e-4311-9f01-ee547573a07b letterId: 91143b85-dd9d-430c-ba23-e42ec90f44f8 - docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx + docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx representative: emailId: 3d05393a-e593-400a-963f-a26893a0b672 smsId: 99bd4a56-256c-4de8-b187-d43a8dde466f @@ -521,7 +521,7 @@ notification: emailId: 78cf9c9c-e2b8-44d7-bcf1-220311f114cb smsId: ede384aa-0b6e-4311-9f01-ee547573a07b letterId: 747d026e-1bec-4e96-8a34-28f36e30bba5 - docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx + docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx hearingAdjourned: appellant: emailId: 77ea995b-9744-4167-9250-e627c85e5eda @@ -677,7 +677,7 @@ notification: appellant: emailId: 01293b93-b23e-40a3-ad78-2c6cd01cd21c smsId: f41222ef-c05c-4682-9634-6b034a166368 - docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx + docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx representative: emailId: 652753bf-59b4-46eb-9c24-bd762338a098 smsId: a6c09fad-6265-4c7c-8b95-36245ffa5352 @@ -685,7 +685,7 @@ notification: appointee: emailId: 362d9a85-e0e4-412b-b874-020c0464e2b4 smsId: f41222ef-c05c-4682-9634-6b034a166368 - docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Appellant.docx + docmosisId: TB-SCS-LET-ENG-Appeal-Lodged-Appellant-v2.docx struckOut: docmosisId: TB-SCS-GNO-ENG-00466.docx processAudioVideo: From 6b7dd1447461d13c4b87e1bdc77edc41fb65e734 Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 10:11:59 +0000 Subject: [PATCH 08/12] Appeal-Lodged-Appellant welsh template --- charts/sscs-tribunals-api/values.preview.template.yaml | 2 -- .../tyanotifications/config/NotificationConfigTestIt.java | 8 ++++---- src/main/resources/config/application.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index 0fbd70483c7..1b5d223f946 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -60,8 +60,6 @@ java: RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" # START - SSCS-IB RELEASE VARIABLES - 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 diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java index d83afbc12d8..758c7e29108 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java @@ -111,10 +111,10 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, GAPS, "readyToList", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, GAPS, "validAppeal", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", null}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, PAPER, GAPS, null, "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", null}, - new Object[]{APPEAL_RECEIVED, true, APPELLANT, ORAL, GAPS, "readyToList", "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx"}, + new Object[]{APPEAL_RECEIVED, true, APPELLANT, ORAL, GAPS, "readyToList", "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{APPEAL_RECEIVED, true, APPELLANT, ORAL, GAPS, "validAppeal", "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", null}, new Object[]{APPEAL_RECEIVED, true, APPELLANT, PAPER, GAPS, null, "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", null}, - new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, GAPS, "readyToList", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx"}, + new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, GAPS, "readyToList", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, GAPS, "validAppeal", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", null}, new Object[]{APPEAL_RECEIVED, true, APPOINTEE, PAPER, GAPS, null, "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", null}, new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, ORAL, GAPS, "readyToList", "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", "TB-SCS-LET-WEL-Appeal-Lodged-Representative-v2.docx"}, @@ -423,10 +423,10 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, "readyToList", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", "TB-SCS-LET-ENG-Appeal-Lodged-Representative-v2.docx"}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, ORAL, LIST_ASSIST, "validAppeal", "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", null}, new Object[]{APPEAL_RECEIVED, false, REPRESENTATIVE, PAPER, LIST_ASSIST, null, "3d05393a-e593-400a-963f-a26893a0b672", List.of("99bd4a56-256c-4de8-b187-d43a8dde466f"), "77ea8a2f-06df-4279-9c1f-0f23cb2d9bbf", null}, - new Object[]{APPEAL_RECEIVED, true, APPELLANT, ORAL, LIST_ASSIST, "readyToList", "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx"}, + new Object[]{APPEAL_RECEIVED, true, APPELLANT, ORAL, LIST_ASSIST, "readyToList", "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{APPEAL_RECEIVED, true, APPELLANT, ORAL, LIST_ASSIST, "validAppeal", "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", null}, new Object[]{APPEAL_RECEIVED, true, APPELLANT, PAPER, LIST_ASSIST, null, "ba2654d8-3e76-43df-bf7d-f457d4d6819a", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "830ba7f1-9757-4833-8520-2f872de7be44", null}, - new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, LIST_ASSIST, "readyToList", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx"}, + new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, LIST_ASSIST, "readyToList", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", "TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx"}, new Object[]{APPEAL_RECEIVED, true, APPOINTEE, ORAL, LIST_ASSIST, "validAppeal", "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", null}, new Object[]{APPEAL_RECEIVED, true, APPOINTEE, PAPER, LIST_ASSIST, null, "c77d9768-5343-42a5-9333-7b399e3d7199", List.of("53369ca5-75a8-43a7-8e5e-4eda9df04001","ede384aa-0b6e-4311-9f01-ee547573a07b"), "95b0b0f8-fdf6-450f-b805-6aab46d63bf7", null}, new Object[]{APPEAL_RECEIVED, true, REPRESENTATIVE, ORAL, LIST_ASSIST, "readyToList", "e7993ed9-982a-44eb-8459-932d6d7653ea", List.of("6970bdda-7293-46d6-8876-7e1a7c4295fc","99bd4a56-256c-4de8-b187-d43a8dde466f"), "89cbb9d8-3b7d-4766-b481-585832e8bd90", "TB-SCS-LET-WEL-Appeal-Lodged-Representative-v2.docx"}, diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index 2324d2eb6b2..1c7afbed576 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -1150,7 +1150,7 @@ notification: emailId: ba2654d8-3e76-43df-bf7d-f457d4d6819a smsId: 53369ca5-75a8-43a7-8e5e-4eda9df04001 letterId: 830ba7f1-9757-4833-8520-2f872de7be44 - docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx + docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx representative: emailId: e7993ed9-982a-44eb-8459-932d6d7653ea smsId: 6970bdda-7293-46d6-8876-7e1a7c4295fc @@ -1160,7 +1160,7 @@ notification: emailId: c77d9768-5343-42a5-9333-7b399e3d7199 smsId: 53369ca5-75a8-43a7-8e5e-4eda9df04001 letterId: 95b0b0f8-fdf6-450f-b805-6aab46d63bf7 - docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx + docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx hearingAdjourned: appellant: emailId: 06c91850-a81f-44bb-9577-1bc528913850 @@ -1316,7 +1316,7 @@ notification: appellant: emailId: e3fa02fd-87b2-471c-9a99-7020b367eca9 smsId: 6a39acc9-7a3f-4ed7-a0b1-d30f6594fe82 - docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx + docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx representative: emailId: 364bccc5-ffa6-495d-8035-e642d15114bf smsId: f8391d2b-4d80-480e-87a9-816710f5650b @@ -1324,7 +1324,7 @@ notification: appointee: emailId: e0355abd-42a6-4f94-836b-ec7ee22631cc smsId: 6a39acc9-7a3f-4ed7-a0b1-d30f6594fe82 - docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Appellant.docx + docmosisId: TB-SCS-LET-WEL-Appeal-Lodged-Appellant-v2.docx struckOut: docmosisId: TB-SCS-GNO-WEL-00593.docx processAudioVideoWelsh: From 21619889f4fb81dde14ca56a3b2d9a38ca5e84f0 Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 10:17:38 +0000 Subject: [PATCH 09/12] ENGLISH_ISSUEADJOURNMENTNOTICE template --- .../values.preview.template.yaml | 3 --- .../config/NotificationConfigTestIt.java | 20 +++++++++---------- .../tyanotifications/tya/NotificationsIt.java | 4 ++-- src/main/resources/config/application.yaml | 6 +++--- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index 1b5d223f946..e1b4fbaffe5 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -60,9 +60,6 @@ java: RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" # START - SSCS-IB RELEASE VARIABLES - 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 diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java index 758c7e29108..475254fc1df 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java @@ -250,11 +250,11 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{HMCTS_APPEAL_LAPSED, true, REPRESENTATIVE, ORAL, GAPS, null, "dc8164a8-b923-4896-9308-3bf8e74d5665", List.of("77180ecb-c7e8-407c-8d74-618ae37b47b6","ee58f7d0-8de7-4bee-acd4-252213db6b7b"), null, "TB-SCS-GNO-WEL-00658.docx"}, new Object[]{HMCTS_APPEAL_LAPSED, true, REPRESENTATIVE, PAPER, GAPS, null, "dc8164a8-b923-4896-9308-3bf8e74d5665", List.of("77180ecb-c7e8-407c-8d74-618ae37b47b6","ee58f7d0-8de7-4bee-acd4-252213db6b7b"), null, "TB-SCS-GNO-WEL-00658.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPELLANT, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPELLANT, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPOINTEE, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPOINTEE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, JOINT_PARTY, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPELLANT, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPELLANT, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPOINTEE, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPOINTEE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, JOINT_PARTY, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, @@ -562,11 +562,11 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{HMCTS_APPEAL_LAPSED, true, REPRESENTATIVE, ORAL, LIST_ASSIST, null, "dc8164a8-b923-4896-9308-3bf8e74d5665", List.of("77180ecb-c7e8-407c-8d74-618ae37b47b6","ee58f7d0-8de7-4bee-acd4-252213db6b7b"), null, "TB-SCS-GNO-WEL-00658.docx"}, new Object[]{HMCTS_APPEAL_LAPSED, true, REPRESENTATIVE, PAPER, LIST_ASSIST, null, "dc8164a8-b923-4896-9308-3bf8e74d5665", List.of("77180ecb-c7e8-407c-8d74-618ae37b47b6","ee58f7d0-8de7-4bee-acd4-252213db6b7b"), null, "TB-SCS-GNO-WEL-00658.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPELLANT, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPELLANT, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPOINTEE, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPOINTEE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, JOINT_PARTY, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPELLANT, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPELLANT, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPOINTEE, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, APPOINTEE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, JOINT_PARTY, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00510-v2.docx"}, new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsIt.java index 631215bae62..3ebcfe78b9a 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsIt.java +++ b/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", @@ -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", diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index 1c7afbed576..4f009f0012f 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -821,13 +821,13 @@ notification: docmosisId: TB-SCS-GNO-ENG-00795.docx issueAdjournmentNotice: appellant: - docmosisId: TB-SCS-GNO-ENG-00510.docx + docmosisId: TB-SCS-GNO-ENG-00510-v2.docx appointee: - docmosisId: TB-SCS-GNO-ENG-00510.docx + docmosisId: TB-SCS-GNO-ENG-00510-v2.docx representative: docmosisId: TB-SCS-GNO-ENG-00512.docx joint_party: - docmosisId: TB-SCS-GNO-ENG-00510.docx + docmosisId: TB-SCS-GNO-ENG-00510-v2.docx other_party: docmosisId: TB-SCS-GNO-ENG-00512.docx requestForInformation: From 4bde9566ecfb849c2a287354f1b7744adec94fdf Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 10:18:10 +0000 Subject: [PATCH 10/12] WELSH_ISSUEADJOURNMENTNOTICEWELSH template --- .../values.preview.template.yaml | 7 ------- .../config/NotificationConfigTestIt.java | 20 +++++++++---------- .../tyanotifications/tya/NotificationsIt.java | 4 ++-- src/main/resources/config/application.yaml | 10 +++++----- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml index e1b4fbaffe5..ae8bd38e58f 100644 --- a/charts/sscs-tribunals-api/values.preview.template.yaml +++ b/charts/sscs-tribunals-api/values.preview.template.yaml @@ -59,13 +59,6 @@ java: HOURS_END_TIME: 23 RUN_DB_MIGRATION_ON_STARTUP: true TEST_RECIPIENTS_POSTCODE: "*" - # START - SSCS-IB RELEASE VARIABLES - 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 diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java index 475254fc1df..5a7f0619d9f 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/config/NotificationConfigTestIt.java @@ -259,11 +259,11 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, APPELLANT, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, APPOINTEE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, JOINT_PARTY, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, REPRESENTATIVE, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, REPRESENTATIVE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, APPELLANT, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, APPOINTEE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, JOINT_PARTY, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, REPRESENTATIVE, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, REPRESENTATIVE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, new Object[]{ISSUE_FINAL_DECISION, false, APPELLANT, ORAL, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00454.docx"}, new Object[]{ISSUE_FINAL_DECISION, false, APPOINTEE, PAPER, GAPS, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00454.docx"}, @@ -571,11 +571,11 @@ private static Object[] templateIdsWithHearingAndEventTypes() { new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, new Object[]{ISSUE_ADJOURNMENT_NOTICE, false, REPRESENTATIVE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00512.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, APPELLANT, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, APPOINTEE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, JOINT_PARTY, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, REPRESENTATIVE, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, - new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, REPRESENTATIVE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, APPELLANT, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, APPOINTEE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, JOINT_PARTY, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, REPRESENTATIVE, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, + new Object[]{ISSUE_ADJOURNMENT_NOTICE_WELSH, true, REPRESENTATIVE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-WEL-00649-v2.docx"}, new Object[]{ISSUE_FINAL_DECISION, false, APPELLANT, ORAL, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00454.docx"}, new Object[]{ISSUE_FINAL_DECISION, false, APPOINTEE, PAPER, LIST_ASSIST, null, null, Collections.emptyList(), null, "TB-SCS-GNO-ENG-00454.docx"}, diff --git a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsIt.java b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsIt.java index 3ebcfe78b9a..6e775482932 100644 --- a/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsIt.java +++ b/src/IntegrationTests/java/uk/gov/hmcts/reform/sscs/tyanotifications/tya/NotificationsIt.java @@ -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", @@ -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", diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml index 4f009f0012f..61151018ee8 100644 --- a/src/main/resources/config/application.yaml +++ b/src/main/resources/config/application.yaml @@ -1429,15 +1429,15 @@ notification: docmosisId: TB-SCS-GNO-WEL-00474.docx issueAdjournmentNoticeWelsh: appellant: - docmosisId: TB-SCS-GNO-WEL-00649.docx + docmosisId: TB-SCS-GNO-WEL-00649-v2.docx appointee: - docmosisId: TB-SCS-GNO-WEL-00649.docx + docmosisId: TB-SCS-GNO-WEL-00649-v2.docx representative: - docmosisId: TB-SCS-GNO-WEL-00649.docx + docmosisId: TB-SCS-GNO-WEL-00649-v2.docx joint_party: - docmosisId: TB-SCS-GNO-WEL-00649.docx + docmosisId: TB-SCS-GNO-WEL-00649-v2.docx other_party: - docmosisId: TB-SCS-GNO-WEL-00649.docx + docmosisId: TB-SCS-GNO-WEL-00649-v2.docx issueFinalDecisionWelsh: appellant: docmosisId: TB-SCS-GNO-WEL-00681.docx From aa31ae5a3ed66b2adb23346e6ac4206246564cd0 Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 10:26:38 +0000 Subject: [PATCH 11/12] checkstyle fix --- .../presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java | 1 - .../ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java | 1 - src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java | 1 - 3 files changed, 3 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java index fe2ce77cc2c..cd41c052424 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandler.java +++ b/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; diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java index c5dafc76aa8..935fd0cce84 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandler.java +++ b/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; diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java b/src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java index 72915dc9a3e..71f2e7446a6 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/model/AppConstants.java +++ b/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 { From dd11b229860cf05124f8be333856203b6f492947 Mon Sep 17 00:00:00 2001 From: nilay Date: Thu, 23 Jan 2025 11:03:54 +0000 Subject: [PATCH 12/12] fix --- .../gov/hmcts/reform/sscs/util/SscsUtil.java | 1 - .../CaseUpdatedAboutToStartHandlerTest.java | 18 +----------------- .../CreateCaseAboutToStartHandlerTest.java | 10 +--------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java b/src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java index 552ccfe5b62..979dc468354 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/util/SscsUtil.java @@ -437,7 +437,6 @@ public static DynamicListItem getPortOfEntryFromCode(String locationCode) { public static DynamicList getBenefitDescriptions() { List items = Arrays.stream(Benefit.values()) - .filter(benefit -> !benefit.getShortName().equals("infectedBloodCompensation")) .sorted(Comparator.comparing(Benefit::getDescription)) .map(SscsUtil::getBenefitDescriptionList) .flatMap(List::stream) diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandlerTest.java index bd9ba6b1466..6cd38ac9efa 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/caseupdated/CaseUpdatedAboutToStartHandlerTest.java @@ -13,7 +13,6 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.springframework.test.util.ReflectionTestUtils; import uk.gov.hmcts.reform.sscs.ccd.callback.Callback; import uk.gov.hmcts.reform.sscs.ccd.callback.PreSubmitCallbackResponse; import uk.gov.hmcts.reform.sscs.ccd.domain.*; @@ -70,22 +69,7 @@ public void setUp() { } @Test - void givenBenefitType_shouldHaveCorrectBenefitSelectionWithInfectedBloodCompensationDisabled() { - ReflectionTestUtils.setField(handler, "isInfectedBloodCompensationEnabled", false); - - var result = handler.handle(ABOUT_TO_START, callback, USER_AUTHORISATION); - var benefitSelection = result.getData().getAppeal().getBenefitType().getDescriptionSelection(); - - assertThat(benefitSelection).isNotNull(); - assertThat(benefitSelection.getValue()).isNotNull(); - assertThat(benefitSelection.getValue().getCode()).isEqualTo("002"); - assertThat(benefitSelection.getListItems()).hasSize(34); - } - - @Test - void givenBenefitType_shouldHaveCorrectBenefitSelectionWithInfectedBloodCompensationEnabled() { - ReflectionTestUtils.setField(handler, "isInfectedBloodCompensationEnabled", true); - + void givenBenefitType_shouldHaveCorrectBenefitSelection() { var result = handler.handle(ABOUT_TO_START, callback, USER_AUTHORISATION); var benefitSelection = result.getData().getAppeal().getBenefitType().getDescriptionSelection(); diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandlerTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandlerTest.java index cbb3ff46621..56a0b7b783e 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandlerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/presubmit/createcase/CreateCaseAboutToStartHandlerTest.java @@ -6,7 +6,6 @@ import static uk.gov.hmcts.reform.sscs.ccd.callback.CallbackType.ABOUT_TO_START; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -14,7 +13,6 @@ import org.junit.jupiter.params.provider.EnumSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.test.util.ReflectionTestUtils; import uk.gov.hmcts.reform.sscs.ccd.callback.Callback; import uk.gov.hmcts.reform.sscs.ccd.callback.CallbackType; import uk.gov.hmcts.reform.sscs.ccd.domain.*; @@ -26,17 +24,11 @@ public class CreateCaseAboutToStartHandlerTest { @Mock private Callback callback; - private CreateCaseAboutToStartHandler handler; + private final CreateCaseAboutToStartHandler handler = new CreateCaseAboutToStartHandler(); @Mock private CaseDetails caseDetails; - @BeforeEach - void setUp() { - handler = new CreateCaseAboutToStartHandler(); - ReflectionTestUtils.setField(handler, "isInfectedBloodCompensationEnabled", true); - } - @ParameterizedTest @CsvSource({ "VALID_APPEAL_CREATED",