CIV-14141 And 13384: DefResponse FullDefence FullDispute Dashboard No…

…tification Update (#4984) * Made changes for CIV-14141 for defendant * added claimant response code * fix tests * removed failfast = false * added integration tests for multi * fix quotes --------- Co-authored-by: sankaviv1 <[email protected]> Co-authored-by: sankaviv1 <[email protected]> Co-authored-by: Madhan Mahadevan <[email protected]> Co-authored-by: vasudevganesanhmcts <[email protected]>
hmcts · Jul 22, 2024 · dcc49c9 · dcc49c9
1 parent 0e42e62
commit dcc49c9
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 42 deletions.
diff --git a/...rs/dashboard/scenarios/claimant/DefendantFullDefenceFullDisputeMediationScenarioTest.java b/...rs/dashboard/scenarios/claimant/DefendantFullDefenceFullDisputeMediationScenarioTest.java
@@ -39,6 +39,7 @@ void should_create_full_defence_pay_already_partial_claimant_scenario() throws E
                     .individualFirstName("James")
                     .individualLastName("John")
                     .build())
+            .responseClaimTrack("SMALL_CLAIM")
             .respondent1ClaimResponseTypeForSpec(RespondentResponseTypeSpec.FULL_DEFENCE)
             .defenceRouteRequired(SpecJourneyConstantLRSpec.DISPUTES_THE_CLAIM)
             .responseClaimMediationSpecRequired(YesOrNo.YES)

diff --git a/...oard/scenarios/claimant/DefendantResponseFullAdmitPayImmediatelyClaimantScenarioTest.java b/...oard/scenarios/claimant/DefendantResponseFullAdmitPayImmediatelyClaimantScenarioTest.java
@@ -34,6 +34,7 @@ void should_create_full_admit_pay_immediately_claimant_scenario() throws Excepti
         CaseData caseData = CaseDataBuilder.builder().atStateRespondentFullAdmissionSpec().build()
             .toBuilder()
             .legacyCaseReference("reference")
