diff --git a/src/main/java/com/rbkmoney/newway/domain/enums/RecurrentTokenSource.java b/src/main/java/com/rbkmoney/newway/domain/enums/RecurrentTokenSource.java deleted file mode 100644 index 2b3357e..0000000 --- a/src/main/java/com/rbkmoney/newway/domain/enums/RecurrentTokenSource.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This file is generated by jOOQ. -*/ -package com.rbkmoney.newway.domain.enums; - - -import com.rbkmoney.newway.domain.Nw; - -import javax.annotation.Generated; - -import org.jooq.Catalog; -import org.jooq.EnumType; -import org.jooq.Schema; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.9.6" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public enum RecurrentTokenSource implements EnumType { - - payment("payment"); - - private final String literal; - - private RecurrentTokenSource(String literal) { - this.literal = literal; - } - - /** - * {@inheritDoc} - */ - @Override - public Catalog getCatalog() { - return getSchema() == null ? null : getSchema().getCatalog(); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Nw.NW; - } - - /** - * {@inheritDoc} - */ - @Override - public String getName() { - return "recurrent_token_source"; - } - - /** - * {@inheritDoc} - */ - @Override - public String getLiteral() { - return literal; - } -} diff --git a/src/main/java/com/rbkmoney/newway/domain/tables/Payment.java b/src/main/java/com/rbkmoney/newway/domain/tables/Payment.java index dd5fe42..fe21b76 100644 --- a/src/main/java/com/rbkmoney/newway/domain/tables/Payment.java +++ b/src/main/java/com/rbkmoney/newway/domain/tables/Payment.java @@ -11,6 +11,9 @@ import com.rbkmoney.newway.domain.enums.PaymentFlowType; import com.rbkmoney.newway.domain.enums.PaymentStatus; import com.rbkmoney.newway.domain.enums.PaymentToolType; import com.rbkmoney.newway.domain.enums.RiskScore; +import com.rbkmoney.newway.domain.enums.SessionChangePayload; +import com.rbkmoney.newway.domain.enums.SessionChangePayloadFinishedResult; +import com.rbkmoney.newway.domain.enums.SessionTargetStatus; import com.rbkmoney.newway.domain.tables.records.PaymentRecord; import java.time.LocalDateTime; @@ -41,7 +44,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Payment extends TableImpl { - private static final long serialVersionUID = 490772039; + private static final long serialVersionUID = -1275329731; /** * The reference instance of nw.payment @@ -271,6 +274,76 @@ public class Payment extends TableImpl { */ public final TableField CURRENT = createField("current", org.jooq.impl.SQLDataType.BOOLEAN.nullable(false).defaultValue(org.jooq.impl.DSL.field("true", org.jooq.impl.SQLDataType.BOOLEAN)), this, ""); + /** + * The column nw.payment.session_target. + */ + public final TableField SESSION_TARGET = createField("session_target", org.jooq.util.postgres.PostgresDataType.VARCHAR.asEnumDataType(com.rbkmoney.newway.domain.enums.SessionTargetStatus.class), this, ""); + + /** + * The column nw.payment.session_payload. + */ + public final TableField SESSION_PAYLOAD = createField("session_payload", org.jooq.util.postgres.PostgresDataType.VARCHAR.asEnumDataType(com.rbkmoney.newway.domain.enums.SessionChangePayload.class), this, ""); + + /** + * The column nw.payment.session_payload_finished_result. + */ + public final TableField SESSION_PAYLOAD_FINISHED_RESULT = createField("session_payload_finished_result", org.jooq.util.postgres.PostgresDataType.VARCHAR.asEnumDataType(com.rbkmoney.newway.domain.enums.SessionChangePayloadFinishedResult.class), this, ""); + + /** + * The column nw.payment.session_payload_finished_result_failed_failure_json. + */ + public final TableField SESSION_PAYLOAD_FINISHED_RESULT_FAILED_FAILURE_JSON = createField("session_payload_finished_result_failed_failure_json", org.jooq.impl.SQLDataType.VARCHAR, this, ""); + + /** + * The column nw.payment.session_payload_suspended_tag. + */ + public final TableField SESSION_PAYLOAD_SUSPENDED_TAG = createField("session_payload_suspended_tag", org.jooq.impl.SQLDataType.VARCHAR, this, ""); + + /** + * The column nw.payment.session_payload_transaction_bound_trx_id. + */ + public final TableField SESSION_PAYLOAD_TRANSACTION_BOUND_TRX_ID = createField("session_payload_transaction_bound_trx_id", org.jooq.impl.SQLDataType.VARCHAR, this, ""); + + /** + * The column nw.payment.session_payload_transaction_bound_trx_timestamp. + */ + public final TableField SESSION_PAYLOAD_TRANSACTION_BOUND_TRX_TIMESTAMP = createField("session_payload_transaction_bound_trx_timestamp", org.jooq.impl.SQLDataType.LOCALDATETIME, this, ""); + + /** + * The column nw.payment.session_payload_transaction_bound_trx_extra_json. + */ + public final TableField SESSION_PAYLOAD_TRANSACTION_BOUND_TRX_EXTRA_JSON = createField("session_payload_transaction_bound_trx_extra_json", org.jooq.impl.SQLDataType.VARCHAR, this, ""); + + /** + * The column nw.payment.session_payload_proxy_state_changed_proxy_state. + */ + public final TableField SESSION_PAYLOAD_PROXY_STATE_CHANGED_PROXY_STATE = createField("session_payload_proxy_state_changed_proxy_state", org.jooq.impl.SQLDataType.BLOB, this, ""); + + /** + * The column nw.payment.session_payload_interaction_requested_interaction_json. + */ + public final TableField SESSION_PAYLOAD_INTERACTION_REQUESTED_INTERACTION_JSON = createField("session_payload_interaction_requested_interaction_json", org.jooq.impl.SQLDataType.VARCHAR, this, ""); + + /** + * The column nw.payment.fee. + */ + public final TableField FEE = createField("fee", org.jooq.impl.SQLDataType.BIGINT, this, ""); + + /** + * The column nw.payment.provider_fee. + */ + public final TableField PROVIDER_FEE = createField("provider_fee", org.jooq.impl.SQLDataType.BIGINT, this, ""); + + /** + * The column nw.payment.external_fee. + */ + public final TableField EXTERNAL_FEE = createField("external_fee", org.jooq.impl.SQLDataType.BIGINT, this, ""); + + /** + * The column nw.payment.guarantee_deposit. + */ + public final TableField GUARANTEE_DEPOSIT = createField("guarantee_deposit", org.jooq.impl.SQLDataType.BIGINT, this, ""); + /** * The column nw.payment.make_recurrent. */ diff --git a/src/main/java/com/rbkmoney/newway/domain/tables/pojos/Payment.java b/src/main/java/com/rbkmoney/newway/domain/tables/pojos/Payment.java index 72dfd4b..4cb2db8 100644 --- a/src/main/java/com/rbkmoney/newway/domain/tables/pojos/Payment.java +++ b/src/main/java/com/rbkmoney/newway/domain/tables/pojos/Payment.java @@ -9,6 +9,9 @@ import com.rbkmoney.newway.domain.enums.PaymentFlowType; import com.rbkmoney.newway.domain.enums.PaymentStatus; import com.rbkmoney.newway.domain.enums.PaymentToolType; import com.rbkmoney.newway.domain.enums.RiskScore; +import com.rbkmoney.newway.domain.enums.SessionChangePayload; +import com.rbkmoney.newway.domain.enums.SessionChangePayloadFinishedResult; +import com.rbkmoney.newway.domain.enums.SessionTargetStatus; import java.io.Serializable; import java.time.LocalDateTime; @@ -30,55 +33,69 @@ import javax.annotation.Generated; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Payment implements Serializable { - private static final long serialVersionUID = -845003393; + private static final long serialVersionUID = 1162777227; - private Long id; - private Long eventId; - private LocalDateTime eventCreatedAt; - private String paymentId; - private LocalDateTime createdAt; - private String invoiceId; - private String partyId; - private String shopId; - private Long domainRevision; - private Long partyRevision; - private PaymentStatus status; - private String statusCancelledReason; - private String statusCapturedReason; - private String statusFailedFailure; - private Long amount; - private String currencyCode; - private PayerType payerType; - private PaymentToolType payerPaymentToolType; - private String payerBankCardToken; - private String payerBankCardPaymentSystem; - private String payerBankCardBin; - private String payerBankCardMaskedPan; - private String payerBankCardTokenProvider; - private String payerPaymentTerminalType; - private String payerDigitalWalletProvider; - private String payerDigitalWalletId; - private String payerPaymentSessionId; - private String payerIpAddress; - private String payerFingerprint; - private String payerPhoneNumber; - private String payerEmail; - private String payerCustomerId; - private String payerCustomerBindingId; - private String payerCustomerRecPaymentToolId; - private byte[] context; - private PaymentFlowType paymentFlowType; - private String paymentFlowOnHoldExpiration; - private LocalDateTime paymentFlowHeldUntil; - private RiskScore riskScore; - private Integer routeProviderId; - private Integer routeTerminalId; - private LocalDateTime wtime; - private Boolean current; - private Boolean makeRecurrent; - private String payerRecurrentParentInvoiceId; - private String payerRecurrentParentPaymentId; - private String recurrentIntentionToken; + private Long id; + private Long eventId; + private LocalDateTime eventCreatedAt; + private String paymentId; + private LocalDateTime createdAt; + private String invoiceId; + private String partyId; + private String shopId; + private Long domainRevision; + private Long partyRevision; + private PaymentStatus status; + private String statusCancelledReason; + private String statusCapturedReason; + private String statusFailedFailure; + private Long amount; + private String currencyCode; + private PayerType payerType; + private PaymentToolType payerPaymentToolType; + private String payerBankCardToken; + private String payerBankCardPaymentSystem; + private String payerBankCardBin; + private String payerBankCardMaskedPan; + private String payerBankCardTokenProvider; + private String payerPaymentTerminalType; + private String payerDigitalWalletProvider; + private String payerDigitalWalletId; + private String payerPaymentSessionId; + private String payerIpAddress; + private String payerFingerprint; + private String payerPhoneNumber; + private String payerEmail; + private String payerCustomerId; + private String payerCustomerBindingId; + private String payerCustomerRecPaymentToolId; + private byte[] context; + private PaymentFlowType paymentFlowType; + private String paymentFlowOnHoldExpiration; + private LocalDateTime paymentFlowHeldUntil; + private RiskScore riskScore; + private Integer routeProviderId; + private Integer routeTerminalId; + private LocalDateTime wtime; + private Boolean current; + private SessionTargetStatus sessionTarget; + private SessionChangePayload sessionPayload; + private SessionChangePayloadFinishedResult sessionPayloadFinishedResult; + private String sessionPayloadFinishedResultFailedFailureJson; + private String sessionPayloadSuspendedTag; + private String sessionPayloadTransactionBoundTrxId; + private LocalDateTime sessionPayloadTransactionBoundTrxTimestamp; + private String sessionPayloadTransactionBoundTrxExtraJson; + private byte[] sessionPayloadProxyStateChangedProxyState; + private String sessionPayloadInteractionRequestedInteractionJson; + private Long fee; + private Long providerFee; + private Long externalFee; + private Long guaranteeDeposit; + private Boolean makeRecurrent; + private String payerRecurrentParentInvoiceId; + private String payerRecurrentParentPaymentId; + private String recurrentIntentionToken; public Payment() {} @@ -126,6 +143,20 @@ public class Payment implements Serializable { this.routeTerminalId = value.routeTerminalId; this.wtime = value.wtime; this.current = value.current; + this.sessionTarget = value.sessionTarget; + this.sessionPayload = value.sessionPayload; + this.sessionPayloadFinishedResult = value.sessionPayloadFinishedResult; + this.sessionPayloadFinishedResultFailedFailureJson = value.sessionPayloadFinishedResultFailedFailureJson; + this.sessionPayloadSuspendedTag = value.sessionPayloadSuspendedTag; + this.sessionPayloadTransactionBoundTrxId = value.sessionPayloadTransactionBoundTrxId; + this.sessionPayloadTransactionBoundTrxTimestamp = value.sessionPayloadTransactionBoundTrxTimestamp; + this.sessionPayloadTransactionBoundTrxExtraJson = value.sessionPayloadTransactionBoundTrxExtraJson; + this.sessionPayloadProxyStateChangedProxyState = value.sessionPayloadProxyStateChangedProxyState; + this.sessionPayloadInteractionRequestedInteractionJson = value.sessionPayloadInteractionRequestedInteractionJson; + this.fee = value.fee; + this.providerFee = value.providerFee; + this.externalFee = value.externalFee; + this.guaranteeDeposit = value.guaranteeDeposit; this.makeRecurrent = value.makeRecurrent; this.payerRecurrentParentInvoiceId = value.payerRecurrentParentInvoiceId; this.payerRecurrentParentPaymentId = value.payerRecurrentParentPaymentId; @@ -133,53 +164,67 @@ public class Payment implements Serializable { } public Payment( - Long id, - Long eventId, - LocalDateTime eventCreatedAt, - String paymentId, - LocalDateTime createdAt, - String invoiceId, - String partyId, - String shopId, - Long domainRevision, - Long partyRevision, - PaymentStatus status, - String statusCancelledReason, - String statusCapturedReason, - String statusFailedFailure, - Long amount, - String currencyCode, - PayerType payerType, - PaymentToolType payerPaymentToolType, - String payerBankCardToken, - String payerBankCardPaymentSystem, - String payerBankCardBin, - String payerBankCardMaskedPan, - String payerBankCardTokenProvider, - String payerPaymentTerminalType, - String payerDigitalWalletProvider, - String payerDigitalWalletId, - String payerPaymentSessionId, - String payerIpAddress, - String payerFingerprint, - String payerPhoneNumber, - String payerEmail, - String payerCustomerId, - String payerCustomerBindingId, - String payerCustomerRecPaymentToolId, - byte[] context, - PaymentFlowType paymentFlowType, - String paymentFlowOnHoldExpiration, - LocalDateTime paymentFlowHeldUntil, - RiskScore riskScore, - Integer routeProviderId, - Integer routeTerminalId, - LocalDateTime wtime, - Boolean current, - Boolean makeRecurrent, - String payerRecurrentParentInvoiceId, - String payerRecurrentParentPaymentId, - String recurrentIntentionToken + Long id, + Long eventId, + LocalDateTime eventCreatedAt, + String paymentId, + LocalDateTime createdAt, + String invoiceId, + String partyId, + String shopId, + Long domainRevision, + Long partyRevision, + PaymentStatus status, + String statusCancelledReason, + String statusCapturedReason, + String statusFailedFailure, + Long amount, + String currencyCode, + PayerType payerType, + PaymentToolType payerPaymentToolType, + String payerBankCardToken, + String payerBankCardPaymentSystem, + String payerBankCardBin, + String payerBankCardMaskedPan, + String payerBankCardTokenProvider, + String payerPaymentTerminalType, + String payerDigitalWalletProvider, + String payerDigitalWalletId, + String payerPaymentSessionId, + String payerIpAddress, + String payerFingerprint, + String payerPhoneNumber, + String payerEmail, + String payerCustomerId, + String payerCustomerBindingId, + String payerCustomerRecPaymentToolId, + byte[] context, + PaymentFlowType paymentFlowType, + String paymentFlowOnHoldExpiration, + LocalDateTime paymentFlowHeldUntil, + RiskScore riskScore, + Integer routeProviderId, + Integer routeTerminalId, + LocalDateTime wtime, + Boolean current, + SessionTargetStatus sessionTarget, + SessionChangePayload sessionPayload, + SessionChangePayloadFinishedResult sessionPayloadFinishedResult, + String sessionPayloadFinishedResultFailedFailureJson, + String sessionPayloadSuspendedTag, + String sessionPayloadTransactionBoundTrxId, + LocalDateTime sessionPayloadTransactionBoundTrxTimestamp, + String sessionPayloadTransactionBoundTrxExtraJson, + byte[] sessionPayloadProxyStateChangedProxyState, + String sessionPayloadInteractionRequestedInteractionJson, + Long fee, + Long providerFee, + Long externalFee, + Long guaranteeDeposit, + Boolean makeRecurrent, + String payerRecurrentParentInvoiceId, + String payerRecurrentParentPaymentId, + String recurrentIntentionToken ) { this.id = id; this.eventId = eventId; @@ -224,6 +269,20 @@ public class Payment implements Serializable { this.routeTerminalId = routeTerminalId; this.wtime = wtime; this.current = current; + this.sessionTarget = sessionTarget; + this.sessionPayload = sessionPayload; + this.sessionPayloadFinishedResult = sessionPayloadFinishedResult; + this.sessionPayloadFinishedResultFailedFailureJson = sessionPayloadFinishedResultFailedFailureJson; + this.sessionPayloadSuspendedTag = sessionPayloadSuspendedTag; + this.sessionPayloadTransactionBoundTrxId = sessionPayloadTransactionBoundTrxId; + this.sessionPayloadTransactionBoundTrxTimestamp = sessionPayloadTransactionBoundTrxTimestamp; + this.sessionPayloadTransactionBoundTrxExtraJson = sessionPayloadTransactionBoundTrxExtraJson; + this.sessionPayloadProxyStateChangedProxyState = sessionPayloadProxyStateChangedProxyState; + this.sessionPayloadInteractionRequestedInteractionJson = sessionPayloadInteractionRequestedInteractionJson; + this.fee = fee; + this.providerFee = providerFee; + this.externalFee = externalFee; + this.guaranteeDeposit = guaranteeDeposit; this.makeRecurrent = makeRecurrent; this.payerRecurrentParentInvoiceId = payerRecurrentParentInvoiceId; this.payerRecurrentParentPaymentId = payerRecurrentParentPaymentId; @@ -574,6 +633,118 @@ public class Payment implements Serializable { this.current = current; } + public SessionTargetStatus getSessionTarget() { + return this.sessionTarget; + } + + public void setSessionTarget(SessionTargetStatus sessionTarget) { + this.sessionTarget = sessionTarget; + } + + public SessionChangePayload getSessionPayload() { + return this.sessionPayload; + } + + public void setSessionPayload(SessionChangePayload sessionPayload) { + this.sessionPayload = sessionPayload; + } + + public SessionChangePayloadFinishedResult getSessionPayloadFinishedResult() { + return this.sessionPayloadFinishedResult; + } + + public void setSessionPayloadFinishedResult(SessionChangePayloadFinishedResult sessionPayloadFinishedResult) { + this.sessionPayloadFinishedResult = sessionPayloadFinishedResult; + } + + public String getSessionPayloadFinishedResultFailedFailureJson() { + return this.sessionPayloadFinishedResultFailedFailureJson; + } + + public void setSessionPayloadFinishedResultFailedFailureJson(String sessionPayloadFinishedResultFailedFailureJson) { + this.sessionPayloadFinishedResultFailedFailureJson = sessionPayloadFinishedResultFailedFailureJson; + } + + public String getSessionPayloadSuspendedTag() { + return this.sessionPayloadSuspendedTag; + } + + public void setSessionPayloadSuspendedTag(String sessionPayloadSuspendedTag) { + this.sessionPayloadSuspendedTag = sessionPayloadSuspendedTag; + } + + public String getSessionPayloadTransactionBoundTrxId() { + return this.sessionPayloadTransactionBoundTrxId; + } + + public void setSessionPayloadTransactionBoundTrxId(String sessionPayloadTransactionBoundTrxId) { + this.sessionPayloadTransactionBoundTrxId = sessionPayloadTransactionBoundTrxId; + } + + public LocalDateTime getSessionPayloadTransactionBoundTrxTimestamp() { + return this.sessionPayloadTransactionBoundTrxTimestamp; + } + + public void setSessionPayloadTransactionBoundTrxTimestamp(LocalDateTime sessionPayloadTransactionBoundTrxTimestamp) { + this.sessionPayloadTransactionBoundTrxTimestamp = sessionPayloadTransactionBoundTrxTimestamp; + } + + public String getSessionPayloadTransactionBoundTrxExtraJson() { + return this.sessionPayloadTransactionBoundTrxExtraJson; + } + + public void setSessionPayloadTransactionBoundTrxExtraJson(String sessionPayloadTransactionBoundTrxExtraJson) { + this.sessionPayloadTransactionBoundTrxExtraJson = sessionPayloadTransactionBoundTrxExtraJson; + } + + public byte[] getSessionPayloadProxyStateChangedProxyState() { + return this.sessionPayloadProxyStateChangedProxyState; + } + + public void setSessionPayloadProxyStateChangedProxyState(byte... sessionPayloadProxyStateChangedProxyState) { + this.sessionPayloadProxyStateChangedProxyState = sessionPayloadProxyStateChangedProxyState; + } + + public String getSessionPayloadInteractionRequestedInteractionJson() { + return this.sessionPayloadInteractionRequestedInteractionJson; + } + + public void setSessionPayloadInteractionRequestedInteractionJson(String sessionPayloadInteractionRequestedInteractionJson) { + this.sessionPayloadInteractionRequestedInteractionJson = sessionPayloadInteractionRequestedInteractionJson; + } + + public Long getFee() { + return this.fee; + } + + public void setFee(Long fee) { + this.fee = fee; + } + + public Long getProviderFee() { + return this.providerFee; + } + + public void setProviderFee(Long providerFee) { + this.providerFee = providerFee; + } + + public Long getExternalFee() { + return this.externalFee; + } + + public void setExternalFee(Long externalFee) { + this.externalFee = externalFee; + } + + public Long getGuaranteeDeposit() { + return this.guaranteeDeposit; + } + + public void setGuaranteeDeposit(Long guaranteeDeposit) { + this.guaranteeDeposit = guaranteeDeposit; + } + public Boolean getMakeRecurrent() { return this.makeRecurrent; } @@ -873,6 +1044,90 @@ public class Payment implements Serializable { } else if (!current.equals(other.current)) return false; + if (sessionTarget == null) { + if (other.sessionTarget != null) + return false; + } + else if (!sessionTarget.equals(other.sessionTarget)) + return false; + if (sessionPayload == null) { + if (other.sessionPayload != null) + return false; + } + else if (!sessionPayload.equals(other.sessionPayload)) + return false; + if (sessionPayloadFinishedResult == null) { + if (other.sessionPayloadFinishedResult != null) + return false; + } + else if (!sessionPayloadFinishedResult.equals(other.sessionPayloadFinishedResult)) + return false; + if (sessionPayloadFinishedResultFailedFailureJson == null) { + if (other.sessionPayloadFinishedResultFailedFailureJson != null) + return false; + } + else if (!sessionPayloadFinishedResultFailedFailureJson.equals(other.sessionPayloadFinishedResultFailedFailureJson)) + return false; + if (sessionPayloadSuspendedTag == null) { + if (other.sessionPayloadSuspendedTag != null) + return false; + } + else if (!sessionPayloadSuspendedTag.equals(other.sessionPayloadSuspendedTag)) + return false; + if (sessionPayloadTransactionBoundTrxId == null) { + if (other.sessionPayloadTransactionBoundTrxId != null) + return false; + } + else if (!sessionPayloadTransactionBoundTrxId.equals(other.sessionPayloadTransactionBoundTrxId)) + return false; + if (sessionPayloadTransactionBoundTrxTimestamp == null) { + if (other.sessionPayloadTransactionBoundTrxTimestamp != null) + return false; + } + else if (!sessionPayloadTransactionBoundTrxTimestamp.equals(other.sessionPayloadTransactionBoundTrxTimestamp)) + return false; + if (sessionPayloadTransactionBoundTrxExtraJson == null) { + if (other.sessionPayloadTransactionBoundTrxExtraJson != null) + return false; + } + else if (!sessionPayloadTransactionBoundTrxExtraJson.equals(other.sessionPayloadTransactionBoundTrxExtraJson)) + return false; + if (sessionPayloadProxyStateChangedProxyState == null) { + if (other.sessionPayloadProxyStateChangedProxyState != null) + return false; + } + else if (!Arrays.equals(sessionPayloadProxyStateChangedProxyState, other.sessionPayloadProxyStateChangedProxyState)) + return false; + if (sessionPayloadInteractionRequestedInteractionJson == null) { + if (other.sessionPayloadInteractionRequestedInteractionJson != null) + return false; + } + else if (!sessionPayloadInteractionRequestedInteractionJson.equals(other.sessionPayloadInteractionRequestedInteractionJson)) + return false; + if (fee == null) { + if (other.fee != null) + return false; + } + else if (!fee.equals(other.fee)) + return false; + if (providerFee == null) { + if (other.providerFee != null) + return false; + } + else if (!providerFee.equals(other.providerFee)) + return false; + if (externalFee == null) { + if (other.externalFee != null) + return false; + } + else if (!externalFee.equals(other.externalFee)) + return false; + if (guaranteeDeposit == null) { + if (other.guaranteeDeposit != null) + return false; + } + else if (!guaranteeDeposit.equals(other.guaranteeDeposit)) + return false; if (makeRecurrent == null) { if (other.makeRecurrent != null) return false; @@ -947,6 +1202,20 @@ public class Payment implements Serializable { result = prime * result + ((this.routeTerminalId == null) ? 0 : this.routeTerminalId.hashCode()); result = prime * result + ((this.wtime == null) ? 0 : this.wtime.hashCode()); result = prime * result + ((this.current == null) ? 0 : this.current.hashCode()); + result = prime * result + ((this.sessionTarget == null) ? 0 : this.sessionTarget.hashCode()); + result = prime * result + ((this.sessionPayload == null) ? 0 : this.sessionPayload.hashCode()); + result = prime * result + ((this.sessionPayloadFinishedResult == null) ? 0 : this.sessionPayloadFinishedResult.hashCode()); + result = prime * result + ((this.sessionPayloadFinishedResultFailedFailureJson == null) ? 0 : this.sessionPayloadFinishedResultFailedFailureJson.hashCode()); + result = prime * result + ((this.sessionPayloadSuspendedTag == null) ? 0 : this.sessionPayloadSuspendedTag.hashCode()); + result = prime * result + ((this.sessionPayloadTransactionBoundTrxId == null) ? 0 : this.sessionPayloadTransactionBoundTrxId.hashCode()); + result = prime * result + ((this.sessionPayloadTransactionBoundTrxTimestamp == null) ? 0 : this.sessionPayloadTransactionBoundTrxTimestamp.hashCode()); + result = prime * result + ((this.sessionPayloadTransactionBoundTrxExtraJson == null) ? 0 : this.sessionPayloadTransactionBoundTrxExtraJson.hashCode()); + result = prime * result + ((this.sessionPayloadProxyStateChangedProxyState == null) ? 0 : Arrays.hashCode(this.sessionPayloadProxyStateChangedProxyState)); + result = prime * result + ((this.sessionPayloadInteractionRequestedInteractionJson == null) ? 0 : this.sessionPayloadInteractionRequestedInteractionJson.hashCode()); + result = prime * result + ((this.fee == null) ? 0 : this.fee.hashCode()); + result = prime * result + ((this.providerFee == null) ? 0 : this.providerFee.hashCode()); + result = prime * result + ((this.externalFee == null) ? 0 : this.externalFee.hashCode()); + result = prime * result + ((this.guaranteeDeposit == null) ? 0 : this.guaranteeDeposit.hashCode()); result = prime * result + ((this.makeRecurrent == null) ? 0 : this.makeRecurrent.hashCode()); result = prime * result + ((this.payerRecurrentParentInvoiceId == null) ? 0 : this.payerRecurrentParentInvoiceId.hashCode()); result = prime * result + ((this.payerRecurrentParentPaymentId == null) ? 0 : this.payerRecurrentParentPaymentId.hashCode()); @@ -1001,6 +1270,20 @@ public class Payment implements Serializable { sb.append(", ").append(routeTerminalId); sb.append(", ").append(wtime); sb.append(", ").append(current); + sb.append(", ").append(sessionTarget); + sb.append(", ").append(sessionPayload); + sb.append(", ").append(sessionPayloadFinishedResult); + sb.append(", ").append(sessionPayloadFinishedResultFailedFailureJson); + sb.append(", ").append(sessionPayloadSuspendedTag); + sb.append(", ").append(sessionPayloadTransactionBoundTrxId); + sb.append(", ").append(sessionPayloadTransactionBoundTrxTimestamp); + sb.append(", ").append(sessionPayloadTransactionBoundTrxExtraJson); + sb.append(", ").append("[binary...]"); + sb.append(", ").append(sessionPayloadInteractionRequestedInteractionJson); + sb.append(", ").append(fee); + sb.append(", ").append(providerFee); + sb.append(", ").append(externalFee); + sb.append(", ").append(guaranteeDeposit); sb.append(", ").append(makeRecurrent); sb.append(", ").append(payerRecurrentParentInvoiceId); sb.append(", ").append(payerRecurrentParentPaymentId); diff --git a/src/main/java/com/rbkmoney/newway/domain/tables/records/PaymentRecord.java b/src/main/java/com/rbkmoney/newway/domain/tables/records/PaymentRecord.java index 58b6068..60cedc6 100644 --- a/src/main/java/com/rbkmoney/newway/domain/tables/records/PaymentRecord.java +++ b/src/main/java/com/rbkmoney/newway/domain/tables/records/PaymentRecord.java @@ -9,6 +9,9 @@ import com.rbkmoney.newway.domain.enums.PaymentFlowType; import com.rbkmoney.newway.domain.enums.PaymentStatus; import com.rbkmoney.newway.domain.enums.PaymentToolType; import com.rbkmoney.newway.domain.enums.RiskScore; +import com.rbkmoney.newway.domain.enums.SessionChangePayload; +import com.rbkmoney.newway.domain.enums.SessionChangePayloadFinishedResult; +import com.rbkmoney.newway.domain.enums.SessionTargetStatus; import com.rbkmoney.newway.domain.tables.Payment; import java.time.LocalDateTime; @@ -32,7 +35,7 @@ import org.jooq.impl.UpdatableRecordImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class PaymentRecord extends UpdatableRecordImpl { - private static final long serialVersionUID = -1095066936; + private static final long serialVersionUID = -538197258; /** * Setter for nw.payment.id. @@ -636,60 +639,256 @@ public class PaymentRecord extends UpdatableRecordImpl { return (Boolean) get(42); } + /** + * Setter for nw.payment.session_target. + */ + public void setSessionTarget(SessionTargetStatus value) { + set(43, value); + } + + /** + * Getter for nw.payment.session_target. + */ + public SessionTargetStatus getSessionTarget() { + return (SessionTargetStatus) get(43); + } + + /** + * Setter for nw.payment.session_payload. + */ + public void setSessionPayload(SessionChangePayload value) { + set(44, value); + } + + /** + * Getter for nw.payment.session_payload. + */ + public SessionChangePayload getSessionPayload() { + return (SessionChangePayload) get(44); + } + + /** + * Setter for nw.payment.session_payload_finished_result. + */ + public void setSessionPayloadFinishedResult(SessionChangePayloadFinishedResult value) { + set(45, value); + } + + /** + * Getter for nw.payment.session_payload_finished_result. + */ + public SessionChangePayloadFinishedResult getSessionPayloadFinishedResult() { + return (SessionChangePayloadFinishedResult) get(45); + } + + /** + * Setter for nw.payment.session_payload_finished_result_failed_failure_json. + */ + public void setSessionPayloadFinishedResultFailedFailureJson(String value) { + set(46, value); + } + + /** + * Getter for nw.payment.session_payload_finished_result_failed_failure_json. + */ + public String getSessionPayloadFinishedResultFailedFailureJson() { + return (String) get(46); + } + + /** + * Setter for nw.payment.session_payload_suspended_tag. + */ + public void setSessionPayloadSuspendedTag(String value) { + set(47, value); + } + + /** + * Getter for nw.payment.session_payload_suspended_tag. + */ + public String getSessionPayloadSuspendedTag() { + return (String) get(47); + } + + /** + * Setter for nw.payment.session_payload_transaction_bound_trx_id. + */ + public void setSessionPayloadTransactionBoundTrxId(String value) { + set(48, value); + } + + /** + * Getter for nw.payment.session_payload_transaction_bound_trx_id. + */ + public String getSessionPayloadTransactionBoundTrxId() { + return (String) get(48); + } + + /** + * Setter for nw.payment.session_payload_transaction_bound_trx_timestamp. + */ + public void setSessionPayloadTransactionBoundTrxTimestamp(LocalDateTime value) { + set(49, value); + } + + /** + * Getter for nw.payment.session_payload_transaction_bound_trx_timestamp. + */ + public LocalDateTime getSessionPayloadTransactionBoundTrxTimestamp() { + return (LocalDateTime) get(49); + } + + /** + * Setter for nw.payment.session_payload_transaction_bound_trx_extra_json. + */ + public void setSessionPayloadTransactionBoundTrxExtraJson(String value) { + set(50, value); + } + + /** + * Getter for nw.payment.session_payload_transaction_bound_trx_extra_json. + */ + public String getSessionPayloadTransactionBoundTrxExtraJson() { + return (String) get(50); + } + + /** + * Setter for nw.payment.session_payload_proxy_state_changed_proxy_state. + */ + public void setSessionPayloadProxyStateChangedProxyState(byte... value) { + set(51, value); + } + + /** + * Getter for nw.payment.session_payload_proxy_state_changed_proxy_state. + */ + public byte[] getSessionPayloadProxyStateChangedProxyState() { + return (byte[]) get(51); + } + + /** + * Setter for nw.payment.session_payload_interaction_requested_interaction_json. + */ + public void setSessionPayloadInteractionRequestedInteractionJson(String value) { + set(52, value); + } + + /** + * Getter for nw.payment.session_payload_interaction_requested_interaction_json. + */ + public String getSessionPayloadInteractionRequestedInteractionJson() { + return (String) get(52); + } + + /** + * Setter for nw.payment.fee. + */ + public void setFee(Long value) { + set(53, value); + } + + /** + * Getter for nw.payment.fee. + */ + public Long getFee() { + return (Long) get(53); + } + + /** + * Setter for nw.payment.provider_fee. + */ + public void setProviderFee(Long value) { + set(54, value); + } + + /** + * Getter for nw.payment.provider_fee. + */ + public Long getProviderFee() { + return (Long) get(54); + } + + /** + * Setter for nw.payment.external_fee. + */ + public void setExternalFee(Long value) { + set(55, value); + } + + /** + * Getter for nw.payment.external_fee. + */ + public Long getExternalFee() { + return (Long) get(55); + } + + /** + * Setter for nw.payment.guarantee_deposit. + */ + public void setGuaranteeDeposit(Long value) { + set(56, value); + } + + /** + * Getter for nw.payment.guarantee_deposit. + */ + public Long getGuaranteeDeposit() { + return (Long) get(56); + } + /** * Setter for nw.payment.make_recurrent. */ public void setMakeRecurrent(Boolean value) { - set(43, value); + set(57, value); } /** * Getter for nw.payment.make_recurrent. */ public Boolean getMakeRecurrent() { - return (Boolean) get(43); + return (Boolean) get(57); } /** * Setter for nw.payment.payer_recurrent_parent_invoice_id. */ public void setPayerRecurrentParentInvoiceId(String value) { - set(44, value); + set(58, value); } /** * Getter for nw.payment.payer_recurrent_parent_invoice_id. */ public String getPayerRecurrentParentInvoiceId() { - return (String) get(44); + return (String) get(58); } /** * Setter for nw.payment.payer_recurrent_parent_payment_id. */ public void setPayerRecurrentParentPaymentId(String value) { - set(45, value); + set(59, value); } /** * Getter for nw.payment.payer_recurrent_parent_payment_id. */ public String getPayerRecurrentParentPaymentId() { - return (String) get(45); + return (String) get(59); } /** * Setter for nw.payment.recurrent_intention_token. */ public void setRecurrentIntentionToken(String value) { - set(46, value); + set(60, value); } /** * Getter for nw.payment.recurrent_intention_token. */ public String getRecurrentIntentionToken() { - return (String) get(46); + return (String) get(60); } // ------------------------------------------------------------------------- @@ -718,7 +917,7 @@ public class PaymentRecord extends UpdatableRecordImpl { /** * Create a detached, initialised PaymentRecord */ - public PaymentRecord(Long id, Long eventId, LocalDateTime eventCreatedAt, String paymentId, LocalDateTime createdAt, String invoiceId, String partyId, String shopId, Long domainRevision, Long partyRevision, PaymentStatus status, String statusCancelledReason, String statusCapturedReason, String statusFailedFailure, Long amount, String currencyCode, PayerType payerType, PaymentToolType payerPaymentToolType, String payerBankCardToken, String payerBankCardPaymentSystem, String payerBankCardBin, String payerBankCardMaskedPan, String payerBankCardTokenProvider, String payerPaymentTerminalType, String payerDigitalWalletProvider, String payerDigitalWalletId, String payerPaymentSessionId, String payerIpAddress, String payerFingerprint, String payerPhoneNumber, String payerEmail, String payerCustomerId, String payerCustomerBindingId, String payerCustomerRecPaymentToolId, byte[] context, PaymentFlowType paymentFlowType, String paymentFlowOnHoldExpiration, LocalDateTime paymentFlowHeldUntil, RiskScore riskScore, Integer routeProviderId, Integer routeTerminalId, LocalDateTime wtime, Boolean current, Boolean makeRecurrent, String payerRecurrentParentInvoiceId, String payerRecurrentParentPaymentId, String recurrentIntentionToken) { + public PaymentRecord(Long id, Long eventId, LocalDateTime eventCreatedAt, String paymentId, LocalDateTime createdAt, String invoiceId, String partyId, String shopId, Long domainRevision, Long partyRevision, PaymentStatus status, String statusCancelledReason, String statusCapturedReason, String statusFailedFailure, Long amount, String currencyCode, PayerType payerType, PaymentToolType payerPaymentToolType, String payerBankCardToken, String payerBankCardPaymentSystem, String payerBankCardBin, String payerBankCardMaskedPan, String payerBankCardTokenProvider, String payerPaymentTerminalType, String payerDigitalWalletProvider, String payerDigitalWalletId, String payerPaymentSessionId, String payerIpAddress, String payerFingerprint, String payerPhoneNumber, String payerEmail, String payerCustomerId, String payerCustomerBindingId, String payerCustomerRecPaymentToolId, byte[] context, PaymentFlowType paymentFlowType, String paymentFlowOnHoldExpiration, LocalDateTime paymentFlowHeldUntil, RiskScore riskScore, Integer routeProviderId, Integer routeTerminalId, LocalDateTime wtime, Boolean current, SessionTargetStatus sessionTarget, SessionChangePayload sessionPayload, SessionChangePayloadFinishedResult sessionPayloadFinishedResult, String sessionPayloadFinishedResultFailedFailureJson, String sessionPayloadSuspendedTag, String sessionPayloadTransactionBoundTrxId, LocalDateTime sessionPayloadTransactionBoundTrxTimestamp, String sessionPayloadTransactionBoundTrxExtraJson, byte[] sessionPayloadProxyStateChangedProxyState, String sessionPayloadInteractionRequestedInteractionJson, Long fee, Long providerFee, Long externalFee, Long guaranteeDeposit, Boolean makeRecurrent, String payerRecurrentParentInvoiceId, String payerRecurrentParentPaymentId, String recurrentIntentionToken) { super(Payment.PAYMENT); set(0, id); @@ -764,9 +963,23 @@ public class PaymentRecord extends UpdatableRecordImpl { set(40, routeTerminalId); set(41, wtime); set(42, current); - set(43, makeRecurrent); - set(44, payerRecurrentParentInvoiceId); - set(45, payerRecurrentParentPaymentId); - set(46, recurrentIntentionToken); + set(43, sessionTarget); + set(44, sessionPayload); + set(45, sessionPayloadFinishedResult); + set(46, sessionPayloadFinishedResultFailedFailureJson); + set(47, sessionPayloadSuspendedTag); + set(48, sessionPayloadTransactionBoundTrxId); + set(49, sessionPayloadTransactionBoundTrxTimestamp); + set(50, sessionPayloadTransactionBoundTrxExtraJson); + set(51, sessionPayloadProxyStateChangedProxyState); + set(52, sessionPayloadInteractionRequestedInteractionJson); + set(53, fee); + set(54, providerFee); + set(55, externalFee); + set(56, guaranteeDeposit); + set(57, makeRecurrent); + set(58, payerRecurrentParentInvoiceId); + set(59, payerRecurrentParentPaymentId); + set(60, recurrentIntentionToken); } }