DTSCCI-4131 Changes for disposal SDO doc

src/main/java/uk/gov/hmcts/reform/civil/model/CaseDataParent.java

@@ -387,7 +387,6 @@ public boolean isApplicantRepresented() {
     private List<DisposalAndTrialHearingDJToggle> disposalHearingSchedulesOfLossDJToggle;
     private List<DisposalAndTrialHearingDJToggle> disposalHearingStandardDisposalOrderDJToggle;
     private List<DisposalAndTrialHearingDJToggle> disposalHearingFinalDisposalHearingDJToggle;
-    private List<DisposalAndTrialHearingDJToggle> disposalHearingBundleDJToggle;
     private List<DisposalAndTrialHearingDJToggle> disposalHearingClaimSettlingDJToggle;
     private List<DisposalAndTrialHearingDJToggle> disposalHearingCostsDJToggle;
 

src/main/java/uk/gov/hmcts/reform/civil/model/CivilCaseData.java

@@ -30,7 +30,6 @@
 import uk.gov.hmcts.reform.civil.model.common.Element;
 import uk.gov.hmcts.reform.civil.model.common.MappableObject;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingAddNewDirectionsDJ;
-import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingBundleDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingDisclosureOfDocumentsDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingFinalDisposalHearingDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingJudgesRecitalDJ;
@@ -55,7 +54,6 @@
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.TrialPersonalInjury;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.TrialRoadTrafficAccident;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingAddNewDirections;
-import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingBundle;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingDisclosureOfDocuments;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingFinalDisposalHearing;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingFinalDisposalHearingTimeDJ;
@@ -172,8 +170,6 @@ public class CivilCaseData extends BaseCaseData implements MappableObject {
     private DisposalHearingStandardDisposalOrder disposalHearingStandardDisposalOrder;
     private DisposalHearingFinalDisposalHearing disposalHearingFinalDisposalHearing;
     private DisposalHearingHearingTime disposalHearingHearingTime;
-    private DisposalHearingBundle disposalHearingBundle;
-    private DisposalHearingBundleDJ disposalHearingBundleDJ;
     private DisposalHearingNotes disposalHearingNotes;
     private String disposalHearingHearingNotes;
     private DisposalOrderWithoutHearing disposalOrderWithoutHearing;
@@ -242,7 +238,10 @@ public class CivilCaseData extends BaseCaseData implements MappableObject {
     private List<OrderDetailsPagesSectionsToggle> fastTrackSchedulesOfLossToggle;
     private List<OrderDetailsPagesSectionsToggle> fastTrackCostsToggle;
     private List<OrderDetailsPagesSectionsToggle> fastTrackTrialToggle;
+    private String fastTrackTrialBundleTitle;
     private List<OrderDetailsPagesSectionsToggle> fastTrackTrialBundleToggle;
+    private String fastTrackTrialBundleText;
+    private String fastTrackTrialBundleEndLine;
     private List<OrderDetailsPagesSectionsToggle> fastTrackMethodToggle;
     private List<OrderDetailsPagesSectionsToggle> disposalHearingDisclosureOfDocumentsToggle;
     private List<OrderDetailsPagesSectionsToggle> disposalHearingWitnessOfFactToggle;
@@ -251,7 +250,6 @@ public class CivilCaseData extends BaseCaseData implements MappableObject {
     private List<OrderDetailsPagesSectionsToggle> disposalHearingSchedulesOfLossToggle;
     private List<OrderDetailsPagesSectionsToggle> disposalHearingFinalDisposalHearingToggle;
     private List<OrderDetailsPagesSectionsToggle> disposalHearingMethodToggle;
-    private List<OrderDetailsPagesSectionsToggle> disposalHearingBundleToggle;
     private List<OrderDetailsPagesSectionsToggle> disposalHearingClaimSettlingToggle;
     private List<OrderDetailsPagesSectionsToggle> disposalHearingCostsToggle;
     private List<OrderDetailsPagesSectionsToggle> smallClaimsHearingToggle;

src/main/java/uk/gov/hmcts/reform/civil/model/defaultjudgment/TrialHearingTrial.java

@@ -4,8 +4,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import uk.gov.hmcts.reform.civil.enums.dj.DisposalHearingBundleType;
-
 import jakarta.validation.constraints.Future;
 import java.time.LocalDate;
 import java.util.List;
@@ -23,5 +21,5 @@ public class TrialHearingTrial {
     private LocalDate date2;
     private String input2;
     private String input3;
-    private List<DisposalHearingBundleType> type;
+    private List<String> type;
 }

src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/dj/DefaultJudgmentSDOOrderForm.java

@@ -8,7 +8,6 @@
 import uk.gov.hmcts.reform.civil.model.common.Element;
 import uk.gov.hmcts.reform.civil.model.common.MappableObject;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingAddNewDirectionsDJ;
-import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingBundleDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingDisclosureOfDocumentsDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingFinalDisposalHearingDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingJudgesRecitalDJ;
@@ -58,7 +57,6 @@ public class DefaultJudgmentSDOOrderForm implements MappableObject {
     private  DisposalHearingQuestionsToExpertsDJ disposalHearingQuestionsToExpertsDJ;
     private  DisposalHearingSchedulesOfLossDJ disposalHearingSchedulesOfLossDJ;
     private DisposalHearingFinalDisposalHearingDJ disposalHearingFinalDisposalHearingDJ;
-    private  DisposalHearingBundleDJ disposalHearingBundleDJ;
     private  DisposalHearingNotesDJ disposalHearingNotesDJ;
     private  List<Element<DisposalHearingAddNewDirectionsDJ>> disposalHearingAddNewDirectionsDJ;
     private  boolean hasNewDirections;
@@ -88,7 +86,6 @@ public class DefaultJudgmentSDOOrderForm implements MappableObject {
     private  boolean disposalHearingQuestionsToExpertsDJAddSection;
     private  boolean disposalHearingSchedulesOfLossDJAddSection;
     private  boolean disposalHearingFinalDisposalHearingDJAddSection;
-    private  boolean disposalHearingBundleDJAddSection;
     private  boolean disposalHearingClaimSettlingAddSection;
     private  boolean disposalHearingCostsAddSection;
 

src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/sdo/SdoDocumentFormDisposal.java

@@ -11,7 +11,6 @@
 import uk.gov.hmcts.reform.civil.model.common.Element;
 import uk.gov.hmcts.reform.civil.model.common.MappableObject;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingAddNewDirections;
-import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingBundle;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingDisclosureOfDocuments;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingFinalDisposalHearing;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingHearingTime;
@@ -66,9 +65,6 @@ public class SdoDocumentFormDisposal implements MappableObject {
     private LocationRefData hearingLocation;
     private LocationRefData caseManagementLocation;
 
-    private DisposalHearingBundle disposalHearingBundle;
-    private String disposalHearingBundleTypeText;
-
     private boolean hasNewDirections;
     private List<Element<DisposalHearingAddNewDirections>> disposalHearingAddNewDirections;
 
@@ -82,7 +78,6 @@ public class SdoDocumentFormDisposal implements MappableObject {
     private boolean disposalHearingSchedulesOfLossToggle;
     private boolean disposalHearingFinalDisposalHearingToggle;
     private boolean disposalHearingMethodToggle;
-    private boolean disposalHearingBundleToggle;
     private boolean disposalHearingClaimSettlingToggle;
     private boolean disposalHearingCostsToggle;
     private boolean writtenByJudge;

src/main/java/uk/gov/hmcts/reform/civil/model/docmosis/sdo/SdoDocumentFormFast.java

@@ -78,7 +78,6 @@ public class SdoDocumentFormFast implements MappableObject {
     private FastTrackTrial fastTrackTrial;
     private FastTrackHearingTime fastTrackHearingTime;
     private String fastTrackHearingTimeEstimate;
-    private String fastTrackTrialBundleTypeText;
 
     private FastTrackMethod fastTrackMethod;
     private DynamicList fastTrackMethodInPerson;

src/main/java/uk/gov/hmcts/reform/civil/model/sdo/FastTrackTrial.java

@@ -5,10 +5,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import uk.gov.hmcts.reform.civil.enums.sdo.FastTrackTrialBundleType;
 
 import java.time.LocalDate;
-import java.util.List;
 
 @Data
 @NoArgsConstructor
@@ -23,5 +21,4 @@ public class FastTrackTrial {
     private LocalDate date2;
     private String input2;
     private String input3;
-    private List<FastTrackTrialBundleType> type;
 }

src/main/java/uk/gov/hmcts/reform/civil/service/directionsorder/DirectionsOrderSpecialistTextLibrary.java

@@ -264,9 +264,7 @@ private DirectionsOrderSpecialistTextLibrary() {
     /* Personal injury (SDO vs DJ variants share question/answer text) */
     public static final String PERSONAL_INJURY_PERMISSION_SDO =
         "The claimant has permission to rely upon the written expert evidence already uploaded to "
-            + "the Digital Portal with the particulars of claim and in addition has permission to rely upon"
-            + " any associated correspondence or updating report which is uploaded to the Digital Portal by"
-            + " 4pm on";
+            + "the Digital Portal with the particulars of claim";
     public static final String PERSONAL_INJURY_PERMISSION_DJ =
         "The claimant has permission to rely upon the written "
             + "expert evidence already uploaded to the Digital"
@@ -418,13 +416,13 @@ case number(s), hearing date(s) and copy final substantive order(s)\s
 
     /* Disposal hearings */
     public static final String DISPOSAL_DOCUMENTS_EXCHANGE =
-        "The parties shall serve on each other copies of the documents upon which reliance is to be"
-            + " placed at the disposal hearing by 4pm on";
+        "The parties must upload to the Digital Portal copies of those documents which they wish the court to consider when deciding" +
+            "the amount of damages, by 4pm on";
     public static final String DISPOSAL_DOCUMENTS_UPLOAD =
         "The parties must upload to the Digital Portal copies of those documents which they wish the "
             + "court to consider when deciding the amount of damages, by 4pm on";
     public static final String DISPOSAL_WITNESS_UPLOAD =
-        "The claimant must upload to the Digital Portal copies of the witness statements of all "
+        "The claimant must upload to the Digital Portal copies of the statements of all "
             + "witnesses of fact on whose evidence reliance is to be placed by 4pm on";
     public static final String DISPOSAL_WITNESS_CPR32_6 =
         "The provisions of CPR 32.6 apply to such evidence.";
@@ -456,8 +454,6 @@ case number(s), hearing date(s) and copy final substantive order(s)\s
     public static final String DISPOSAL_SCHEDULE_FUTURE_LOSS =
         "If there is a claim for future pecuniary loss and the parties have not already set out their"
             + " case on periodical payments, they must do so in the respective schedule and counter-schedule.";
-    public static final String DISPOSAL_BUNDLE_REQUIREMENT =
-        "At least 7 days before the disposal hearing, the claimant must file and serve";
     public static final String DISPOSAL_FINAL_HEARING_LISTING_SDO =
         "This claim will be listed for final disposal before a judge on the first available date after";
     public static final String DISPOSAL_FINAL_HEARING_LISTING_DJ =

src/main/java/uk/gov/hmcts/reform/civil/service/dj/DjDisposalDirectionsService.java

@@ -27,7 +27,6 @@ public void populateDisposalDirections(CaseData.CaseDataBuilder<?, ?> caseDataBu
         caseDataBuilder.disposalHearingFinalDisposalHearingDJ(disposalNarrativeService.buildFinalDisposalHearing());
         caseDataBuilder.disposalHearingFinalDisposalHearingTimeDJ(
             disposalNarrativeService.buildFinalDisposalHearingTime());
-        caseDataBuilder.disposalHearingBundleDJ(disposalNarrativeService.buildBundle());
         caseDataBuilder.disposalHearingNotesDJ(disposalNarrativeService.buildNotes());
 
         // copy of disposalHearingNotesDJ field to update order made without hearing field without breaking

src/main/java/uk/gov/hmcts/reform/civil/service/dj/DjDisposalNarrativeService.java

@@ -2,7 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingBundleDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingDisclosureOfDocumentsDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingFinalDisposalHearingDJ;
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingJudgesRecitalDJ;
@@ -13,7 +12,6 @@
 import uk.gov.hmcts.reform.civil.model.defaultjudgment.DisposalHearingWitnessOfFactDJ;
 import uk.gov.hmcts.reform.civil.model.sdo.DisposalHearingFinalDisposalHearingTimeDJ;
 
-import static uk.gov.hmcts.reform.civil.service.directionsorder.DirectionsOrderSpecialistTextLibrary.DISPOSAL_BUNDLE_REQUIREMENT;
 import static uk.gov.hmcts.reform.civil.service.directionsorder.DirectionsOrderSpecialistTextLibrary.DISPOSAL_DOCUMENTS_EXCHANGE;
 import static uk.gov.hmcts.reform.civil.service.directionsorder.DirectionsOrderSpecialistTextLibrary.DISPOSAL_FINAL_HEARING_LISTING_DJ;
 import static uk.gov.hmcts.reform.civil.service.directionsorder.DirectionsOrderSpecialistTextLibrary.DISPOSAL_SCHEDULE_CLAIMANT_SEND_DJ;
@@ -89,11 +87,6 @@ public DisposalHearingFinalDisposalHearingTimeDJ buildFinalDisposalHearingTime()
             .setDate(deadlineService.weeksFromNow(16));
     }
 
-    public DisposalHearingBundleDJ buildBundle() {
-        return new DisposalHearingBundleDJ()
-            .setInput(DISPOSAL_BUNDLE_REQUIREMENT);
-    }
-
     public DisposalHearingNotesDJ buildNotes() {
         return new DisposalHearingNotesDJ()
             .setInput(ORDER_WITHOUT_HEARING_UPLOAD_TO_PORTAL_DJ)

src/main/java/uk/gov/hmcts/reform/civil/service/dj/DjLocationAndToggleService.java

@@ -120,7 +120,6 @@ private CaseData fillDisposalToggle(CaseData caseData) {
         builder.disposalHearingSchedulesOfLossDJToggle(DEFAULT_TOGGLE);
         builder.disposalHearingStandardDisposalOrderDJToggle(DEFAULT_TOGGLE);
         builder.disposalHearingFinalDisposalHearingDJToggle(DEFAULT_TOGGLE);
-        builder.disposalHearingBundleDJToggle(DEFAULT_TOGGLE);
         builder.disposalHearingClaimSettlingDJToggle(DEFAULT_TOGGLE);
         builder.disposalHearingCostsDJToggle(DEFAULT_TOGGLE);
         return builder.build();

src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/dj/DjDisposalTemplateService.java

@@ -19,7 +19,6 @@ public class DjDisposalTemplateService {
     private final UserService userService;
     private final DocumentHearingLocationHelper locationHelper;
     private final DjAuthorisationFieldService authorisationFieldService;
-    private final DjBundleFieldService bundleFieldService;
     private final DjDirectionsToggleService directionsToggleService;
     private final DjPartyFieldService partyFieldService;
     private final DjHearingMethodFieldService hearingMethodFieldService;
@@ -34,9 +33,6 @@ public DefaultJudgmentSDOOrderForm buildTemplate(CaseData caseData, String autho
             .setWrittenByJudge(writtenByJudge)
             .setJudgeNameTitle(caseData.getDisposalHearingJudgesRecitalDJ().getJudgeNameTitle())
             .setCaseNumber(caseData.getLegacyCaseReference())
-            .setDisposalHearingBundleDJ(caseData.getDisposalHearingBundleDJ())
-            .setDisposalHearingBundleDJAddSection(nonNull(caseData.getDisposalHearingBundleDJ()))
-            .setTypeBundleInfo(bundleFieldService.buildBundleInfo(caseData))
             .setDisposalHearingDisclosureOfDocumentsDJ(caseData.getDisposalHearingDisclosureOfDocumentsDJ())
             .setDisposalHearingDisclosureOfDocumentsDJAddSection(
                 nonNull(caseData.getDisposalHearingDisclosureOfDocumentsDJ()))

src/main/java/uk/gov/hmcts/reform/civil/service/docmosis/dj/DjTrialTemplateService.java

@@ -20,7 +20,6 @@ public class DjTrialTemplateService {
     private final UserService userService;
     private final DocumentHearingLocationHelper locationHelper;
     private final DjAuthorisationFieldService authorisationFieldService;
-    private final DjBundleFieldService bundleFieldService;
     private final DjDirectionsToggleService directionsToggleService;
     private final DjPartyFieldService partyFieldService;
     private final DjHearingMethodFieldService hearingMethodFieldService;
@@ -45,7 +44,6 @@ public DefaultJudgmentSDOOrderForm buildTemplate(CaseData caseData, String autho
             .setSdoDJR2TrialCreditHireAddSection(nonNull(caseData.getSdoDJR2TrialCreditHire()))
             .setSdoDJR2TrialCreditHireDetailsAddSection(trialTemplateFieldService.showCreditHireDetails(caseData))
             .setTrialHearingTrialDJ(caseData.getTrialHearingTrialDJ())
-            .setTypeBundleInfo(bundleFieldService.buildBundleInfo(caseData))
             .setTrialHearingTrialDJAddSection(directionsToggleService.isToggleEnabled(caseData.getTrialHearingTrialDJToggle()))
             .setTrialHearingNotesDJ(caseData.getTrialHearingNotesDJ())
             .setHasNewDirections(directionsToggleService.hasAdditionalDirections(caseData))