Add service request for fees payments

Author: dharmendra kumar

src/main/java/uk/gov/hmcts/reform/payments/client/PaymentsApi.java

@@ -10,10 +10,13 @@
 import uk.gov.hmcts.reform.payments.client.health.InternalHealth;
 import uk.gov.hmcts.reform.payments.client.models.PaymentDto;
 import uk.gov.hmcts.reform.payments.request.CardPaymentRequest;
+import uk.gov.hmcts.reform.payments.request.CardPaymentServiceRequestDTO;
 import uk.gov.hmcts.reform.payments.request.CreateServiceRequestDTO;
 import uk.gov.hmcts.reform.payments.request.CreditAccountPaymentRequest;
 import uk.gov.hmcts.reform.payments.request.PBAServiceRequestDTO;
+import uk.gov.hmcts.reform.payments.response.CardPaymentServiceRequestResponse;
 import uk.gov.hmcts.reform.payments.response.PBAServiceRequestResponse;
+import uk.gov.hmcts.reform.payments.response.PaymentGroupResponse;
 import uk.gov.hmcts.reform.payments.response.PaymentServiceResponse;
 
 @FeignClient(name = "payments-api", url = "${payments.api.url}", configuration = PaymentClientConfiguration.class)
@@ -51,6 +54,13 @@ void cancelCardPayment(
             @RequestHeader("ServiceAuthorization") String serviceAuthorization
     );
 
+    @GetMapping(value = "/card-payments/{internal-reference}/status")
+    PaymentDto getCardPaymentStatus(
+            @PathVariable("internal-reference") String internalReference,
+            @RequestHeader("Authorization") String authorization,
+            @RequestHeader("ServiceAuthorization") String serviceAuthorization
+    );
+
     @PostMapping(value = "/service-request", consumes = "application/json")
     PaymentServiceResponse createServiceRequest(
             @RequestHeader("Authorization") String authorization,
@@ -65,4 +75,20 @@ PBAServiceRequestResponse createPbaPayment(
             @RequestHeader("ServiceAuthorization") String serviceAuthorization,
             @RequestBody PBAServiceRequestDTO paymentRequest
     );
+
+    @PostMapping(value = "/service-request/{service-request-reference}/card-payments", consumes = "application/json")
+    CardPaymentServiceRequestResponse createCardPaymentServiceRequest(
+            @PathVariable("service-request-reference") String serviceReqReference,
+            @RequestHeader("Authorization") String authorization,
+            @RequestHeader("ServiceAuthorization") String serviceAuthorization,
+            @RequestBody CardPaymentServiceRequestDTO paymentRequest
+    );
+
+    @GetMapping(value = "cases/{ccd-case-number}/paymentgroups")
+    PaymentGroupResponse getCasePaymentGroups(
+            @PathVariable("ccd-case-number") String ccdCaseNumber,
+            @RequestHeader("Authorization") String authorization,
+            @RequestHeader("ServiceAuthorization") String serviceAuthorization
+    );
+
 }

src/main/java/uk/gov/hmcts/reform/payments/client/models/PaymentGroupDto.java

@@ -0,0 +1,36 @@
+package uk.gov.hmcts.reform.payments.client.models;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentGroupDto {
+
+    @JsonProperty("any_payment_disputed")
+    private boolean anyPaymentDisputed;
+    @JsonProperty("date_created")
+    private OffsetDateTime dateCreated;
+    @JsonProperty("date_updated")
+    private OffsetDateTime dateUpdated;
+    private List<FeeDto> fees;
+    @JsonProperty("payment_group_reference")
+    private String paymentGroupReference;
+    private List<PaymentDto> payments;
+    private List<RemissionDto> remissions;
+    @JsonProperty("service_request_status")
+    private String serviceRequestStatus;
+}

src/main/java/uk/gov/hmcts/reform/payments/client/models/RemissionDto.java

@@ -0,0 +1,63 @@
+package uk.gov.hmcts.reform.payments.client.models;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RemissionDto {
+
+    @JsonProperty("add_refund")
+    private boolean addRefund;
+
+    @JsonProperty("beneficiary_name")
+    private String beneficiaryName;
+
+    @JsonProperty("case_reference")
+    private String caseReference;
+
+    @JsonProperty("ccd_case_number")
+    private String ccdCaseNumber;
+
+    @JsonProperty("date_created")
+    private String dateCreated;
+
+    @JsonProperty("fee_code")
+    private String feeCode;
+
+    @JsonProperty("fee_id")
+    private String feeId;
+
+    @JsonProperty("hwf_amount")
+    private BigDecimal hwfAmount;
+
+    @JsonProperty("hwf_reference")
+    private String hwfReference;
+
+    private String id;
+
+    @JsonProperty("issue_refund_add_refund_add_remission")
+    private boolean issueRefundAddRefundAddRemission;
+
+    @JsonProperty("payment_group_reference")
+    private String paymentGroupReference;
+
+    @JsonProperty("payment_reference")
+    private String paymentReference;
+
+    @JsonProperty("remission_reference")
+    private String remissionReference;
+
+}

src/main/java/uk/gov/hmcts/reform/payments/request/CardPaymentServiceRequestDTO.java

@@ -0,0 +1,26 @@
+package uk.gov.hmcts.reform.payments.request;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CardPaymentServiceRequestDTO {
+
+    @JsonProperty("language")
+    private String language;
+    @JsonProperty("amount")
+    private BigDecimal amount;
+    @Builder.Default
+    @JsonProperty("currency")
+    private String currency = "GBP";
+    @JsonProperty("return-url")
+    private String returnUrl;
+}

src/main/java/uk/gov/hmcts/reform/payments/response/CardPaymentServiceRequestResponse.java

@@ -0,0 +1,31 @@
+package uk.gov.hmcts.reform.payments.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CardPaymentServiceRequestResponse {
+
+    @JsonProperty("external_reference")
+    private String externalReference;
+
+    @JsonProperty("payment_reference")
+    private String paymentReference;
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("next_url")
+    private String nextUrl;
+
+    @JsonProperty("date_created")
+    private String dateCreated;
+}

src/main/java/uk/gov/hmcts/reform/payments/response/PaymentGroupResponse.java

@@ -0,0 +1,22 @@
+package uk.gov.hmcts.reform.payments.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import uk.gov.hmcts.reform.payments.client.models.PaymentGroupDto;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PaymentGroupResponse {
+
+    @JsonProperty("payment_groups")
+    List<PaymentGroupDto> paymentGroups;
+}