+            .responseClaimTrack("SMALL_CLAIM")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)
             .respondent1(Party.builder().type(Party.Type.INDIVIDUAL)

diff --git a/...oard/scenarios/claimant/DefendantResponsePartAdmitPayImmediatelyClaimantScenarioTest.java b/...oard/scenarios/claimant/DefendantResponsePartAdmitPayImmediatelyClaimantScenarioTest.java
@@ -50,6 +50,7 @@ void should_create_part_admit_defendant_response_scenario() throws Exception {
             .totalClaimAmount(BigDecimal.valueOf(300))
             .respondToAdmittedClaimOwingAmountPounds(BigDecimal.valueOf(300))
             .applicant1Represented(NO)
+            .responseClaimTrack("SMALL_CLAIM")
             .build();
 
         handler.handle(callbackParams(caseData));

diff --git a/...narios/claimant/DefendantResponsePartFullAdmitInstallmentsOrgComClaimantScenarioTest.java b/...narios/claimant/DefendantResponsePartFullAdmitInstallmentsOrgComClaimantScenarioTest.java
@@ -39,6 +39,7 @@ void should_create_full_part_admit_installments_org_com_claimant_scenario() thro
             .legacyCaseReference("reference")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)
+            .responseClaimTrack("SMALL_CLAIM")
             .respondent1(Party.builder().companyName("Company One").type(Party.Type.COMPANY).build())
             .respondent1RepaymentPlan(RepaymentPlanLRspec
                                           .builder()

diff --git a/.../scenarios/claimant/FullOrPartAdmitPayByDateOrgOrLtdCompanyFromDefendantScenarioTest.java b/.../scenarios/claimant/FullOrPartAdmitPayByDateOrgOrLtdCompanyFromDefendantScenarioTest.java
@@ -37,6 +37,7 @@ void should_create_part_admit_pay_by_setDate_scenario() throws Exception {
             .legacyCaseReference("reference")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)
+            .responseClaimTrack("SMALL_CLAIM")
             .respondent1(Party.builder()
                         .companyName("Company one")
                         .type(Party.Type.COMPANY).build())
@@ -92,6 +93,7 @@ void should_create_full_admit_pay_by_setDate_scenario() throws Exception {
             .legacyCaseReference("reference")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)
+            .responseClaimTrack("SMALL_CLAIM")
             .respondent1(Party.builder()
                     .organisationName("Org one")
                     .type(Party.Type.ORGANISATION).build())

diff --git a/...ollers/dashboard/scenarios/claimant/PartAdmitFullDefenceFullPaidClaimantScenarioTest.java b/...ollers/dashboard/scenarios/claimant/PartAdmitFullDefenceFullPaidClaimantScenarioTest.java
@@ -34,11 +34,13 @@ void should_create_full_defence_full_paid_claimant_scenario() throws Exception {
         LocalDate deadline = LocalDate.of(2024, 7, 25);
         CaseData caseData = CaseDataBuilder.builder().atStateRespondentFullDefenceSpec().build()
             .toBuilder()
+            .responseClaimTrack("SMALL_CLAIM")
             .legacyCaseReference("reference")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)
             .respondent1ClaimResponseTypeForSpec(RespondentResponseTypeSpec.FULL_DEFENCE)
             .applicant1ResponseDeadline(LocalDateTime.of(deadline, LocalTime.now()))
+            .responseClaimTrack("SMALL_CLAIM")
             .respondToClaim(RespondToClaim.builder()
                                 .howMuchWasPaid(new BigDecimal(100000))
                                 .whenWasThisAmountPaid(paymentDate)
@@ -91,6 +93,7 @@ void should_create_part_admit_full_paid_claimant_scenario() throws Exception {
 
         CaseData caseData = CaseDataBuilder.builder().atStateRespondentPartAdmissionSpec().build()
             .toBuilder()
+            .responseClaimTrack("SMALL_CLAIM")
             .legacyCaseReference("reference")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)

diff --git a/...hboard/scenarios/claimant/PartAdmitFullDefencePaidAlreadyPartialClaimantScenarioTest.java b/...hboard/scenarios/claimant/PartAdmitFullDefencePaidAlreadyPartialClaimantScenarioTest.java
@@ -36,6 +36,7 @@ void should_create_full_defence_pay_already_partial_claimant_scenario() throws E
         LocalDate paymentDate = OffsetDateTime.now().toLocalDate().minusDays(5);
         CaseData caseData = CaseDataBuilder.builder().atStateRespondentFullDefenceSpec().build()
             .toBuilder()
+            .responseClaimTrack("SMALL_CLAIM")
             .legacyCaseReference("reference")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)
@@ -87,6 +88,7 @@ void should_create_part_admit_pay_already_partial_claimant_scenario() throws Exc
         CaseData caseData = CaseDataBuilder.builder().atStateRespondentPartAdmissionSpec().build()
             .toBuilder()
             .legacyCaseReference("reference")
+            .responseClaimTrack("SMALL_CLAIM")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)
             .respondent1ClaimResponseTypeForSpec(RespondentResponseTypeSpec.PART_ADMISSION)

diff --git a/...civil/controllers/dashboard/scenarios/claimant/PartAdmitPayByInstalmentsScenarioTest.java b/...civil/controllers/dashboard/scenarios/claimant/PartAdmitPayByInstalmentsScenarioTest.java
@@ -36,6 +36,7 @@ void should_create_full_part_admit_installments_claimant_scenario() throws Excep
         BigDecimal totalAmount = new BigDecimal("10000");
         CaseData caseData = CaseDataBuilder.builder().atStateRespondentFullAdmissionSpec().build()
             .toBuilder()
+            .responseClaimTrack("SMALL_CLAIM")
             .legacyCaseReference("reference")
             .ccdCaseReference(Long.valueOf(caseId))
             .applicant1Represented(YesOrNo.NO)

diff --git a/...shboard/scenarios/defendant/DefendantFullDefenceFullDisputeWithMediationScenarioTest.java b/...shboard/scenarios/defendant/DefendantFullDefenceFullDisputeWithMediationScenarioTest.java
@@ -37,6 +37,7 @@ void should_create_scenario_for_fullDefence_DisputeAll_With_Mediation() throws E
                 .respondent1ClaimResponseTypeForSpec(RespondentResponseTypeSpec.FULL_DEFENCE)
                 .defenceRouteRequired(DISPUTES_THE_CLAIM)
                 .responseClaimMediationSpecRequired(YesOrNo.YES)
+                .responseClaimTrack("SMALL_CLAIM")
                 .build();
 
         handler.handle(callbackParams(caseData));

diff --git a/...hboard/scenarios/defendant/DefendantResponseFullDefenceFastTrackClaimantScenarioTest.java b/...hboard/scenarios/defendant/DefendantResponseFullDefenceFastTrackClaimantScenarioTest.java
@@ -1,34 +1,33 @@
 package uk.gov.hmcts.reform.civil.controllers.dashboard.scenarios.defendant;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import uk.gov.hmcts.reform.civil.controllers.DashboardBaseIntegrationTest;
+import uk.gov.hmcts.reform.civil.enums.AllocatedTrack;
 import uk.gov.hmcts.reform.civil.enums.RespondentResponseTypeSpec;
 import uk.gov.hmcts.reform.civil.enums.YesOrNo;
 import uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.claimant.DefendantResponseClaimantNotificationHandler;
 import uk.gov.hmcts.reform.civil.model.CaseData;
 import uk.gov.hmcts.reform.civil.model.Party;
 import uk.gov.hmcts.reform.civil.sampledata.CaseDataBuilder;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static uk.gov.hmcts.reform.civil.constants.SpecJourneyConstantLRSpec.DISPUTES_THE_CLAIM;
-import static uk.gov.hmcts.reform.civil.enums.AllocatedTrack.FAST_CLAIM;
 
 public class DefendantResponseFullDefenceFastTrackClaimantScenarioTest extends DashboardBaseIntegrationTest {
 
     @Autowired
     private DefendantResponseClaimantNotificationHandler handler;
 
-    @Test
-    void shouldCreateFullDefenceFastTrackResponseScenario() throws Exception {
+    @ParameterizedTest
+    @EnumSource(value = AllocatedTrack.class, mode = EnumSource.Mode.EXCLUDE, names = {"SMALL_CLAIM"})
+    void shouldCreateFullDefenceFastTrackResponseScenario(AllocatedTrack track) throws Exception {
 
         String caseId = "1234987";
-        LocalDate responseDeadline = OffsetDateTime.now().toLocalDate();
         CaseData caseData = CaseDataBuilder.builder().atStateRespondentFullDefenceSpec().build()
             .toBuilder()
             .legacyCaseReference("reference")
@@ -38,7 +37,7 @@ void shouldCreateFullDefenceFastTrackResponseScenario() throws Exception {
             .applicant1ResponseDeadline(LocalDateTime.of(2024, 8, 6, 12, 0))
             .respondent1(Party.builder().individualFirstName("James")
                     .individualLastName("John").type(Party.Type.INDIVIDUAL).build())
-            .responseClaimTrack(FAST_CLAIM.name())
+            .responseClaimTrack(track.name())
             .defenceRouteRequired(DISPUTES_THE_CLAIM)
             .build();
 

diff --git a/...mcts/reform/civil/handler/callback/camunda/dashboardnotifications/DashboardScenarios.java b/...mcts/reform/civil/handler/callback/camunda/dashboardnotifications/DashboardScenarios.java
@@ -97,8 +97,8 @@ public enum DashboardScenarios {
     SCENARIO_AAA6_CP_HEARING_SCHEDULED_CLAIMANT("Scenario.AAA6.CP.Hearing.Scheduled.Claimant"),
     SCENARIO_AAA6_CP_HEARING_SCHEDULED_DEFENDANT("Scenario.AAA6.CP.Hearing.Scheduled.Defendant"),
     SCENARIO_AAA6_CLAIMANT_INTENT_REJECT_REPAYMENT_ORG_DEFENDANT("Scenario.AAA6.ClaimantIntent.Defendant.OrgLtdCo.Claimant"),
-    SCENARIO_AAA6_DEFENDANT_RESPONSE_FULLDISPUTE_FAST_TRACK_CLAIMANT("Scenario.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Claimant"),
-    SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_FAST_TRACK_DEFENDANT("Scenario.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Defendant"),
+    SCENARIO_AAA6_DEFENDANT_RESPONSE_FULLDISPUTE_MULTI_INT_FAST_CLAIMANT("Scenario.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Claimant"),
+    SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_MULTI_INT_FAST_DEFENDANT("Scenario.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Defendant"),
     SCENARIO_AAA6_CP_HEARING_DOCUMENTS_UPLOAD_CLAIMANT("Scenario.AAA6.CP.HearingDocuments.Upload.Claimant"),
     SCENARIO_AAA6_CP_HEARING_DOCUMENTS_UPLOAD_DEFENDANT("Scenario.AAA6.CP.HearingDocuments.Upload.Defendant"),
     SCENARIO_AAA6_HEARING_FEE_UNPAID_CLAIMANT("Scenario.AAA6.CP.StrikeOut.HearingFeeUnpaid.Claimant"),

diff --git a/...camunda/dashboardnotifications/claimant/DefendantResponseClaimantNotificationHandler.java b/...camunda/dashboardnotifications/claimant/DefendantResponseClaimantNotificationHandler.java
@@ -22,7 +22,7 @@
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_ALREADY_PAID_CLAIMANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_CLAIMANT_CARM;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_MEDIATION_CLAIMANT;
-import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_RESPONSE_FULLDISPUTE_FAST_TRACK_CLAIMANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_RESPONSE_FULLDISPUTE_MULTI_INT_FAST_CLAIMANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEF_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_REFUSED_MEDIATION_CLAIMANT;
 
 @Service
@@ -91,8 +91,8 @@ private String getFullDefenceScenario(CaseData caseData) {
                 return SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_MEDIATION_CLAIMANT.getScenario();
             } else if (caseData.hasDefendantNotAgreedToFreeMediation() && caseData.isSmallClaim()) {
                 return SCENARIO_AAA6_DEF_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_REFUSED_MEDIATION_CLAIMANT.getScenario();
-            } else if (caseData.isFastTrackClaim()) {
-                return SCENARIO_AAA6_DEFENDANT_RESPONSE_FULLDISPUTE_FAST_TRACK_CLAIMANT.getScenario();
+            } else if (!caseData.isSmallClaim()) {
+                return SCENARIO_AAA6_DEFENDANT_RESPONSE_FULLDISPUTE_MULTI_INT_FAST_CLAIMANT.getScenario();
             }
         }
 

diff --git a/...munda/dashboardnotifications/defendant/DefendantResponseDefendantNotificationHandler.java b/...munda/dashboardnotifications/defendant/DefendantResponseDefendantNotificationHandler.java
@@ -19,7 +19,7 @@
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_ALREADY_PAID;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_FULL_DEFENCE_FULL_DISPUTE_MEDIATION;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_DEFENDANT_CARM;
-import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_FAST_TRACK_DEFENDANT;
+import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_MULTI_INT_FAST_DEFENDANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_FULL_DEFENCE_NO_MEDIATION_DEFENDANT;
 import static uk.gov.hmcts.reform.civil.handler.callback.camunda.dashboardnotifications.DashboardScenarios.SCENARIO_AAA6_DEFENDANT_FULL_OR_PART_ADMIT_PAY_SET_DATE_ORG_DEFENDANT;
 
@@ -69,9 +69,9 @@ public String getScenario(CaseData caseData) {
             return SCENARIO_AAA6_DEFENDANT_ALREADY_PAID.getScenario();
         }
 
-        if (caseData.isFastTrackClaim() && caseData.isRespondentResponseFullDefence()
+        if (!caseData.isSmallClaim() && caseData.isRespondentResponseFullDefence()
             && caseData.isClaimBeingDisputed()) {
-            return SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_FAST_TRACK_DEFENDANT.getScenario();
+            return SCENARIO_AAA6_DEFENDANT_RESPONSE_FULL_DEFENCE_FULL_DISPUTE_MULTI_INT_FAST_DEFENDANT.getScenario();
         }
 
         if (caseData.isFullAdmitPayImmediatelyClaimSpec()

diff --git a/...urces/db/migration/V2024_03_01_1442__CIV-12792_claimant_intent_go_to_hearing_scenario.sql b/...urces/db/migration/V2024_03_01_1442__CIV-12792_claimant_intent_go_to_hearing_scenario.sql
@@ -3,7 +3,7 @@
  */
 INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
 VALUES ('Scenario.AAA6.ClaimantIntent.GoToHearing.Claimant',
-        '{"Notice.AAA6.DefResponse.PartAdmit.PayImmediately.Claimant", "Notice.AAA6.DefResponse.FullOrPartAdmit.PayBySetDate.Claimant", "Notice.AAA6.DefResponse.FullOrPartAdmit.PayByInstallments.Claimant", "Notice.AAA6.DefResponse.OrgOrLtdCompany.FullOrPartAdmit.PayBySetDate.Claimant", "Notice.AAA6.DefResponse.OrgOrLtdCompany.FullOrPartAdmit.PayByInstallments.Claimant", "Notice.AAA6.DefResponse.PartAdmit.AlreadyPaid.Claimant", "Notice.AAA6.DefResponse.FullDefence.AlreadyPaid.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.RefusedMediation.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.SuggestedMediation.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Claimant"}', '{"Notice.AAA6.ClaimantIntent.GoToHearing.Claimant":["respondent1PartyName"]}');
+        '{"Notice.AAA6.DefResponse.PartAdmit.PayImmediately.Claimant", "Notice.AAA6.DefResponse.FullOrPartAdmit.PayBySetDate.Claimant", "Notice.AAA6.DefResponse.FullOrPartAdmit.PayByInstallments.Claimant", "Notice.AAA6.DefResponse.OrgOrLtdCompany.FullOrPartAdmit.PayBySetDate.Claimant", "Notice.AAA6.DefResponse.OrgOrLtdCompany.FullOrPartAdmit.PayByInstallments.Claimant", "Notice.AAA6.DefResponse.PartAdmit.AlreadyPaid.Claimant", "Notice.AAA6.DefResponse.FullDefence.AlreadyPaid.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.RefusedMediation.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.SuggestedMediation.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Claimant"}', '{"Notice.AAA6.ClaimantIntent.GoToHearing.Claimant":["respondent1PartyName"]}');
 
 /**
  * Add notification template

diff --git a/...ources/db/migration/V2024_03_05_1500__CIV-12753_creat_claimant_claim_settled_scenario.sql b/...ources/db/migration/V2024_03_05_1500__CIV-12753_creat_claimant_claim_settled_scenario.sql
@@ -1,6 +1,6 @@
 INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
 VALUES ('Scenario.AAA6.ClaimantIntent.ClaimSettled.Claimant',
-        '{"Notice.AAA6.DefResponse.PartAdmit.AlreadyPaid.Claimant", "Notice.AAA6.DefResponse.FullDefence.AlreadyPaid.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Claimant","Notice.AAA6.DefResponse.FullDefence.FullDispute.RefusedMediation.Claimant"}',
+        '{"Notice.AAA6.DefResponse.PartAdmit.AlreadyPaid.Claimant", "Notice.AAA6.DefResponse.FullDefence.AlreadyPaid.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Claimant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.RefusedMediation.Claimant"}',
         '{"Notice.AAA6.ClaimantIntent.ClaimSettled.Claimant":["respondent1PartyName","claimSettledAmount", "claimSettledDateEn", "claimSettledDateCy"]}');
 
 /**

diff --git a/.../resources/db/migration/V2024_03_13_1153__CIV-12811_full_defence_proceed_no_mediation.sql b/.../resources/db/migration/V2024_03_13_1153__CIV-12811_full_defence_proceed_no_mediation.sql
@@ -3,7 +3,7 @@
  */
 INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
 VALUES ('Scenario.AAA6.ClaimantIntent.GoToHearing.DefFullDefence.ClaimantDisputes.Defendant',
-        '{"Notice.AAA6.DefResponse.FullDefence.FullDispute.RefusedMediation.Defendant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Defendant"}',
+        '{"Notice.AAA6.DefResponse.FullDefence.FullDispute.RefusedMediation.Defendant", "Notice.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Defendant"}',
         '{"Notice.AAA6.ClaimantIntent.GoToHearing.DefFullDefence.ClaimantDisputes.Defendant" : ["applicant1PartyName"]}');
 
 /**

diff --git a/...n/resources/db/migration/V2024_03_27_1420__CIV-13166-claimant_full_defence_fast_track.sql b/...n/resources/db/migration/V2024_03_27_1420__CIV-13166-claimant_full_defence_fast_track.sql
@@ -2,16 +2,16 @@
  * Add scenario
  */
 INSERT INTO dbs.scenario (name, notifications_to_delete, notifications_to_create)
-VALUES ('Scenario.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Claimant',
+VALUES ('Scenario.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Claimant',
         '{"Notice.AAA6.DefResponse.ResponseTimeElapsed.Claimant", "Notice.AAA6.ClaimIssue.Response.Await", "Notice.AAA6.ClaimIssue.HWF.PhonePayment","Notice.AAA6.DefResponse.MoretimeRequested.Claimant","Notice.AAA6.ClaimIssue.HWF.FullRemission", "Notice.AAA6.DefResponse.BilingualFlagSet.Claimant"}',
-        '{"Notice.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Claimant" : ["respondent1PartyName", "applicant1ResponseDeadlineEn", "applicant1ResponseDeadlineCy"]}');
+        '{"Notice.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Claimant" : ["respondent1PartyName", "applicant1ResponseDeadlineEn", "applicant1ResponseDeadlineCy"]}');
 
 /**
  * Add notification template
  */
 INSERT INTO dbs.dashboard_notifications_templates (template_name, title_En, title_Cy, description_En, description_Cy
                                                   ,notification_role)
-VALUES ('Notice.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Claimant', 'Response to the claim', 'Ymateb i’r hawliad',
+VALUES ('Notice.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Claimant', 'Response to the claim', 'Ymateb i’r hawliad',
         '<p class="govuk-body">${respondent1PartyName} has rejected the claim. You need to respond by ${applicant1ResponseDeadlineEn}.</p><p class="govuk-body"><a href="{CLAIMANT_RESPONSE_TASK_LIST}" class="govuk-link">View and respond</a></p>',
         '<p class="govuk-body">Mae ${respondent1PartyName} wedi gwrthod yr hawliad. Mae angen i chi ymateb erbyn ${applicant1ResponseDeadlineCy}.</p><p class="govuk-body"><a href="{CLAIMANT_RESPONSE_TASK_LIST}" class="govuk-link">Gweld ac ymateb</a></p>',
         'CLAIMANT');
@@ -23,4 +23,4 @@ INSERT INTO dbs.task_item_template (task_name_en, category_en, task_name_cy, cat
                                     scenario_name, task_status_sequence, role, task_order)
 values ('<a href={VIEW_RESPONSE_TO_CLAIM}  rel="noopener noreferrer" class="govuk-link">View the response to the claim</a>','The response',
         '<a href={VIEW_RESPONSE_TO_CLAIM}  rel="noopener noreferrer" class="govuk-link">Gweld yr ymateb i''r hawliad</a>','Yr ymateb',
-        'Response.View', 'Scenario.AAA6.DefResponse.FullDefence.FullDispute.FastTrack.Claimant', '{3, 3}', 'CLAIMANT', 3);
+        'Response.View', 'Scenario.AAA6.DefResponse.FullDefence.FullDispute.Multi.Int.Fast.Claimant', '{3, 3}', 'CLAIMANT', 3);