Merge pull request #116 from hmcts/feature/PAY-548-1

Updated fees register contract api version and fixed incorrect fee issue
hmcts · Mar 19, 2018 · 124c86d · 124c86d
2 parents b348802 + c8174d0
commit 124c86d
Show file tree

Hide file tree

Showing 19 changed files with 280 additions and 377 deletions.
diff --git a/api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/FeeCsvDto.java b/api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/FeeCsvDto.java
diff --git a/api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/FeeDto.java b/api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/FeeDto.java
@@ -1,5 +1,6 @@
 package uk.gov.hmcts.payment.api.contract;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
@@ -11,7 +12,6 @@
 
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotNull;
-
 import java.math.BigDecimal;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
@@ -33,4 +33,10 @@ public class FeeDto {
     @NotNull
     @Digits(integer = 10, fraction = 2, message = "Fee calculated amount cannot have more than 2 decimal places")
     private BigDecimal calculatedAmount;
+
+    @JsonIgnore
+    private String memoLine;
+    @JsonIgnore
+    private String naturalAccountCode;
+
 }
diff --git a/api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/PaymentCsvDto.java b/api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/PaymentCsvDto.java
diff --git a/api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/PaymentDto.java b/api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/PaymentDto.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.AllArgsConstructor;
@@ -111,14 +110,13 @@ public static class LinkDto {
 
     public String toCardPaymentCsv() {
 
+
         SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy HH:mm:ss zzz");
 
         StringJoiner sb = new StringJoiner(",")
             .add(getServiceName())
             .add(getPaymentGroupReference())
             .add(getPaymentReference())
-            .add(getCcdCaseNumber())
-            .add(getCaseReference())
             .add(sdf.format(getDateCreated()))
             .add(sdf.format(getDateUpdated()))
             .add(getStatus())
@@ -130,15 +128,26 @@ public String toCardPaymentCsv() {
         StringJoiner feeSb = new StringJoiner(",");
 
         for (FeeDto fee : getFees()) {
-
-            feeSb.add(fee.getCode()).add(fee.getVersion()).add(fee.getCalculatedAmount().toString());
+            String memolineWithQuotes="";
+            if (null!=fee.getMemoLine()){
+                memolineWithQuotes = new StringBuffer().append('"').append(fee.getMemoLine()).append('"').toString();
+            }
+            String naturalAccountCode="";
+            if (null!=fee.getNaturalAccountCode()){
+                naturalAccountCode= fee.getNaturalAccountCode();
+            }
+            feeSb.add(fee.getCode())
+                .add(fee.getVersion())
+                .add(fee.getCalculatedAmount().toString())
+                .add(memolineWithQuotes)
+                .add(naturalAccountCode);
         }
 
-
         return sb.merge(feeSb).toString();
     }
 
 
+
     public String toCreditAccountPaymentCsv() {
 
         SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy HH:mm:ss zzz");
@@ -163,15 +172,22 @@ public String toCreditAccountPaymentCsv() {
         StringJoiner feeSb = new StringJoiner(",");
 
         for (FeeDto fee : getFees()) {
-
-            feeSb.add(fee.getCode()).add(fee.getVersion()).add(fee.getCalculatedAmount().toString());
+            String memolineWithQuotes="";
+            if (null!=fee.getMemoLine()){
+                memolineWithQuotes = new StringBuffer().append('"').append(fee.getMemoLine()).append('"').toString();
+            }
+            String naturalAccountCode="";
+            if (null!=fee.getNaturalAccountCode()){
+                naturalAccountCode= fee.getNaturalAccountCode();
+            }
+            feeSb.add(fee.getCode())
+                .add(fee.getVersion())
+                .add(fee.getCalculatedAmount().toString())
+                .add(memolineWithQuotes)
+                .add(naturalAccountCode);
         }
-
-
         return sb.merge(feeSb).toString();
     }
 
 
-
-
 }
diff --git a/api/src/main/java/uk/gov/hmcts/payment/api/dto/mapper/CardPaymentDtoMapper.java b/api/src/main/java/uk/gov/hmcts/payment/api/dto/mapper/CardPaymentDtoMapper.java
@@ -3,7 +3,9 @@
 import lombok.SneakyThrows;
 import org.springframework.hateoas.mvc.ControllerLinkBuilder;
 import org.springframework.stereotype.Component;
-import uk.gov.hmcts.payment.api.contract.*;
+import uk.gov.hmcts.payment.api.contract.FeeDto;
+import uk.gov.hmcts.payment.api.contract.PaymentDto;
+import uk.gov.hmcts.payment.api.contract.StatusHistoryDto;
 import uk.gov.hmcts.payment.api.contract.util.CurrencyCode;
 import uk.gov.hmcts.payment.api.controllers.CardPaymentController;
 import uk.gov.hmcts.payment.api.model.Fee;
@@ -67,9 +69,9 @@ public PaymentDto toRetrievePaymentStatusesDto(PaymentFeeLink paymentFeeLink) {
             .build();
     }
 
-    public PaymentCsvDto toReconciliationResponseDto(PaymentFeeLink paymentFeeLink) {
+    public PaymentDto toReconciliationResponseDto(PaymentFeeLink paymentFeeLink) {
         Payment payment = paymentFeeLink.getPayments().get(0);
-        return PaymentCsvDto.paymentCsvDtoWith()
+        return PaymentDto.payment2DtoWith()
             .paymentReference(payment.getReference())
             .paymentGroupReference(paymentFeeLink.getPaymentReference())
             .serviceName(payment.getServiceType())
@@ -83,7 +85,7 @@ public PaymentCsvDto toReconciliationResponseDto(PaymentFeeLink paymentFeeLink)
             .dateCreated(payment.getDateCreated())
             .dateUpdated(payment.getDateUpdated())
             .method(payment.getPaymentMethod().getName())
-            .fees(toFeeCsvDtos(paymentFeeLink.getFees()))
+            .fees(toFeeDtos(paymentFeeLink.getFees()))
             .build();
 
     }
@@ -92,11 +94,6 @@ private List<FeeDto> toFeeDtos(List<Fee> fees) {
         return fees.stream().map(this::toFeeDto).collect(Collectors.toList());
     }
 
-    private List<FeeCsvDto> toFeeCsvDtos(List<Fee> fees) {
-        return fees.stream().map(this::toFeeCsvDto).collect(Collectors.toList());
-    }
-
-
     public List<Fee> toFees(List<FeeDto> feeDtos) {
         return feeDtos.stream().map(this::toFee).collect(Collectors.toList());
     }
@@ -109,12 +106,6 @@ private FeeDto toFeeDto(Fee fee) {
         return FeeDto.feeDtoWith().calculatedAmount(fee.getCalculatedAmount()).code(fee.getCode()).version(fee.getVersion()).build();
     }
 
-
-    private FeeCsvDto toFeeCsvDto(Fee fee) {
-        return FeeCsvDto.feeCsvDtoWith().calculatedAmount(fee.getCalculatedAmount()).code(fee.getCode()).version(fee.getVersion())
-            .memoLine("").naturalAccountCode("").build();
-    }
-
     private List<StatusHistoryDto> toStatusHistoryDtos(List<StatusHistory> statusHistories) {
         return statusHistories.stream().map(this::toStatusHistoryDto).collect(Collectors.toList());
     }

diff --git a/api/src/main/java/uk/gov/hmcts/payment/api/dto/mapper/CreditAccountDtoMapper.java b/api/src/main/java/uk/gov/hmcts/payment/api/dto/mapper/CreditAccountDtoMapper.java
@@ -129,9 +129,9 @@ public PaymentDto toPaymentDto(Payment payment) {
             .siteId(payment.getSiteId())
             .build();
     }
-    public PaymentCsvDto toReconciliationResponseDto(PaymentFeeLink paymentFeeLink) {
+    public PaymentDto toReconciliationResponseDto(PaymentFeeLink paymentFeeLink) {
         Payment payment = paymentFeeLink.getPayments().get(0);
-        return PaymentCsvDto.paymentCsvDtoWith()
+        return PaymentDto.payment2DtoWith()
             .paymentReference(payment.getReference())
             .paymentGroupReference(paymentFeeLink.getPaymentReference())
             .serviceName(payment.getServiceType())
@@ -148,7 +148,7 @@ public PaymentCsvDto toReconciliationResponseDto(PaymentFeeLink paymentFeeLink)
             .dateCreated(payment.getDateCreated())
             .dateUpdated(payment.getDateUpdated())
             .method(payment.getPaymentMethod().getName())
-            .fees(toFeeCsvDtos(paymentFeeLink.getFees()))
+            .fees(toFeeDtos(paymentFeeLink.getFees()))
             .build();
 
     }
@@ -161,9 +161,6 @@ public List<Payment> toPaymentsRequest(List<CreditAccountPaymentRequest> creditA
     public List<FeeDto> toFeeDtos(List<Fee> fees) {
         return fees.stream().map(this::toFeeDto).collect(Collectors.toList());
     }
-    private List<FeeCsvDto> toFeeCsvDtos(List<Fee> fees) {
-        return fees.stream().map(this::toFeeCsvDto).collect(Collectors.toList());
-    }
 
 
     public List<Fee> toFees(List<FeeDto> feeDtos) {
@@ -177,10 +174,6 @@ public Fee toFee(FeeDto feeDto) {
     public FeeDto toFeeDto(Fee fee) {
         return FeeDto.feeDtoWith().calculatedAmount(fee.getCalculatedAmount()).code(fee.getCode()).version(fee.getVersion()).build();
     }
-    private FeeCsvDto toFeeCsvDto(Fee fee) {
-        return FeeCsvDto.feeCsvDtoWith().calculatedAmount(fee.getCalculatedAmount()).code(fee.getCode()).version(fee.getVersion())
-            .memoLine("").naturalAccountCode("").build();
-    }
 
 
     @SneakyThrows(NoSuchMethodException.class)

diff --git a/...t/api/fees/client/FeesRegisterClient.java → ...yment/api/reports/FeesRegisterClient.java b/...t/api/fees/client/FeesRegisterClient.java → ...yment/api/reports/FeesRegisterClient.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.payment.api.fees.client;
+package uk.gov.hmcts.payment.api.reports;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;