PAY-7103: Calculate the AMOUNT DUE and OVERPAYMENTS for ( Issue refun…

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

@@ -10,6 +10,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import uk.gov.hmcts.payment.api.contract.util.CurrencyCode;
 
 import javax.validation.constraints.NotEmpty;
@@ -30,6 +31,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
+@ToString
 public class PaymentDto {
 
     private String id;

api/src/main/java/uk/gov/hmcts/payment/api/controllers/CaseController.java

@@ -4,6 +4,8 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.MultiValueMap;
@@ -41,6 +43,8 @@
 @Validated
 public class CaseController {
 
+    private static final Logger LOG = LoggerFactory.getLogger(CaseController.class);
+
     private final PaymentService<PaymentFeeLink, String> paymentService;
     private final PaymentGroupService<PaymentFeeLink, String> paymentGroupService;
     private final PaymentDtoMapper paymentDtoMapper;
@@ -110,9 +114,10 @@ public PaymentGroupResponse retrieveCasePaymentGroups(@PathVariable(name = "ccdc
             throw new PaymentGroupNotFoundException("No Service found for given CaseType or HMCTS Org Id");
         }
         PaymentGroupResponse paymentGroupResponse = new PaymentGroupResponse(paymentGroups);
-
         paymentGroupResponse = paymentRefundsService.checkRefundAgainstRemissionV2(headers, paymentGroupResponse, ccdCaseNumber);
 
+        LOG.info("Refund " + paymentGroupResponse.getPaymentGroups().get(0).getRefunds());
+        LOG.info("END case number:-----"+ ccdCaseNumber);
         return paymentGroupResponse;
     }
 

api/src/main/java/uk/gov/hmcts/payment/api/dto/PaymentGroupDto.java

@@ -23,6 +23,7 @@
 @NoArgsConstructor
 @Getter
 @Setter
+@ToString
 public class PaymentGroupDto {
 
     private String paymentGroupReference;
@@ -43,4 +44,6 @@ public class PaymentGroupDto {
 
     private boolean isAnyPaymentDisputed;
 
+    private List<RefundDto> refunds;
+
 }

api/src/main/java/uk/gov/hmcts/payment/api/dto/RefundDto.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.payment.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
@@ -8,19 +9,22 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 import uk.gov.hmcts.payment.api.model.ContactDetails;
 
 import java.math.BigDecimal;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+@JsonInclude(NON_NULL)
 @Builder(builderMethodName = "buildRefundListDtoWith")
 @AllArgsConstructor
 @NoArgsConstructor
 @Getter
 @Setter
-@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
-@JsonInclude(NON_NULL)
+@ToString
 public class RefundDto {
 
     private String ccdCaseNumber;

api/src/main/java/uk/gov/hmcts/payment/api/dto/RemissionDto.java

@@ -19,6 +19,7 @@
 @NoArgsConstructor
 @Getter
 @Setter
+@ToString
 public class RemissionDto {
 
     private String id;

api/src/main/java/uk/gov/hmcts/payment/api/service/PaymentRefundsService.java

@@ -19,4 +19,6 @@ ResponseEntity<RefundResponse> createAndValidateRetrospectiveRemissionRequest(
 
 
     void deleteByRefundReference(String refundReference, MultiValueMap<String, String> headers);
+
+    RefundListDtoResponse getRefundsApprovedFromRefundService(String ccdCaseNumber, MultiValueMap<String, String> headers);
 }

api/src/main/java/uk/gov/hmcts/payment/api/service/PaymentRefundsServiceImpl.java

@@ -4,7 +4,6 @@
 import java.time.temporal.ChronoUnit;
 
 import org.apache.commons.lang3.EnumUtils;
-import org.apache.poi.hpsf.Decimal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -248,6 +247,21 @@ public ResponseEntity updateTheRemissionAmount(String paymentReference, Resubmit
             }
         return new ResponseEntity<>(null, HttpStatus.OK);
     }
+
+
+    public RefundListDtoResponse getRefundsApprovedFromRefundService (String ccdCaseNumber, MultiValueMap<String, String> headers) {
+        final var refundListDtoResponse = getRefundsFromRefundService(ccdCaseNumber, headers);
+        if (refundListDtoResponse == null){
+            return RefundListDtoResponse.buildRefundListWith().refundList(new ArrayList<>()).build();
+        }
+        return RefundListDtoResponse.buildRefundListWith()
+            .refundList(refundListDtoResponse.getRefundList()
+                .stream()
+                .filter(e->e.getRefundStatus().getName().equals("Accepted")
+                ).collect(Collectors.toList())
+            ).build();
+    }
+
     private RefundListDtoResponse getRefundsFromRefundService(String ccdCaseNumber, MultiValueMap<String, String> headers) {
 
 
@@ -267,12 +281,14 @@ private RefundListDtoResponse getRefundsFromRefundService(String ccdCaseNumber,
 
             refundListDtoResponse = refundListDtoResponseEntity.hasBody() ? refundListDtoResponseEntity.getBody() : null;
 
-        } catch (HttpClientErrorException e) {
-
-            LOG.error("client err ", e);
+        } catch (Exception e) {
+            LOG.info("Catch the refund error for this case number: "+ ccdCaseNumber);
+            LOG.info("Catch the refund error", e.getMessage());
+            LOG.info("There has been an error calling refunds endpoint.", e);
+            e.printStackTrace();
+            LOG.info("Get cause:    ", e.getCause());
 
             refundListDtoResponse = null;
-
         }
 
         return refundListDtoResponse;

api/src/main/java/uk/gov/hmcts/payment/api/v1/controllers/ControllerExceptionHandler.java

@@ -21,6 +21,8 @@ public class ControllerExceptionHandler {
     @ExceptionHandler(value = {RuntimeException.class})
     @ResponseStatus(code = INTERNAL_SERVER_ERROR)
     public void unknownException(RuntimeException e) {
+        LOG.error("GIVE ME A CLUE !!!!!");
+        e.printStackTrace();
         LOG.error("Unknown error has occurred with errorMessage: " + e.getMessage(), e);
     }