diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/robotics/mapper/EventHistoryMapper.java b/src/main/java/uk/gov/hmcts/reform/civil/service/robotics/mapper/EventHistoryMapper.java index 6facbe0e3b8..3aa254f203e 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/robotics/mapper/EventHistoryMapper.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/robotics/mapper/EventHistoryMapper.java @@ -7,7 +7,6 @@ import org.springframework.stereotype.Component; import uk.gov.hmcts.reform.civil.enums.AllocatedTrack; import uk.gov.hmcts.reform.civil.enums.CaseCategory; -import uk.gov.hmcts.reform.civil.enums.CaseState; import uk.gov.hmcts.reform.civil.enums.DJPaymentTypeSelection; import uk.gov.hmcts.reform.civil.enums.MultiPartyScenario; import uk.gov.hmcts.reform.civil.enums.ReasonForProceedingOnPaper; @@ -2345,8 +2344,7 @@ private void buildMiscellaneousDJEvent(EventHistory.EventHistoryBuilder builder, String miscTextRequested = "RPA Reason: Default Judgment requested and claim moved offline."; String miscTextGranted = "RPA Reason: Default Judgment granted and claim moved offline."; - if (featureToggleService.isJOLiveFeedActive() - && caseData.getCcdState() == CaseState.All_FINAL_ORDERS_ISSUED) { + if (featureToggleService.isJOLiveFeedActive()) { miscTextGranted = RECORD_JUDGMENT; } @@ -2355,7 +2353,7 @@ private void buildMiscellaneousDJEvent(EventHistory.EventHistoryBuilder builder, Event.builder() .eventSequence(prepareEventSequence(builder.build())) .eventCode(MISCELLANEOUS.getCode()) - .dateReceived(LocalDateTime.now()) + .dateReceived(getDateOfDjCreated(caseData)) .eventDetailsText(grantedFlag ? miscTextRequested : miscTextGranted) .eventDetails(EventDetails.builder() .miscText(grantedFlag ? miscTextRequested : miscTextGranted) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/robotics/mapper/EventHistoryMapperTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/robotics/mapper/EventHistoryMapperTest.java index 0fd71d74c14..5ac71791456 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/robotics/mapper/EventHistoryMapperTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/robotics/mapper/EventHistoryMapperTest.java @@ -7844,6 +7844,7 @@ public void shouldgenerateRPAfeedfor_DJNoDivergent_case_online_999_event() { + "Subtotal \n £1172.00\n\n ### Amount" + " already paid \n£100.00\n ## Total still owed \n £1072.00") .respondent2SameLegalRepresentative(YES) + .joDJCreatedDate(LocalDateTime.now()) .hearingSupportRequirementsDJ(HearingSupportRequirementsDJ.builder().build()) .respondent1ResponseDeadline(LocalDateTime.now().minusDays(15)) .defendantDetailsSpec(DynamicList.builder() @@ -7875,6 +7876,7 @@ public void shouldgenerateRPAfeedfor_DJNoDivergent_case_offline_999_event() { .respondent2(PartyBuilder.builder().individual().build()) .addRespondent2(YES) .paymentTypeSelection(DJPaymentTypeSelection.REPAYMENT_PLAN) + .joDJCreatedDate(LocalDateTime.now()) .repaymentSummaryObject( "The judgment will order dsfsdf ffdg to pay £1072.00, " + "including the claim fee and interest," @@ -7942,7 +7944,7 @@ public void shouldgenerateRPAfeedfor_DJ_event_update_sequenceno() { assertThat(eventHistory).extracting("miscellaneous").asList() .extracting("eventCode").asString().contains("999"); assertThat(eventHistory).extracting("miscellaneous").asList() - .extracting("eventSequence").asString().contains("5"); + .extracting("eventSequence").asString().contains("3"); assertThat(eventHistory).extracting("miscellaneous").asList() .extracting("eventDetailsText").asString().isNotEmpty(); }