PAY-651 ccd reference and Case reference added back into CSV report (#117)

Author: sacsdam

api-contract/src/main/java/uk/gov/hmcts/payment/api/contract/PaymentDto.java

@@ -117,6 +117,8 @@ public String toCardPaymentCsv() {
             .add(getServiceName())
             .add(getPaymentGroupReference())
             .add(getPaymentReference())
+            .add(getCcdCaseNumber())
+            .add(getCaseReference())
             .add(sdf.format(getDateCreated()))
             .add(sdf.format(getDateUpdated()))
             .add(getStatus())

api/src/main/java/uk/gov/hmcts/payment/api/reports/FeesService.java

@@ -61,8 +61,10 @@ public Map<String, Map<String, FeeVersionDto>> getFeesVersionsData() {
     public Map<String, Fee2Dto> getFeesDtoMap() {
         try {
             if (feesDtoMap.isEmpty()) {
-                if (feesRegisterClient.getFeesDataAsMap().isPresent())
-                    feesDtoMap = feesRegisterClient.getFeesDataAsMap().get();
+                Optional<Map<String, Fee2Dto>> optionalFeesDtoMap = feesRegisterClient.getFeesDataAsMap();
+                if (optionalFeesDtoMap.isPresent()) {
+                    feesDtoMap = optionalFeesDtoMap.get();
+                }
             }
         } catch (Exception ex) {
             LOG.error("FeesService  -  Unable to get fees data." + ex.getMessage());

api/src/main/java/uk/gov/hmcts/payment/api/reports/PaymentsReportService.java

@@ -54,7 +54,7 @@ public class PaymentsReportService {
 
     private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss");
 
-    private static final String CARD_PAYMENTS_HEADER = "Service,Payment Group reference,Payment reference,"
+    private static final String CARD_PAYMENTS_HEADER = "Service,Payment Group reference,Payment reference,CCD reference,Case reference,"
         + "Payment created date,Payment status updated date,Payment status,Payment channel,Payment method,Payment amount,"
         + "Site id,Fee code,Version,Calculated amount,Memoline,Natural account code,"
         + "Fee code,Version,Calculated amount,Memoline,Natural account code,"

version.txt

@@ -1 +1 @@
-2.1.9
+2.1.10