Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package uk.gov.hmcts.reform.prl.enums.serveorder;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.RequiredArgsConstructor;
import uk.gov.hmcts.reform.prl.enums.CustomEnumSerializer;

@RequiredArgsConstructor
@JsonSerialize(using = CustomEnumSerializer.class)
public enum LocalAuthorityDocumentsEnum {
@JsonProperty("childImpactReport1")
childImpactReport1("childImpactReport1", "Child Impact Report 1"),
@JsonProperty("childImpactReport2")
childImpactReport2("childImpactReport2", "Child Impact Report 2"),
@JsonProperty("section37Report")
section37Report("section37Report", "Section 37 Report"),
@JsonProperty("section7Report")
section7Report("section7Report", "Section 7 report"),
@JsonProperty("section7Addendum")
section7Addendum("section7Addendum", "Section 7 Addendum"),
@JsonProperty("localAuthorityInvolvementLetter")
localAuthorityInvolvementLetter("localAuthorityInvolvementLetter", "Local Authority Involvement Letter"),
@JsonProperty("section47Inquiry")
section47Inquiry("section47Inquiry", "Section 47 Inquiry"),
@JsonProperty("other")
other("other", "Other");

private final String id;
private final String displayedValue;

@JsonValue
public String getDisplayedValue() {
return displayedValue;
}

@JsonCreator
public static LocalAuthorityDocumentsEnum getValue(String key) {
return LocalAuthorityDocumentsEnum.valueOf(key);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import uk.gov.hmcts.reform.prl.enums.YesNoNotApplicable;
import uk.gov.hmcts.reform.prl.enums.YesOrNo;
import uk.gov.hmcts.reform.prl.enums.serveorder.CafcassCymruDocumentsEnum;
import uk.gov.hmcts.reform.prl.enums.serveorder.LocalAuthorityDocumentsEnum;
import uk.gov.hmcts.reform.prl.enums.serveorder.WhatToDoWithOrderEnum;
import uk.gov.hmcts.reform.prl.enums.serviceofapplication.SoaSolicitorServingRespondentsEnum;
import uk.gov.hmcts.reform.prl.models.complextypes.manageorders.ServedParties;
Expand Down Expand Up @@ -38,6 +39,11 @@ public class ServeOrderDetails {
private final YesOrNo cafcassOrCymruNeedToProvideReport;
private final List<CafcassCymruDocumentsEnum> cafcassCymruDocuments;
private final String whenReportsMustBeFiled;

private final YesOrNo localAuthorityNeedToProvideReport;
private final List<LocalAuthorityDocumentsEnum> localAuthorityMultipleDocuments;
private final String whenReportsMustBeFiledByLocalAuthority;

private final YesOrNo orderEndsInvolvementOfCafcassOrCymru;
private final YesOrNo doYouWantToServeOrder;
private final WhatToDoWithOrderEnum whatDoWithOrder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import uk.gov.hmcts.reform.prl.enums.YesOrNo;
import uk.gov.hmcts.reform.prl.enums.serveorder.CafcassCymruDocumentsEnum;
import uk.gov.hmcts.reform.prl.enums.serveorder.LocalAuthorityDocumentsEnum;
import uk.gov.hmcts.reform.prl.enums.serveorder.WhatToDoWithOrderEnum;

import java.time.LocalDate;
Expand All @@ -16,6 +18,7 @@
@Data
@Builder(toBuilder = true)
@AllArgsConstructor
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class ServeOrderData {
@JsonProperty("cafcassOrCymruNeedToProvideReport")
Expand All @@ -24,6 +27,12 @@ public class ServeOrderData {
private final List<CafcassCymruDocumentsEnum> cafcassCymruDocuments;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
private final LocalDate whenReportsMustBeFiled;
@JsonProperty("localAuthorityNeedToProvideReport")
private final YesOrNo localAuthorityNeedToProvideReport;
@JsonProperty("localAuthorityMultipleDocuments")
private final List<LocalAuthorityDocumentsEnum> localAuthorityMultipleDocuments;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
private final LocalDate whenReportsMustBeFiledByLocalAuthority;
@JsonProperty("orderEndsInvolvementOfCafcassOrCymru")
private final YesOrNo orderEndsInvolvementOfCafcassOrCymru;
@JsonProperty("doYouWantToServeOrder")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,8 @@ private List<Element<OrderDetails>> getListOfOrders(String authorisation,
}

public static ServeOrderDetails buildServeOrderDetails(ServeOrderData serveOrderData) {
return ServeOrderDetails.builder()
final ServeOrderDetails.ServeOrderDetailsBuilder serveOrderDetails = ServeOrderDetails.builder();
serveOrderDetails
.cafcassOrCymruNeedToProvideReport(
serveOrderData.getCafcassOrCymruNeedToProvideReport())
.cafcassCymruDocuments(serveOrderData.getCafcassCymruDocuments())
Expand All @@ -1103,8 +1104,22 @@ public static ServeOrderDetails buildServeOrderDetails(ServeOrderData serveOrder
Locale.ENGLISH
)) : null)
.orderEndsInvolvementOfCafcassOrCymru(
serveOrderData.getOrderEndsInvolvementOfCafcassOrCymru())
.build();
serveOrderData.getOrderEndsInvolvementOfCafcassOrCymru());

if (null != serveOrderData.getLocalAuthorityNeedToProvideReport()
&& serveOrderData.getLocalAuthorityNeedToProvideReport().equals(Yes)) {
serveOrderDetails
.localAuthorityNeedToProvideReport(serveOrderData.getLocalAuthorityNeedToProvideReport())
.localAuthorityMultipleDocuments(serveOrderData.getLocalAuthorityMultipleDocuments())
.whenReportsMustBeFiledByLocalAuthority(serveOrderData.getWhenReportsMustBeFiledByLocalAuthority() != null
? serveOrderData.getWhenReportsMustBeFiledByLocalAuthority()
.format(DateTimeFormatter.ofPattern(
PrlAppsConstants.D_MMM_YYYY,
Locale.ENGLISH
)) : null);
}

return serveOrderDetails.build();
}

public String getSelectedChildInfoFromMangeOrder(CaseData caseData) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,7 @@ test-url: ${TEST_URL:http://localhost:4044}

core_case_data:
api:
#url: ${CORE_CASE_DATA_API_URL:http://ccd-data-store-api-aat.service.core-compute-aat.internal}
url: ${CORE_CASE_DATA_API_URL:https://ccd-data-store-api-prl-ccd-definitions-pr-2868.preview.platform.hmcts.net/}
url: ${CORE_CASE_DATA_API_URL:http://ccd-data-store-api-aat.service.core-compute-aat.internal}

auth:
idam:
Expand Down