Skip to content
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.

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

Pay 4718 Orders GET APIs #1037

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
59eec7b
Update PaymentGroupDtoMapper.java
vigneshpushkaranHMCTS May 20, 2021
66c63e5
Replaced PaymentDto with RetrieveOrderPaymentDto, PaymentGroupDto wit…
priyatham-bhikkumalla May 21, 2021
e585bf3
Update PaymentGroupDtoMapperTest.java
vigneshpushkaranHMCTS May 21, 2021
1ed3557
Merge commit 'e2d97b7b48895692ff1e0f0723e4af15abcef8f4' into HEAD
yashikno May 25, 2021
1a42ccc
Merge commit 'e2d97b7b48895692ff1e0f0723e4af15abcef8f4' into HEAD
yashikno May 25, 2021
85146ab
Bumping chart version
hmcts-jenkins-feepay[bot] May 25, 2021
38a9a81
Bumping chart version
hmcts-jenkins-feepay[bot] May 25, 2021
4f735fd
merged post api
vigneshpushkaranHMCTS May 25, 2021
161639f
refactored merged changes
vigneshpushkaranHMCTS May 25, 2021
6b9a235
Unit test
vigneshpushkaranHMCTS May 28, 2021
295b7a6
test cases addded for feedomain and payment domain
Jennings-HMCTS Jun 2, 2021
9ec3833
CasePaymentDto altered
Jennings-HMCTS Jun 4, 2021
f93024f
Merge remote-tracking branch 'origin/master' into PAY-Orders-getapi
Jennings-HMCTS Jun 4, 2021
026e220
casecontroller response bodies restructuring inprogress
Jennings-HMCTS Jun 4, 2021
7a965d4
case controller response types changed and unit tests
Jennings-HMCTS Jun 6, 2021
ac77982
Merge branch 'master' into PAY-Orders-getapi
Jennings-HMCTS Jun 7, 2021
b53c98c
Bumping chart version
hmcts-jenkins-feepay[bot] Jun 7, 2021
044c19e
GovPayment create function removed
Jennings-HMCTS Jun 7, 2021
5c03f91
stubbing rectified
Jennings-HMCTS Jun 7, 2021
201156e
get order apis name changed
Jennings-HMCTS Jun 8, 2021
6d640d8
ResponseTypes refactored
Jennings-HMCTS Jun 14, 2021
220387d
Merge branch 'master' into PAY-Orders-getapi
Jennings-HMCTS Jun 17, 2021
4e6f3dc
conflict resolved with master
Nov 9, 2021
ada622b
Bumping chart version/ fixing aliases
hmcts-jenkins-a-to-c[bot] Oct 26, 2022
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package uk.gov.hmcts.payment.api.contract;


import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;

import javax.validation.constraints.Digits;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Positive;
import java.math.BigDecimal;
import java.util.Date;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@JsonInclude(NON_NULL)
@Builder(builderMethodName = "caseFeeDtoWith")
@AllArgsConstructor
@NoArgsConstructor
@Setter
@Getter
@ToString
public class CaseFeeDto {

private Integer id;

@NotEmpty
private String code;

@NotEmpty
private String version;

@Positive
private Integer volume;

@NotNull
@Digits(integer = 10, fraction = 2, message = "Fee calculated amount cannot have more than 2 decimal places")
private BigDecimal calculatedAmount;

private BigDecimal feeAmount;

private String memoLine;

private String naturalAccountCode;

private String ccdCaseNumber;

private String caseReference;

private String reference;

@Digits(integer = 10, fraction = 2, message = "Net amount cannot have more than 2 decimal places")
private BigDecimal netAmount;

private String jurisdiction1;

private String jurisdiction2;

private String description;

private Date dateCreated;

private Date dateUpdated;

private BigDecimal amountDue;

// The below 3 fields added as part of apportionment changes for Liberata

private String paymentGroupReference;

private BigDecimal apportionedPayment;

private Date dateReceiptProcessed;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package uk.gov.hmcts.payment.api.contract;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@JsonInclude(NON_NULL)
@Builder(builderMethodName = "casePaymentAllocationDtoWith")
@AllArgsConstructor
@NoArgsConstructor
@Data
public class CasePaymentAllocationDto {
private String allocationStatus;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
package uk.gov.hmcts.payment.api.contract;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import uk.gov.hmcts.payment.api.contract.util.CurrencyCode;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@JsonInclude(NON_NULL)
@Builder(builderMethodName = "casePaymentDtoWith")
@AllArgsConstructor
@NoArgsConstructor
@Setter
@Getter
@ToString
public class CasePaymentDto {

private String paymentReference;

private String paymentGroupReference;

private String serviceName;

private String siteId;

private BigDecimal amount;

private String caseReference;

private String ccdCaseNumber;

private String accountNumber;

private String organisationName;

private String customerReference;

private String channel;

private CurrencyCode currency;

private String status;

private List<StatusHistoryDto> statusHistories;

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT")
private Date dateCreated;

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT")
private Date dateUpdated;

private String method;

private String giroSlipNo;

private String externalProvider;

private String externalReference;

private Date reportedDateOffline;

private List<FeeDto> fees;
// ----

// private String description;
// private String reference;
// private Date bankedDate;
// private String documentControlNumber;
// private List<PaymentAllocationDto> paymentAllocation;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package uk.gov.hmcts.payment.api.contract;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.*;
import uk.gov.hmcts.payment.api.contract.util.CurrencyCode;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@JsonInclude(NON_NULL)
@Builder(builderMethodName = "casePaymentGroupDtoWith")
@AllArgsConstructor
@NoArgsConstructor
@Setter
@Getter
@ToString
public class CasePaymentGroupDto {

private String reference;

private BigDecimal amount;

private CurrencyCode currency;

private String caseReference;

private String ccdCaseNumber;

private String accountNumber;

private String organisationName;

private String customerReference;

private String status;

private String serviceName;

private String siteId;

private String description;

private String channel;

private String method;

private String externalReference;

private String externalProvider;

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT")
private Date dateCreated;

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT")
private Date dateUpdated;

private String documentControlNumber;

private Date bankedDate;

private String payerName;

private List<CasePaymentAllocationDto> paymentAllocation;


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package uk.gov.hmcts.payment.api.contract;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@JsonInclude(NON_NULL)
@Builder(builderMethodName = "creditPaymentStatusDtoWith")
@AllArgsConstructor
@NoArgsConstructor
@Data
public class CreditPaymentStatusDto {
private String reference;

@NotEmpty
private BigDecimal amount;


private String status;

private List<CreditStatusHistoryDto> statusHistories;


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package uk.gov.hmcts.payment.api.contract;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.Date;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@JsonInclude(NON_NULL)
@Builder(builderMethodName = "creditStatusHistoryDtoWith")
@AllArgsConstructor
@NoArgsConstructor
@Data
public class CreditStatusHistoryDto {

private String status;

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT")
private Date dateCreated;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package uk.gov.hmcts.payment.api.contract;

import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@AllArgsConstructor
@NoArgsConstructor
@Data
public class OrderPaymentsResponse {

private List<RetrieveOrderPaymentDto> payments;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package uk.gov.hmcts.payment.api.contract;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.List;

import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@JsonInclude(NON_NULL)
@Builder(builderMethodName = "paymentStatusDtoWith")
@AllArgsConstructor
@NoArgsConstructor
@Data
public class PaymentStatusDto {
private String reference;

@NotEmpty
private BigDecimal amount;

private String paymentGroupReference;

private String status;

private List<StatusHistoryDto> statusHistories;
}

Loading