Skip to content

civil fees feedId Issue #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raokonda11 wants to merge 1 commit into
base: team/sni-9179
Choose a base branch
from
Open

civil fees feedId Issue #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions .../uk/gov/moj/cpp/prosecution/casefile/event/listener/converter/CaseDetailsToCivilFees.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,42 @@ public class CaseDetailsToCivilFees implements Converter<CaseDetails, Set<CivilF
@SuppressWarnings("squid:S1135")
public Set<CivilFees> convert(final CaseDetails caseDetails) {

if(isEmpty(caseDetails.getFeeStatus()) && isEmpty(caseDetails.getContestedFeeStatus())) {
final String feeStatus = normalize(caseDetails.getFeeStatus());
final String contestedFeeStatus = normalize(caseDetails.getContestedFeeStatus());

if (isEmpty(feeStatus) && isEmpty(contestedFeeStatus)) {
return null;
}

Set<CivilFees> civilFeesSet = new HashSet<>();

if(StringUtils.isNotEmpty(caseDetails.getFeeStatus())) {
if (StringUtils.isNotEmpty(feeStatus)) {
civilFeesSet.add(createCivilFee(caseDetails.getFeeId(),
caseDetails.getCaseId(),
caseDetails.getFeeType(),
caseDetails.getFeeStatus(),
feeStatus,
caseDetails.getPaymentReference()));
}

if(StringUtils.isNotEmpty(caseDetails.getContestedFeeStatus())) {
if (StringUtils.isNotEmpty(contestedFeeStatus)) {
civilFeesSet.add(createCivilFee(caseDetails.getContestedFeeId(),
caseDetails.getCaseId(),
caseDetails.getContestedFeeType(),
caseDetails.getContestedFeeStatus(),
contestedFeeStatus,
caseDetails.getContestedFeePaymentReference()));
}

return civilFeesSet;

}

private String normalize(final String status) {
if (status == null) return null;
final String trimmed = status.trim();
if (trimmed.isEmpty()) return null;
return "NOT_APPLICABLE".equalsIgnoreCase(trimmed) ? null : trimmed;
}

private CivilFees createCivilFee(UUID feeId, UUID caseId, String feeType, String feeStatus, String paymentReference) {
return new CivilFees(feeId, caseId, feeType, feeStatus, paymentReference);
}
Expand Down
13 changes: 12 additions & 1 deletion ...gov/moj/cpp/prosecution/casefile/event/listener/converter/CaseDetailsToCivilFeesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,23 @@ public void shouldReturnNullWhenCivilFeesStatusEmpty() {
assertNull(civilFees);
}

@Test
public void shouldReturnNullWhenStatusIsNotApplicable() {
CaseDetails caseDetails = CaseDetails.caseDetails()
.withFeeStatus("NOT_APPLICABLE")
.build();

Set<CivilFees> civilFees = underTest.convert(caseDetails);

assertNull(civilFees);
}

@Test
public void shouldCreateCivilFeesObject() {
UUID feeId = UUID.randomUUID();
UUID caseId = UUID.randomUUID();
String feeType = "someFeeType";
String feeStatus = "someFeeStatus";
String feeStatus = "OUTSTANDING";
String paymentReference = "somePaymentReference";

CaseDetails caseDetails = CaseDetails.caseDetails()
Expand Down
20 changes: 15 additions & 5 deletions ...j/cpp/prosecution/casefile/event/processor/converter/CaseDetailsToCivilFeesConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,40 @@ public class CaseDetailsToCivilFeesConverter implements Converter<CaseDetails, L
@SuppressWarnings("squid:S1188")
public List<CivilFees> convert(final CaseDetails caseDetails) {

if(isEmpty(caseDetails.getFeeStatus()) && isEmpty(caseDetails.getContestedFeeStatus())) {
final String feeStatus = normalize(caseDetails.getFeeStatus());
final String contestedFeeStatus = normalize(caseDetails.getContestedFeeStatus());

if (isEmpty(feeStatus) && isEmpty(contestedFeeStatus)) {
return null;
}

List<CivilFees> civilFeesList = new ArrayList<>();

if(StringUtils.isNotEmpty(caseDetails.getFeeStatus())) {
if (StringUtils.isNotEmpty(feeStatus)) {
civilFeesList.add(createCivilFee(caseDetails.getFeeId(),
caseDetails.getFeeType(),
caseDetails.getFeeStatus(),
feeStatus,
caseDetails.getPaymentReference()));
}

if(StringUtils.isNotEmpty(caseDetails.getContestedFeeStatus())) {
if (StringUtils.isNotEmpty(contestedFeeStatus)) {
civilFeesList.add(createCivilFee(caseDetails.getContestedFeeId(),
caseDetails.getContestedFeeType(),
caseDetails.getContestedFeeStatus(),
contestedFeeStatus,
caseDetails.getContestedFeePaymentReference()));
}

return civilFeesList;

}

private String normalize(final String status) {
if (status == null) return null;
final String trimmed = status.trim();
if (trimmed.isEmpty()) return null;
return "NOT_APPLICABLE".equalsIgnoreCase(trimmed) ? null : trimmed;
}

private CivilFees createCivilFee(UUID feeId, String feeType, String feeStatus, String paymentReference) {
return new CivilFees(feeId, FeeStatus.valueOf(feeStatus), FeeType.valueOf(feeType), paymentReference);
}
Expand Down
15 changes: 13 additions & 2 deletions ...p/prosecution/casefile/event/processor/converter/CaseDetailsToCivilFeesConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static uk.gov.justice.core.courts.FeeStatus.NOT_APPLICABLE;
import static uk.gov.justice.core.courts.FeeStatus.OUTSTANDING;
import static uk.gov.justice.core.courts.FeeType.INITIAL;

import uk.gov.justice.core.courts.CivilFees;
Expand All @@ -28,12 +28,23 @@ public void shouldReturnNullWhenCivilFeesStatusEmpty() {
assertNull(civilFees);
}

@Test
public void shouldReturnNullWhenStatusIsNotApplicable() {
CaseDetails caseDetails = CaseDetails.caseDetails()
.withFeeStatus("NOT_APPLICABLE")
.build();

List<CivilFees> civilFees = underTest.convert(caseDetails);

assertNull(civilFees);
}

@Test
public void shouldCreateCivilFeesObject() {
UUID feeId = UUID.randomUUID();
UUID caseId = UUID.randomUUID();
FeeType feeType = INITIAL;
FeeStatus feeStatus = NOT_APPLICABLE;
FeeStatus feeStatus = OUTSTANDING;
String paymentReference = "somePaymentReference";

CaseDetails caseDetails = CaseDetails.caseDetails()
Expand Down
Loading